imake cleanup (nx-X11/programs/Xserver/Imakefile): Drop build rules for XF86Server and XorgServer.

1 files changed, 2 insertions, 286 deletions

diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index d6e67d864..1419531a4 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -338,304 +338,20 @@ XCOMM
 XCOMM
 XCOMM force non-parallel build of XF86 servers to prevent MUTEX overrides
 XCOMM
-#if defined(XF86Server) && XF86Server
-XF86SERVER = XFree86
-#endif
-#if defined(XorgServer) && XorgServer
-XF86SERVER = Xorg
-#endif
 #if defined(NXAgentServer) && NXAgentServer
 NXAGENT = nxagent
 #endif
 #if defined(NXWinServer) && NXWinServer && !MakeDllModules
 NXWIN = NXWin
 #endif
-#if (defined(XF86Server) && XF86Server) || \
-    (defined(XorgServer) && XorgServer) || \
-    (defined(NXAgentServer) && NXAgentServer) || \
+#if (defined(NXAgentServer) && NXAgentServer) || \
     (!MakeDllModules && defined(NXWinServer) && NXWinServer) 
-MakeMutex($(XF86SERVER) $(NXAGENT) $(NXWIN))
+MakeMutex($(NXAGENT) $(NXWIN))
 #endif
 MakeMutex($(STDDIRS) mfb fb cfb cfb16 cfb24 cfb32)
 #endif
 
 
-#if defined(XF86Server) && XF86Server
-XCOMM
-XCOMM XFree86 Server
-XCOMM
-FBSUBDIR = fb
-MFBSUBDIR  = mfb
-CFB8SUBDIR = cfb
-CFB16SUBDIR = cfb16
-CFB24SUBDIR = cfb24
-CFB32SUBDIR = cfb32
-MIDAMAGEDIR = miext/damage
-SHADOWDIR = miext/shadow
-LAYERDIR = miext/layer
-#ifdef OS2Architecture
-SERVERDEFFILE = XFree86.def
-XNESTDEFFILE = Xnest.def
-XVFBDEFFILE = Xvfb.def
-#endif
-#if XF86AFB
-AFBSUBDIR = afb
-#endif
-XFREE86DDXDIR  = hw/xfree86
-XF86SERVERSUBDIRS = $(STDDIRS) $(MFBDIR) $(FBDIR) $(AFBDIR) \
-		    $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \
-		    $(SHADOWDIR) $(LAYERDIR) $(XFREE86DDXDIR) $(DEPDIRS) \
-		    $(MIDAMAGEDIR)
-XF86INIT   = $(XF86COMSRC)/xf86Init.o $(XF86COMSRC)/xf86IniExt.o
-XF86COMLIB = $(XF86COMSRC)/LibraryTargetName(xf86)
-XF86PARSLIB= $(XF86PARSERSRC)/LibraryTargetName(xf86config)
-XF86OSLIB  = $(XF86OSSRC)/LibraryTargetName(xf86_os)
-#if XF86XAA
-XF86XAALIB = $(XF86SRC)/xaa/LibraryTargetName(xaa)
-#endif
-#if XF86EXA
-XF86EXALIB = $(XF86SRC)/exa/LibraryTargetName(exa)
-#endif
-#if XF86VgaHw
-XF86VGAHWLIB = $(XF86SRC)/vgahw/LibraryTargetName(vgahw)
-#endif
-#if XF86FBDevHw
-XF86FBDEVHWLIB = $(XF86SRC)/fbdevhw/LibraryTargetName(fbdevhw)
-#endif
-#if XF1Bpp || XF4Bpp
-XF1BPPLIB = $(XF86SRC)/xf1bpp/LibraryTargetName(xf1bpp)
-#endif
-#if XF4Bpp
-XF4BPPLIB = $(XF86SRC)/xf4bpp/LibraryTargetName(xf4bpp)
-#endif
-#if XF8_32Wid
-XF8_32WIDLIB = $(XF86SRC)/xf8_32wid/LibraryTargetName(xf8_32wid)
-#endif
-#if XF8_32Bpp
-XF8_32BPPLIB = $(XF86SRC)/xf8_32bpp/LibraryTargetName(xf8_32bpp)
-#endif
-#if XF8_16Bpp
-XF8_16BPPLIB = $(XF86SRC)/xf8_16bpp/LibraryTargetName(xf8_16bpp)
-#endif
-#if XFShadowFB
-XFSHADOWFBLIB = $(XF86SRC)/shadowfb/LibraryTargetName(shadowfb)
-#endif
-#if XF86AFB
-AFBLIB = afb/LibraryTargetName(afb)
-#endif
-XF86DRIVERLIB = $(XF86SRC)/drivers/LibraryTargetName(driver)
-#if XF86Ramdac
-XF86RAMDACLIB = $(XF86SRC)/ramdac/LibraryTargetName(ramdac)
-#endif
-#if XF86I2C
-XF86I2CLIB = $(XF86SRC)/i2c/LibraryTargetName(i2c)
-#endif
-#if XF86DDC
-XF86DDCLIB = $(XF86SRC)/ddc/LibraryTargetName(ddc)
-#endif
-#if XF86VBE
-XF86VBELIB = $(XF86SRC)/vbe/LibraryTargetName(vbe)
-#endif
-#if XF86RAC
-XF86RACLIB = $(XF86SRC)/rac/LibraryTargetName(rac)
-#endif
-#if XF86INT10_BUILD > X86EMU_GENERIC
-XF86INT10LIB = $(XF86OSSRC)/LibraryTargetName(int10)
-#else
-XF86INT10LIB = $(XF86SRC)/int10/LibraryTargetName(int10)
-#endif
-#if UseMemLeak
-MEMDEBUGLIB = $(TOP)/util/memleak/LibraryTargetName(memleak)
-#endif
-XF86IDRIVERLIB = $(XF86SRC)/input/LibraryTargetName(idriver)
-#if !DoLoadableServer
-XF86DRVOBJS = $(XF86SRC)/drivers/drvConf.o
-XF86DRVLIBS = $(XF86DRIVERLIB) $(XF86RAMDACLIB) $(XF86DDCLIB) $(XF86I2CLIB) \
-              $(XF86XAALIB) $(XF86EXALIB) $(XF86VGAHWLIB) $(XF86FBDEVHWLIB) \
-	      $(XF8_32WIDLIB) $(XF8_32BPPLIB) \
-	      $(XF8_16BPPLIB) \
-	      $(XF4BPPLIB) $(XF1BPPLIB) $(XFSHADOWFBLIB) $(AFBLIB)
-XF86IDRVOBJS = $(XF86SRC)/input/drvConf.o
-XF86IDRVLIBS = $(XF86IDRIVERLIB)
-XF86SCANLIB = $(XF86SRC)/scanpci/LibraryTargetName(scanpci)
-XF86LIBS  = $(MEMDEBUGLIB) $(XF86INIT) $(XF86COMLIB) $(XF86RACLIB) \
-	    $(XF86PARSLIB) $(XF86VBELIB) $(XF86OSLIB) $(XF86INT10LIB) 
-#else
-XF86LIBS  = $(MEMDEBUGLIB) $(XF86INIT) $(XF86COMLIB) \
-	    $(XF86PARSLIB) $(XF86OSLIB) 
-#endif
-#if DoLoadableServer
-XF86LOADERLIB = $(XF86SRC)/loader/LibraryTargetName(loader)
-XF86MAINLIBS = PreFbLibsNoFont \
-	       $(FONTBASE) $(OTHEREXTS) $(XF86COMLIB) \
-	       NoMfbPostFbLibs
-XF86SERVERSYSLIBS = $(SYSLIBS) $(LIBDL) $(LIBREGEX)
-XF86SERVERLIBS = $(XF86DRVLIBS) $(XF86IDRVLIBS) $(XF86LIBS) $(XF86LOADERLIB) \
-		 $(XF86COMLIB) $(XF86MAINLIBS) $(XF86SCANLIB) $(XF86OSLIB)
-#else
-XF86MAINLIBS = MiExtLibs AllFBLibs $(XF86COMLIB) $(MI)
-XF86SERVERSYSLIBS = $(FONTLIBS) $(SYSLIBS) $(LIBDL) $(LIBREGEX)
-XF86SERVERLIBS = $(XF86DRVLIBS) $(XF86IDRVLIBS) $(XF86LIBS) $(XF86LOADERLIB) \
-		 $(XF86COMLIB) $(XF86MAINLIBS) $(XF86SCANLIB) $(XF86OSLIB) \
-		 $(XF86DDCLIB)
-#endif
-XF86SERVEROBJS = $(XF86XKBOBJS) $(XF86DRVOBJS) $(XF86IDRVOBJS)
-#if HasParallelMake
-MakeMutex($(XF86SERVERSUBDIRS) $(XF86SERVERLIBS) $(XF86SERVERSYSLIBS))
-#endif
-#if ForceServerRemake
-$(XF86SERVERLIBS) $(XF86SERVERSYSLIBS):: $(XF86SERVERSUBDIRS)
-	@if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
-#endif
-SetUIDServerTarget(XFree86,$(XF86SERVERSUBDIRS),$(XF86SERVEROBJS) $(SERVERDEFFILE), \
-	$(XF86SERVERLIBS),$(XF86SERVERSYSLIBS))
-#if DoLoadableServer
-ServerDriverSDKTarget(XFree86)
-#endif
-#ifndef ServerToInstall
-#define ServerToInstall XFree86
-#endif
-#endif        /* XF86Server */
-
-#if defined(XorgServer) && XorgServer
-XCOMM
-XCOMM Xorg Server
-XCOMM
-FBSUBDIR = fb
-MFBSUBDIR  = mfb
-CFB8SUBDIR = cfb
-CFB16SUBDIR = cfb16
-#if XF8_32Wid
-CFB24SUBDIR = cfb24
-#endif
-CFB32SUBDIR = cfb32
-MIDAMAGEDIR = miext/damage
-SHADOWDIR = miext/shadow
-LAYERDIR = miext/layer
-#ifdef OS2Architecture
-SERVERDEFFILE = Xorg.def
-XNESTDEFFILE = Xnest.def
-XVFBDEFFILE = Xvfb.def
-#endif
-#if XF86AFB
-AFBSUBDIR = afb
-#endif
-XFREE86DDXDIR  = hw/xfree86
-XF86SERVERSUBDIRS = $(STDDIRS) $(MFBDIR) $(FBDIR) $(AFBDIR) \
-		    $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \
-		    $(SHADOWDIR) $(LAYERDIR) $(XFREE86DDXDIR) $(DEPDIRS) \
-		    $(MIDAMAGEDIR)
-XF86INIT   = $(XF86COMSRC)/xf86Init.o $(XF86COMSRC)/xf86IniExt.o
-XF86COMLIB = $(XF86COMSRC)/LibraryTargetName(xf86)
-XF86PARSLIB= $(XF86PARSERSRC)/LibraryTargetName(xf86config)
-XF86OSLIB  = $(XF86OSSRC)/LibraryTargetName(xf86_os)
-#if XF86XAA
-XF86XAALIB = $(XF86SRC)/xaa/LibraryTargetName(xaa)
-#endif
-#if XF86EXA
-XF86EXALIB = $(XF86SRC)/exa/LibraryTargetName(exa)
-#endif
-#if XF86VgaHw
-XF86VGAHWLIB = $(XF86SRC)/vgahw/LibraryTargetName(vgahw)
-#endif
-#if XF86FBDevHw
-XF86FBDEVHWLIB = $(XF86SRC)/fbdevhw/LibraryTargetName(fbdevhw)
-#endif
-#if XF1Bpp || XF4Bpp
-XF1BPPLIB = $(XF86SRC)/xf1bpp/LibraryTargetName(xf1bpp)
-#endif
-#if XF4Bpp
-XF4BPPLIB = $(XF86SRC)/xf4bpp/LibraryTargetName(xf4bpp)
-#endif
-#if XF8_32Wid
-XF8_32WIDLIB = $(XF86SRC)/xf8_32wid/LibraryTargetName(xf8_32wid)
-#endif
-#if XF8_32Bpp
-XF8_32BPPLIB = $(XF86SRC)/xf8_32bpp/LibraryTargetName(xf8_32bpp)
-#endif
-#if XF8_16Bpp
-XF8_16BPPLIB = $(XF86SRC)/xf8_16bpp/LibraryTargetName(xf8_16bpp)
-#endif
-#if XFShadowFB
-XFSHADOWFBLIB = $(XF86SRC)/shadowfb/LibraryTargetName(shadowfb)
-#endif
-#if XF86AFB
-AFBLIB = afb/LibraryTargetName(afb)
-#endif
-XF86DRIVERLIB = $(XF86SRC)/drivers/LibraryTargetName(driver)
-#if XF86Ramdac
-XF86RAMDACLIB = $(XF86SRC)/ramdac/LibraryTargetName(ramdac)
-#endif
-#if XF86I2C
-XF86I2CLIB = $(XF86SRC)/i2c/LibraryTargetName(i2c)
-#endif
-#if XF86DDC
-XF86DDCLIB = $(XF86SRC)/ddc/LibraryTargetName(ddc)
-#endif
-#if XF86VBE
-XF86VBELIB = $(XF86SRC)/vbe/LibraryTargetName(vbe)
-#endif
-#if XF86RAC
-XF86RACLIB = $(XF86SRC)/rac/LibraryTargetName(rac)
-#endif
-#if XF86INT10_BUILD > X86EMU_GENERIC
-XF86INT10LIB = $(XF86OSSRC)/LibraryTargetName(int10)
-#else
-XF86INT10LIB = $(XF86SRC)/int10/LibraryTargetName(int10)
-#endif
-#if UseMemLeak
-MEMDEBUGLIB = $(TOP)/util/memleak/LibraryTargetName(memleak)
-#endif
-XF86IDRIVERLIB = $(XF86SRC)/input/LibraryTargetName(idriver)
-#if !DoLoadableServer
-XF86DRVOBJS = $(XF86SRC)/drivers/drvConf.o
-XF86DRVLIBS = $(XF86DRIVERLIB) $(XF86RAMDACLIB) $(XF86DDCLIB) $(XF86I2CLIB) \
-              $(XF86XAALIB) $(XF86EXALIB) $(XF86VGAHWLIB) $(XF86FBDEVHWLIB) \
-	      $(XF8_32WIDLIB) $(XF8_32BPPLIB) \
-	      $(XF8_16BPPLIB) \
-	      $(XF4BPPLIB) $(XF1BPPLIB) $(XFSHADOWFBLIB) $(AFBLIB)
-XF86IDRVOBJS = $(XF86SRC)/input/drvConf.o
-XF86IDRVLIBS = $(XF86IDRIVERLIB)
-XF86SCANLIB = $(XF86SRC)/scanpci/LibraryTargetName(scanpci)
-XF86LIBS  = $(MEMDEBUGLIB) $(XF86INIT) $(XF86COMLIB) $(XF86RACLIB) \
-	    $(XF86PARSLIB) $(XF86VBELIB) $(XF86OSLIB) $(XF86INT10LIB) 
-#else
-XF86LIBS  = $(MEMDEBUGLIB) $(XF86INIT) $(XF86COMLIB) \
-	    $(XF86PARSLIB) $(XF86OSLIB) 
-#endif
-#if DoLoadableServer
-XF86LOADERLIB = $(XF86SRC)/loader/LibraryTargetName(loader)
-XF86MAINLIBS = PreFbLibsNoFont \
-	       $(FONTBASE) $(OTHEREXTS) $(XF86COMLIB) \
-	       NoMfbPostFbLibs
-XF86SERVERSYSLIBS = $(SYSLIBS) $(LIBDL) $(LIBREGEX)
-XF86SERVERLIBS = $(XF86DRVLIBS) $(XF86IDRVLIBS) $(XF86LIBS) $(XF86LOADERLIB) \
-		 $(XF86COMLIB) $(XF86MAINLIBS) $(XF86SCANLIB) $(XF86OSLIB)
-#else
-XF86MAINLIBS = MiExtLibs AllFBLibs $(XF86COMLIB) $(MI)
-XF86SERVERSYSLIBS = $(FONTLIBS) $(SYSLIBS) $(LIBDL) $(LIBREGEX)
-XF86SERVERLIBS = $(XF86DRVLIBS) $(XF86IDRVLIBS) $(XF86LIBS) $(XF86LOADERLIB) \
-		 $(XF86COMLIB) $(XF86MAINLIBS) $(XF86SCANLIB) $(XF86OSLIB) \
-		 $(XF86DDCLIB)
-#endif
-XF86SERVEROBJS = $(XF86XKBOBJS) $(XF86DRVOBJS) $(XF86IDRVOBJS)
-#if HasParallelMake
-MakeMutex($(XF86SERVERSUBDIRS) $(XF86SERVERLIBS) $(XF86SERVERSYSLIBS))
-#endif
-#if ForceServerRemake
-$(XF86SERVERLIBS) $(XF86SERVERSYSLIBS):: $(XF86SERVERSUBDIRS)
-	@if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
-#endif
-SetUIDServerTarget(Xorg,$(XF86SERVERSUBDIRS),$(XF86SERVEROBJS) $(SERVERDEFFILE), \
-	$(XF86SERVERLIBS),$(XF86SERVERSYSLIBS))
-#if DoLoadableServer
-ServerDriverSDKTarget(Xorg)
-#endif
-#ifndef ServerToInstall
-#define ServerToInstall Xorg
-#endif
-#endif        /* XorgServer */
-
 #if defined(NXAgentServer) && NXAgentServer
 XCOMM
 XCOMM Nested server with NXlib-based ddx and compressed transport.