Fix linking order hack in nxagent.

We have to make sure that all X.org libraries we link against use symbols provided by libNX_X11.

Fix linking order hack in nxagent.
3ded4a2d · Mike Gabriel · b83a1484 · 3ded4a2d
Commit 3ded4a2d authored Jun 28, 2016 by Mike Gabriel
Show whitespace changes
Inline Side-by-side

Showing with 23 additions and 10 deletions

Imakefile nx-X11/programs/Xserver/Imakefile +23 -10

No files found.
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -421,19 +421,32 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS)
 */
 #if defined(SunArchitecture)
-NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \
+NXAGENTNXLIBS = -L/usr/sfw/lib \
-                -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender -lXfixes -lXfont \
+                -L ../../../nxcomp  \
-                -L../../../nx-X11/exports/lib -lXcomposite -lXdmcp
+                -L../../../nx-X11/exports/lib \
+                -L ../../../nxcompext -L ../../../nxcompshad \
+                -lrt \
+                -lXcomp \
+                -lXcompext -lXcompshad \
+                -lXrender -lXfixes -lXfont -lXcomposite -lXinerama -lXdmcp \
+                -lNX_X11 -lNX_Xext
 #elif defined(cygwinArchitecture)
-NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \
+NXAGENTNXLIBS = -L ../../../nxcomp  \
-                -lXcomp -lXcompext -lXrender -lX11 -lNX_Xext -lXcomposite -lXfixes -lXfont \
+                -L../../../nx-X11/exports/lib \
-                -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXdmcp
+                -L ../../../nxcompext -L ../../../nxcompshad \
+                -lXcomp \
+                -lXcompext -lXcompshad \
+                -lXrender -lXfixes -lXfont -lXcomposite -lXdmcp \
+                -lNX_X11 -lNX_Xext
 #else
-NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \
+NXAGENTNXLIBS = -L ../../../nxcomp  \
-                -lXcomp -lXcompext -lXcompshad -lXrender -lNX_X11 -lNX_Xext -lXfixes -lXfont \
+                -L../../../nx-X11/exports/lib \
-                -L../../../nx-X11/exports/lib -lXcomposite -lXinerama -lXdmcp
+                -L ../../../nxcompext -L ../../../nxcompshad \
+                -lXcomp \
+                -lXcompext -lXcompshad \
+                -lXrender -lXfixes -lXfont -lXcomposite -lXinerama -lXdmcp \
+                -lNX_X11 -lNX_Xext
 #endif
 #endif
 #ifdef cygwinArchitecture