From 4818c13e7d92a0c4e1e444c81d41a9ce208cea6a Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 8 Mar 2017 11:26:16 +0100
Subject: Xserver/Imakefile: Change order of linker options, so that self-built
 components get mentioned first in the nxagent linker command.

---
 nx-X11/programs/Xserver/Imakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index e5dfa9320..47d761a74 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -385,7 +385,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.
-- 
cgit v1.2.3


From e91132f3b21927e83350c5609356b30a144e6260 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 8 Mar 2017 10:45:51 +0100
Subject: Xserver/Imakefile: Drop redundant library path option
 -L../../../nx-X11/exports/lib when linking nxagent. As -L../../exports/lib is
 already present and points to the same location.

---
 nx-X11/programs/Xserver/Imakefile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 47d761a74..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 \
-- 
cgit v1.2.3