Xserver Imakefiles: Make sure NXAGENT_SERVER is defined for all extensions.

9 files changed, 62 insertions, 12 deletions

diff --git a/nx-X11/programs/Xserver/GL/glx/Imakefile b/nx-X11/programs/Xserver/GL/glx/Imakefile
index 05dfed738..24a35d22e 100644
--- a/nx-X11/programs/Xserver/GL/glx/Imakefile
+++ b/nx-X11/programs/Xserver/GL/glx/Imakefile
@@ -31,6 +31,8 @@ NXAGENT_SKIP_SRCS =                     \
 NXAGENT_SKIP_OBJS =                     \
                 glxext.o                \
                 $(NULL)
+#else
+       NX_DEFINES = -DNXAGENT_SERVER
 #endif
 
          SRCS = global.c                \
@@ -124,8 +126,12 @@ NXAGENT_SKIP_OBJS =                     \
 
 XCOMM If you add "-DDEBUG" in DEFINES, then make sure you also
 XCOMM add DEBUG to the define in ../mesa/src/X/xf86glx.c
-      DEFINES = $(GLX_DEFINES) $(NO_EXT_DEFS) $(APIENTRY_DEFS)
-
+      DEFINES = 			\
+                $(GLX_DEFINES)		\
+                $(NO_EXT_DEFS)		\
+                $(APIENTRY_DEFS)	\
+                $(NX_DEFINES)		\
+                $(NULL)
 
 #ifdef IHaveModules
 ModuleObjectRule()
diff --git a/nx-X11/programs/Xserver/Xi/Imakefile b/nx-X11/programs/Xserver/Xi/Imakefile
index 29190b711..b40f0d06b 100644
--- a/nx-X11/programs/Xserver/Xi/Imakefile
+++ b/nx-X11/programs/Xserver/Xi/Imakefile
@@ -86,6 +86,12 @@ XCOMM $XFree86: xc/programs/Xserver/Xi/Imakefile,v 3.2 1999/04/17 09:08:22 dawes
    INCLUDES = -I../include -I$(EXTINCSRC) -I$(XINCLUDESRC) `pkg-config --cflags-only-I pixman-1`
    LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
 
+#if defined(NXAgentServer) && NXAgentServer
+ NX_DEFINES = -DNXAGENT_SERVER
+#endif
+
+    DEFINES = $(NX_DEFINES)
+
 NormalLibraryTarget(xinput,$(OBJS))
 NormalLibraryObjectRule()
 LintLibraryTarget(xinput,$(SRCS))
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()
diff --git a/nx-X11/programs/Xserver/damageext/Imakefile b/nx-X11/programs/Xserver/damageext/Imakefile
index 24dcee85c..d8cc1bfa4 100644
--- a/nx-X11/programs/Xserver/damageext/Imakefile
+++ b/nx-X11/programs/Xserver/damageext/Imakefile
@@ -1,5 +1,7 @@
 #include <Server.tmpl>
 
+       NULL =
+
        SRCS =	damageext.c
 
        OBJS =	damageext.o
@@ -10,6 +12,14 @@
 
    LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
 
+#if defined(NXAgentServer) && NXAgentServer
+ NX_DEFINES = -DNXAGENT_SERVER
+#endif
+
+    DEFINES = 			\
+              $(NX_DEFINES)	\
+              $(NULL)
+
 NormalLibraryTarget(damage,$(OBJS))
 NormalLibraryObjectRule()
 LintLibraryTarget(damage,$(SRCS))
diff --git a/nx-X11/programs/Xserver/randr/Imakefile b/nx-X11/programs/Xserver/randr/Imakefile
index 8dc8de1b7..2959e05ab 100644
--- a/nx-X11/programs/Xserver/randr/Imakefile
+++ b/nx-X11/programs/Xserver/randr/Imakefile
@@ -62,7 +62,7 @@ XCOMM $XFree86: xc/programs/Xserver/randr/Imakefile,v 1.1 2001/05/23 03:29:44 ke
     PNRX_DEFINES = -DXINERAMA -DPANORAMIX
 #endif
 
-#if defined(NXAgentServer)
+#if defined(NXAgentServer) && NXAgentServer
     NX_DEFINES = -DNXAGENT_SERVER
 #endif
 
diff --git a/nx-X11/programs/Xserver/record/Imakefile b/nx-X11/programs/Xserver/record/Imakefile
index c24cbb0d9..cabcd558d 100644
--- a/nx-X11/programs/Xserver/record/Imakefile
+++ b/nx-X11/programs/Xserver/record/Imakefile
@@ -1,10 +1,8 @@
 XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:45 cpqbld Exp $
-
-
-
-
 XCOMM $XFree86: xc/programs/Xserver/record/Imakefile,v 1.12 2001/11/02 23:29:34 dawes Exp $
 
+       NULL =
+
 #if DoLoadableServer
 #define IHaveSubdirs
 #endif
@@ -18,7 +16,15 @@ XCOMM $XFree86: xc/programs/Xserver/record/Imakefile,v 1.12 2001/11/02 23:29:34
        OBJS = record.o set.o
    INCLUDES = -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/Xext `pkg-config --cflags-only-I pixman-1`
    LINTLIBS = ../dix/llib-ldix.ln
-    DEFINES = -DNDEBUG
+
+#if defined(NXAgentServer) && NXAgentServer
+ NX_DEFINES = -DNXAGENT_SERVER
+#endif
+
+    DEFINES =			\
+              -DNDEBUG		\
+              $(NX_DEFINES)	\
+              $(NULL)
 
 NormalLibraryObjectRule()
 NormalLibraryTarget(record,$(OBJS))
diff --git a/nx-X11/programs/Xserver/render/Imakefile b/nx-X11/programs/Xserver/render/Imakefile
index 2d918458b..6c3a7880c 100644
--- a/nx-X11/programs/Xserver/render/Imakefile
+++ b/nx-X11/programs/Xserver/render/Imakefile
@@ -1,6 +1,6 @@
 XCOMM $XFree86: xc/programs/Xserver/render/Imakefile,v 1.10 2002/11/23 02:38:15 keithp Exp $
 
-NULL =
+             NULL =
 
 #include <Server.tmpl>
 
@@ -20,7 +20,7 @@ NXAGENT_SKIP_OBJS =             \
                     render.o    \
                     $(NULL)
 #else
-          DEFINES = -DNXAGENT_SERVER
+       NX_DEFINES = -DNXAGENT_SERVER
 #endif
 
        SRCS =   animcur.c \
@@ -53,6 +53,10 @@ NXAGENT_SKIP_OBJS =             \
                 `pkg-config --cflags-only-I pixman-1`
    LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
 
+    DEFINES = 			\
+              $(NX_DEFINES)	\
+              $(NULL)
+
 NormalLibraryTarget(render,$(OBJS))
 NormalLibraryObjectRule()
 LintLibraryTarget(render,$(SRCS))
diff --git a/nx-X11/programs/Xserver/xfixes/Imakefile b/nx-X11/programs/Xserver/xfixes/Imakefile
index 84f7c6f16..83e368488 100755
--- a/nx-X11/programs/Xserver/xfixes/Imakefile
+++ b/nx-X11/programs/Xserver/xfixes/Imakefile
@@ -1,5 +1,7 @@
 #include <Server.tmpl>
 
+       NULL =
+
        SRCS =	cursor.c region.c saveset.c select.c xfixes.c
 
        OBJS =	cursor.o region.o saveset.o select.o xfixes.o
@@ -10,6 +12,14 @@
 
    LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
 
+#if defined(NXAgentServer) && NXAgentServer
+ NX_DEFINES = -DNXAGENT_SERVER
+#endif
+
+    DEFINES = 			\
+              $(NX_DEFINES)	\
+              $(NULL)
+
 NormalLibraryTarget(xfixes,$(OBJS))
 NormalLibraryObjectRule()
 LintLibraryTarget(xfixes,$(SRCS))
diff --git a/nx-X11/programs/Xserver/xkb/Imakefile b/nx-X11/programs/Xserver/xkb/Imakefile
index e63ca4462..3581324fc 100644
--- a/nx-X11/programs/Xserver/xkb/Imakefile
+++ b/nx-X11/programs/Xserver/xkb/Imakefile
@@ -26,7 +26,7 @@ XKB_DISABLE = -DXKB_DFLT_DISABLED=0
 XKB_DDXDEFS = XkbServerDefines
 
 #if defined(NXAgentServer) && NXAgentServer
-NX_DEFINES = -DNXAGENT_SERVER
+ NX_DEFINES = -DNXAGENT_SERVER
 #endif
 
 #if (defined(XorgServer) && XorgServer)