diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-28 11:43:06 +0000 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-28 16:17:57 +0200 |
| commit | 3ded4a2d64233eb405f949066107db85d02e9645 (patch) | |
| tree | e7ad035edc83438f6ad953e8826d2f25ce19068d | |
| parent | b83a1484399bf0d3790b03206a97ec0d55296fb9 (diff) | |
| download | nx-libs-3ded4a2d64233eb405f949066107db85d02e9645.tar.gz nx-libs-3ded4a2d64233eb405f949066107db85d02e9645.tar.bz2 nx-libs-3ded4a2d64233eb405f949066107db85d02e9645.zip | |
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.
| -rw-r--r-- | nx-X11/programs/Xserver/Imakefile | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 3e320f8e1..0d820fad2 100644 --- 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 \ - -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender -lXfixes -lXfont \ - -L../../../nx-X11/exports/lib -lXcomposite -lXdmcp +NXAGENTNXLIBS = -L/usr/sfw/lib \ + -L ../../../nxcomp \ + -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 \ - -lXcomp -lXcompext -lXrender -lX11 -lNX_Xext -lXcomposite -lXfixes -lXfont \ - -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXdmcp +NXAGENTNXLIBS = -L ../../../nxcomp \ + -L../../../nx-X11/exports/lib \ + -L ../../../nxcompext -L ../../../nxcompshad \ + -lXcomp \ + -lXcompext -lXcompshad \ + -lXrender -lXfixes -lXfont -lXcomposite -lXdmcp \ + -lNX_X11 -lNX_Xext #else -NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ - -lXcomp -lXcompext -lXcompshad -lXrender -lNX_X11 -lNX_Xext -lXfixes -lXfont \ - -L../../../nx-X11/exports/lib -lXcomposite -lXinerama -lXdmcp +NXAGENTNXLIBS = -L ../../../nxcomp \ + -L../../../nx-X11/exports/lib \ + -L ../../../nxcompext -L ../../../nxcompshad \ + -lXcomp \ + -lXcompext -lXcompshad \ + -lXrender -lXfixes -lXfont -lXcomposite -lXinerama -lXdmcp \ + -lNX_X11 -lNX_Xext #endif - #endif #ifdef cygwinArchitecture |