--- OLD/xc/programs/Xserver/Imakefile	Thu Jan  1 00:00:00 1970
+++ NEW/xc/programs/Xserver/Imakefile	Thu Jan  1 00:00:00 1970
@@ -28,6 +28,7 @@
 #if BuildLowMem
 #define LMFCFBLibs PreFbLibs $(LMFCFB) NoMfbBarePostFbLibs $(EXTENSIONS)
 #endif
+#define CFB2Libs PreFbLibs $(CFB2) PostFbLibs
 #define CFB8Libs PreFbLibs $(CFB8) PostFbLibs
 #define CFB16Libs PreFbLibs $(CFB16) PostFbLibs
 #define CFB32Libs PreFbLibs $(CFB32) PostFbLibs
@@ -146,6 +147,7 @@
 #if BuildLowMem
          LMFCFB = lmfcfb/LibraryTargetName(cfb)
 #endif
+           CFB2 = cfb2/LibraryTargetName(cfb)
            CFB8 = cfb/LibraryTargetName(cfb)
           CFB16 = cfb/LibraryTargetName(cfb) cfb16/LibraryTargetName(cfb)
           CFB32 = cfb/LibraryTargetName(cfb) cfb32/LibraryTargetName(cfb)
@@ -186,6 +188,7 @@
  *  MFBDIR = mfb
  *  Similarly, its build block should have:
  *  CFB8DIR  = cfb   (if the servr needs 8 bit cfb)
+ *  CFB2DIR  = cfb2  (2 bit cfb)
  *  CFB16DIR = cfb16 (16 bit cfb)
  *  CFB32DIR = cfb32 (32 bit cfb)
  *  
@@ -259,17 +262,18 @@
 XCOMM
 MFBDIR  = mfb
 CFB8DIR = cfb
-DDXDIR1 = hw/sun
+XSUNDDXDIR1 = hw/sun
+DDXDIR1 += $(XSUNDDXDIR1)
 #ifndef AmoebaArchitecture
 SUNOBJS = hw/sun/sunInit.o
 #else
 SUNOBJS = hw/sun/sunInitColor.o
 #endif
 #if BuildLowMem
-SUNDIRS = $(STDDIRS) $(LMFCFBDIR) $(DDXDIR1) $(DEPDIRS)
+SUNDIRS = $(STDDIRS) $(LMFCFBDIR) $(XSUNDDXDIR1) $(DEPDIRS)
 SUNLIBS = hw/sun/LibraryTargetName(sun) LMFCFBLibs
 #else
-SUNDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
+SUNDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(XSUNDDXDIR1) $(DEPDIRS)
 SUNLIBS = hw/sun/LibraryTargetName(sun) CFB8Libs
 #endif
 SUNSYSLIBS = $(WIDECHARSYSLIB) $(SYSLIBS)
@@ -288,8 +292,9 @@
 CFB8DIR = cfb
 CFB16DIR = cfb16
 CFB32DIR = cfb32
-DDXDIR1 = hw/sun
-SUN24DIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
+XSUN24DDXDIR1 = hw/sun
+DDXDIR1 += $(XSUN24DDXDIR1)
+SUN24DIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(XSUN24DDXDIR1) $(DEPDIRS)
 SUN24OBJS = hw/sun/sunInitMulti.o
 SUN24LIBS = hw/sun/LibraryTargetName(sun) CFBLibs
 SetUIDServerTarget(Xsun24,$(SUN24DIRS),$(SUN24OBJS),$(SUN24LIBS),$(SYSLIBS))
@@ -304,8 +309,9 @@
 XCOMM Sun monochrome server
 XCOMM
 MFBDIR = mfb
-DDXDIR1 = hw/sun
-SUNMDIRS = $(STDDIRS) $(MFBDIR) $(DDXDIR1) $(DEPDIRS)
+XSUNMONODDXDIR1 = hw/sun
+DDXDIR1 += $(XSUNMONODDXDIR1)
+SUNMDIRS = $(STDDIRS) $(MFBDIR) $(XSUNMONODDXDIR1) $(DEPDIRS)
 SUNMOBJS = hw/sun/sunInitMono.o hw/sun/sunInExMono.o
 SUNMLIBS = hw/sun/LibraryTargetName(sun) MFBBareLibs $(OTHEREXTS)
 SetUIDServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS),$(SUNMLIBS),$(SYSLIBS))
@@ -321,8 +327,9 @@
 XCOMM
 MFBDIR = mfb
 CFB8DIR = cfb
-DDXDIR1 = hw/sunAmoeba
-SUNDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
+XSUNAMOEBADDXDIR1 = hw/sunAmoeba
+DDXDIR1 += $(XSUNAMOEBADDXDIR1)
+SUNDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(XSUNAMOEBADDXDIR1) $(DEPDIRS)
 SUNOBJS = hw/sunAmoeba/sunInitColor.o
 SUNLIBS = hw/sunAmoeba/LibraryTargetName(sun) CFB8Libs
 ServerTarget(Xsun,$(SUNDIRS),$(SUNOBJS),$(SUNLIBS),$(SYSLIBS))
@@ -337,8 +344,9 @@
 XCOMM Sun monochrome server for Amoeba
 XCOMM
 MFBDIR = mfb
-DDXDIR1 = hw/sunAmoeba
-SUNMDIRS = $(STDDIRS) $(MFBDIR) $(DDXDIR1) $(DEPDIRS)
+XSUNAMOEBAMONODDXDIR1 = hw/sunAmoeba
+DDXDIR1 += $(XSUNAMOEBAMONODDXDIR1)
+SUNMDIRS = $(STDDIRS) $(MFBDIR) $(XSUNAMOEBAMONODDXDIR1) $(DEPDIRS)
 SUNMOBJS = hw/sunAmoeba/sunInitMono.o hw/sunAmoeba/sunInExMono.o
 SUNMLIBS = hw/sunAmoeba/LibraryTargetName(sun) MFBBareLibs $(OTHEREXTS)
 ServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS),$(SUNMLIBS),$(SYSLIBS))
@@ -348,6 +356,65 @@
 #endif /* XsunAmoebaMonoServer */
 
 
+#if Xs24Server
+XCOMM
+XCOMM S24 server
+XCOMM
+XS24DDXDIR1 = hw/s24
+DDXDIR1 += $(XS24DDXDIR1)
+S24OBJS = hw/s24/s24.o
+MFBDIR = mfb
+CFB8DIR = cfb
+CFB16DIR = cfb16
+CFB32DIR = cfb32
+S24DIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(XS24DDXDIR1) $(DEPDIRS)
+S24LIBS = PreFbLibs hw/s24/LibraryTargetName(s24) cfb32/LibraryTargetName(cfb) cfb16/LibraryTargetName(cfb) cfb/LibraryTargetName(cfb) PostFbLibs
+S24SYSLIBS = $(WIDECHARSYSLIB) $(SYSLIBS)
+SetUIDServerTarget(Xs24,$(S24DIRS),$(S24OBJS),$(S24LIBS),$(S24SYSLIBS))
+#ifndef ServerToInstall
+#define ServerToInstall Xs24
+#endif
+#endif /* Xs24Server */
+
+
+#if Xcg14Server
+XCOMM
+XCOMM CG14 server
+XCOMM
+MFBDIR = mfb
+CFB8DIR = cfb
+CFB16DIR = cfb16
+CFB32DIR = cfb32
+XCG14DDXDIR1 = hw/cg14
+DDXDIR1 += $(XCG14DDXDIR1)
+CG14DIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(XCG14DDXDIR1) $(DEPDIRS)
+CG14OBJS = hw/cg14/cg14.o
+CG14LIBS = PreFbLibs hw/cg14/LibraryTargetName(cg14) cfb32/LibraryTargetName(cfb) cfb16/LibraryTargetName(cfb) cfb/LibraryTargetName(cfb) PostFbLibs
+SetUIDServerTarget(Xcg14,$(CG14DIRS),$(CG14OBJS),$(CG14LIBS),$(SYSLIBS))
+#ifndef ServerToInstall
+#define ServerToInstall Xcg14
+#endif
+#endif /* Xcg14Server */
+
+
+#if XnextServer
+XCOMM
+XCOMM NeXT server
+XCOMM
+MFBDIR  = mfb
+CFB2DIR = cfb2
+DDXDIR1 = hw/next
+NEXTOBJS = hw/next/nextInit.o
+NEXTDIRS = $(STDDIRS) $(MFBDIR) $(CFB2DIR) $(DDXDIR1) $(DEPDIRS)
+NEXTLIBS = hw/next/LibraryTargetName(next) CFB2Libs
+NEXTSYSLIBS = $(WIDECHARSYSLIB) $(SYSLIBS)
+SetUIDServerTarget(Xnext,$(NEXTDIRS),$(NEXTOBJS),$(NEXTLIBS),$(NEXTSYSLIBS))
+#ifndef ServerToInstall
+#define ServerToInstall Xnext
+#endif
+#endif /* XnextServer */
+
+
 #if XhpServer
 XCOMM
 XCOMM Hewlett Packard CFB Server
@@ -1168,10 +1235,11 @@
 XCOMM non server, just compile sources for build test
 XCOMM
 MFBDIR   = mfb
+CFB2DIR  = cfb2
 CFB8DIR  = cfb
 CFB16DIR = cfb16
 CFB32DIR = cfb32
-Xnon: $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DEPDIRS)
+Xnon: $(STDDIRS) $(MFBDIR) $(CFB2DIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DEPDIRS)
 #endif /* XnonServer */
 
 
@@ -1207,8 +1275,8 @@
 #endif /* XVirtualFramebufferServer */
 
 
-CFBDIRS = $(CFB8DIR) $(CFB16DIR) $(CFB32DIR)
-DDXDIRS = $(DDXDIR1) $(DDXDIR2) $(DDXDIR3) $(XVFBDDXDIR) $(XNESTDDXDIR)
+CFBDIRS = $(CFB2DIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR)
+DDXDIRS = $(DDXDIR1:O:U) $(DDXDIR2) $(DDXDIR3) $(XVFBDDXDIR) $(XNESTDDXDIR)
 SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFBDIRS) $(LMFCFBDIR) $(DDXDIRS)
 
 #ifdef ServerToInstall