(file) Return to Imakefile CVS log (file) (dir) Up to [XFree86 CVS] / xc / programs / Xserver

Diff for /xc/programs/Xserver/Imakefile between version 3.51 and 3.85.2.16

version 3.51, 1996/02/19 09:49:19 version 3.85.2.16, 1999/07/30 11:21:00
Line 1 
Line 1 
 XCOMM $XConsortium: Imakefile /main/r61_main/5 1996/02/02 18:44:52 gildea $  XCOMM $TOG: Imakefile /main/235 1997/05/25 15:12:21 kaleb $
 XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.50 1996/02/18 03:41:27 dawes Exp $  
 /* /*
  * Server Master Makefile  * Server Master Makefile
  */  */
   XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.85.2.15 1999/07/28 13:37:33 hohndel Exp $
 #ifndef InstallXserverSetUID  
 #define InstallXserverSetUID NO  
 #endif  
 #define InstallServerSetUID InstallXserverSetUID  
  
 #include <Server.tmpl> #include <Server.tmpl>
  
Line 16 
Line 11 
 INSTPGMFLAGS = INSTPGMFLAGS =
 #endif #endif
  
 #define PreFbLibs $(DIX) $(OS) $(FONT)  #define PreFbLibs $(DIX) $(OS) $(FONT) $(XPDDX)
 #define BarePostFbLibs $(MFB) $(MI)  #define BarePostFbLibs $(MFB) $(XPFBLIBS) $(MI)
 #define PostFbLibs BarePostFbLibs $(EXTENSIONS) #define PostFbLibs BarePostFbLibs $(EXTENSIONS)
 #define NoMfbBarePostFbLibs $(MI)  #define NoMfbBarePostFbLibs $(XPFBLIBS) $(MI)
 #define NoMfbPostFbLibs NoMfbBarePostFbLibs $(EXTENSIONS) #define NoMfbPostFbLibs NoMfbBarePostFbLibs $(EXTENSIONS)
  
 #define MFBBareLibs PreFbLibs BarePostFbLibs #define MFBBareLibs PreFbLibs BarePostFbLibs
Line 27 
Line 22 
 #define MFBLibs PreFbLibs PostFbLibs #define MFBLibs PreFbLibs PostFbLibs
 #define NoMFBLibs PreFbLibs NoMfbPostFbLibs #define NoMFBLibs PreFbLibs NoMfbPostFbLibs
 #define CFBLibs PreFbLibs $(CFB) PostFbLibs #define CFBLibs PreFbLibs $(CFB) PostFbLibs
   #define CFB4Libs PreFbLibs $(CFB4) PostFbLibs
 #define CFB8Libs PreFbLibs $(CFB8) PostFbLibs #define CFB8Libs PreFbLibs $(CFB8) PostFbLibs
 #define CFB16Libs PreFbLibs $(CFB16) PostFbLibs #define CFB16Libs PreFbLibs $(CFB16) PostFbLibs
   #define CFB24Libs PreFbLibs $(CFB24) PostFbLibs
 #define CFB32Libs PreFbLibs $(CFB32) PostFbLibs #define CFB32Libs PreFbLibs $(CFB32) PostFbLibs
  
 #if BuildPexExt #if BuildPexExt
Line 44 
Line 41 
                    PEX5/ospex/LibraryTargetName(ospex)                    PEX5/ospex/LibraryTargetName(ospex)
           PEXDIR = PEX5           PEXDIR = PEX5
 #endif #endif
   
   #if BuildGlxExt /* && !GlxModule */
   #if GlxStubLib
           GLXLIB = glxStub/LibraryTargetName(ServerGlx)
           GLXDIR = glxStub
   #else
           GLXLIB = GlxStaticServerLib
           GLXDIR =
   #endif
   #endif
   
 #if BuildXInputExt #if BuildXInputExt
       XINPUTEXT = Xi/LibraryTargetName(xinput)       XINPUTEXT = Xi/LibraryTargetName(xinput)
           XIDIR = Xi           XIDIR = Xi
 #endif #endif
 #if BuildXIE #if BuildXIE
       XIEEXT = XIE/dixie/LibraryTargetName(dixie) XIE/mixie/LibraryTargetName(mixie)       XIEEXT = XIE/dixie/LibraryTargetName(dixie) XIE/mixie/LibraryTargetName(mixie)
   #endif
   #if BuildXIE || BuildXIElib
       XIEDIR = XIE       XIEDIR = XIE
 #endif #endif
 #if BuildXKB #if BuildXKB
Line 57 
Line 67 
       XKBDIR = xkb       XKBDIR = xkb
 #endif #endif
 #if BuildLBX #if BuildLBX
          LBXEXT = $(TOP)/workInProgress/lbx/programs/Xserver/lbx/LibraryTargetName(lbx) \           LBXEXT = lbx/LibraryTargetName(lbx) \
                   $(TOP)/workInProgress/lbx/lib/lbxutil/LibraryTargetName(lbxutil)                    $(TOP)/lib/lbxutil/LibraryTargetName(lbxutil)
         LBXDIRS = $(TOP)/workInProgress/lbx/programs/Xserver/lbx \          LBXDIRS = lbx
                   $(TOP)/workInProgress/lbx/lib/lbxutil  
 #endif #endif
 #if BuildDBE #if BuildDBE
          DBEEXT = dbe/LibraryTargetName(dbe)          DBEEXT = dbe/LibraryTargetName(dbe)
   #endif
   #if BuildDBE || BuildDBElib
          DBEDIR = dbe          DBEDIR = dbe
 #endif #endif
 #if BuildRECORD #if BuildRECORD
          RECORDEXT = record/LibraryTargetName(record)          RECORDEXT = record/LibraryTargetName(record)
   #endif
   #if BuildRECORD || BuildRECORDlib
          RECORDDIR = record          RECORDDIR = record
 #endif #endif
 #ifdef SiteExtensionLibs #ifdef SiteExtensionLibs
Line 77 
Line 90 
      SITEEXTDIRS = SiteExtensionDirs      SITEEXTDIRS = SiteExtensionDirs
 #endif #endif
  
   #if BuildXprint
   
   #ifndef XpRasterDDX
   #define XpRasterDDX NO
   #endif
   #ifndef XpColorPclDDX
   #define XpColorPclDDX YES
   #endif
   #ifndef XpMonoPclDDX
   #define XpMonoPclDDX NO
   #endif
   #ifndef XpPostScriptDDX
   #define XpPostScriptDDX YES
   #endif
   
   #if XpRasterDDX
   XPRASTLIB = Xprint/raster/LibraryTargetName(raster)
   #endif
   #if XpColorPclDDX
   XPPCLLIB = Xprint/pcl/LibraryTargetName(pcl)
   #endif
   #if XpMonoPclDDX
   XPMPCLLIB = Xprint/pcl-mono/LibraryTargetName(pcl)
   #endif
   #if XpPostScriptDDX
   XPPSLIB = Xprint/ps/LibraryTargetName(ps)
   #endif
   
   XPDDXLIBS = Xprint/LibraryTargetName(printer) $(XPRASTLIB) $(XPPCLLIB) $(XPMPCLLIB) $(XPPSLIB)
   XPDDXFBLIBS = $(MFB) $(CFB32)
   #if !PrintOnlyServer
         XPFBLIBS = $(XPDDXFBLIBS)
         XPDDX = $(XPDDXLIBS)
   #endif
         XPDDXDIR = Xprint
   #endif
   #if !BuildXprint || PrintOnlyServer
   XPFBLIBS = dix/LibraryTargetName(xpstubs)
   #endif
   
       OTHEREXTS = Xext/LibraryTargetName(ext) $(XKBEXT) $(XINPUTEXT) \       OTHEREXTS = Xext/LibraryTargetName(ext) $(XKBEXT) $(XINPUTEXT) \
                   $(XIEEXT) $(LBXEXT) $(DBEEXT) $(RECORDEXT) $(SITEEXTS)                   $(XIEEXT) $(LBXEXT) $(DBEEXT) $(RECORDEXT) $(SITEEXTS)
         EXTDIRS = Xext $(XKBDIR) $(XIDIR) $(XIEDIR) $(PEXDIR) \          EXTDIRS = Xext $(XKBDIR) $(XIDIR) $(XIEDIR) $(PEXDIR) $(GLXDIR) \
                   $(LBXDIRS) $(DBEDIR) $(RECORDDIR) $(SITEEXTDIRS)                   $(LBXDIRS) $(DBEDIR) $(RECORDDIR) $(SITEEXTDIRS)
      EXTENSIONS = $(OTHEREXTS) $(PEXLIBS)       EXTENSIONS = $(OTHEREXTS) $(PEXLIBS) $(GLXLIB)
          XAULIB = $(XAUTHSRC)/LibraryTargetName(Xau)          XAULIB = $(XAUTHSRC)/LibraryTargetName(Xau)
        XDMCPLIB = $(XDMCPLIBSRC)/LibraryTargetName(Xdmcp)        XDMCPLIB = $(XDMCPLIBSRC)/LibraryTargetName(Xdmcp)
   #if BuildLBX || GzipFontCompression
              ZLIB = GzipLibrary
   #endif
              OS = os/LibraryTargetName(os) $(XAULIB) $(XDMCPLIB)              OS = os/LibraryTargetName(os) $(XAULIB) $(XDMCPLIB)
         BSDEMUL = $(DEPXBSDLIB)         BSDEMUL = $(DEPXBSDLIB)
             MFB = mfb/LibraryTargetName(mfb)             MFB = mfb/LibraryTargetName(mfb)
             CFB = cfb/LibraryTargetName(cfb) cfb16/LibraryTargetName(cfb) cfb32/LibraryTargetName(cfb)              CFB = cfb/LibraryTargetName(cfb) cfb16/LibraryTargetName(cfb) cfb24/LibraryTargetName(cfb) cfb32/LibraryTargetName(cfb)
            CFB8 = cfb/LibraryTargetName(cfb)            CFB8 = cfb/LibraryTargetName(cfb)
             CFB4  = cfb/LibraryTargetName(cfb) cfb4/LibraryTargetName(cfb)
           CFB16 = cfb/LibraryTargetName(cfb) cfb16/LibraryTargetName(cfb)           CFB16 = cfb/LibraryTargetName(cfb) cfb16/LibraryTargetName(cfb)
             CFB24 = cfb/LibraryTargetName(cfb) cfb24/LibraryTargetName(cfb)
           CFB32 = cfb/LibraryTargetName(cfb) cfb32/LibraryTargetName(cfb)           CFB32 = cfb/LibraryTargetName(cfb) cfb32/LibraryTargetName(cfb)
              MI = mi/LibraryTargetName(mi)              MI = mi/LibraryTargetName(mi)
             DIX = dix/LibraryTargetName(dix)             DIX = dix/LibraryTargetName(dix)
Line 98 
Line 156 
    EXTRASYSLIBS = ServerExtraSysLibs    EXTRASYSLIBS = ServerExtraSysLibs
 #endif #endif
 #if SystemV4 || defined(SGIArchitecture) || UseRgbTxt #if SystemV4 || defined(SGIArchitecture) || UseRgbTxt
         SYSLIBS = MathLibrary Krb5Libraries $(EXTRASYSLIBS)          SYSLIBS = $(ZLIB) MathLibrary Krb5Libraries $(EXTRASYSLIBS)
 #else #else
         SYSLIBS = MathLibrary Krb5Libraries DBMLibrary $(EXTRASYSLIBS)          SYSLIBS = $(ZLIB) MathLibrary Krb5Libraries DBMLibrary $(EXTRASYSLIBS)
   #endif
   #if HasPam
           PAMLIBS = -lpam -lpam_misc -ldl
 #endif #endif
            CBRT = mi/LibraryTargetName(cbrt)            CBRT = mi/LibraryTargetName(cbrt)
         STDDIRS = include dix os mi $(EXTDIRS)          STDDIRS = include dix os mi $(XPDDXDIR) $(EXTDIRS)
  
 XCOMM XCOMM
 XCOMM This turns off the default rule for compiling .c files because XCOMM This turns off the default rule for compiling .c files because
Line 117 
Line 178 
  *  If a server needs mfb, its build block should have a line like:  *  If a server needs mfb, its build block should have a line like:
  *  MFBDIR = mfb  *  MFBDIR = mfb
  *  Similarly, its build block should have:  *  Similarly, its build block should have:
  *  CFB8DIR  = cfb   (if the servr needs 8 bit cfb)   *  CFB4DIR  = cfb4  (if the server needs 4 bit cfb)
    *  CFB8DIR  = cfb   (8 bit cfb)
  *  CFB16DIR = cfb16 (16 bit cfb)  *  CFB16DIR = cfb16 (16 bit cfb)
    *  CFB24DIR = cfb24 (24 bit cfb)
  *  CFB32DIR = cfb32 (32 bit cfb)  *  CFB32DIR = cfb32 (32 bit cfb)
  *  *
  *  If a server does not need all of the above components, simply  *  If a server does not need all of the above components, simply
Line 145 
Line 208 
 DDXDIR1 = hw/dec/ws DDXDIR1 = hw/dec/ws
 DECDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS) DECDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
 DECOBJS = hw/dec/ws/init.o hw/dec/ws/sdepthinit.o DECOBJS = hw/dec/ws/init.o hw/dec/ws/sdepthinit.o
 DECLIBS = hw/dec/ws/libdec.a CFB8Libs  DECLIBS = hw/dec/ws/LibraryTargetName(dec) CFB8Libs
 ServerTarget(Xdec,$(DECDIRS),$(DECOBJS),$(DECLIBS),$(SYSLIBS)) ServerTarget(Xdec,$(DECDIRS),$(DECOBJS),$(DECLIBS),$(SYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall Xdec #define ServerToInstall Xdec
Line 161 
Line 224 
 MFBDIR   = mfb MFBDIR   = mfb
 CFB8DIR  = cfb CFB8DIR  = cfb
 CFB16DIR = cfb16 CFB16DIR = cfb16
   CFB24DIR = cfb24
 CFB32DIR = cfb32 CFB32DIR = cfb32
 DDXDIR1  = hw/dec/ws DDXDIR1  = hw/dec/ws
 DECDIRS1 = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)  DECDIRS1 = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
 DECOBJS1 = hw/dec/ws/init.o hw/dec/ws/mdepthinit.o DECOBJS1 = hw/dec/ws/init.o hw/dec/ws/mdepthinit.o
 DECLIBS1 = hw/dec/ws/libdec.a CFBLibs  DECLIBS1 = hw/dec/ws/LibraryTargetName(dec) CFBLibs
 ServerTarget(Xdec_md,$(DECDIRS1),$(DECOBJS1),$(DECLIBS1),$(SYSLIBS)) ServerTarget(Xdec_md,$(DECDIRS1),$(DECOBJS1),$(DECLIBS1),$(SYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall Xdec_md #define ServerToInstall Xdec_md
Line 180 
Line 244 
 MFBDIR = mfb MFBDIR = mfb
 CFB8DIR = cfb CFB8DIR = cfb
 DDXDIR1 = hw/sun DDXDIR1 = hw/sun
 SUNDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)  
 #ifndef AmoebaArchitecture #ifndef AmoebaArchitecture
 SUNOBJS = hw/sun/sunInit.o SUNOBJS = hw/sun/sunInit.o
 #else #else
 SUNOBJS = hw/sun/sunInitColor.o SUNOBJS = hw/sun/sunInitColor.o
 #endif #endif
 SUNLIBS = hw/sun/libsun.a CFB8Libs  SUNDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
 SetUIDServerTarget(Xsun,$(SUNDIRS),$(SUNOBJS),$(SUNLIBS),$(SYSLIBS))  SUNLIBS = hw/sun/LibraryTargetName(sun) CFB8Libs
   SUNSYSLIBS = $(WIDECHARSYSLIB) $(SYSLIBS)
   SetUIDServerTarget(Xsun,$(SUNDIRS),$(SUNOBJS),$(SUNLIBS),$(SUNSYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall Xsun #define ServerToInstall Xsun
 #endif #endif
Line 201 
Line 266 
 MFBDIR = mfb MFBDIR = mfb
 CFB8DIR = cfb CFB8DIR = cfb
 CFB16DIR = cfb16 CFB16DIR = cfb16
   CFB24DIR = cfb24
 CFB32DIR = cfb32 CFB32DIR = cfb32
 DDXDIR1 = hw/sun DDXDIR1 = hw/sun
 SUN24DIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)  SUN24DIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
 SUN24OBJS = hw/sun/sunInitMulti.o SUN24OBJS = hw/sun/sunInitMulti.o
 SUN24LIBS = hw/sun/libsun.a CFBLibs  SUN24LIBS = hw/sun/LibraryTargetName(sun) CFBLibs
 SetUIDServerTarget(Xsun24,$(SUN24DIRS),$(SUN24OBJS),$(SUN24LIBS),$(SYSLIBS)) SetUIDServerTarget(Xsun24,$(SUN24DIRS),$(SUN24OBJS),$(SUN24LIBS),$(SYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall Xsun24 #define ServerToInstall Xsun24
Line 221 
Line 287 
 DDXDIR1 = hw/sun DDXDIR1 = hw/sun
 SUNMDIRS = $(STDDIRS) $(MFBDIR) $(DDXDIR1) $(DEPDIRS) SUNMDIRS = $(STDDIRS) $(MFBDIR) $(DDXDIR1) $(DEPDIRS)
 SUNMOBJS = hw/sun/sunInitMono.o hw/sun/sunInExMono.o SUNMOBJS = hw/sun/sunInitMono.o hw/sun/sunInExMono.o
 SUNMLIBS = hw/sun/libsun.a MFBBareLibs $(OTHEREXTS)  SUNMLIBS = hw/sun/LibraryTargetName(sun) MFBBareLibs $(OTHEREXTS)
 SetUIDServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS),$(SUNMLIBS),$(SYSLIBS)) SetUIDServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS),$(SUNMLIBS),$(SYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall XsunMono #define ServerToInstall XsunMono
Line 238 
Line 304 
 DDXDIR1 = hw/sunAmoeba DDXDIR1 = hw/sunAmoeba
 SUNDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS) SUNDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
 SUNOBJS = hw/sunAmoeba/sunInitColor.o SUNOBJS = hw/sunAmoeba/sunInitColor.o
 SUNLIBS = hw/sunAmoeba/libsun.a CFB8Libs  SUNLIBS = hw/sunAmoeba/LibraryTargetName(sun) CFB8Libs
 ServerTarget(Xsun,$(SUNDIRS),$(SUNOBJS),$(SUNLIBS),$(SYSLIBS)) ServerTarget(Xsun,$(SUNDIRS),$(SUNOBJS),$(SUNLIBS),$(SYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall Xsun #define ServerToInstall Xsun
Line 254 
Line 320 
 DDXDIR1 = hw/sunAmoeba DDXDIR1 = hw/sunAmoeba
 SUNMDIRS = $(STDDIRS) $(MFBDIR) $(DDXDIR1) $(DEPDIRS) SUNMDIRS = $(STDDIRS) $(MFBDIR) $(DDXDIR1) $(DEPDIRS)
 SUNMOBJS = hw/sunAmoeba/sunInitMono.o hw/sunAmoeba/sunInExMono.o SUNMOBJS = hw/sunAmoeba/sunInitMono.o hw/sunAmoeba/sunInExMono.o
 SUNMLIBS = hw/sunAmoeba/libsun.a MFBBareLibs $(OTHEREXTS)  SUNMLIBS = hw/sunAmoeba/LibraryTargetName(sun) MFBBareLibs $(OTHEREXTS)
 ServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS),$(SUNMLIBS),$(SYSLIBS)) ServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS),$(SUNMLIBS),$(SYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall XsunMono #define ServerToInstall XsunMono
Line 262 
Line 328 
 #endif /* XsunAmoebaMonoServer */ #endif /* XsunAmoebaMonoServer */
  
  
   #if XsunLynxServer
   XCOMM
   XCOMM Sun server for LynxOS microSPARC 2.4.0
   XCOMM
   MFBDIR = mfb
   CFB8DIR = cfb
   DDXDIR1 = hw/sunLynx
   SUNDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
   SUNOBJS = hw/sunLynx/sunLyInit.o
   SUNLIBS = hw/sunLynx/libsun.a CFB8Libs
   ServerTarget(Xsun,$(SUNDIRS),$(SUNOBJS),$(SUNLIBS),$(SYSLIBS))
   #ifndef ServerToInstall
   #define ServerToInstall Xsun
   #endif
   #endif /* XsunLynxServer */
   
   
   #if XsunLynxMonoServer
   XCOMM
   XCOMM Sun monochrome server for LynxOS microSPARC 2.4.0
   XCOMM
   MFBDIR = mfb
   DDXDIR1 = hw/sunLynx
   SUNMDIRS = $(STDDIRS) $(MFBDIR) $(DDXDIR1) $(DEPDIRS)
   SUNMOBJS = hw/sunLynx/sunInitMono.o hw/sunLynx/sunInExMono.o
   SUNMLIBS = hw/sunLynx/libsun.a MFBBareLibs $(OTHEREXTS)
   ServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS),$(SUNMLIBS),$(SYSLIBS))
   #ifndef ServerToInstall
   #define ServerToInstall XsunMono
   #endif
   #endif /* XsunLynxMonoServer */
   
   
 #if XibmServer #if XibmServer
 XCOMM XCOMM
 XCOMM IBM server XCOMM IBM server
 XCOMM XCOMM
 #if SpecialMalloc #if SpecialMalloc
 IBMALLOCLIB = hw/ibm/common/libibmalloc.a  IBMALLOCLIB = hw/ibm/common/LibraryTargetName(ibmalloc)
 #else #else
 IBMALLOCLIB = IBMALLOCLIB =
 #endif #endif
Line 276 
Line 375 
 DDXDIR1 = hw/ibm DDXDIR1 = hw/ibm
 IBMDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS) IBMDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
 IBMOBJS = hw/ibm/common/ibmcomm.o hw/ibm/common/ibmDate.o IBMOBJS = hw/ibm/common/ibmcomm.o hw/ibm/common/ibmDate.o
 IBMLIBS = hw/ibm/AIX/hft.o hw/ibm/libibm.a $(IBMALLOCLIB) CFB8Libs  IBMLIBS = hw/ibm/AIX/hft.o hw/ibm/LibraryTargetName(ibm) $(IBMALLOCLIB) CFB8Libs
 ServerTarget(Xibm,$(IBMDIRS),$(IBMOBJS),$(IBMLIBS),$(SYSLIBS)) ServerTarget(Xibm,$(IBMDIRS),$(IBMOBJS),$(IBMLIBS),$(SYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall Xibm #define ServerToInstall Xibm
Line 284 
Line 383 
 #endif /* XibmServer */ #endif /* XibmServer */
  
  
 #if XirisServer  
 XCOMM  
 XCOMM SGI Iris Server  
 XCOMM  
 DDXDIR1 = hw/sgi/IRIX hw/sgi/common hw/sgi/gr1 hw/sgi/nfb hw/sgi/rrm \  
         hw/sgi/sgi  
 MFBDIR  = mfb  
 CFB8DIR = cfb  
 IRISDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)  
 IRISOBJS =  
 IRISLIBS =      $(DIX) $(OS) \  
                 hw/sgi/common/libcomm.a \  
                 hw/sgi/sgi/libsgi.a \  
                 hw/sgi/gr1/re2/libre2.a \  
                 hw/sgi/gr1/libgr1.a \  
                 hw/sgi/rrm/librrm.a \  
                 hw/sgi/nfb/libnfb.a \  
                 $(CFB8) $(MFB) $(MI) $(FONT) $(EXTENSIONS) \  
                 hw/sgi/IRIX/libirix.a  
 IRISSYSLIBS = $(SYSLIBS)  
 ServerTarget(Xiris,$(IRISDIRS),$(IRISOBJS),$(IRISLIBS),$(IRISSYSLIBS))  
 #ifndef ServerToInstall  
 #define ServerToInstall Xiris  
 #endif  
 #endif /* XirisServer */  
   
   
 #if XhpServer #if XhpServer
 XCOMM XCOMM
 XCOMM Hewlett Packard CFB Server XCOMM Hewlett Packard CFB Server
Line 319 
Line 391 
 CFB8DIR = cfb CFB8DIR = cfb
 CFB32DIR = cfb32 CFB32DIR = cfb32
 DDXDIR1 = hw/hp DDXDIR1 = hw/hp
 HPSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)  
 HPOBJS = hw/hp/hp.o HPOBJS = hw/hp/hp.o
   HPSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
 HPLIBS = CFB32Libs HPLIBS = CFB32Libs
 HPSYSLIBS = $(CBRT) $(SYSLIBS) HPSYSLIBS = $(CBRT) $(SYSLIBS)
 ServerTarget(Xhp,$(HPSUBDIRS),$(HPOBJS),$(HPLIBS),$(HPSYSLIBS)) ServerTarget(Xhp,$(HPSUBDIRS),$(HPOBJS),$(HPLIBS),$(HPSYSLIBS))
Line 347 
Line 419 
 #endif #endif
 #endif  /* XsvgaServer */ #endif  /* XsvgaServer */
  
   
 #ifdef XFree86Version #ifdef XFree86Version
 XF86INIT   = $(XF86COMSRC)/xf86Init.o $(XF86CONFIGSRC)/xf86IniExt.o XF86INIT   = $(XF86COMSRC)/xf86Init.o $(XF86CONFIGSRC)/xf86IniExt.o
 XF86MINIT  = $(XF86COMSRC)/xf86Init_m.o $(XF86CONFIGSRC)/xf86MIniExt.o XF86MINIT  = $(XF86COMSRC)/xf86Init_m.o $(XF86CONFIGSRC)/xf86MIniExt.o
Line 354 
Line 427 
 XF86COMLIB = $(XF86COMSRC)/LibraryTargetName(xf86) XF86COMLIB = $(XF86COMSRC)/LibraryTargetName(xf86)
 XF86OSLIB  = $(XF86OSSRC)/LibraryTargetName(xf86_os) XF86OSLIB  = $(XF86OSSRC)/LibraryTargetName(xf86_os)
 XF86HWLIB  = $(XF86HWSRC)/LibraryTargetName(xf86_hw) XF86HWLIB  = $(XF86HWSRC)/LibraryTargetName(xf86_hw)
 XF86LIBS   = $(XF86INIT) $(XF86CONFIG) $(XF86COMLIB) $(XF86HWLIB)  XF86LIBS   = $(XF86INIT) $(XF86CONFIG) $(XF86COMLIB) $(XF86OSLIB) \
 XF86MLIBS  = $(XF86MINIT) $(XF86CONFIG) $(XF86COMLIB) $(XF86HWLIB)               $(XF86HWLIB) $(XF86OSLIB)
   XF86MLIBS  = $(XF86MINIT) $(XF86CONFIG) $(XF86COMLIB) $(XF86OSLIB) \
                $(XF86HWLIB) $(XF86OSLIB)
   
   XF68INIT   = $(XF68COMSRC)/xf86Init.o $(XF68CONFIGSRC)/xf86IniExt.o
   XF68MINIT  = $(XF68COMSRC)/xf86Init_m.o $(XF68CONFIGSRC)/xf86MIniExt.o
   XF68CONFIG = $(XF68CONFIGSRC)/xf86_Option.o
   XF68COMLIB = $(XF68COMSRC)/LibraryTargetName(xf86)
   XF68OSLIB  = $(XF68OSSRC)/LibraryTargetName(xf86_os)
   XF68LIBS   = $(XF68INIT) $(XF68CONFIG) $(XF68COMLIB) $(XF68OSLIB)
   XF68MLIBS  = $(XF68MINIT) $(XF68CONFIG) $(XF68COMLIB) $(XF68OSLIB)
  
 XF98INIT       = $(XF98COMSRC)/xf86Init.o $(XF98CONFIGSRC)/xf86IniExt.o XF98INIT       = $(XF98COMSRC)/xf86Init.o $(XF98CONFIGSRC)/xf86IniExt.o
 XF98MINIT      = $(XF98COMSRC)/xf86Init_m.o $(XF98CONFIGSRC)/xf86MIniExt.o XF98MINIT      = $(XF98COMSRC)/xf86Init_m.o $(XF98CONFIGSRC)/xf86MIniExt.o
Line 366 
Line 449 
 XF98HWNECLIB   = $(XF98HWNECSRC)/LibraryTargetName(xf86_hw) XF98HWNECLIB   = $(XF98HWNECSRC)/LibraryTargetName(xf86_hw)
 XF98HWPWSKBLIB = $(XF98HWPWSKBSRC)/LibraryTargetName(xf86_hw) XF98HWPWSKBLIB = $(XF98HWPWSKBSRC)/LibraryTargetName(xf86_hw)
 XF98HWPWLBLIB  = $(XF98HWPWLBSRC)/LibraryTargetName(xf86_hw) XF98HWPWLBLIB  = $(XF98HWPWLBSRC)/LibraryTargetName(xf86_hw)
   XF98HWGA968LIB = $(XF98HWGA968SRC)/LibraryTargetName(xf86_hw)
 XF98LIBS       = $(XF98INIT) $(XF98CONFIG) $(XF98COMLIB) \ XF98LIBS       = $(XF98INIT) $(XF98CONFIG) $(XF98COMLIB) \
                  $(XF98HWLIB)                   $(XF98HWLIB) $(XF98OSLIB)
 XF98LIBSNEC    = $(XF98INIT) $(XF98CONFIG) $(XF98COMLIB) \ XF98LIBSNEC    = $(XF98INIT) $(XF98CONFIG) $(XF98COMLIB) \
                  $(XF98HWNECLIB)                   $(XF98HWNECLIB) $(XF98OSLIB)
 XF98LIBSPWSKB  = $(XF98INIT) $(XF98CONFIG) $(XF98COMLIB) \ XF98LIBSPWSKB  = $(XF98INIT) $(XF98CONFIG) $(XF98COMLIB) \
                  $(XF98HWPWSKBLIB)                   $(XF98HWPWSKBLIB) $(XF98OSLIB)
 XF98LIBSPWLB   = $(XF98INIT) $(XF98CONFIG) $(XF98COMLIB) \ XF98LIBSPWLB   = $(XF98INIT) $(XF98CONFIG) $(XF98COMLIB) \
                  $(XF98HWPWLBLIB)                   $(XF98HWPWLBLIB) $(XF98OSLIB)
   XF98LIBSGA968  = $(XF98INIT) $(XF98CONFIG) $(XF98COMLIB) \
                    $(XF98HWGA968LIB) $(XF98OSLIB)
 XF98MLIBS      = $(XF98MINIT) $(XF98CONFIG) $(XF98COMLIB) \ XF98MLIBS      = $(XF98MINIT) $(XF98CONFIG) $(XF98COMLIB) \
                  $(XF98HWLIB)                   $(XF98HWLIB) $(XF98OSLIB)
 XF98MLIBSNEC   = $(XF98MINIT) $(XF98CONFIG) $(XF98COMLIB) \ XF98MLIBSNEC   = $(XF98MINIT) $(XF98CONFIG) $(XF98COMLIB) \
                  $(XF98HWNECLIB)                   $(XF98HWNECLIB) $(XF98OSLIB)
 XF98MLIBSPWSKB = $(XF98MINIT) $(XF98CONFIG) $(XF98COMLIB) \ XF98MLIBSPWSKB = $(XF98MINIT) $(XF98CONFIG) $(XF98COMLIB) \
                  $(XF98HWPWSKBLIB)                   $(XF98HWPWSKBLIB) $(XF98OSLIB)
 XF98MLIBSPWLB  = $(XF98MINIT) $(XF98CONFIG) $(XF98COMLIB) \ XF98MLIBSPWLB  = $(XF98MINIT) $(XF98CONFIG) $(XF98COMLIB) \
                  $(XF98HWPWLBLIB)                   $(XF98HWPWLBLIB) $(XF98OSLIB)
   XF98MLIBSGA968 = $(XF98MINIT) $(XF98CONFIG) $(XF98COMLIB) \
                    $(XF98HWGA968LIB) $(XF98OSLIB)
 #endif #endif
  
   
 #if HasParallelMake #if HasParallelMake
 XCOMM XCOMM
 XCOMM force non-parallel build of XF86 servers to prevent MUTEX overrides XCOMM force non-parallel build of XF86 servers to prevent MUTEX overrides
Line 403 
Line 492 
 #if XF86S3Server #if XF86S3Server
 XF86S3 = XF86_S3 XF86S3 = XF86_S3
 #endif #endif
   #if XF86S3VServer
   XF86S3V = XF86_S3V
   #endif
 #if XF86I8514Server #if XF86I8514Server
 XF868514 = XF86_8514 XF868514 = XF86_8514
 #endif #endif
Line 424 
Line 516 
 #if XF86I128Server #if XF86I128Server
 XF86I128 = XF86_I128 XF86I128 = XF86_I128
 #endif #endif
   #if XF86GLINTServer
   XF86GLINT = XF86_3DLabs
   #endif
   #if XF86TGAServer
   XF86TGA = XF86_TGA
   #endif
   #if XF68FBDevServer
   XF68FBDEV = XF68_FBDev
   #endif
   #if XF86FBDevServer
   XF68FBDEV = XF86_FBDev
   #endif
 #if XF98GANBWAPServer #if XF98GANBWAPServer
 XF98GANBWAP = XF98_GANBWAP XF98GANBWAP = XF98_GANBWAP
 #endif #endif
Line 442 
Line 546 
 #if XF98WSNAServer #if XF98WSNAServer
 XF98WSNA = XF98_WSNA XF98WSNA = XF98_WSNA
 #endif #endif
   #if XF98TGUIServer
   XF98TGUI = XF98_TGUI
   #endif
   #if XF98MGAServer
   XF98MGA = XF98_MGA
   #endif
   #if XF98SVGAServer
   XF98SVGA = XF98_SVGA
   #endif
 #if XF98EGCServer #if XF98EGCServer
 XF98EGC = XF98_EGC XF98EGC = XF98_EGC
 #endif #endif
Line 454 
Line 567 
 #if XF98PWLBServer #if XF98PWLBServer
 XF98PWLB = XF98_PWLB XF98PWLB = XF98_PWLB
 #endif #endif
   #if XF98GA968Server
   XF98GA968 = XF98_GA968
   #endif
 #if XnestServer #if XnestServer
 XNEST = Xnest XNEST = Xnest
 #endif #endif
 #if XVirtualFramebufferServer #if XVirtualFramebufferServer
 XVFB = Xvfb XVFB = Xvfb
 #endif #endif
 #if defined(XF86SVGAServer) || defined(XF98GANBWAPServer) || defined(XF98NEC480Server) || defined(XF98NKVNECServer) || defined(XF98WABSServer) || defined(XF98WABEPServer) || defined(XF98WSNAServer) || defined(XF86VGA16Server) || defined(XF98EGCServer) || defined(XF86W32Server) || defined(XF86MonoServer) || defined(XF86S3Server) || defined(XF98NECS3Server) || defined(XF98PWSKBServer) || defined(XF98PWLBServer) || defined(XF86I8514Server) || defined(XF86Mach8Server) || defined(XF86Mach32Server) || defined(XF86Mach64Server) || defined(XF86P9000Server) || defined(XF86AGXServer) || defined(XF86I128Server) || defined(XnestServer) || defined(XVirtualFramebufferServer)  #if defined(XF86SVGAServer) || defined(XF98GANBWAPServer) || \
 MakeMutex($(XF86SVGA) $(XF98GANBWAP) $(XF98NEC480) $(XF98NKVNEC) $(XF98WABS) $(XF98WABEP) $(XF98WSNA) $(XF86VGA16) $(XF98EGC) $(XF86W32) $(XF86MONO) $(XF86S3) $(XF98NECS3) $(XF98PWSKB) $(XF98PWLB) $(XF868514) $(XF86MACH8) $(XF86MACH32) $(XF86MACH64) $(XF86P9000) $(XF86AGX) $(XF86I128) $(XNEST) $(XVFB))      defined(XF98NEC480Server) || defined(XF98NKVNECServer) || \
       defined(XF98WABSServer) || defined(XF98WABEPServer) || \
       defined(XF98WSNAServer) || defined(XF98TGUIServer) || \
       defined(XF98MGAServer) || defined(XF98SVGAServer) || \
       defined(XF86VGA16Server) || defined(XF98EGCServer) || \
       defined(XF86W32Server) || defined(XF86MonoServer) || \
       defined(XF86S3Server) || defined(XF86S3VServer) || \
       defined(XF98NECS3Server) || defined(XF98PWSKBServer) || \
       defined(XF98PWLBServer) || defined(XF98GA968Server) || \
       defined(XF86I8514Server) || defined(XF86Mach8Server) || \
       defined(XF86Mach32Server) || defined(XF86Mach64Server) || \
       defined(XF86P9000Server) || defined(XF86AGXServer) || \
       defined(XF86I128Server) || defined(XF86TGAServer) || \
       defined(XF86FBDevServer) || defined(XF68FBDevServer) || \
       defined(XnestServer) || defined(XVirtualFramebufferServer)
   MakeMutex($(XF86SVGA) $(XF98GANBWAP) $(XF98NEC480) $(XF98NKVNEC) $(XF98WABS) \
             $(XF98WABEP) $(XF98WSNA) $(XF98TGUI) $(XF98MGA) $(XF98SVGA) \
             $(XF86VGA16) \
             $(XF98EGC) $(XF86W32) $(XF86MONO) $(XF86S3) $(XF86S3V) $(XF98NECS3) \
             $(XF98PWSKB) $(XF98PWLB) $(XF98GA968) $(XF868514) $(XF86MACH8) \
             $(XF86MACH32) $(XF86MACH64) $(XF86P9000) $(XF86AGX) $(XF86I128) \
             $(XF86TGA) $(XF68FBDEV) $(XNEST) $(XVFB))
 #endif #endif
 MakeMutex($(STDDIRS) mfb cfb cfb16 cfb32) MakeMutex($(STDDIRS) mfb cfb cfb16 cfb32)
 #endif #endif
  
   
 #if XF86SVGAServer #if XF86SVGAServer
 XCOMM XCOMM
 XCOMM XFree86 SVGA Server XCOMM XFree86 SVGA Server
Line 473 
Line 611 
 MFBDIR  = mfb MFBDIR  = mfb
 CFB8DIR = cfb CFB8DIR = cfb
 CFB16DIR = cfb16 CFB16DIR = cfb16
   CFB24DIR = cfb24
 CFB32DIR = cfb32 CFB32DIR = cfb32
 DDXDIR1 = hw/xfree86 DDXDIR1 = hw/xfree86
 XF86SVGASUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) \  XF86SVGASUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) \
                   $(DDXDIR1) $(DEPDIRS)                    $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
 XF86SVGAOBJS = $(XF86COMSRC)/XF86_SVGA.o $(XF86SRC)/vga256/vga256Conf.o  XF86SVGAOBJS = $(XF86COMSRC)/XF86_SVGA.o $(XF86SRC)/vga256/vga256Conf.o \
                  $(XF86SRC)/xaa/xaavga256/xaavga256.o \
                  $(XF86SRC)/xaa/xaa16/xaa16.o $(XF86SRC)/xaa/xaa24/xaa24.o \
                  $(XF86SRC)/xaa/xaa32/xaa32.o
 XF86SVGALIBS = $(VGADRIVERSRC)/LibraryTargetName(driver256) \ XF86SVGALIBS = $(VGADRIVERSRC)/LibraryTargetName(driver256) \
                $(XF86SRC)/vga256/LibraryTargetName(vga256) $(XF86LIBS) \                 $(XF86SRC)/xaa/LibraryTargetName(xaa) \
                CFBLibs $(XF86OSLIB)                 $(XF86SRC)/vga256/LibraryTargetName(vga256) \
                  $(XF86LIBS) CFBLibs
 XF86SVGASYSLIBS = $(SYSLIBS) XF86SVGASYSLIBS = $(SYSLIBS)
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XF86SVGASUBDIRS) $(XF86SVGAOBJS) $(XF86SVGALIBS) $(XF86SVGASYSLIBS)) MakeMutex($(XF86SVGASUBDIRS) $(XF86SVGAOBJS) $(XF86SVGALIBS) $(XF86SVGASYSLIBS))
 #endif #endif
   #if HasGnuMake
   $(XF86SVGAOBJS) $(XF86SVGALIBS) $(XF86SVGASYSLIBS):: $(XF86SVGASUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
 SetUIDServerTarget(XF86_SVGA,$(XF86SVGASUBDIRS),$(XF86SVGAOBJS),$(XF86SVGALIBS),$(XF86SVGASYSLIBS)) SetUIDServerTarget(XF86_SVGA,$(XF86SVGASUBDIRS),$(XF86SVGAOBJS),$(XF86SVGALIBS),$(XF86SVGASYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall XF86_SVGA #define ServerToInstall XF86_SVGA
 #endif #endif
 #ifdef OS2Architecture #ifdef OS2Architecture
 LinkFile(XF86_SVGA.def,SVGA.def) LinkFile(XF86_SVGA.def,SVGA.def)
   InstallLinkKitNonExecFile(SVGA.def,$(LINKKITDIR))
 #endif #endif
 #endif  /* XF86SVGAServer */ #endif  /* XF86SVGAServer */
  
Line 510 
Line 658 
                 $(XF86SRC)/vga16/misc/vga16misc.o $(XF86VGA16MONOOBJS)                 $(XF86SRC)/vga16/misc/vga16misc.o $(XF86VGA16MONOOBJS)
 XF86VGA16LIBS = $(VGA16DRIVERSRC)/LibraryTargetName(driver16) \ XF86VGA16LIBS = $(VGA16DRIVERSRC)/LibraryTargetName(driver16) \
                 $(XF86SRC)/vga16/LibraryTargetName(vga16) \                 $(XF86SRC)/vga16/LibraryTargetName(vga16) \
                 $(XF86VGA16MONOLIBS) $(XF86MLIBS) \                  $(XF86VGA16MONOLIBS) $(XF86MLIBS) NoMFBBareLibs $(OTHEREXTS)
                 NoMFBBareLibs $(OTHEREXTS) $(XF86OSLIB)  
 XF86VGA16SYSLIBS = $(SYSLIBS) XF86VGA16SYSLIBS = $(SYSLIBS)
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XF86VGA16SUBDIRS) $(XF86VGA16OBJS) $(XF86VGA16LIBS) $(XF86VGA16SYSLIBS)) MakeMutex($(XF86VGA16SUBDIRS) $(XF86VGA16OBJS) $(XF86VGA16LIBS) $(XF86VGA16SYSLIBS))
 #endif #endif
   #if HasGnuMake
   $(XF86VGA16OBJS) $(XF86VGA16LIBS) $(XF86VGA16SYSLIBS):: $(XF86VGA16SUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
 SetUIDServerTarget(XF86_VGA16,$(XF86VGA16SUBDIRS),$(XF86VGA16OBJS),$(XF86VGA16LIBS),$(XF86VGA16SYSLIBS)) SetUIDServerTarget(XF86_VGA16,$(XF86VGA16SUBDIRS),$(XF86VGA16OBJS),$(XF86VGA16LIBS),$(XF86VGA16SYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall XF86_VGA16 #define ServerToInstall XF86_VGA16
 #endif #endif
 #ifdef OS2Architecture #ifdef OS2Architecture
 LinkFile(XF86_VGA16.def,VGA16.def) LinkFile(XF86_VGA16.def,VGA16.def)
   InstallLinkKitNonExecFile(VGA16.def,$(LINKKITDIR))
 #endif #endif
 #endif  /* XF86VGA16Server */ #endif  /* XF86VGA16Server */
  
   
 #if XF86W32Server #if XF86W32Server
 XCOMM XCOMM
 XCOMM XFree86 W32 Server XCOMM XFree86 W32 Server
Line 538 
Line 691 
               $(XF86ACCELSRC)/et4000w32/cfb.w32/LibraryTargetName(cfb) \               $(XF86ACCELSRC)/et4000w32/cfb.w32/LibraryTargetName(cfb) \
               $(XF86ACCELSRC)/et4000w32/w32/LibraryTargetName(w32) \               $(XF86ACCELSRC)/et4000w32/w32/LibraryTargetName(w32) \
               $(XF86ACCELSRC)/et4000w32/asm/LibraryTargetName(asm) \               $(XF86ACCELSRC)/et4000w32/asm/LibraryTargetName(asm) \
               $(XF86LIBS) CFB8Libs $(XF86OSLIB)                $(XF86LIBS) CFB8Libs
 XF86W32SYSLIBS = $(SYSLIBS) XF86W32SYSLIBS = $(SYSLIBS)
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XF86W32SUBDIRS) $(XF86W32OBJS) $(XF86W32LIBS) $(XF86W32SYSLIBS)) MakeMutex($(XF86W32SUBDIRS) $(XF86W32OBJS) $(XF86W32LIBS) $(XF86W32SYSLIBS))
 #endif #endif
   #if HasGnuMake
   $(XF86W32OBJS) $(XF86W32LIBS) $(XF86W32SYSLIBS):: $(XF86W32SUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
 SetUIDServerTarget(XF86_W32,$(XF86W32SUBDIRS),$(XF86W32OBJS),$(XF86W32LIBS),$(XF86W32SYSLIBS)) SetUIDServerTarget(XF86_W32,$(XF86W32SUBDIRS),$(XF86W32OBJS),$(XF86W32LIBS),$(XF86W32SYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall XF86_W32 #define ServerToInstall XF86_W32
 #endif #endif
 #ifdef OS2Architecture #ifdef OS2Architecture
 LinkFile(XF86_W32.def,W32.def) LinkFile(XF86_W32.def,W32.def)
   InstallLinkKitNonExecFile(W32.def,$(LINKKITDIR))
 #endif #endif
 #endif #endif
  
   
 #if XF86MonoServer #if XF86MonoServer
 XCOMM XCOMM
 XCOMM XFree86 Monochrome VGA Server XCOMM XFree86 Monochrome VGA Server
Line 567 
Line 726 
                $(XF86SRC)/vga2/misc/vga2misc.o $(XF86MONOMONOOBJS)                $(XF86SRC)/vga2/misc/vga2misc.o $(XF86MONOMONOOBJS)
 XF86MONOLIBS = $(VGA2DRIVERSRC)/LibraryTargetName(driver2) \ XF86MONOLIBS = $(VGA2DRIVERSRC)/LibraryTargetName(driver2) \
                $(XF86SRC)/vga2/LibraryTargetName(vga2) \                $(XF86SRC)/vga2/LibraryTargetName(vga2) \
                $(XF86MONOMONOLIBS) $(XF86MLIBS) \                 $(XF86MONOMONOLIBS) $(XF86MLIBS) NoMFBBareLibs $(OTHEREXTS)
                NoMFBBareLibs $(OTHEREXTS) $(XF86OSLIB)  
 XF86MONOSYSLIBS = $(SYSLIBS) XF86MONOSYSLIBS = $(SYSLIBS)
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XF86MONOSUBDIRS) $(XF86MONOOBJS) $(XF86MONOLIBS) $(XF86MONOSYSLIBS)) MakeMutex($(XF86MONOSUBDIRS) $(XF86MONOOBJS) $(XF86MONOLIBS) $(XF86MONOSYSLIBS))
 #endif #endif
   #if HasGnuMake
   $(XF86MONOOBJS) $(XF86MONOLIBS) $(XF86MONOSYSLIBS):: $(XF86MONOSUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
 SetUIDServerTarget(XF86_Mono,$(XF86MONOSUBDIRS),$(XF86MONOOBJS),$(XF86MONOLIBS),$(XF86MONOSYSLIBS)) SetUIDServerTarget(XF86_Mono,$(XF86MONOSUBDIRS),$(XF86MONOOBJS),$(XF86MONOLIBS),$(XF86MONOSYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall XF86_Mono #define ServerToInstall XF86_Mono
 #endif #endif
 #ifdef OS2Architecture #ifdef OS2Architecture
 LinkFile(XF86_Mono.def,Mono.def) LinkFile(XF86_Mono.def,Mono.def)
   InstallLinkKitNonExecFile(Mono.def,$(LINKKITDIR))
 #endif #endif
 #endif  /* XF86MonoServer */ #endif  /* XF86MonoServer */
  
Line 590 
Line 753 
 MFBDIR   = mfb MFBDIR   = mfb
 CFB8DIR  = cfb CFB8DIR  = cfb
 CFB16DIR = cfb16 CFB16DIR = cfb16
   CFB24DIR = cfb24
 CFB32DIR = cfb32 CFB32DIR = cfb32
 DDXDIR1 = hw/xfree86 DDXDIR1 = hw/xfree86
 XF86S3SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) \  XF86S3SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) \
                 $(DDXDIR1) $(DEPDIRS)                  $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
 XF86S3OBJS = $(XF86COMSRC)/XF86_S3.o $(XF86ACCELSRC)/s3/s3Conf.o \ XF86S3OBJS = $(XF86COMSRC)/XF86_S3.o $(XF86ACCELSRC)/s3/s3Conf.o \
                $(S3DRIVERSRC)/newmmio/newmmio.o \
              $(S3DRIVERSRC)/mmio_928/mmio_928.o \              $(S3DRIVERSRC)/mmio_928/mmio_928.o \
              $(S3DRIVERSRC)/s3_generic/s3_generic.o              $(S3DRIVERSRC)/s3_generic/s3_generic.o
 XF86S3LIBS = $(XF86ACCELSRC)/s3/LibraryTargetName(s3) \ XF86S3LIBS = $(XF86ACCELSRC)/s3/LibraryTargetName(s3) \
                $(XF86ACCELSRC)/s3/s3newmmio/LibraryTargetName(s3newmmio) \
              $(XF86ACCELSRC)/s3/s3mmio/LibraryTargetName(s3mmio) $(XF86LIBS) \              $(XF86ACCELSRC)/s3/s3mmio/LibraryTargetName(s3mmio) $(XF86LIBS) \
              CFBLibs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache) \               CFBLibs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache)
              $(XF86OSLIB)  
 XF86S3SYSLIBS = $(SYSLIBS) XF86S3SYSLIBS = $(SYSLIBS)
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XF86S3SUBDIRS) $(XF86S3OBJS) $(XF86S3LIBS) $(XF86S3SYSLIBS)) MakeMutex($(XF86S3SUBDIRS) $(XF86S3OBJS) $(XF86S3LIBS) $(XF86S3SYSLIBS))
Line 611 
Line 776 
 #endif #endif
 #ifdef OS2Architecture #ifdef OS2Architecture
 LinkFile(XF86_S3.def,S3.def) LinkFile(XF86_S3.def,S3.def)
   InstallLinkKitNonExecFile(S3.def,$(LINKKITDIR))
 #endif #endif
 #endif  /* XF86S3Server */ #endif  /* XF86S3Server */
  
  
   #if XF86S3VServer
   XCOMM
   XCOMM XFree86 S3 ViRGE Server
   XCOMM
   MFBDIR   = mfb
   CFB8DIR  = cfb
   CFB16DIR = cfb16
   CFB24DIR = cfb24
   CFB32DIR = cfb32
   DDXDIR1 = hw/xfree86
   XF86S3VSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) \
                   $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
   XF86S3VOBJS = $(XF86COMSRC)/XF86_S3.o $(XF86ACCELSRC)/s3_virge/s3vConf.o \
                $(S3VDRIVERSRC)/s3_virge/s3_virge.o
   XF86S3VLIBS = $(XF86ACCELSRC)/s3_virge/LibraryTargetName(s3v) $(XF86LIBS) \
                CFBLibs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache)
   XF86S3VSYSLIBS = $(SYSLIBS)
   #if HasParallelMake
   MakeMutex($(XF86S3VSUBDIRS) $(XF86S3VOBJS) $(XF86S3VLIBS) $(XF86S3VSYSLIBS))
   #endif
   #if HasGnuMake
   $(XF86S3VOBJS) $(XF86S3VLIBS) $(XF86S3VSYSLIBS):: $(XF86S3VSUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
   SetUIDServerTarget(XF86_S3V,$(XF86S3VSUBDIRS),$(XF86S3VOBJS),$(XF86S3VLIBS),$(XF86S3VSYSLIBS))
   #ifndef ServerToInstall
   #define ServerToInstall XF86_S3V
   #endif
   #ifdef OS2Architecture
   LinkFile(XF86_S3V.def,S3V.def)
   InstallLinkKitNonExecFile(S3V.def,$(LINKKITDIR))
   #endif
   #endif  /* XF86S3VServer */
   
   
 #if XF86I8514Server #if XF86I8514Server
 XCOMM XCOMM
 XCOMM XFree86 8514 Server XCOMM XFree86 8514 Server
Line 625 
Line 826 
 XF868514SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS) XF868514SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
 XF868514OBJS = $(XF86COMSRC)/XF86_8514.o XF868514OBJS = $(XF86COMSRC)/XF86_8514.o
 XF868514LIBS = $(XF86ACCELSRC)/ibm8514/LibraryTargetName(8514) $(XF86LIBS) \ XF868514LIBS = $(XF86ACCELSRC)/ibm8514/LibraryTargetName(8514) $(XF86LIBS) \
                CFB8Libs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache) \                 CFB8Libs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache)
                $(XF86OSLIB)  
 XF868514SYSLIBS = $(SYSLIBS) XF868514SYSLIBS = $(SYSLIBS)
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XF868514SUBDIRS) $(XF868514OBJS) $(XF868514LIBS) $(XF868514SYSLIBS)) MakeMutex($(XF868514SUBDIRS) $(XF868514OBJS) $(XF868514LIBS) $(XF868514SYSLIBS))
 #endif #endif
   #if HasGnuMake
   $(XF868514OBJS) $(XF868514LIBS) $(XF868514SYSLIBS):: $(XF868514SUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
 SetUIDServerTarget(XF86_8514,$(XF868514SUBDIRS),$(XF868514OBJS),$(XF868514LIBS),$(XF868514SYSLIBS)) SetUIDServerTarget(XF86_8514,$(XF868514SUBDIRS),$(XF868514OBJS),$(XF868514LIBS),$(XF868514SYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall XF86_8514 #define ServerToInstall XF86_8514
 #endif #endif
 #ifdef OS2Architecture #ifdef OS2Architecture
 LinkFile(XF86_8514.def,8514.def) LinkFile(XF86_8514.def,8514.def)
   InstallLinkKitNonExecFile(8514.def,$(LINKKITDIR))
 #endif #endif
 #endif  /* XF86I8514Server */ #endif  /* XF86I8514Server */
  
Line 651 
Line 856 
 XF86MACH8SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS) XF86MACH8SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
 XF86MACH8OBJS = $(XF86COMSRC)/XF86_Mach8.o XF86MACH8OBJS = $(XF86COMSRC)/XF86_Mach8.o
 XF86MACH8LIBS = $(XF86ACCELSRC)/mach8/LibraryTargetName(mach8) $(XF86LIBS) \ XF86MACH8LIBS = $(XF86ACCELSRC)/mach8/LibraryTargetName(mach8) $(XF86LIBS) \
                 CFB8Libs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache) \                  CFB8Libs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache)
                 $(XF86OSLIB)  
 XF86MACH8SYSLIBS = $(SYSLIBS) XF86MACH8SYSLIBS = $(SYSLIBS)
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XF86MACH8SUBDIRS) $(XF86MACH8OBJS) $(XF86MACH8LIBS) $(XF86MACH8SYSLIBS)) MakeMutex($(XF86MACH8SUBDIRS) $(XF86MACH8OBJS) $(XF86MACH8LIBS) $(XF86MACH8SYSLIBS))
 #endif #endif
   #if HasGnuMake
   $(XF86MACH8OBJS) $(XF86MACH8LIBS) $(XF86MACH8SYSLIBS):: $(XF86MACH8SUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
 SetUIDServerTarget(XF86_Mach8,$(XF86MACH8SUBDIRS),$(XF86MACH8OBJS),$(XF86MACH8LIBS),$(XF86MACH8SYSLIBS)) SetUIDServerTarget(XF86_Mach8,$(XF86MACH8SUBDIRS),$(XF86MACH8OBJS),$(XF86MACH8LIBS),$(XF86MACH8SYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall XF86_Mach8 #define ServerToInstall XF86_Mach8
 #endif #endif
 #ifdef OS2Architecture #ifdef OS2Architecture
 LinkFile(XF86_Mach8.def,Mach8.def) LinkFile(XF86_Mach8.def,Mach8.def)
   InstallLinkKitNonExecFile(Mach8.def,$(LINKKITDIR))
 #endif #endif
 #endif  /* XF86Mach8Server */ #endif  /* XF86Mach8Server */
  
Line 679 
Line 888 
                     $(DEPDIRS)                     $(DEPDIRS)
 XF86MACH32OBJS = $(XF86COMSRC)/XF86_Mach32.o XF86MACH32OBJS = $(XF86COMSRC)/XF86_Mach32.o
 XF86MACH32LIBS = $(XF86ACCELSRC)/mach32/LibraryTargetName(mach32) $(XF86LIBS) \ XF86MACH32LIBS = $(XF86ACCELSRC)/mach32/LibraryTargetName(mach32) $(XF86LIBS) \
                  CFB16Libs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache) \                   CFB16Libs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache)
                  $(XF86OSLIB)  
 XF86MACH32SYSLIBS = $(SYSLIBS) XF86MACH32SYSLIBS = $(SYSLIBS)
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XF86MACH32SUBDIRS) $(XF86MACH32OBJS) $(XF86MACH32LIBS) $(XF86MACH32SYSLIBS)) MakeMutex($(XF86MACH32SUBDIRS) $(XF86MACH32OBJS) $(XF86MACH32LIBS) $(XF86MACH32SYSLIBS))
 #endif #endif
   #if HasGnuMake
   $(XF86MACH32OBJS) $(XF86MACH32LIBS) $(XF86MACH32SYSLIBS):: $(XF86MACH32SUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
 SetUIDServerTarget(XF86_Mach32,$(XF86MACH32SUBDIRS),$(XF86MACH32OBJS),$(XF86MACH32LIBS),$(XF86MACH32SYSLIBS)) SetUIDServerTarget(XF86_Mach32,$(XF86MACH32SUBDIRS),$(XF86MACH32OBJS),$(XF86MACH32LIBS),$(XF86MACH32SYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall XF86_Mach32 #define ServerToInstall XF86_Mach32
 #endif #endif
 #ifdef OS2Architecture #ifdef OS2Architecture
 LinkFile(XF86_Mach32.def,Mach32.def) LinkFile(XF86_Mach32.def,Mach32.def)
   InstallLinkKitNonExecFile(Mach32.def,$(LINKKITDIR))
 #endif #endif
 #endif  /* XF86Mach32Server */ #endif  /* XF86Mach32Server */
  
Line 702 
Line 915 
 MFBDIR   = mfb MFBDIR   = mfb
 CFB8DIR  = cfb CFB8DIR  = cfb
 CFB16DIR = cfb16 CFB16DIR = cfb16
   CFB24DIR = cfb24
 CFB32DIR = cfb32 CFB32DIR = cfb32
 DDXDIR1  = hw/xfree86 DDXDIR1  = hw/xfree86
 XF86MACH64SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) \  XF86MACH64SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) \
                     $(DDXDIR1) $(DEPDIRS)                      $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
 XF86MACH64OBJS = $(XF86COMSRC)/XF86_Mach64.o XF86MACH64OBJS = $(XF86COMSRC)/XF86_Mach64.o
 XF86MACH64LIBS = $(XF86ACCELSRC)/mach64/LibraryTargetName(mach64) \ XF86MACH64LIBS = $(XF86ACCELSRC)/mach64/LibraryTargetName(mach64) \
                  $(XF86LIBS) CFBLibs $(XF86OSLIB)                   $(XF86LIBS) CFBLibs
 XF86MACH64SYSLIBS = $(SYSLIBS) XF86MACH64SYSLIBS = $(SYSLIBS)
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XF86MACH64SUBDIRS) $(XF86MACH64OBJS) $(XF86MACH64LIBS) $(XF86MACH64SYSLIBS)) MakeMutex($(XF86MACH64SUBDIRS) $(XF86MACH64OBJS) $(XF86MACH64LIBS) $(XF86MACH64SYSLIBS))
 #endif #endif
   #if HasGnuMake
   $(XF86MACH64OBJS) $(XF86MACH64LIBS) $(XF86MACH64SYSLIBS):: $(XF86MACH64SUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
 SetUIDServerTarget(XF86_Mach64,$(XF86MACH64SUBDIRS),$(XF86MACH64OBJS),$(XF86MACH64LIBS),$(XF86MACH64SYSLIBS)) SetUIDServerTarget(XF86_Mach64,$(XF86MACH64SUBDIRS),$(XF86MACH64OBJS),$(XF86MACH64LIBS),$(XF86MACH64SYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall XF86_Mach64 #define ServerToInstall XF86_Mach64
 #endif #endif
 #ifdef OS2Architecture #ifdef OS2Architecture
 LinkFile(XF86_Mach64.def,Mach64.def) LinkFile(XF86_Mach64.def,Mach64.def)
   InstallLinkKitNonExecFile(Mach64.def,$(LINKKITDIR))
 #endif #endif
 #endif  /* XF86Mach64Server */ #endif  /* XF86Mach64Server */
  
Line 730 
Line 949 
 MFBDIR  = mfb MFBDIR  = mfb
 CFB8DIR = cfb CFB8DIR = cfb
 CFB16DIR = cfb16 CFB16DIR = cfb16
   CFB24DIR = cfb24
 CFB32DIR = cfb32 CFB32DIR = cfb32
 DDXDIR1 = hw/xfree86 DDXDIR1 = hw/xfree86
 XF86P9000SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) \  XF86P9000SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) \
                    $(DDXDIR1) $(DEPDIRS)                     $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
 XF86P9000OBJS = $(XF86COMSRC)/XF86_P9000.o XF86P9000OBJS = $(XF86COMSRC)/XF86_P9000.o
 XF86P9000LIBS = $(XF86ACCELSRC)/p9000/LibraryTargetName(p9000) \ XF86P9000LIBS = $(XF86ACCELSRC)/p9000/LibraryTargetName(p9000) \
                 $(XF86LIBS) CFBLibs $(XF86OSLIB)                  $(XF86LIBS) CFBLibs
 XF86P9000SYSLIBS = $(SYSLIBS) XF86P9000SYSLIBS = $(SYSLIBS)
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XF86P9000SUBDIRS) $(XF86P9000OBJS) $(XF86P9000LIBS) $(XF86P9000SYSLIBS)) MakeMutex($(XF86P9000SUBDIRS) $(XF86P9000OBJS) $(XF86P9000LIBS) $(XF86P9000SYSLIBS))
 #endif #endif
   #if HasGnuMake
   $(XF86P9000OBJS) $(XF86P9000LIBS) $(XF86P9000SYSLIBS):: $(XF86P9000SUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
 SetUIDServerTarget(XF86_P9000,$(XF86P9000SUBDIRS),$(XF86P9000OBJS),$(XF86P9000LIBS),$(XF86P9000SYSLIBS)) SetUIDServerTarget(XF86_P9000,$(XF86P9000SUBDIRS),$(XF86P9000OBJS),$(XF86P9000LIBS),$(XF86P9000SYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall XF86_P9000 #define ServerToInstall XF86_P9000
 #endif #endif
 #ifdef OS2Architecture #ifdef OS2Architecture
 LinkFile(XF86_P9000.def,P9000.def) LinkFile(XF86_P9000.def,P9000.def)
   InstallLinkKitNonExecFile(P9000.def,$(LINKKITDIR))
 #endif #endif
 #endif        /* XF86P9000Server */ #endif        /* XF86P9000Server */
  
Line 758 
Line 983 
 MFBDIR   = mfb MFBDIR   = mfb
 CFB8DIR  = cfb CFB8DIR  = cfb
 CFB16DIR = cfb16 CFB16DIR = cfb16
   CFB24DIR = cfb24
 CFB32DIR = cfb32 CFB32DIR = cfb32
 DDXDIR1  = hw/xfree86 DDXDIR1  = hw/xfree86
 XF86AGXSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) \  XF86AGXSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) \
                  $(DDXDIR1) $(DEPDIRS)                   $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
 XF86AGXOBJS = $(XF86COMSRC)/XF86_AGX.o XF86AGXOBJS = $(XF86COMSRC)/XF86_AGX.o
 XF86AGXLIBS = $(XF86ACCELSRC)/agx/LibraryTargetName(agx) $(XF86LIBS) \  XF86AGXLIBS = $(XF86ACCELSRC)/agx/LibraryTargetName(agx) $(XF86LIBS) CFBLibs
               CFBLibs $(XF86OSLIB)  
 XF86AGXSYSLIBS = $(SYSLIBS) XF86AGXSYSLIBS = $(SYSLIBS)
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XF86AGXSUBDIRS) $(XF86AGXOBJS) $(XF86AGXLIBS) $(XF86AGXSYSLIBS)) MakeMutex($(XF86AGXSUBDIRS) $(XF86AGXOBJS) $(XF86AGXLIBS) $(XF86AGXSYSLIBS))
 #endif #endif
   #if HasGnuMake
   $(XF86AGXOBJS) $(XF86AGXLIBS) $(XF86AGXSYSLIBS):: $(XF86AGXSUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
 SetUIDServerTarget(XF86_AGX,$(XF86AGXSUBDIRS),$(XF86AGXOBJS),$(XF86AGXLIBS),$(XF86AGXSYSLIBS)) SetUIDServerTarget(XF86_AGX,$(XF86AGXSUBDIRS),$(XF86AGXOBJS),$(XF86AGXLIBS),$(XF86AGXSYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall XF86_AGX #define ServerToInstall XF86_AGX
 #endif #endif
 #ifdef OS2Architecture #ifdef OS2Architecture
 LinkFile(XF86_AGX.def,AGX.def) LinkFile(XF86_AGX.def,AGX.def)
   InstallLinkKitNonExecFile(AGX.def,$(LINKKITDIR))
 #endif #endif
 #endif        /* XF86AGXServer */ #endif        /* XF86AGXServer */
  
Line 786 
Line 1016 
 MFBDIR  = mfb MFBDIR  = mfb
 CFB8DIR = cfb CFB8DIR = cfb
 CFB16DIR = cfb16 CFB16DIR = cfb16
   CFB24DIR = cfb24
 CFB32DIR = cfb32 CFB32DIR = cfb32
 DDXDIR2 = hw/xfree98 DDXDIR2 = hw/xfree98
 XF98GANBWAPSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)  XF98GANBWAPSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
 XF98GANBWAPOBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/vga256Conf.o  XF98GANBWAPOBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/vga256Conf.o \
                    $(XF98SRC)/xaa/xaa16/xaa16.o $(XF98SRC)/xaa/xaa24/xaa24.o $(XF98SRC)/xaa/xaa32/xaa32.o $(XF98SRC)/xaa/xaavga256/xaavga256.o
 XF98GANBWAPLIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(driverganbwap) \ XF98GANBWAPLIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(driverganbwap) \
                     $(XF98SRC)/xaa/LibraryTargetName(xaa) \
                   $(XF98SRC)/vga256/LibraryTargetName(ganbwap) $(XF98LIBS) \                   $(XF98SRC)/vga256/LibraryTargetName(ganbwap) $(XF98LIBS) \
                   CFBLibs $(XF98OSLIB)                    CFBLibs
 XF98GANBWAPSYSLIBS = $(SYSLIBS) XF98GANBWAPSYSLIBS = $(SYSLIBS)
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XF98GANBWAPSUBDIRS) $(XF98GANBWAPOBJS) $(XF98GANBWAPLIBS) $(XF98GANBWAPSYSLIBS)) MakeMutex($(XF98GANBWAPSUBDIRS) $(XF98GANBWAPOBJS) $(XF98GANBWAPLIBS) $(XF98GANBWAPSYSLIBS))
 #endif #endif
   #if HasGnuMake
   $(XF98GANBWAPOBJS) $(XF98GANBWAPLIBS) $(XF98GANBWAPSYSLIBS):: $(XF98GANBWAPSUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
 SetUIDServerTarget(XF98_GANBWAP,$(XF98GANBWAPSUBDIRS),$(XF98GANBWAPOBJS),$(XF98GANBWAPLIBS),$(XF98GANBWAPSYSLIBS)) SetUIDServerTarget(XF98_GANBWAP,$(XF98GANBWAPSUBDIRS),$(XF98GANBWAPOBJS),$(XF98GANBWAPLIBS),$(XF98GANBWAPSYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall XF98_GANBWAP #define ServerToInstall XF98_GANBWAP
 #endif #endif
 #ifdef OS2Architecture  
 LinkFile(XF98_GANBWAP.def,SVGA.def)  
 #endif  
 #endif  /* XF98GANBWAPServer */ #endif  /* XF98GANBWAPServer */
  
   
 #if XF98NEC480Server #if XF98NEC480Server
 XCOMM XCOMM
 XCOMM XFree98 NEC480 Server XCOMM XFree98 NEC480 Server
Line 813 
Line 1048 
 MFBDIR  = mfb MFBDIR  = mfb
 CFB8DIR = cfb CFB8DIR = cfb
 CFB16DIR = cfb16 CFB16DIR = cfb16
   CFB24DIR = cfb24
 CFB32DIR = cfb32 CFB32DIR = cfb32
 DDXDIR2 = hw/xfree98 DDXDIR2 = hw/xfree98
 XF98NEC480SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)  XF98NEC480SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
 XF98NEC480OBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/nec480Conf.o  XF98NEC480OBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/nec480Conf.o\
                    $(XF98SRC)/xaa/xaa16/xaa16.o $(XF98SRC)/xaa/xaa24/xaa24.o $(XF98SRC)/xaa/xaa32/xaa32.o $(XF98SRC)/xaa/xaavga256/xaavga256.o
 XF98NEC480LIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(drivernec480) \ XF98NEC480LIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(drivernec480) \
                    $(XF98SRC)/xaa/LibraryTargetName(xaa) \
                  $(XF98SRC)/vga256/LibraryTargetName(nec480) $(XF98LIBS) \                  $(XF98SRC)/vga256/LibraryTargetName(nec480) $(XF98LIBS) \
                  CFBLibs $(XF98OSLIB)                   CFBLibs
 XF98NEC480SYSLIBS = $(SYSLIBS) XF98NEC480SYSLIBS = $(SYSLIBS)
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XF98NEC480SUBDIRS) $(XF98NEC480OBJS) $(XF98NEC480LIBS) $(XF98NEC480SYSLIBS)) MakeMutex($(XF98NEC480SUBDIRS) $(XF98NEC480OBJS) $(XF98NEC480LIBS) $(XF98NEC480SYSLIBS))
 #endif #endif
   #if HasGnuMake
   $(XF98NEC480OBJS) $(XF98NEC480LIBS) $(XF98NEC480SYSLIBS):: $(XF98NEC480SUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
 SetUIDServerTarget(XF98_NEC480,$(XF98NEC480SUBDIRS),$(XF98NEC480OBJS),$(XF98NEC480LIBS),$(XF98NEC480SYSLIBS)) SetUIDServerTarget(XF98_NEC480,$(XF98NEC480SUBDIRS),$(XF98NEC480OBJS),$(XF98NEC480LIBS),$(XF98NEC480SYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall XF98_NEC480 #define ServerToInstall XF98_NEC480
 #endif #endif
 #ifdef OS2Architecture  
 LinkFile(XF98_NEC480.def,NEC480.def)  
 #endif  
 #endif  /* XF98NEC480Server */ #endif  /* XF98NEC480Server */
  
   
 #if XF98NKVNECServer #if XF98NKVNECServer
 XCOMM XCOMM
 XCOMM XFree98 NEC-CIRRUS/EPSON NKV/NKV2 Server XCOMM XFree98 NEC-CIRRUS/EPSON NKV/NKV2 Server
Line 840 
Line 1080 
 MFBDIR  = mfb MFBDIR  = mfb
 CFB8DIR = cfb CFB8DIR = cfb
 CFB16DIR = cfb16 CFB16DIR = cfb16
   CFB24DIR = cfb24
 CFB32DIR = cfb32 CFB32DIR = cfb32
 DDXDIR2 = hw/xfree98 DDXDIR2 = hw/xfree98
 XF98NKVNECSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)  XF98NKVNECSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
 XF98NKVNECOBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/vga256Conf.o  XF98NKVNECOBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/vga256Conf.o \
                    $(XF98SRC)/xaa/xaa16/xaa16.o $(XF98SRC)/xaa/xaa24/xaa24.o $(XF98SRC)/xaa/xaa32/xaa32.o $(XF98SRC)/xaa/xaavga256/xaavga256.o
 XF98NKVNECLIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(drivernkvnec) \ XF98NKVNECLIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(drivernkvnec) \
                    $(XF98SRC)/xaa/LibraryTargetName(xaa) \
                  $(XF98SRC)/vga256/LibraryTargetName(nkvnec) $(XF98LIBS) \                  $(XF98SRC)/vga256/LibraryTargetName(nkvnec) $(XF98LIBS) \
                  CFBLibs $(XF98OSLIB)                   CFBLibs
 XF98NKVNECSYSLIBS = $(SYSLIBS) XF98NKVNECSYSLIBS = $(SYSLIBS)
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XF98NKVNECSUBDIRS) $(XF98NKVNECOBJS) $(XF98NKVNECLIBS) $(XF98NKVNECSYSLIBS)) MakeMutex($(XF98NKVNECSUBDIRS) $(XF98NKVNECOBJS) $(XF98NKVNECLIBS) $(XF98NKVNECSYSLIBS))
 #endif #endif
   #if HasGnuMake
   $(XF98NKVNECOBJS) $(XF98NKVNECLIBS) $(XF98NKVNECSYSLIBS):: $(XF98NKVNECSUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
 SetUIDServerTarget(XF98_NKVNEC,$(XF98NKVNECSUBDIRS),$(XF98NKVNECOBJS),$(XF98NKVNECLIBS),$(XF98NKVNECSYSLIBS)) SetUIDServerTarget(XF98_NKVNEC,$(XF98NKVNECSUBDIRS),$(XF98NKVNECOBJS),$(XF98NKVNECLIBS),$(XF98NKVNECSYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall XF98_NKVNEC #define ServerToInstall XF98_NKVNEC
 #endif #endif
 #ifdef OS2Architecture  
 LinkFile(XF98_NKVNEC.def,SVGA.def)  
 #endif  
 #endif  /* XF98NKVNECServer */ #endif  /* XF98NKVNECServer */
  
   
 #if XF98WABSServer #if XF98WABSServer
 XCOMM XCOMM
 XCOMM XFree98 WAB-S Server XCOMM XFree98 WAB-S Server
Line 867 
Line 1112 
 MFBDIR  = mfb MFBDIR  = mfb
 CFB8DIR = cfb CFB8DIR = cfb
 CFB16DIR = cfb16 CFB16DIR = cfb16
   CFB24DIR = cfb24
 CFB32DIR = cfb32 CFB32DIR = cfb32
 DDXDIR2 = hw/xfree98 DDXDIR2 = hw/xfree98
 XF98WABSSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)  XF98WABSSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
 XF98WABSOBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/vga256Conf.o  XF98WABSOBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/vga256Conf.o \
                    $(XF98SRC)/xaa/xaa16/xaa16.o $(XF98SRC)/xaa/xaa24/xaa24.o $(XF98SRC)/xaa/xaa32/xaa32.o $(XF98SRC)/xaa/xaavga256/xaavga256.o
 XF98WABSLIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(driverwabs) \ XF98WABSLIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(driverwabs) \
                $(XF98SRC)/vga256/LibraryTargetName(wabs) $(XF98LIBS) CFBLibs \                 $(XF98SRC)/xaa/LibraryTargetName(xaa) \
                $(XF98OSLIB)                 $(XF98SRC)/vga256/LibraryTargetName(wabs) $(XF98LIBS) CFBLibs
 XF98WABSSYSLIBS = $(SYSLIBS) XF98WABSSYSLIBS = $(SYSLIBS)
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XF98WABSSUBDIRS) $(XF98WABSOBJS) $(XF98WABSLIBS) $(XF98WABSSYSLIBS)) MakeMutex($(XF98WABSSUBDIRS) $(XF98WABSOBJS) $(XF98WABSLIBS) $(XF98WABSSYSLIBS))
 #endif #endif
   #if HasGnuMake
   $(XF98WABSOBJS) $(XF98WABSLIBS) $(XF98WABSSYSLIBS):: $(XF98WABSSUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
 SetUIDServerTarget(XF98_WABS,$(XF98WABSSUBDIRS),$(XF98WABSOBJS),$(XF98WABSLIBS),$(XF98WABSSYSLIBS)) SetUIDServerTarget(XF98_WABS,$(XF98WABSSUBDIRS),$(XF98WABSOBJS),$(XF98WABSLIBS),$(XF98WABSSYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall XF98_WABS #define ServerToInstall XF98_WABS
 #endif #endif
 #ifdef OS2Architecture  
 LinkFile(XF98_WABS.def,SVGA.def)  
 #endif  
 #endif  /* XF98WABSServer */ #endif  /* XF98WABSServer */
  
   
 #if XF98WABEPServer #if XF98WABEPServer
 XCOMM XCOMM
 XCOMM XFree98 WAB-EP Server XCOMM XFree98 WAB-EP Server
Line 894 
Line 1143 
 MFBDIR  = mfb MFBDIR  = mfb
 CFB8DIR = cfb CFB8DIR = cfb
 CFB16DIR = cfb16 CFB16DIR = cfb16
   CFB24DIR = cfb24
 CFB32DIR = cfb32 CFB32DIR = cfb32
 DDXDIR2 = hw/xfree98 DDXDIR2 = hw/xfree98
 XF98WABEPSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)  XF98WABEPSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
 XF98WABEPOBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/vga256Conf.o  XF98WABEPOBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/vga256Conf.o \
                    $(XF98SRC)/xaa/xaa16/xaa16.o $(XF98SRC)/xaa/xaa24/xaa24.o $(XF98SRC)/xaa/xaa32/xaa32.o $(XF98SRC)/xaa/xaavga256/xaavga256.o
 XF98WABEPLIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(driverwabep) \ XF98WABEPLIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(driverwabep) \
                $(XF98SRC)/vga256/LibraryTargetName(wabep) $(XF98LIBS) CFBLibs \                 $(XF98SRC)/xaa/LibraryTargetName(xaa) \
                $(XF98OSLIB)                 $(XF98SRC)/vga256/LibraryTargetName(wabep) $(XF98LIBS) CFBLibs
 XF98WABEPSYSLIBS = $(SYSLIBS) XF98WABEPSYSLIBS = $(SYSLIBS)
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XF98WABEPSUBDIRS) $(XF98WABEPOBJS) $(XF98WABEPLIBS) $(XF98WABEPSYSLIBS)) MakeMutex($(XF98WABEPSUBDIRS) $(XF98WABEPOBJS) $(XF98WABEPLIBS) $(XF98WABEPSYSLIBS))
 #endif #endif
   #if HasGnuMake
   $(XF98WABEPOBJS) $(XF98WABEPLIBS) $(XF98WABEPSYSLIBS):: $(XF98WABEPSUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
 SetUIDServerTarget(XF98_WABEP,$(XF98WABEPSUBDIRS),$(XF98WABEPOBJS),$(XF98WABEPLIBS),$(XF98WABEPSYSLIBS)) SetUIDServerTarget(XF98_WABEP,$(XF98WABEPSUBDIRS),$(XF98WABEPOBJS),$(XF98WABEPLIBS),$(XF98WABEPSYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall XF98_WABEP #define ServerToInstall XF98_WABEP
 #endif #endif
 #ifdef OS2Architecture  
 LinkFile(XF98_WABEP.def,SVGA.def)  
 #endif  
 #endif  /* XF98WABEPServer */ #endif  /* XF98WABEPServer */
  
   
 #if XF98WSNAServer #if XF98WSNAServer
 XCOMM XCOMM
 XCOMM XFree98 WSN-A2F Server XCOMM XFree98 WSN-A2F Server
Line 921 
Line 1174 
 MFBDIR  = mfb MFBDIR  = mfb
 CFB8DIR = cfb CFB8DIR = cfb
 CFB16DIR = cfb16 CFB16DIR = cfb16
   CFB24DIR = cfb24
 CFB32DIR = cfb32 CFB32DIR = cfb32
 DDXDIR2 = hw/xfree98 DDXDIR2 = hw/xfree98
 XF98WSNASUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)  XF98WSNASUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
 XF98WSNAOBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/vga256Conf.o  XF98WSNAOBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/vga256Conf.o \
                    $(XF98SRC)/xaa/xaa16/xaa16.o $(XF98SRC)/xaa/xaa24/xaa24.o $(XF98SRC)/xaa/xaa32/xaa32.o $(XF98SRC)/xaa/xaavga256/xaavga256.o
 XF98WSNALIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(driverwsna) \ XF98WSNALIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(driverwsna) \
                $(XF98SRC)/vga256/LibraryTargetName(wsna) $(XF98LIBS) CFBLibs \                 $(XF98SRC)/xaa/LibraryTargetName(xaa) \
                $(XF98OSLIB)                 $(XF98SRC)/vga256/LibraryTargetName(wsna) $(XF98LIBS) CFBLibs
 XF98WSNASYSLIBS = $(SYSLIBS) XF98WSNASYSLIBS = $(SYSLIBS)
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XF98WSNASUBDIRS) $(XF98WSNAOBJS) $(XF98WSNALIBS) $(XF98WSNASYSLIBS)) MakeMutex($(XF98WSNASUBDIRS) $(XF98WSNAOBJS) $(XF98WSNALIBS) $(XF98WSNASYSLIBS))
 #endif #endif
   #if HasGnuMake
   $(XF98WSNAOBJS) $(XF98WSNALIBS) $(XF98WSNASYSLIBS):: $(XF98WSNASUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
 SetUIDServerTarget(XF98_WSNA,$(XF98WSNASUBDIRS),$(XF98WSNAOBJS),$(XF98WSNALIBS),$(XF98WSNASYSLIBS)) SetUIDServerTarget(XF98_WSNA,$(XF98WSNASUBDIRS),$(XF98WSNAOBJS),$(XF98WSNALIBS),$(XF98WSNASYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall XF98_WSNA #define ServerToInstall XF98_WSNA
 #endif #endif
 #ifdef OS2Architecture  
 LinkFile(XF98_WSNA.def,SVGA.def)  
 #endif  
 #endif  /* XF98WSNAServer */ #endif  /* XF98WSNAServer */
  
   
   #if XF98TGUIServer
   XCOMM
   XCOMM XFree98 Trident Cyber9320/9680 Server
   XCOMM
   MFBDIR  = mfb
   CFB8DIR = cfb
   CFB16DIR = cfb16
   CFB24DIR = cfb24
   CFB32DIR = cfb32
   DDXDIR2 = hw/xfree98
   XF98TGUISUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
   XF98TGUIOBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/tguiConf.o \
                    $(XF98SRC)/xaa/xaa16/xaa16.o $(XF98SRC)/xaa/xaa24/xaa24.o $(XF98SRC)/xaa/xaa32/xaa32.o $(XF98SRC)/xaa/xaavga256/xaavga256.o
   XF98TGUILIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(drivertrident) \
                  $(XF98SRC)/xaa/LibraryTargetName(xaa) \
                  $(XF98SRC)/vga256/LibraryTargetName(trident) $(XF98LIBS) CFBLibs
   XF98TGUISYSLIBS = $(SYSLIBS)
   #if HasParallelMake
   MakeMutex($(XF98TGUISUBDIRS) $(XF98TGUIOBJS) $(XF98TGUILIBS) $(XF98TGUISYSLIBS))
   #endif
   #if HasGnuMake
   $(XF98TGUIOBJS) $(XF98TGUILIBS) $(XF98TGUISYSLIBS):: $(XF98TGUISUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
   SetUIDServerTarget(XF98_TGUI,$(XF98TGUISUBDIRS),$(XF98TGUIOBJS),$(XF98TGUILIBS),$(XF98TGUISYSLIBS))
   #ifndef ServerToInstall
   #define ServerToInstall XF98_TGUI
   #endif
   #endif  /* XF98TGUIServer */
   
   
   #if XF98MGAServer
   XCOMM
   XCOMM XFree98 Matrox Millennium/Mystique Server
   XCOMM
   MFBDIR  = mfb
   CFB8DIR = cfb
   CFB16DIR = cfb16
   CFB24DIR = cfb24
   CFB32DIR = cfb32
   DDXDIR2 = hw/xfree98
   XF98MGASUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
   XF98MGAOBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/mgaConf.o \
                    $(XF98SRC)/xaa/xaa16/xaa16.o $(XF98SRC)/xaa/xaa24/xaa24.o $(XF98SRC)/xaa/xaa32/xaa32.o $(XF98SRC)/xaa/xaavga256/xaavga256.o
   XF98MGALIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(drivermga) \
                  $(XF98SRC)/xaa/LibraryTargetName(xaa) \
                  $(XF98SRC)/vga256/LibraryTargetName(mga) $(XF98LIBS) CFBLibs
   XF98MGASYSLIBS = $(SYSLIBS)
   #if HasParallelMake
   MakeMutex($(XF98MGASUBDIRS) $(XF98MGAOBJS) $(XF98MGALIBS) $(XF98MGASYSLIBS))
   #endif
   #if HasGnuMake
   $(XF98MGAOBJS) $(XF98MGALIBS) $(XF98MGASYSLIBS):: $(XF98MGASUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
   SetUIDServerTarget(XF98_MGA,$(XF98MGASUBDIRS),$(XF98MGAOBJS),$(XF98MGALIBS),$(XF98MGASYSLIBS))
   #ifndef ServerToInstall
   #define ServerToInstall XF98_MGA
   #endif
   #endif  /* XF98MGAServer */
   
   
   #if XF98SVGAServer
   XCOMM
   XCOMM XFree98 Cirrus Logic CLGD7555 Server
   XCOMM
   MFBDIR  = mfb
   CFB8DIR = cfb
   CFB16DIR = cfb16
   CFB24DIR = cfb24
   CFB32DIR = cfb32
   DDXDIR2 = hw/xfree98
   XF98SVGASUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
   XF98SVGAOBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/vga256Conf.o \
                    $(XF98SRC)/xaa/xaa16/xaa16.o $(XF98SRC)/xaa/xaa24/xaa24.o $(XF98SRC)/xaa/xaa32/xaa32.o $(XF98SRC)/xaa/xaavga256/xaavga256.o
   XF98SVGALIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(driversvga) \
                  $(XF98SRC)/xaa/LibraryTargetName(xaa) \
                  $(XF98SRC)/vga256/LibraryTargetName(vga256) $(XF98LIBS) CFBLibs
   XF98SVGASYSLIBS = $(SYSLIBS)
   #if HasParallelMake
   MakeMutex($(XF98SVGASUBDIRS) $(XF98SVGAOBJS) $(XF98SVGALIBS) $(XF98SVGASYSLIBS))
   #endif
   #if HasGnuMake
   $(XF98SVGAOBJS) $(XF98SVGALIBS) $(XF98SVGASYSLIBS):: $(XF98SVGASUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
   SetUIDServerTarget(XF98_SVGA,$(XF98SVGASUBDIRS),$(XF98SVGAOBJS),$(XF98SVGALIBS),$(XF98SVGASYSLIBS))
   #ifndef ServerToInstall
   #define ServerToInstall XF98_SVGA
   #endif
   #endif  /* XF98SVGAServer */
   
   
 #if XF98EGCServer #if XF98EGCServer
 XCOMM XCOMM
 XCOMM XFree98 EGC Server XCOMM XFree98 EGC Server
Line 951 
Line 1301 
                 $(XF98SRC)/vga16/misc/vga16misc.o                 $(XF98SRC)/vga16/misc/vga16misc.o
 XF98EGCLIBS = $(XF98VGA16DRIVERSRC)/LibraryTargetName(driver16) \ XF98EGCLIBS = $(XF98VGA16DRIVERSRC)/LibraryTargetName(driver16) \
                 $(XF98SRC)/vga16/LibraryTargetName(vga16) $(XF98MLIBS) \                 $(XF98SRC)/vga16/LibraryTargetName(vga16) $(XF98MLIBS) \
                 NoMFBBareLibs $(OTHEREXTS) $(XF98OSLIB)                  NoMFBBareLibs $(OTHEREXTS)
 XF98EGCSYSLIBS = $(SYSLIBS) XF98EGCSYSLIBS = $(SYSLIBS)
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XF98EGCSUBDIRS) $(XF98EGCOBJS) $(XF98EGCLIBS) $(XF98EGCSYSLIBS)) MakeMutex($(XF98EGCSUBDIRS) $(XF98EGCOBJS) $(XF98EGCLIBS) $(XF98EGCSYSLIBS))
 #endif #endif
   #if HasGnuMake
   $(XF98EGCOBJS) $(XF98EGCLIBS) $(XF98EGCSYSLIBS):: $(XF98EGCSUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
 SetUIDServerTarget(XF98_EGC,$(XF98EGCSUBDIRS),$(XF98EGCOBJS),$(XF98EGCLIBS),$(XF98EGCSYSLIBS)) SetUIDServerTarget(XF98_EGC,$(XF98EGCSUBDIRS),$(XF98EGCOBJS),$(XF98EGCLIBS),$(XF98EGCSYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall XF98_EGC #define ServerToInstall XF98_EGC
 #endif #endif
 #ifdef OS2Architecture  
 LinkFile(XF98_EGC.def,VGA16.def)  
 #endif  
 #endif  /* XF98EGCServer */ #endif  /* XF98EGCServer */
  
   
 #if XF98NECS3Server #if XF98NECS3Server
 XCOMM XCOMM
 XCOMM XFree98 NEC S3 Server XCOMM XFree98 NEC S3 Server
Line 972 
Line 1324 
 MFBDIR   = mfb MFBDIR   = mfb
 CFB8DIR  = cfb CFB8DIR  = cfb
 CFB16DIR = cfb16 CFB16DIR = cfb16
   CFB24DIR = cfb24
 CFB32DIR = cfb32 CFB32DIR = cfb32
 DDXDIR2 = hw/xfree98 DDXDIR2 = hw/xfree98
 XF98NECS3SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) \ XF98NECS3SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) \
                    $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)                     $(CFB24DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
 XF98NECS3OBJS = $(XF98COMSRC)/XF86_S3.o $(XF98ACCELSRC)/s3nec/s3Conf.o \ XF98NECS3OBJS = $(XF98COMSRC)/XF86_S3.o $(XF98ACCELSRC)/s3nec/s3Conf.o \
                 $(XF98NECDRIVERSRC)/mmio_928/mmio_928.o \                  $(XF98NECS3DRIVERSRC)/newmmio/newmmio.o \
                 $(XF98NECDRIVERSRC)/s3_generic/s3_generic.o                  $(XF98NECS3DRIVERSRC)/mmio_928/mmio_928.o \
 XF98NECS3LIBS = $(XF98ACCELSRC)/s3nec/LibraryTargetName(s3) \                  $(XF98NECS3DRIVERSRC)/s3_generic/s3_generic.o
                 $(XF98ACCELSRC)/s3nec/s3mmio/LibraryTargetName(s3mmio) \  XF98NECS3LIBS = $(XF98ACCELSRC)/s3nec/LibraryTargetName(s3nec) \
                   $(XF98ACCELSRC)/s3nec/s3newmmio/LibraryTargetName(s3necnewmmio) \
                   $(XF98ACCELSRC)/s3nec/s3mmio/LibraryTargetName(s3necmmio) \
                 $(XF98LIBSNEC) CFBLibs \                 $(XF98LIBSNEC) CFBLibs \
                 $(XF98ACCELSRC)/cache/LibraryTargetName(xf86cache) $(XF98OSLIB)                  $(XF98ACCELSRC)/cache/LibraryTargetName(xf86cache)
 XF98NECS3SYSLIBS = $(SYSLIBS) XF98NECS3SYSLIBS = $(SYSLIBS)
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XF98NECS3SUBDIRS) $(XF98NECS3OBJS) $(XF98NECS3LIBS) $(XF98NECS3SYSLIBS)) MakeMutex($(XF98NECS3SUBDIRS) $(XF98NECS3OBJS) $(XF98NECS3LIBS) $(XF98NECS3SYSLIBS))
 #endif #endif
   #if HasGnuMake
   $(XF98NECS3OBJS) $(XF98NECS3LIBS) $(XF98NECS3SYSLIBS):: $(XF98NECS3SUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
 SetUIDServerTarget(XF98_NECS3,$(XF98NECS3SUBDIRS),$(XF98NECS3OBJS),$(XF98NECS3LIBS),$(XF98NECS3SYSLIBS)) SetUIDServerTarget(XF98_NECS3,$(XF98NECS3SUBDIRS),$(XF98NECS3OBJS),$(XF98NECS3LIBS),$(XF98NECS3SYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall XF98_NECS3 #define ServerToInstall XF98_NECS3
 #endif #endif
 #ifdef OS2Architecture  
 LinkFile(XF98_NECS3.def,NECS3.def)  
 #endif  
 #endif  /* XF98NECS3Server */ #endif  /* XF98NECS3Server */
  
   
 #if XF98PWSKBServer #if XF98PWSKBServer
 XCOMM XCOMM
 XCOMM XFree98 S3 PW/PCSKB Server XCOMM XFree98 S3 PW/PCSKB Server
Line 1003 
Line 1360 
 MFBDIR   = mfb MFBDIR   = mfb
 CFB8DIR  = cfb CFB8DIR  = cfb
 CFB16DIR = cfb16 CFB16DIR = cfb16
   CFB24DIR = cfb24
 CFB32DIR = cfb32 CFB32DIR = cfb32
 DDXDIR2 = hw/xfree98 DDXDIR2 = hw/xfree98
 XF98PWSKBSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) \ XF98PWSKBSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) \
                    $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)                     $(CFB24DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
 XF98PWSKBOBJS = $(XF98COMSRC)/XF86_S3.o $(XF98ACCELSRC)/s3pwskb/s3Conf.o \ XF98PWSKBOBJS = $(XF98COMSRC)/XF86_S3.o $(XF98ACCELSRC)/s3pwskb/s3Conf.o \
                   $(XF98PWSKBDRIVERSRC)/newmmio/newmmio.o \
                 $(XF98PWSKBDRIVERSRC)/mmio_928/mmio_928.o \                 $(XF98PWSKBDRIVERSRC)/mmio_928/mmio_928.o \
                 $(XF98PWSKBDRIVERSRC)/s3_generic/s3_generic.o                 $(XF98PWSKBDRIVERSRC)/s3_generic/s3_generic.o
 XF98PWSKBLIBS = $(XF98ACCELSRC)/s3pwskb/LibraryTargetName(s3) \  XF98PWSKBLIBS = $(XF98ACCELSRC)/s3pwskb/LibraryTargetName(s3pwskb) \
                 $(XF98ACCELSRC)/s3pwskb/s3mmio/LibraryTargetName(s3mmio) \                  $(XF98ACCELSRC)/s3pwskb/s3newmmio/LibraryTargetName(s3pwskbnewmmio) \
                   $(XF98ACCELSRC)/s3pwskb/s3mmio/LibraryTargetName(s3pwskbmmio) \
                 $(XF98LIBSPWSKB) CFBLibs \                 $(XF98LIBSPWSKB) CFBLibs \
                 $(XF98ACCELSRC)/cache/LibraryTargetName(xf86cache) $(XF98OSLIB)                  $(XF98ACCELSRC)/cache/LibraryTargetName(xf86cache)
 XF98PWSKBSYSLIBS = $(SYSLIBS) XF98PWSKBSYSLIBS = $(SYSLIBS)
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XF98PWSKBSUBDIRS) $(XF98PWSKBOBJS) $(XF98PWSKBLIBS) $(XF98PWSKBSYSLIBS)) MakeMutex($(XF98PWSKBSUBDIRS) $(XF98PWSKBOBJS) $(XF98PWSKBLIBS) $(XF98PWSKBSYSLIBS))
 #endif #endif
   #if HasGnuMake
   $(XF98PWSKBOBJS) $(XF98PWSKBLIBS) $(XF98PWSKBSYSLIBS):: $(XF98PWSKBSUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
 SetUIDServerTarget(XF98_PWSKB,$(XF98PWSKBSUBDIRS),$(XF98PWSKBOBJS),$(XF98PWSKBLIBS),$(XF98PWSKBSYSLIBS)) SetUIDServerTarget(XF98_PWSKB,$(XF98PWSKBSUBDIRS),$(XF98PWSKBOBJS),$(XF98PWSKBLIBS),$(XF98PWSKBSYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall XF98_PWSKB #define ServerToInstall XF98_PWSKB
 #endif #endif
 #ifdef OS2Architecture  
 LinkFile(XF98_PWSKB.def,PWSKB.def)  
 #endif  
 #endif  /* XF98PWSKBServer */ #endif  /* XF98PWSKBServer */
  
   
 #if XF98PWLBServer #if XF98PWLBServer
 XCOMM XCOMM
 XCOMM XFree98 S3 PW/LB Server XCOMM XFree98 S3 PW/LB Server
Line 1034 
Line 1396 
 MFBDIR   = mfb MFBDIR   = mfb
 CFB8DIR  = cfb CFB8DIR  = cfb
 CFB16DIR = cfb16 CFB16DIR = cfb16
   CFB24DIR = cfb24
 CFB32DIR = cfb32 CFB32DIR = cfb32
 DDXDIR2 = hw/xfree98 DDXDIR2 = hw/xfree98
 XF98PWLBSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) \  XF98PWLBSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \
                   $(DDXDIR2) $(DEPDIRS)                   $(DDXDIR2) $(DEPDIRS)
 XF98PWLBOBJS = $(XF98COMSRC)/XF86_S3.o $(XF98ACCELSRC)/s3pwlb/s3Conf.o \ XF98PWLBOBJS = $(XF98COMSRC)/XF86_S3.o $(XF98ACCELSRC)/s3pwlb/s3Conf.o \
                  $(XF98PWLBDRIVERSRC)/newmmio/newmmio.o \
                $(XF98PWLBDRIVERSRC)/mmio_928/mmio_928.o \                $(XF98PWLBDRIVERSRC)/mmio_928/mmio_928.o \
                $(XF98PWLBDRIVERSRC)/s3_generic/s3_generic.o                $(XF98PWLBDRIVERSRC)/s3_generic/s3_generic.o
 XF98PWLBLIBS = $(XF98ACCELSRC)/s3pwlb/LibraryTargetName(s3) \  XF98PWLBLIBS = $(XF98ACCELSRC)/s3pwlb/LibraryTargetName(s3pwlb) \
                $(XF98ACCELSRC)/s3pwlb/s3mmio/LibraryTargetName(s3mmio) \                 $(XF98ACCELSRC)/s3pwlb/s3newmmio/LibraryTargetName(s3pwlbnewmmio) \
                  $(XF98ACCELSRC)/s3pwlb/s3mmio/LibraryTargetName(s3pwlbmmio) \
                $(XF98LIBSPWLB) CFBLibs \                $(XF98LIBSPWLB) CFBLibs \
                $(XF98ACCELSRC)/cache/LibraryTargetName(xf86cache) $(XF98OSLIB)                 $(XF98ACCELSRC)/cache/LibraryTargetName(xf86cache)
 XF98PWLBSYSLIBS = $(SYSLIBS) XF98PWLBSYSLIBS = $(SYSLIBS)
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XF98PWLBSUBDIRS) $(XF98PWLBOBJS) $(XF98PWLBLIBS) $(XF98PWLBSYSLIBS)) MakeMutex($(XF98PWLBSUBDIRS) $(XF98PWLBOBJS) $(XF98PWLBLIBS) $(XF98PWLBSYSLIBS))
 #endif #endif
   #if HasGnuMake
   $(XF98PWLBOBJS) $(XF98PWLBLIBS) $(XF98PWLBSYSLIBS):: $(XF98PWLBSUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
 SetUIDServerTarget(XF98_PWLB,$(XF98PWLBSUBDIRS),$(XF98PWLBOBJS),$(XF98PWLBLIBS),$(XF98PWLBSYSLIBS)) SetUIDServerTarget(XF98_PWLB,$(XF98PWLBSUBDIRS),$(XF98PWLBOBJS),$(XF98PWLBLIBS),$(XF98PWLBSYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall XF98_PWLB #define ServerToInstall XF98_PWLB
 #endif #endif
 #ifdef OS2Architecture  
 LinkFile(XF98_PWLB.def,PWLB.def)  
 #endif  
 #endif  /* XF98PWLBServer */ #endif  /* XF98PWLBServer */
  
  
   #if XF98GA968Server
   XCOMM
   XCOMM XFree98 S3 GA-968 Server
   XCOMM
   MFBDIR   = mfb
   CFB8DIR  = cfb
   CFB16DIR = cfb16
   CFB24DIR = cfb24
   CFB32DIR = cfb32
   DDXDIR2 = hw/xfree98
   XF98GA968SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) \
                      $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
   XF98GA968OBJS = $(XF98COMSRC)/XF86_S3.o $(XF98ACCELSRC)/s3ga968/s3Conf.o \
                   $(XF98GA968DRIVERSRC)/newmmio/newmmio.o \
                   $(XF98GA968DRIVERSRC)/mmio_928/mmio_928.o \
                   $(XF98GA968DRIVERSRC)/s3_generic/s3_generic.o
   XF98GA968LIBS = $(XF98ACCELSRC)/s3ga968/LibraryTargetName(s3ga968) \
                   $(XF98ACCELSRC)/s3ga968/s3newmmio/LibraryTargetName(s3ga968newmmio) \
                   $(XF98ACCELSRC)/s3ga968/s3mmio/LibraryTargetName(s3ga968mmio) \
                   $(XF98LIBSGA968) CFBLibs \
                   $(XF98ACCELSRC)/cache/LibraryTargetName(xf86cache)
   XF98GA968SYSLIBS = $(SYSLIBS)
   #if HasParallelMake
   MakeMutex($(XF98GA968SUBDIRS) $(XF98GA968OBJS) $(XF98GA968LIBS) $(XF98GA968SYSLIBS))
   #endif
   #if HasGnuMake
   $(XF98GA968OBJS) $(XF98GA968LIBS) $(XF98GA968SYSLIBS):: $(XF98GA968SUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
   SetUIDServerTarget(XF98_GA968,$(XF98GA968SUBDIRS),$(XF98GA968OBJS),$(XF98GA968LIBS),$(XF98GA968SYSLIBS))
   #ifndef ServerToInstall
   #define ServerToInstall XF98_GA968
   #endif
   #endif  /* XF98GA968Server */
   
   
 #if XF86I128Server #if XF86I128Server
 XCOMM XCOMM
 XCOMM XFree86 I128 Server XCOMM XFree86 I128 Server
Line 1066 
Line 1468 
 MFBDIR   = mfb MFBDIR   = mfb
 CFB8DIR  = cfb CFB8DIR  = cfb
 CFB16DIR = cfb16 CFB16DIR = cfb16
   CFB24DIR = cfb24
 CFB32DIR = cfb32 CFB32DIR = cfb32
 DDXDIR1  = hw/xfree86 DDXDIR1  = hw/xfree86
 XF86I128SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) \  XF86I128SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) \
                   $(DDXDIR1) $(DEPDIRS)                    $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
 XF86I128OBJS = $(XF86COMSRC)/XF86_I128.o  XF86I128OBJS = $(XF86COMSRC)/XF86_I128.o \
 XF86I128LIBS = $(XF86ACCELSRC)/i128/LibraryTargetName(i128) $(XF86LIBS) \                 $(XF86SRC)/xaa/xaa8/xaa8.o $(XF86SRC)/xaa/xaa16/xaa16.o \
                CFBLibs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache) \                 $(XF86SRC)/xaa/xaa24/xaa24.o $(XF86SRC)/xaa/xaa32/xaa32.o
                $(XF86OSLIB)  XF86I128LIBS = $(XF86ACCELSRC)/i128/LibraryTargetName(i128) \
                  $(XF86SRC)/xaa/LibraryTargetName(xaa) $(XF86LIBS) \
                  CFBLibs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache)
 XF86I128SYSLIBS = $(SYSLIBS) XF86I128SYSLIBS = $(SYSLIBS)
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XF86I128SUBDIRS) $(XF86I128OBJS) $(XF86I128LIBS) $(XF86I128SYSLIBS)) MakeMutex($(XF86I128SUBDIRS) $(XF86I128OBJS) $(XF86I128LIBS) $(XF86I128SYSLIBS))
 #endif #endif
   #if HasGnuMake
   $(XF86I128OBJS) $(XF86I128LIBS) $(XF86I128SYSLIBS):: $(XF86I128SUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
 SetUIDServerTarget(XF86_I128,$(XF86I128SUBDIRS),$(XF86I128OBJS),$(XF86I128LIBS),$(XF86I128SYSLIBS)) SetUIDServerTarget(XF86_I128,$(XF86I128SUBDIRS),$(XF86I128OBJS),$(XF86I128LIBS),$(XF86I128SYSLIBS))
 #ifndef ServerToInstall #ifndef ServerToInstall
 #define ServerToInstall XF86_I128 #define ServerToInstall XF86_I128
 #endif #endif
 #ifdef OS2Architecture #ifdef OS2Architecture
 LinkFile(XF86_I128.def,I128.def) LinkFile(XF86_I128.def,I128.def)
   InstallLinkKitNonExecFile(I128.def,$(LINKKITDIR))
 #endif #endif
 #endif        /* XF86I128Server */ #endif        /* XF86I128Server */
  
   #if XF86GLINTServer
   XCOMM
   XCOMM XFree86 Glint Server
   XCOMM
   MFBDIR   = mfb
   CFB8DIR  = cfb
   CFB16DIR = cfb16
   CFB24DIR = cfb24
   CFB32DIR = cfb32
   DDXDIR1  = hw/xfree86
   XF86GLINTSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) \
                     $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
   XF86GLINTOBJS = $(XF86COMSRC)/XF86_GLINT.o \
                  $(XF86SRC)/xaa/xaa8/xaa8.o $(XF86SRC)/xaa/xaa16/xaa16.o \
                  $(XF86SRC)/xaa/xaa24/xaa24.o $(XF86SRC)/xaa/xaa32/xaa32.o
   XF86GLINTLIBS = $(XF86ACCELSRC)/glint/LibraryTargetName(glint) \
                  $(XF86SRC)/xaa/LibraryTargetName(xaa) $(XF86LIBS) \
                  CFBLibs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache)
   XF86GLINTSYSLIBS = $(SYSLIBS)
   #if HasParallelMake
   MakeMutex($(XF86GLINTSUBDIRS) $(XF86GLINTOBJS) $(XF86GLINTLIBS) $(XF86GLINTSYSLIBS))
   #endif
   #if HasGnuMake
   $(XF86GLINTOBJS) $(XF86GLINTLIBS) $(XF86GLINTSYSLIBS):: $(XF86GLINTSUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
   SetUIDServerTarget(XF86_3DLabs,$(XF86GLINTSUBDIRS),$(XF86GLINTOBJS),$(XF86GLINTLIBS),$(XF86GLINTSYSLIBS))
   #ifndef ServerToInstall
   #define ServerToInstall XSuSETargetServer
   #endif
   #ifdef OS2Architecture
   LinkFile(XF86_3DLabs.def,3DLabs.def)
   InstallLinkKitNonExecFile(3DLabs.def,$(LINKKITDIR))
   #endif
   #endif        /* XF86GLINTServer */
   
   #if XF86TGAServer
   XCOMM
   XCOMM XFree86 TGA Server
   XCOMM
   MFBDIR   = mfb
   CFB8DIR  = cfb
   CFB16DIR = cfb16
   CFB24DIR = cfb24
   CFB32DIR = cfb32
   DDXDIR1  = hw/xfree86
   XF86TGASUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) \
                    $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
   XF86TGAOBJS = $(XF86COMSRC)/XF86_TGA.o \
                 $(XF86SRC)/xaa/xaa8/xaa8.o $(XF86SRC)/xaa/xaa16/xaa16.o \
                 $(XF86SRC)/xaa/xaa24/xaa24.o $(XF86SRC)/xaa/xaa32/xaa32.o
   XF86TGALIBS = $(XF86ACCELSRC)/tga/LibraryTargetName(tga) \
                 $(XF86SRC)/xaa/LibraryTargetName(xaa) $(XF86LIBS) \
                  CFBLibs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache)
   XF86TGASYSLIBS = $(SYSLIBS)
   #if HasParallelMake
   MakeMutex($(XF86TGASUBDIRS) $(XF86TGAOBJS) $(XF86TGALIBS) $(XF86TGASYSLIBS))
   #endif
   #if HasGnuMake
   $(XF86TGAOBJS) $(XF86TGALIBS) $(XF86TGASYSLIBS):: $(XF86TGASUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
   SetUIDServerTarget(XF86_TGA,$(XF86TGASUBDIRS),$(XF86TGAOBJS),$(XF86TGALIBS),$(XF86TGASYSLIBS))
   #ifndef ServerToInstall
   #define ServerToInstall XF86_TGA
   #endif
   #ifdef OS2Architecture
   LinkFile(XF86_TGA.def,TGA.def)
   InstallLinkKitNonExecFile(TGA.def,$(LINKKITDIR))
   #endif
   #endif
   
   #if XF86FBDevServer
   XCOMM
   XCOMM XFree86 Linux/x86 (post 2.1.115) Frame Buffer Device Server
   XCOMM
   MFBDIR  = mfb
   #if XF68FBDevCFB8
   CFB8DIR = cfb
   FBDEVFBLIBS:= $(FBDEVFBLIBS) $(CFB8)
   #endif
   #if XF68FBDevCFB16
   CFB16DIR = cfb16
   FBDEVFBLIBS:= $(FBDEVFBLIBS) $(CFB16)
   #endif
   #if XF68FBDevCFB24
   CFB24DIR = cfb24
   FBDEVFBLIBS:= $(FBDEVFBLIBS) $(CFB24)
   #endif
   #if XF68FBDevCFB32
   CFB32DIR = cfb32
   FBDEVFBLIBS:= $(FBDEVFBLIBS) $(CFB32)
   #endif
   XF68FBDevSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) \
                      $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DEPDIRS)
   XF68FBDevOBJS = $(XF86COMSRC)/XF68_FBDev.o
   XF68FBDevLIBS = $(XF86SRC)/fbdev/LibraryTargetName(fbdev) $(XF86LIBS) \
                   PreFbLibs $(FBDEVFBLIBS) PostFbLibs
   XF68FBDevSYSLIBS = $(SYSLIBS)
   #if HasParallelMake
   MakeMutex($(XF68FBDevSUBDIRS) $(XF68FBDevOBJS) $(XF68FBDevLIBS) $(XF68FBDevSYSLIBS))
   #endif
   #if HasGnuMake
   $(XF68FBDevOBJS) $(XF68FBDevLIBS) $(XF68FBDevSYSLIBS):: $(XF68FBDevSUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
   #if XF86FBDevServer
   SetUIDServerTarget(XF86_FBDev,$(XF68FBDevSUBDIRS),$(XF68FBDevOBJS),$(XF68FBDevLIBS),$(XF68FBDevSYSLIBS))
   #ifndef ServerToInstall
   #define ServerToInstall XF86_FBDev
   #endif
   #endif
   
   #endif /* XF68FBDevServer */
   #if XF68FBDevServer
   XCOMM
   XCOMM XFree68 Linux/m68k Frame Buffer Device Server
   XCOMM
   MFBDIR  = mfb
   DDXDIR3 = hw/xfree68
   #if XF68FBDevIPLAN2p2
   IPLAN2P2DIR = iplan2p2
   FBDEVFBLIBS:= $(FBDEVFBLIBS) iplan2p2/LibraryTargetName(ipl2p2)
   #endif
   #if XF68FBDevIPLAN2p4
   IPLAN2P4DIR = iplan2p4
   FBDEVFBLIBS:= $(FBDEVFBLIBS) iplan2p4/LibraryTargetName(ipl2p4)
   #endif
   #if XF68FBDevIPLAN2p8
   IPLAN2P8DIR = iplan2p8
   FBDEVFBLIBS:= $(FBDEVFBLIBS) iplan2p8/LibraryTargetName(ipl2p8)
   #endif
   #if XF68FBDevILBM
   ILBMDIR = ilbm
   FBDEVFBLIBS:= $(FBDEVFBLIBS) ilbm/LibraryTargetName(ilbm)
   #endif
   #if XF68FBDevAFB
   AFBDIR = afb
   FBDEVFBLIBS:= $(FBDEVFBLIBS) afb/LibraryTargetName(afb)
   #endif
   #if XF68FBDevCFB8
   CFB8DIR = cfb
   FBDEVFBLIBS:= $(FBDEVFBLIBS) $(CFB8)
   #endif
   #if XF68FBDevCFB16
   CFB16DIR = cfb16
   FBDEVFBLIBS:= $(FBDEVFBLIBS) $(CFB16)
   #endif
   #if XF68FBDevCFB24
   CFB24DIR = cfb24
   FBDEVFBLIBS:= $(FBDEVFBLIBS) $(CFB24)
   #endif
   #if XF68FBDevCFB32
   CFB32DIR = cfb32
   FBDEVFBLIBS:= $(FBDEVFBLIBS) $(CFB32)
   #endif
   #if XF68FBDev77C32
   NCR77C32DIR = hw/xfree68/77c32blt
   FBDEVFBLIBS:= $(FBDEVFBLIBS) $(XF68SRC)/77c32blt/LibraryTargetName(ncr77c32)
   #endif
   #if XF68FBDevMach64
   MACH64DIR = hw/xfree68/mach64
   FBDEVFBLIBS:= $(FBDEVFBLIBS) $(XF68SRC)/mach64/LibraryTargetName(mach64)
   #endif
   #if XF68FBDevIMSTT
   IMSTTDIR = hw/xfree68/imstt
   FBDEVFBLIBS:= $(FBDEVFBLIBS) $(XF68SRC)/imstt/LibraryTargetName(imstt)
   #endif
   XF68FBDevSUBDIRS = $(STDDIRS) $(MFBDIR) $(IPLAN2P2DIR) $(IPLAN2P4DIR) \
                      $(IPLAN2P8DIR) $(ILBMDIR) $(AFBDIR) $(CFB8DIR) \
                      $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR3) $(DEPDIRS) \
                      $(NCR77C32DIR) $(MACH64DIR) $(IMSTTDIR)
   XF68FBDevOBJS = $(XF68COMSRC)/XF68_FBDev.o
   XF68FBDevLIBS = $(XF68SRC)/fbdev/LibraryTargetName(fbdev) $(XF68LIBS) \
                   PreFbLibs $(FBDEVFBLIBS) PostFbLibs
   XF68FBDevSYSLIBS = $(SYSLIBS)
   #if HasParallelMake
   MakeMutex($(XF68FBDevSUBDIRS) $(XF68FBDevOBJS) $(XF68FBDevLIBS) $(XF68FBDevSYSLIBS))
   #endif
   #if HasGnuMake
   $(XF68FBDevOBJS) $(XF68FBDevLIBS) $(XF68FBDevSYSLIBS):: $(XF68FBDevSUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
   #if XF68FBDevServer
   SetUIDServerTarget(XF68_FBDev,$(XF68FBDevSUBDIRS),$(XF68FBDevOBJS),$(XF68FBDevLIBS),$(XF68FBDevSYSLIBS))
   #ifndef ServerToInstall
   #define ServerToInstall XF68_FBDev
   #endif
   #endif
   #endif /* XF68FBDevServer */
   
   
   #if XprtServer
   XCOMM
   XCOMM Print Server
   XCOMM
   MFBDIR  = mfb
   CFB8DIR = cfb
   CFB32DIR = cfb32
   XPSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB32DIR) $(DEPDIRS)
   #if PrintOnlyServer
   XPOBJS = Xprint/ddxInit.o Xprint/miinitext.o
   XPLIBS = PreFbLibs $(XPDDXLIBS) $(XPDDXFBLIBS) PostFbLibs
   #else
   XPOBJS = Xprint/ddxInit.o
   XPLIBS = PreFbLibs PostFbLibs
   #endif
   #if (defined(SunArchitecture) || defined(SparcArchitecture)) && defined(SVR4Architecture)
   XPSYSLIBS = $(CBRT) $(SYSLIBS) -lw
   #else
   XPSYSLIBS = $(CBRT) $(SYSLIBS)
   #endif
   #if HasParallelMake
   MakeMutex($(XPSUBDIRS) $(XPOBJS) $(XPLIBS) $(XPSYSLIBS))
   #endif
   #if HasGnuMake
   $(XPOBJS) $(XPLIBS) $(XPSYSLIBS):: $(XPSUBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
   ServerTarget(Xprt,$(XPSUBDIRS),$(XPOBJS),$(XPLIBS),$(XPSYSLIBS))
   #endif  /* XprtServer */
  
 #if XnestServer #if XnestServer
 XCOMM XCOMM
 XCOMM Server with Xlib-based ddx XCOMM Server with Xlib-based ddx
 XCOMM XCOMM
   #ifndef Win32Architecture
 XNESTDDXDIR = hw/xnest XNESTDDXDIR = hw/xnest
   #else
   XNESTDDXDIR = hw
   #endif
 XNESTDIRS = $(STDDIRS) $(XNESTDDXDIR) $(DEPDIRS) XNESTDIRS = $(STDDIRS) $(XNESTDDXDIR) $(DEPDIRS)
 #ifndef LynxOSArchitecture  #if !defined(LynxOSArchitecture) && !defined(Win32Architecture) && !defined(QNXArchitecture)
 XNESTOBJS = XNESTOBJS =
 #else #else
 XNESTOBJS = dix/main.o XNESTOBJS = dix/main.o
 #endif #endif
 XNEST = hw/xnest/LibraryTargetName(xnest) XNEST = hw/xnest/LibraryTargetName(xnest)
 XNESTLIBS = $(DIX) $(OS) $(FONT) $(XNEST) $(MI) $(EXTENSIONS) $(XNEST)  XNESTLIBS = PreFbLibs $(XNEST) NoMfbPostFbLibs $(XNEST)
 XNESTSYSLIBS = $(LDPRELIB) $(XLIB) $(SYSLIBS)  #if defined(QNXArchitecture)
   XNESTSYSLIBS = -Wl,"op undefsok" $(LDPRELIBS) $(XLIB) $(SYSLIBS)
   #else
   XNESTSYSLIBS = $(LDPRELIBS) $(XLIB) $(SYSLIBS)
   #endif
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XNESTDIRS) $(XNESTOBJS) $(XNESTLIBS) $(XNESTSYSLIBS)) MakeMutex($(XNESTDIRS) $(XNESTOBJS) $(XNESTLIBS) $(XNESTSYSLIBS))
 #endif #endif
   #if HasGnuMake
   $(XNESTOBJS) $(XNESTLIBS) $(XNESTSYSLIBS):: $(XNESTDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
 ServerTarget(Xnest,$(XNESTDIRS),$(XNESTOBJS),$(XNESTLIBS),$(XNESTSYSLIBS)) ServerTarget(Xnest,$(XNESTDIRS),$(XNESTOBJS),$(XNESTLIBS),$(XNESTSYSLIBS))
   #ifdef OS2Architecture
   InstallLinkKitNonExecFile(Xnest.def,$(LINKKITDIR))
   #endif
 #endif /* XnestServer */ #endif /* XnestServer */
  
  
Line 1131 
Line 1777 
 MFBDIR   = mfb MFBDIR   = mfb
 CFB8DIR  = cfb CFB8DIR  = cfb
 CFB16DIR = cfb16 CFB16DIR = cfb16
   CFB24DIR = cfb24
 CFB32DIR = cfb32 CFB32DIR = cfb32
   #ifndef Win32Architecture
 XVFBDDXDIR  = hw/vfb XVFBDDXDIR  = hw/vfb
 XVFBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(XVFBDDXDIR) $(DEPDIRS)  #else
   XVFBDDXDIR = hw
   #endif
   XVFBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(XVFBDDXDIR) $(DEPDIRS)
   #if !defined(LynxOSArchitecture) && !defined(Win32Architecture)
 XVFBOBJS = hw/vfb/stubs.o XVFBOBJS = hw/vfb/stubs.o
   #else
   XVFBOBJS = hw/vfb/stubs.o dix/main.o
   #endif
 XVFB = hw/vfb/LibraryTargetName(vfb) XVFB = hw/vfb/LibraryTargetName(vfb)
 XVFBLIBS = $(DIX) $(OS) $(FONT) $(XVFB) $(MFB) $(CFB) $(MI) $(EXTENSIONS)  XVFBLIBS = PreFbLibs $(XVFB) $(CFB) PostFbLibs
 XVFBSYSLIBS = $(SYSLIBS) XVFBSYSLIBS = $(SYSLIBS)
 #if HasParallelMake #if HasParallelMake
 MakeMutex($(XVFBDIRS) $(XVFBOBJS) $(XVFB) $(XVFBLIBS) $(XVFBSYSLIBS)) MakeMutex($(XVFBDIRS) $(XVFBOBJS) $(XVFB) $(XVFBLIBS) $(XVFBSYSLIBS))
 #endif #endif
   #if HasGnuMake
   $(XVFBOBJS) $(XVFB) $(XVFBLIBS) $(XVFBSYSLIBS):: $(XVFBDIRS)
           @if [ -f $@ ]; then touch $@; fi
   #endif
 ServerTarget(Xvfb,$(XVFBDIRS),$(XVFBOBJS),$(XVFBLIBS),$(XVFBSYSLIBS)) ServerTarget(Xvfb,$(XVFBDIRS),$(XVFBOBJS),$(XVFBLIBS),$(XVFBSYSLIBS))
 #endif /* XVirtualFramebufferServer */ #endif /* XVirtualFramebufferServer */
  
  
 CFBDIRS = $(CFB8DIR) $(CFB16DIR) $(CFB32DIR)  #if UseXserverWrapper
   #if HasPam
   SetUIDProgramTarget(Xwrapper,os/wrapper.o,NullParameter,$(PAMLIBS),NullParameter)
   #else
   SetUIDProgramTarget(Xwrapper,os/wrapper.o,NullParameter,NullParameter,NullParameter)
   #endif
   InstallProgramWithFlags(Xwrapper,$(BINDIR),$(INSTUIDFLAGS))
   #endif
   
   CFBDIRS = $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR)
   IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR)
 DDXDIRS = $(DDXDIR1) $(DDXDIR2) $(DDXDIR3) $(XVFBDDXDIR) $(XNESTDDXDIR) DDXDIRS = $(DDXDIR1) $(DDXDIR2) $(DDXDIR3) $(XVFBDDXDIR) $(XNESTDDXDIR)
 SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFBDIRS) $(DDXDIRS)  SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFBDIRS) $(IPLANDIRS) $(ILBMDIR) $(AFBDIR) \
             $(DDXDIRS) $(NCR77C32DIR) $(MACH64DIR) $(IMSTTDIR)
  
 #if defined(ServerToInstall) && !defined(OS2Architecture)  #if defined(ServerToInstall) && !defined(OS2Architecture) && !defined(QNXArchitecture)
 install:: install::
         -(cd $(DESTDIR)$(BINDIR); $(RM) X; $(LN) ServerToInstall X)         -(cd $(DESTDIR)$(BINDIR); $(RM) X; $(LN) ServerToInstall X)
 #endif #endif

Legend:
Removed from v.3.51  
changed lines
  Added in v.3.85.2.16
Powered by
ViewCVS 0.9.2