aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-05-12 06:07:45 +0200
committerMihai Moldovan <ionic@ionic.de>2015-05-12 06:07:45 +0200
commitf7295831a0dd1b52fb68e41dd9e84e0850524835 (patch)
tree228931919b826ec3d1eb10df549c26a952f3e0ee /nx-X11/programs
parentb573cbba9416c8f87d7d399e383157ebd0446c8f (diff)
parent027f593fc78ea5bb53b1d6372aa7bf37e49e59f7 (diff)
downloadnx-libs-f7295831a0dd1b52fb68e41dd9e84e0850524835.tar.gz
nx-libs-f7295831a0dd1b52fb68e41dd9e84e0850524835.tar.bz2
nx-libs-f7295831a0dd1b52fb68e41dd9e84e0850524835.zip
Merge branch 'sunweaver-pr/libxdamage-cleanup' into arctica-3.6.x
Attributes GH PR #18: https://github.com/ArcticaProject/nx-libs/pull/18
Diffstat (limited to 'nx-X11/programs')
-rw-r--r--nx-X11/programs/Xserver/Imakefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index b1782eb15..eb65fba19 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -427,7 +427,7 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS)
#if defined(SunArchitecture)
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \
-lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lNX_Xrender -lNX_Xfixes -lXfont \
- -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lXdmcp \
+ -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xrandr -lNX_Xcomposite -lXdmcp \
`pkg-config --libs libxml-2.0`
#elif defined(cygwinArchitecture)
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \
@@ -437,7 +437,7 @@ NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \
#else
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \
-lXcomp -lXcompext -lXcompshad -lNX_Xrender -lNX_X11 -lNX_Xext -lNX_Xfixes -lXfont \
- -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xinerama -lXdmcp \
+ -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xrandr -lNX_Xcomposite -lNX_Xinerama -lXdmcp \
`pkg-config --libs libxml-2.0`
#endif