added Server.tmpl include file

8 files changed, 15 insertions, 20 deletions

diff --git a/xc/programs/Xserver/Imakefile b/xc/programs/Xserver/Imakefile
index 95723e261..6ce1c4d45 100644
--- a/xc/programs/Xserver/Imakefile
+++ b/xc/programs/Xserver/Imakefile
@@ -2,11 +2,8 @@
  * Server Master Makefile
  */
 
-#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' 'CC=$(CC)' 'CCOPTIONS=$(CCOPTIONS)'
+#include <Server.tmpl>
 
-      CCOPTIONS = ServerCCOptions
-    STD_DEFINES = ServerDefines
-    CDEBUGFLAGS = ServerCDebugFlags
      EXTENSIONS = $(EXTENSIONSRC)/server/libext.a
          EXTDIR = $(EXTENSIONSRC)/server
     FONTUTILDIR = $(FONTSRC)/mkfontdir
diff --git a/xc/programs/Xserver/cfb/Imakefile b/xc/programs/Xserver/cfb/Imakefile
index 2336483b0..f79fdaa44 100644
--- a/xc/programs/Xserver/cfb/Imakefile
+++ b/xc/programs/Xserver/cfb/Imakefile
@@ -1,3 +1,5 @@
+#include <Server.tmpl>
+
 SRCS =	 cfbgc.c cfbwindow.c \
 	 cfbpntwin.c cfbmskbits.c cfbpixmap.c cfbbitblt.c \
 	 cfbfillsp.c cfbsetsp.c cfbscrinit.c \
@@ -18,8 +20,6 @@ OBJS =   cfbgc.o cfbwindow.o \
  	 cfbpush8.o cfbrctstp8.o cfbpolypnt.o \
 	 cfbbres.o cfbline.o cfbhrzvert.o cfbbresd.o cfbimage.o cfbseg.o
 
-STD_DEFINES = ServerDefines
-CDEBUGFLAGS = ServerCDebugFlags
    INCLUDES = -I. -I../mfb -I../mi -I../../include -I$(INCLUDESRC)
    LINTLIBS = ../../dix/llib-ldix.ln ../../os/4.2bsd/llib-los.ln \
 	     ../mfb/llib-lmfb.ln ../mi/llib-lmi.ln
diff --git a/xc/programs/Xserver/dix/Imakefile b/xc/programs/Xserver/dix/Imakefile
index a58bae663..90fc7b3e3 100644
--- a/xc/programs/Xserver/dix/Imakefile
+++ b/xc/programs/Xserver/dix/Imakefile
@@ -1,3 +1,5 @@
+#include <Server.tmpl>
+
 SRCS = atom.c colormap.c cursor.c devices.c dispatch.c dixutils.c events.c \
 	extension.c gc.c globals.c glyphcurs.c grabs.c \
 	main.c property.c resource.c swaprep.c swapreq.c \
@@ -7,10 +9,7 @@ OBJS = atom.o colormap.o cursor.o devices.o dispatch.o dixutils.o events.o \
 	main.o property.o resource.o swaprep.o swapreq.o \
 	tables.o window.o initatoms.o dixfonts.o
 
- STD_DEFINES = ServerDefines
- CDEBUGFLAGS = ServerCDebugFlags
     INCLUDES = -I. -I../include -I$(INCLUDESRC)
- EXT_DEFINES = ExtensionDefines
     LINTLIBS = ../ddx/snf/llib-lsnf.ln ../os/4.2bsd/llib-los.ln
 
 /*
diff --git a/xc/programs/Xserver/hw/macII/Imakefile b/xc/programs/Xserver/hw/macII/Imakefile
index 49489d7fe..6c10fa82f 100644
--- a/xc/programs/Xserver/hw/macII/Imakefile
+++ b/xc/programs/Xserver/hw/macII/Imakefile
@@ -1,3 +1,5 @@
+#include <Server.tmpl>
+
 SRCS =	\
 	macIIInit.c \
 	macIIMono.c \
@@ -26,8 +28,6 @@ OBJS = \
 	macIIUtils.o \
 	macIIKMap.o
 
-STD_DEFINES = ServerDefines
-CDEBUGFLAGS = ServerCDebugFlags
    INCLUDES = -I.  -I../../include -I../mi -I../mfb -I../../dix -I$(INCLUDESRC)
    LINTLIBS = ../../dix/llib-ldix.ln ../../os/4.2bsd/llib-los.ln \
 	      ../mfb/llib-lmfb.ln ../mi/llib-lmi.ln ../cfb/llib-lcfb.ln
diff --git a/xc/programs/Xserver/hw/sun/Imakefile b/xc/programs/Xserver/hw/sun/Imakefile
index 62f03244d..e55323e0b 100644
--- a/xc/programs/Xserver/hw/sun/Imakefile
+++ b/xc/programs/Xserver/hw/sun/Imakefile
@@ -1,3 +1,5 @@
+#include <Server.tmpl>
+
 SRCS1 =	\
 	sunInit.c \
 	sunBW2.c \
@@ -31,8 +33,6 @@ OBJS = \
 	sunCG6C.o \
 	sunKeyMap.o
 
-STD_DEFINES = ServerDefines
-CDEBUGFLAGS = ServerCDebugFlags
    INCLUDES = -I. -I../mfb -I../mi -I../../include -I$(INCLUDESRC)
    LINTLIBS = ../../dix/llib-ldix.ln ../../os/4.2bsd/llib-los.ln \
 	      ../mfb/llib-lmfb.ln ../mi/llib-lmi.ln ../cfb/llib-lcfb.ln
diff --git a/xc/programs/Xserver/mfb/Imakefile b/xc/programs/Xserver/mfb/Imakefile
index 2da948d7d..d3899345f 100644
--- a/xc/programs/Xserver/mfb/Imakefile
+++ b/xc/programs/Xserver/mfb/Imakefile
@@ -1,3 +1,5 @@
+#include <Server.tmpl>
+
 SRCS1 =	 mfbgc.c mfbwindow.c mfbfont.c \
 	 mfbfillrct.c mfbpntwin.c maskbits.c mfbpixmap.c \
 	 mfbimage.c mfbline.c mfbbres.c mfbhrzvert.c mfbbresd.c \
@@ -19,8 +21,6 @@ OBJS =   mfbgc.o mfbwindow.o mfbfont.o \
 	 mfbpawhite.o mfbpablack.o mfbpainv.o mfbtile.o \
          mfbtewhite.o mfbteblack.o mfbmisc.o mfbbstore.o
 
-STD_DEFINES = ServerDefines
-CDEBUGFLAGS = ServerCDebugFlags
 INCLUDES = -I. -I../mi -I../../include -I$(INCLUDESRC)
 LINTDEFS = -DMFBPOLYGLYPHBLT=mfbPolyGlyphBltWhite \
 	   -DMFBIMAGEGLYPHBLT=mfbImageGlyphBltWhite \
diff --git a/xc/programs/Xserver/mi/Imakefile b/xc/programs/Xserver/mi/Imakefile
index 85eff40a5..f80f0bd6b 100644
--- a/xc/programs/Xserver/mi/Imakefile
+++ b/xc/programs/Xserver/mi/Imakefile
@@ -1,3 +1,5 @@
+#include <Server.tmpl>
+
 SRCS =  mivaltree.c mipolyseg.c mipolyrect.c \
 	mipoly.c mipolycon.c mipolygen.c mipolyutil.c \
 	mifillrct.c milines.c miarc.c mizerarc.c mifillarc.c \
@@ -16,9 +18,6 @@ OBJS =	mivaltree.o mipolyseg.o mipolyrect.o \
 	midash.o miwidedash.o mibstore.o miinitext.o \
 	mipointer.o misprite.o midispcur.o
 
-STD_DEFINES = ServerDefines
-CDEBUGFLAGS = ServerCDebugFlags
-EXT_DEFINES = ExtensionDefines
 INCLUDES = -I. -I../../include -I$(INCLUDESRC)
 LINTLIBS = ../../dix/llib-ldix.ln ../../os/4.2bsd/llib-los.ln
 
diff --git a/xc/programs/Xserver/os/Imakefile b/xc/programs/Xserver/os/Imakefile
index 9aa2a79a5..e641441df 100644
--- a/xc/programs/Xserver/os/Imakefile
+++ b/xc/programs/Xserver/os/Imakefile
@@ -1,3 +1,5 @@
+#include <Server.tmpl>
+
 /*
  * If you have any extra files to be put into the library, define them here.
  * Note that System V boxes should use os/sysV to get Berklib.c.
@@ -28,8 +30,6 @@ BOOTSTRAPCFLAGS =
                   osfonts.o osinit.o utils.o auth.o mitauth.o\
  		  xdmcp.o OtherObjects
    FONT_DEFINES = FontDefines FontFilters
-    STD_DEFINES = ServerDefines
-    CDEBUGFLAGS = ServerCDebugFlags
 #if SpecialMalloc
      OS_DEFINES = -DSPECIAL_MALLOC
 #else