diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-08-25 12:44:49 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-08-25 12:44:49 +0200 |
| commit | ae0a2bfdeb9ceacb80aa03375353039d425b14b9 (patch) | |
| tree | daec55145477bcec69273e03d5c9ff10c10a4137 /nx-X11/programs/Xserver/Imakefile | |
| parent | cbe2c0e44f412d07024207f374c0f56684adb088 (diff) | |
| parent | 3b7e5a42f5abecb903a9d730d163d704520efb07 (diff) | |
| download | nx-libs-ae0a2bfdeb9ceacb80aa03375353039d425b14b9.tar.gz nx-libs-ae0a2bfdeb9ceacb80aa03375353039d425b14b9.tar.bz2 nx-libs-ae0a2bfdeb9ceacb80aa03375353039d425b14b9.zip | |
Merge branch 'sunweaver-pr/libnx-x11-autoreconf' into 3.6.x
Attributes GH PR #498: https://github.com/ArcticaProject/nx-libs/pull/498
Diffstat (limited to 'nx-X11/programs/Xserver/Imakefile')
| -rw-r--r-- | nx-X11/programs/Xserver/Imakefile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 3c7e68597..86c5abf81 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -315,8 +315,9 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS) #if defined(SunArchitecture) NXAGENTNXLIBS = -L/usr/sfw/lib \ - -L../../../nxcomp/src/.libs \ + -L../../../nxcomp/src/.libs \ -L../../../nxcompshad/src/.libs \ + -L../../lib/src/.libs \ -lrt \ -lXcomp \ -lXcompshad \ @@ -332,6 +333,7 @@ NXAGENTNXLIBS = -L/usr/sfw/lib \ #elif defined(cygwinArchitecture) NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \ -L../../../nxcompshad/src/.libs \ + -L../../lib/src/.libs \ -lXcomp \ -lXcompshad \ -lXrender \ @@ -343,9 +345,9 @@ NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \ -lXext \ $(NULL) #elif defined(OpenBSDArchitecture) -NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \ - -L../../../nx-X11/exports/lib \ +NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \ -L../../../nxcompshad/src/.libs \ + -L../../lib/src/.libs \ -lkvm \ -lXcomp \ -lXcompshad \ @@ -359,8 +361,9 @@ NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \ -lXext \ $(NULL) #else -NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \ +NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \ -L../../../nxcompshad/src/.libs \ + -L../../lib/src/.libs \ -lXcomp \ -lXcompshad \ -lXrender \ |