aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-04-21 16:20:50 +0200
committerMihai Moldovan <ionic@ionic.de>2017-04-21 16:20:50 +0200
commit1c6217054dc53b749fd60ccd1a6d9305b68af251 (patch)
treee82aae4fb4fa87d2895eb21d9a2d04ba284989ba /nx-X11
parent22b6ac728ea33642d9f6e3c2240bfd29c7956fb0 (diff)
parente91132f3b21927e83350c5609356b30a144e6260 (diff)
downloadnx-libs-1c6217054dc53b749fd60ccd1a6d9305b68af251.tar.gz
nx-libs-1c6217054dc53b749fd60ccd1a6d9305b68af251.tar.bz2
nx-libs-1c6217054dc53b749fd60ccd1a6d9305b68af251.zip
Merge branch 'sunweaver-pr/use-source-tree-nxcomp' into 3.6.x
Attributes GH PR #437: https://github.com/ArcticaProject/nx-libs/pull/437
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/Imakefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index e5dfa9320..c5bbbeb75 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -316,7 +316,6 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS)
#if defined(SunArchitecture)
NXAGENTNXLIBS = -L/usr/sfw/lib \
-L../../../nxcomp \
- -L../../../nx-X11/exports/lib \
-L../../../nxcompshad \
-lrt \
-lXcomp \
@@ -332,7 +331,6 @@ NXAGENTNXLIBS = -L/usr/sfw/lib \
$(NULL)
#elif defined(cygwinArchitecture)
NXAGENTNXLIBS = -L../../../nxcomp \
- -L../../../nx-X11/exports/lib \
-L../../../nxcompshad \
-lXcomp \
-lXcompshad \
@@ -362,7 +360,6 @@ NXAGENTNXLIBS = -L../../../nxcomp \
$(NULL)
#else
NXAGENTNXLIBS = -L../../../nxcomp \
- -L../../../nx-X11/exports/lib \
-L../../../nxcompshad \
-lXcomp \
-lXcompshad \
@@ -385,7 +382,7 @@ NX_XSHADOWLIBNAME = libXcompshad.so
#endif
ServerTarget(nxagent,$(NXAGENTDIRS),$(NXAGENTOBJS), \
- $(LIBCWRAPPER) $(NXCOMPEXT) $(NXAGENTLIBS) $(LOADABLEEXTS),$(NXCOMPEXTSYSLIBS) $(NXAGENTSYSLIBS) $(NXAGENTNXLIBS))
+ $(LIBCWRAPPER) $(NXCOMPEXT) $(NXAGENTLIBS) $(LOADABLEEXTS),$(NXAGENTNXLIBS) $(NXAGENTSYSLIBS) $(NXCOMPEXTSYSLIBS))
/*
* Hard coded target to build a static nxagent server.