--- 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)
  *  
@@ -348,6 +351,24 @@
 #endif /* XsunAmoebaMonoServer */
 
 
+#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 +1189,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,7 +1229,7 @@
 #endif /* XVirtualFramebufferServer */
 
 
-CFBDIRS = $(CFB8DIR) $(CFB16DIR) $(CFB32DIR)
+CFBDIRS = $(CFB2DIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR)
 DDXDIRS = $(DDXDIR1) $(DDXDIR2) $(DDXDIR3) $(XVFBDDXDIR) $(XNESTDDXDIR)
 SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFBDIRS) $(LMFCFBDIR) $(DDXDIRS)
 
