diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-06-21 18:12:11 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-29 19:11:59 +0100 |
| commit | bd592c2e7edb7cd3dd06dd6c13b559bd6c498596 (patch) | |
| tree | 2b33c92ce02ed89726cd32d0e46ff578aad1361f /nx-X11/programs/Xserver | |
| parent | b768e8124b8c76a7617a51fee56bc85c1d54e8c5 (diff) | |
| download | nx-libs-bd592c2e7edb7cd3dd06dd6c13b559bd6c498596.tar.gz nx-libs-bd592c2e7edb7cd3dd06dd6c13b559bd6c498596.tar.bz2 nx-libs-bd592c2e7edb7cd3dd06dd6c13b559bd6c498596.zip | |
library clean-up: Don't build libNX_Xtst anymore. Use system's libXtst shared library. (Fixes ArcticaProject/nx-libs#32).
Diffstat (limited to 'nx-X11/programs/Xserver')
| -rw-r--r-- | nx-X11/programs/Xserver/Imakefile | 6 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/extmod/modinit.h | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/xtest.c | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/mi/miinitext.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 93a676390..309d5d98f 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -403,17 +403,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 -lXfixes -lXfont \ - -L../../../nx-X11/exports/lib -lNX_Xtst -lXrandr -lXcomposite -lXdmcp \ + -L../../../nx-X11/exports/lib -lXtst -lXrandr -lXcomposite -lXdmcp \ `pkg-config --libs libxml-2.0` #elif defined(cygwinArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ -lXcomp -lXcompext -lNX_Xrender -lX11 -lNX_Xext -lXcomposite -lXfixes -lXfont \ - -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lNX_Xtst -lXdmcp \ + -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -lXdmcp \ `pkg-config --libs libxml-2.0` #else NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ -lXcomp -lXcompext -lXcompshad -lNX_Xrender -lNX_X11 -lNX_Xext -lXfixes -lXfont \ - -L../../../nx-X11/exports/lib -lNX_Xtst -lXrandr -lXcomposite -lNX_Xinerama -lXdmcp \ + -L../../../nx-X11/exports/lib -lXtst -lXrandr -lXcomposite -lNX_Xinerama -lXdmcp \ `pkg-config --libs libxml-2.0` #endif diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.h b/nx-X11/programs/Xserver/Xext/extmod/modinit.h index 40e1828bb..672586fdd 100644 --- a/nx-X11/programs/Xserver/Xext/extmod/modinit.h +++ b/nx-X11/programs/Xserver/Xext/extmod/modinit.h @@ -30,7 +30,7 @@ extern void MITMiscExtensionInit(INITARGS); #ifdef XTEST extern void XTestExtensionInit(INITARGS); #define _XTEST_SERVER_ -#include <nx-X11/extensions/XTest.h> +#include <nx-X11/extensions/xtestconst.h> #include <nx-X11/extensions/xteststr.h> #endif diff --git a/nx-X11/programs/Xserver/Xext/xtest.c b/nx-X11/programs/Xserver/Xext/xtest.c index d9adc03c0..482ad91d4 100644 --- a/nx-X11/programs/Xserver/Xext/xtest.c +++ b/nx-X11/programs/Xserver/Xext/xtest.c @@ -46,7 +46,7 @@ from The Open Group. #include "dixevents.h" #include "sleepuntil.h" #define _XTEST_SERVER_ -#include <nx-X11/extensions/XTest.h> +#include <nx-X11/extensions/xtestconst.h> #include <nx-X11/extensions/xteststr.h> #ifdef XINPUT #include <nx-X11/extensions/XI.h> diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c index f4ff4c243..47ff26127 100644 --- a/nx-X11/programs/Xserver/mi/miinitext.c +++ b/nx-X11/programs/Xserver/mi/miinitext.c @@ -195,7 +195,7 @@ typedef void (*InitExtension)(INITARGS); #endif #ifdef XTEST #define _XTEST_SERVER_ -#include <nx-X11/extensions/XTest.h> +#include <nx-X11/extensions/xtestconst.h> #endif #ifdef XKB #include <nx-X11/extensions/XKB.h> |