From 778e83a3cb717f4033a3bff65134cc5697a528fc Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 13 Apr 2016 15:28:33 +0200
Subject: hw/nxagent/NX{glyphstr,picturestr}.h: Don't ship the complete header
 files in nxagent's code base. Rather replace structures we need modified
 only.

---
 nx-X11/programs/Xserver/fb/Imakefile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'nx-X11/programs/Xserver/fb/Imakefile')

diff --git a/nx-X11/programs/Xserver/fb/Imakefile b/nx-X11/programs/Xserver/fb/Imakefile
index 662a70717..2d17a856e 100644
--- a/nx-X11/programs/Xserver/fb/Imakefile
+++ b/nx-X11/programs/Xserver/fb/Imakefile
@@ -34,7 +34,7 @@ SUBDIRS = module
 #include <Server.tmpl>
 
 #ifdef FbNoPixelAddrCode
-DEFINES=-DFBNOPIXADDR -DFBNO24BIT
+FB_DEFINES=-DFBNOPIXADDR -DFBNO24BIT
 #endif
 
 #if defined(IHaveModules)
@@ -47,6 +47,16 @@ RENDERSRC = fbcompose.c
 RENDEROBJ = fbcompose.o
 #endif
 
+#if defined(NXAgentServer) && NXAgentServer
+NX_DEFINES = -DNXAGENT_SERVER
+#endif
+
+#if defined(NXAgentServer) && NXAgentServer
+     DEFINES = $(FB_DEFINES) $(NX_DEFINES)
+#else
+     DEFINES = $(FB_DEFINES)
+#endif
+
 SRCS =	$(XFMODSRC) \
 	fballpriv.c \
 	fbbits.c \
-- 
cgit v1.2.3