aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/composite/Imakefile
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-02 13:53:16 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-02 13:53:16 +0200
commit279d37127db241a9ee685f6b671f51aa21a972ea (patch)
treee41ad6d5cd85b97101c9fd3d37be951eee1a409e /nx-X11/programs/Xserver/composite/Imakefile
parentdd5f5b56b48127641ca2bf70a272f60872f2568b (diff)
parent487870fff5cd1bc3db5ade4f5721f483f96119c7 (diff)
downloadnx-libs-279d37127db241a9ee685f6b671f51aa21a972ea.tar.gz
nx-libs-279d37127db241a9ee685f6b671f51aa21a972ea.tar.bz2
nx-libs-279d37127db241a9ee685f6b671f51aa21a972ea.zip
Merge branch 'sunweaver-pr/protocols-version-h' into 3.6.x
Attributes GH PR #160: https://github.com/ArcticaProject/nx-libs/pull/160 Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Fri, 01 Jul 2016 12:42:42 -0700
Diffstat (limited to 'nx-X11/programs/Xserver/composite/Imakefile')
-rw-r--r--nx-X11/programs/Xserver/composite/Imakefile10
1 files changed, 9 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/composite/Imakefile b/nx-X11/programs/Xserver/composite/Imakefile
index 911950182..cf44ded4a 100644
--- a/nx-X11/programs/Xserver/composite/Imakefile
+++ b/nx-X11/programs/Xserver/composite/Imakefile
@@ -1,5 +1,7 @@
#include <Server.tmpl>
+ NULL =
+
SRCS = compalloc.c compext.c compinit.c compoverlay.c compwindow.c
OBJS = compalloc.o compext.o compinit.o compoverlay.o compwindow.o
@@ -11,7 +13,13 @@
LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
- DEFINES = -DNXAGENT_SERVER
+#if defined(NXAgentServer) && NXAgentServer
+ NX_DEFINES = -DNXAGENT_SERVER
+#endif
+
+ DEFINES = \
+ $(NX_DEFINES) \
+ $(NULL)
NormalLibraryTarget(composite,$(OBJS))
NormalLibraryObjectRule()