diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-04-22 22:48:54 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-04-22 22:48:54 +0200 |
| commit | 825af1835c81070931d078b153e2d49df4a6bc69 (patch) | |
| tree | 8f4d31115a2a3e6159f7fba88a84e6d0997291e6 /nx-X11/programs/Xserver/Imakefile | |
| parent | a5bb888248b3887bbe306505f900368b931b7f18 (diff) | |
| parent | 49fc383a4107062a843bc0c3a8fd9cae7e20e032 (diff) | |
| download | nx-libs-825af1835c81070931d078b153e2d49df4a6bc69.tar.gz nx-libs-825af1835c81070931d078b153e2d49df4a6bc69.tar.bz2 nx-libs-825af1835c81070931d078b153e2d49df4a6bc69.zip | |
Merge branch 'sunweaver-pr/libxdmcp-cleanup' into arctica-3.6.x
Attributes GH PR #15: https://github.com/ArcticaProject/nx-libs/pull/15
Diffstat (limited to 'nx-X11/programs/Xserver/Imakefile')
| -rw-r--r-- | nx-X11/programs/Xserver/Imakefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index fd0a55311..bf791c878 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -204,7 +204,7 @@ INSTPGMFLAGS = #if BuildLBX ZLIB = GzipLibrary #endif - OS = os/LibraryTargetName(os) $(DEPXAUTHLIB) $(DEPXDMCPLIB) + OS = os/LibraryTargetName(os) $(DEPXAUTHLIB) BSDEMUL = $(DEPXBSDLIB) #if DoLoadableServer MFB = mfb/ModuleLibraryTargetName(mfb) @@ -440,17 +440,17 @@ $(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 -lNX_Xdmcp \ + -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lXdmcp \ `pkg-config --libs libxml-2.0` #elif defined(cygwinArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ -lXcomp -lXcompext -lNX_Xrender -lX11 -lNX_Xext -lNX_Xcomposite -lNX_Xfixes -lXfont \ - -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdmcp \ + -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lNX_Xtst -lXdmcp \ `pkg-config --libs libxml-2.0` #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 -lNX_Xdmcp \ + -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xinerama -lXdmcp \ `pkg-config --libs libxml-2.0` #endif |