[xorg-commit-diffs] xc/programs/Xserver Xorg.def, NONE,
1.1.10.1 Imakefile, 1.1.4.7, 1.1.4.8
Egbert Eich
xorg-commit at pdx.freedesktop.org
Thu Apr 15 03:15:20 PDT 2004
Committed by: eich
Update of /cvs/xorg/xc/programs/Xserver
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver
Modified Files:
Tag: XORG-CURRENT
Imakefile
Added Files:
Tag: XORG-CURRENT
Xorg.def
Log Message:
2004-04-15 Egbert Eich <eich at freedesktop.org>
Merged changes from RELEASE-1 branch
--- NEW FILE: Xorg.def ---
NAME Xorg NOTWINDOWCOMPAT
DESCRIPTION "@#XORG:4.4.0#@ $XdotOrg: xc/programs/Xserver/Xorg.def,v 1.1.10.1 2004/04/15 10:15:13 eich Exp $"
PROTMODE
EXETYPE OS2
Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Imakefile,v
retrieving revision 1.1.4.7
retrieving revision 1.1.4.8
diff -u -d -r1.1.4.7 -r1.1.4.8
--- a/Imakefile 25 Mar 2004 05:10:06 -0000 1.1.4.7
+++ b/Imakefile 15 Apr 2004 10:15:12 -0000 1.1.4.8
@@ -12,7 +12,7 @@
#include <Server.tmpl>
-#ifdef XFree86Version
+#if (defined (XFree86Version) || defined(XorgVersion))
/* Do not strip server binaries */
INSTPGMFLAGS =
#endif
@@ -82,7 +82,7 @@
#if BuildXKB
XKBEXT = xkb/LibraryTargetName(xkb)
XKBDIR = xkb
-#ifdef XFree86Version
+#if (defined(XFree86Version) || defined(XorgVersion))
XF86XKBOBJS = xkb/xf86KillSrv.o xkb/xf86VT.o xkb/xf86Private.o
#endif
#endif
@@ -363,7 +363,8 @@
SUNDDXDIR = hw/sun
#if DoLoadableServer
SUNOBJS = hw/sun/sunInit.o hw/sun/sunInitExt.o hw/sun/stubs.o
-#elif defined(XF86Server) && XF86Server
+#elif (defined(XF86Server) && XF86Server) \
+ || (defined(XorgServer) && XorgServer)
SUNOBJS = hw/sun/sunInit.o hw/sun/stubs.o
#else
SUNOBJS = hw/sun/sunInit.o
@@ -399,7 +400,8 @@
$(SUNDDXDIR) $(DEPDIRS)
#if DoLoadableServer
SUN24OBJS = hw/sun/sunInitMulti.o hw/sun/sunInitExt.o hw/sun/stubs.o
-#elif defined(XF86Server) && XF86Server
+#elif defined(XF86Server) && XF86Server \
+ || (defined(XorgServer) && XorgServer)
SUN24OBJS = hw/sun/sunInitMulti.o hw/sun/stubs.o
#else
SUN24OBJS = hw/sun/sunInitMulti.o
@@ -420,7 +422,8 @@
MFBSUBDIR = mfb
SUNDDXDIR = hw/sun
SUNMDIRS = $(STDDIRS) $(MFBDIR) $(SUNDDXDIR) $(DEPDIRS)
-#if defined(XF86Server) && XF86Server
+#if defined(XF86Server) && XF86Server \
+ || (defined(XorgServer) && XorgServer)
SUNMOBJS = hw/sun/sunInitMono.o hw/sun/sunInExMono.o hw/sun/stubs.o
#else
SUNMOBJS = hw/sun/sunInitMono.o hw/sun/sunInExMono.o
@@ -476,8 +479,11 @@
#if defined(XF86Server) && XF86Server
XF86SERVER = XFree86
#endif
+#if defined(XorgServer) && XorgServer
+XF86SERVER = Xorg
+#endif
#if defined(XnestServer) && XnestServer
-XNEST = Xnest
+XNEST = Xnext
#endif
#if defined(XVirtualFramebufferServer) && XVirtualFramebufferServer
XVFB = Xvfb
@@ -486,6 +492,7 @@
XWIN = XWin
#endif
#if (defined(XF86Server) && XF86Server) || \
+ (defined(XorgServer) && XorgServer) || \
(defined(XnestServer) && XnestServer) || \
(defined(XVirtualFramebufferServer) && XVirtualFramebufferServer) || \
(!MakeDllModules && defined(XWinServer) && XWinServer)
@@ -630,410 +637,140 @@
#endif
#endif /* XF86Server */
-#if defined(KDriveXServer) && KDriveXServer
-XCOMM
-XCOMM Tiny X server section
-XCOMM
-
- KDRIVE = hw/kdrive
-#if HasTsLib
- KDTSLIB = -lts
-#endif
-#ifdef LinuxArchitecture
- KDOSDIR = $(KDRIVE)/linux
- KDOS = $(KDOSDIR)/LibraryTargetName(linux) $(KDTSLIB)
-#endif
-
-#ifdef VXWORKS
- KDOSDIR = $(KDRIVE)/vxworks
- KDOS = $(KDOSDIR)/LibraryTargetName(vxworks)
-#endif
-
-#if BuildPseudo8
- PSEUDO8 = $(KDRIVE)/pseudo8/LibraryTargetName(pseudo8)
- PSEUDO8DIR = $(KDRIVE)/pseudo8
-#endif
- SHADOWDIR = miext/shadow
- LAYERDIR = miext/layer
- KD = $(KDRIVE)/LibraryTargetName(kdrive)
- KDFBDEV = $(KDRIVE)/fbdev/LibraryTargetName(fbdev)
-
-
-#define StdKdDirs $(KDRIVE) $(KDOSDIR) $(PSEUDO8DIR) fb $(DEPDIRS)
-#define StdKdSysLibs $(FONTLIBS) $(SYSLIBS)
-#define KdLibs $(KD) $(KDOS) $(PSEUDO8) MiExtLibs $(RANDRLIB) $(RENDERLIB)
-
-#if defined(XfbdevServer) && XfbdevServer
+#if defined(XorgServer) && XorgServer
XCOMM
-XCOMM server with Keith's fbdev driver only
+XCOMM Xorg Server
XCOMM
-
- FBDEVDIR = $(KDRIVE)/fbdev
- FBDEV = $(FBDEVDIR)/LibraryTargetName(fbdev)
-
- KDDIRS = StdKdDirs
-
- FBDEVDIRS = $(STDDIRS) $(KDDIRS) $(FBDEVDIR) $(SHADOWDIR) $(LAYERDIR)
-
- FBDEVLIBS = PreFbLibs $(FBDEV) $(LAYER) KdLibs FbPostFbLibs
-FBDEVSYSLIBS = StdKdSysLibs
-
-#if HasParallelMake
-MakeMutex($(FBDEVDIRS) $(FBDEVOBJS) $(FBDEVLIBS) $(FBDEVSYSLIBS))
+FBSUBDIR = fb
+MFBSUBDIR = mfb
+CFB8SUBDIR = cfb
+CFB16SUBDIR = cfb16
+CFB24SUBDIR = cfb24
+CFB32SUBDIR = cfb32
+SHADOWDIR = miext/shadow
+LAYERDIR = miext/layer
+#ifdef OS2Architecture
+SERVERDEFFILE = Xorg.def
+XNESTDEFFILE = Xnest.def
+XVFBDEFFILE = Xvfb.def
#endif
-#if ForceServerRemake
-$(FBDEVOBJS) $(XFBDEV) $(FBDEVLIBS) $(FBDEVSYSLIBS):: $(FBDEVDIRS)
- @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
+#if XF86AFB
+AFBSUBDIR = afb
#endif
-ServerTarget(Xfbdev,$(FBDEVDIRS),$(FBDEVOBJS), \
- $(FBDEVLIBS),$(FBDEVSYSLIBS))
-#endif /* XfbdevServer */
-
-#if defined(XSavageServer) && XSavageServer
-XCOMM
-XCOMM server with Keith's S3 Savage driver
-XCOMM
-
- SAVAGEDIR = $(KDRIVE)/savage
- SAVAGE = $(SAVAGEDIR)/LibraryTargetName(savage)
-
- KDDIRS = StdKdDirs
-
- SAVAGEDIRS = $(STDDIRS) $(KDDIRS) $(SAVAGEDIR)
-
- SAVAGELIBS = PreFbLibs $(SAVAGE) KdLibs FbPostFbLibs
-SAVAGESYSLIBS = StdKdSysLibs
-
-#if HasParallelMake
-MakeMutex($(SAVAGEDIRS) $(SAVAGEOBJS) $(SAVAGELIBS) $(SAVAGESYSLIBS))
+XFREE86DDXDIR = hw/xfree86
+XF86SERVERSUBDIRS = $(STDDIRS) $(MFBDIR) $(FBDIR) $(AFBDIR) \
+ $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \
+ $(SHADOWDIR) $(LAYERDIR) $(XFREE86DDXDIR) $(DEPDIRS)
+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 ForceServerRemake
-$(SAVAGEOBJS) $(XSAVAGE) $(SAVAGELIBS) $(SAVAGESYSLIBS):: $(SAVAGEDIRS)
- @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
+#if XF86VgaHw
+XF86VGAHWLIB = $(XF86SRC)/vgahw/LibraryTargetName(vgahw)
#endif
-ServerTarget(Xsavage,$(SAVAGEDIRS),$(SAVAGEOBJS), \
- $(SAVAGELIBS),$(SAVAGESYSLIBS))
-#endif /* XSavageServer */
-
-#if defined(XIgsServer) && XIgsServer
-XCOMM
-XCOMM server with Keith's S3 Igs driver
-XCOMM
-
- IGSDIR = $(KDRIVE)/igs
- IGS = $(IGSDIR)/LibraryTargetName(igs)
-
- KDDIRS = StdKdDirs
-
- IGSDIRS = $(STDDIRS) $(KDDIRS) $(IGSDIR)
-
- IGSLIBS = PreFbLibs $(IGS) KdLibs FbPostFbLibs
- IGSSYSLIBS = StdKdSysLibs
-
-#if HasParallelMake
-MakeMutex($(IGSDIRS) $(IGSOBJS) $(IGSLIBS) $(IGSSYSLIBS))
+#if XF86FBDevHw
+XF86FBDEVHWLIB = $(XF86SRC)/fbdevhw/LibraryTargetName(fbdevhw)
#endif
-#if ForceServerRemake
-$(IGSOBJS) $(XIGS) $(IGSLIBS) $(IGSSYSLIBS):: $(IGSDIRS)
- @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
+#if XF1Bpp || XF4Bpp
+XF1BPPLIB = $(XF86SRC)/xf1bpp/LibraryTargetName(xf1bpp)
#endif
-ServerTarget(Xigs,$(IGSDIRS),$(IGSOBJS), \
- $(IGSLIBS),$(IGSSYSLIBS))
-#endif /* XIgsServer */
-
-#if defined(XTridentServer) && XTridentServer
-XCOMM
-XCOMM server with Keith's TRIDENT Cyber9525 driver
-XCOMM
-
- FBDEVDIR = $(KDRIVE)/fbdev
- FBDEV = $(FBDEVDIR)/LibraryTargetName(fbdev)
- VESADIR = $(KDRIVE)/vesa
- VESA = $(VESADIR)/LibraryTargetName(vesa)
- TRIDENTDIR = $(KDRIVE)/trident
- TRIDENT = $(TRIDENTDIR)/LibraryTargetName(trident)
-
- KDDIRS = StdKdDirs
-
- TRIDENTDIRS = $(STDDIRS) $(KDDIRS) \
- $(FBDEVDIR) $(VESADIR) $(SHADOWDIR) $(LAYERDIR) $(TRIDENTDIR)
-
- TRIDENTLIBS = PreFbLibs $(TRIDENT) $(FBDEV) $(VESA) $(LAYER) KdLibs FbPostFbLibs
-TRIDENTSYSLIBS = StdKdSysLibs
-
-#if HasParallelMake
-MakeMutex($(TRIDENTDIRS) $(TRIDENTLIBS) $(TRIDENTSYSLIBS))
+#if XF4Bpp
+XF4BPPLIB = $(XF86SRC)/xf4bpp/LibraryTargetName(xf4bpp)
#endif
-#if ForceServerRemake
-$(TRIDENTOBJS) $(TRIDENTLIBS) $(TRIDENTSYSLIBS):: $(TRIDENTDIRS)
- @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
+#if XF8_32Wid
+XF8_32WIDLIB = $(XF86SRC)/xf8_32wid/LibraryTargetName(xf8_32wid)
#endif
-ServerTarget(Xtrident,$(TRIDENTDIRS),$(TRIDENTOBJS), \
- $(TRIDENTLIBS),$(TRIDENTSYSLIBS))
-#endif /* XTridentServer */
-
-#if defined(XchipsServer) && XchipsServer
-XCOMM
-XCOMM server with Keith's C&T driver
-XCOMM
-
- VESADIR = $(KDRIVE)/vesa
- VESA = $(VESADIR)/LibraryTargetName(vesa)
- CHIPSDIR = $(KDRIVE)/chips
- CHIPS = $(CHIPSDIR)/LibraryTargetName(chips)
-
- KDDIRS = StdKdDirs
-
- CHIPSDIRS = $(STDDIRS) $(KDDIRS) \
- $(FBDEVDIR) $(VESADIR) $(SHADOWDIR) $(LAYERDIR) $(CHIPSDIR)
-
- CHIPSLIBS = PreFbLibs $(CHIPS) $(VESA) $(LAYER) KdLibs FbPostFbLibs
-CHIPSSYSLIBS = StdKdSysLibs
-
-#if HasParallelMake
-MakeMutex($(CHIPSDIRS) $(CHIPSLIBS) $(CHIPSSYSLIBS))
+#if XF8_32Bpp
+XF8_32BPPLIB = $(XF86SRC)/xf8_32bpp/LibraryTargetName(xf8_32bpp)
#endif
-#if ForceServerRemake
-$(CHIPSOBJS) $(CHIPSLIBS) $(CHIPSSYSLIBS):: $(CHIPSDIRS)
- @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
+#if XF8_16Bpp
+XF8_16BPPLIB = $(XF86SRC)/xf8_16bpp/LibraryTargetName(xf8_16bpp)
#endif
-ServerTarget(Xchips,$(CHIPSDIRS),$(CHIPSOBJS), \
- $(CHIPSLIBS),$(CHIPSSYSLIBS))
-#endif /* XchipsServer */
-
-#if defined(Xmach64Server) && Xmach64Server
-XCOMM
-XCOMM server with Keith's Mach64 driver (for Mobility 1 machines)
-XCOMM
-
- VESADIR = $(KDRIVE)/vesa
- VESA = $(VESADIR)/LibraryTargetName(vesa)
- MACH64DIR = $(KDRIVE)/mach64
- MACH64 = $(MACH64DIR)/LibraryTargetName(mach64)
-
- KDDIRS = StdKdDirs
-
- MACH64DIRS = $(STDDIRS) $(KDDIRS) \
- $(VESADIR) $(SHADOWDIR) $(LAYERDIR) $(MACH64DIR)
-
- MACH64LIBS = PreFbLibs $(MACH64) $(VESA) $(LAYER) KdLibs FbPostFbLibs
-MACH64SYSLIBS = StdKdSysLibs
-
-#if HasParallelMake
-MakeMutex($(MACH64DIRS) $(MACH64LIBS) $(MACH64SYSLIBS))
+#if XF24_32Bpp
+XF24_32BPPLIB = $(XF86SRC)/xf24_32bpp/LibraryTargetName(xf24_32bpp)
#endif
-#if ForceServerRemake
-$(MACH64OBJS) $(MACH64LIBS) $(MACH64SYSLIBS):: $(MACH64DIRS)
- @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
+#if XFShadowFB
+XFSHADOWFBLIB = $(XF86SRC)/shadowfb/LibraryTargetName(shadowfb)
#endif
-ServerTarget(Xmach64,$(MACH64DIRS),$(MACH64OBJS), \
- $(MACH64LIBS),$(MACH64SYSLIBS))
-#endif /* Xmach64Server */
-
-#if defined(Xi810Server) && Xi810Server
-XCOMM
-XCOMM server with Intel i810 driver
-XCOMM
-
- FBDEVDIR = $(KDRIVE)/fbdev
- FBDEV = $(FBDEVDIR)/LibraryTargetName(fbdev)
- VESADIR = $(KDRIVE)/vesa
- VESA = $(VESADIR)/LibraryTargetName(vesa)
- I810DIR = $(KDRIVE)/i810
- I810 = $(I810DIR)/LibraryTargetName(i810)
-
- KDDIRS = StdKdDirs
-
- I810DIRS = $(STDDIRS) $(KDDIRS) $(SHADOWDIR) $(I810DIR)
-
- I810LIBS = PreFbLibs $(I810) KdLibs FbPostFbLibs
- I810SYSLIBS = StdKdSysLibs
-
-#if HasParallelMake
-MakeMutex($(I810DIRS) $(I810LIBS) $(I810SYSLIBS))
+#if XF86AFB
+AFBLIB = afb/LibraryTargetName(afb)
#endif
-#if ForceServerRemake
-$(I810OBJS) $(I810LIBS) $(I810SYSLIBS):: $(I810DIRS)
- @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
+XF86DRIVERLIB = $(XF86SRC)/drivers/LibraryTargetName(driver)
+#if XF86Ramdac
+XF86RAMDACLIB = $(XF86SRC)/ramdac/LibraryTargetName(ramdac)
#endif
-ServerTarget(Xi810,$(I810DIRS),$(I810OBJS), \
- $(I810LIBS),$(I810SYSLIBS))
-#endif /* Xi810Server */
-
-
-#if defined(XSis530Server) && XSis530Server
-XCOMM
-XCOMM server with Keith's SiS 530 driver
-XCOMM
-
- SIS530DIR = $(KDRIVE)/sis530
- SIS530 = $(SIS530DIR)/LibraryTargetName(sis530)
-
- KDDIRS = StdKdDirs
-
- SIS530DIRS = $(STDDIRS) $(KDDIRS) $(SIS530DIR)
-
- SIS530LIBS = PreFbLibs $(SIS530) KdLibs FbPostFbLibs
-SIS530SYSLIBS = StdKdSysLibs
-
-#if HasParallelMake
-MakeMutex($(SIS530DIRS) $(SIS530OBJS) $(SIS530LIBS) $(SIS530SYSLIBS))
+#if XF86I2C
+XF86I2CLIB = $(XF86SRC)/i2c/LibraryTargetName(i2c)
#endif
-#if ForceServerRemake
-$(SIS530OBJS) $(SIS530LIBS) $(SIS530SYSLIBS):: $(SIS530DIRS)
- @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
+#if XF86DDC
+XF86DDCLIB = $(XF86SRC)/ddc/LibraryTargetName(ddc)
#endif
-ServerTarget(Xsis530,$(SIS530DIRS),$(SIS530OBJS), \
- $(SIS530LIBS),$(SIS530SYSLIBS))
-#endif /* XSis530Server */
-
-#if defined(XTrioServer) && XTrioServer
-XCOMM
-XCOMM server with Keith's S3 Trio driver
-XCOMM
-
- TRIODIR = $(KDRIVE)/trio
- TRIO = $(TRIODIR)/LibraryTargetName(trio)
-
- KDDIRS = StdKdDirs
-
- TRIODIRS = $(STDDIRS) $(KDDIRS) $(TRIODIR)
-
- TRIOLIBS = PreFbLibs $(TRIO) KdLibs FbPostFbLibs
-TRIOSYSLIBS = StdKdSysLibs
-
-#if HasParallelMake
-MakeMutex($(TRIODIRS) $(TRIOOBJS) $(TRIOLIBS) $(TRIOSYSLIBS))
+#if XF86VBE
+XF86VBELIB = $(XF86SRC)/vbe/LibraryTargetName(vbe)
#endif
-#if ForceServerRemake
-$(TRIOOBJS) $(TRIOLIBS) $(TRIOSYSLIBS):: $(TRIODIRS)
- @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
+#if XF86RAC
+XF86RACLIB = $(XF86SRC)/rac/LibraryTargetName(rac)
#endif
-ServerTarget(Xtrio,$(TRIODIRS),$(TRIOOBJS), \
- $(TRIOLIBS),$(TRIOSYSLIBS))
-#endif /* XTrioServer */
-
-#if defined(XipaqServer) && XipaqServer
-XCOMM
-XCOMM server with Alan's HP VGA Out PCMCIA driver & fbdev
-XCOMM
-
- FBDEVDIR = $(KDRIVE)/fbdev
- FBDEV = $(FBDEVDIR)/LibraryTargetName(fbdev)
-
- PCMCIADIR = $(KDRIVE)/pcmcia
- PCMCIA = $(PCMCIADIR)/LibraryTargetName(pcmcia)
-
- SHADOWDIR = miext/shadow
-
- IPAQDIR = $(KDRIVE)/ipaq
- IPAQ = $(IPAQDIR)/LibraryTargetName(ipaq)
-
- KDDIRS = StdKdDirs
-
- IPAQDIRS = $(STDDIRS) $(KDDIRS) $(FBDEVDIR) $(LAYERDIR) $(SHADOWDIR) $(PCMCIADIR) $(IPAQDIR)
-
- IPAQLIBS = PreFbLibs $(IPAQ) $(FBDEV) $(LAYER) $(SHADOW) $(PCMCIA) KdLibs FbPostFbLibs
- IPAQSYSLIBS = StdKdSysLibs
-
-#if HasParallelMake
-MakeMutex($(IPAQDIRS) $(IPAQOBJS) $(IPAQLIBS) $(IPAQSYSLIBS))
+#if XF86INT10_BUILD > X86EMU_GENERIC
+XF86INT10LIB = $(XF86OSSRC)/LibraryTargetName(int10)
+#else
+XF86INT10LIB = $(XF86SRC)/int10/LibraryTargetName(int10)
#endif
-#if ForceServerRemake
-$(IPAQOBJS) $(IPAQLIBS) $(IPAQSYSLIBS):: $(IPAQDIRS)
- @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
+#if UseMemLeak
+MEMDEBUGLIB = $(TOP)/util/memleak/LibraryTargetName(memleak)
#endif
-ServerTarget(Xipaq,$(IPAQDIRS),$(IPAQOBJS), \
- $(IPAQLIBS),$(IPAQSYSLIBS))
-#endif /* XIPAQServer */
-
-#if defined(XTS300Server) && XTS300Server
-XCOMM
-XCOMM server with Keith's S3 Trio and SiS530 driver for the TS300/TS400
-XCOMM
-
- TRIODIR = $(KDRIVE)/trio
- TRIO = $(TRIODIR)/LibraryTargetName(trio)
-
- SIS530DIR = $(KDRIVE)/sis530
- SIS530 = $(SIS530DIR)/LibraryTargetName(sis530)
-
- TS300DIR = $(KDRIVE)/ts300
- TS300 = $(TS300DIR)/LibraryTargetName(ts300)
-
- KDDIRS = StdKdDirs
-
- TS300DIRS = $(STDDIRS) $(KDDIRS) $(TRIODIR) $(SIS530DIR) $(TS300DIR)
-
- TS300LIBS = PreFbLibs $(TS300) $(TRIO) $(SIS530) KdLibs FbPostFbLibs
- TS300SYSLIBS = StdKdSysLibs
-
-#if HasParallelMake
-MakeMutex($(TS300DIRS) $(TS300OBJS) $(TS300LIBS) $(TS300SYSLIBS))
+XF86IDRIVERLIB = $(XF86SRC)/input/LibraryTargetName(idriver)
+#if !DoLoadableServer
+XF86DRVOBJS = $(XF86SRC)/drivers/drvConf.o
+XF86DRVLIBS = $(XF86DRIVERLIB) $(XF86RAMDACLIB) $(XF86DDCLIB) $(XF86I2CLIB) \
+ $(XF86XAALIB) $(XF86VGAHWLIB) $(XF86FBDEVHWLIB) \
+ $(XF8_32WIDLIB) $(XF8_32BPPLIB) \
+ $(XF8_16BPPLIB) $(XF24_32BPPLIB) \
+ $(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 ForceServerRemake
-$(TS300OBJS) $(TS300LIBS) $(TS300SYSLIBS):: $(TS300DIRS)
- @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
+#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
-ServerTarget(Xts300,$(TS300DIRS),$(TS300OBJS), \
- $(TS300LIBS),$(TS300SYSLIBS))
-#endif /* XTS300Server */
-
-#if defined(XItsyServer) && XItsyServer
-XCOMM
-XCOMM server with Keith's FB driver only
-XCOMM
- ITSYDIR = $(KDRIVE)/itsy
- ITSY = $(ITSYDIR)/LibraryTargetName(itsy)
-
- KDDIRS = StdKdDirs
-
- ITSYDIRS = $(STDDIRS) $(KDDIRS) $(ITSYDIR)
-
- ITSYLIBS = PreFbLibs $(ITSY) KdLibs FbPostFbLibs
-ITSYSYSLIBS = StdKdSysLibs
-
+XF86SERVEROBJS = $(XF86XKBOBJS) $(XF86DRVOBJS) $(XF86IDRVOBJS)
#if HasParallelMake
-MakeMutex($(ITSYDIRS) $(ITSYOBJS) $(ITSYLIBS) $(ITSYSYSLIBS))
+MakeMutex($(XF86SERVERSUBDIRS) $(XF86SERVERLIBS) $(XF86SERVERSYSLIBS))
#endif
#if ForceServerRemake
-$(ITSYOBJS) $(ITSYLIBS) $(ITSYSYSLIBS):: $(ITSYDIRS)
+$(XF86SERVERLIBS) $(XF86SERVERSYSLIBS):: $(XF86SERVERSUBDIRS)
@if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
#endif
-ServerTarget(Xitsy,$(ITSYDIRS),$(ITSYOBJS), \
- $(ITSYLIBS),$(ITSYSYSLIBS))
-#endif /* XItsyServer */
-
-#if defined(XvesaServer) && XvesaServer
-XCOMM
-XCOMM server with vesa driver only based on Keith's server
-XCOMM
-
- VESADIR = $(KDRIVE)/vesa
- VESA = $(VESADIR)/LibraryTargetName(vesa)
-
- KDDIRS = StdKdDirs
-
- VESADIRS = $(STDDIRS) $(KDDIRS) $(VESADIR) $(SHADOWDIR) $(LAYERDIR)
-
- VESALIBS = PreFbLibs $(VESA) $(LAYER) KdLibs FbPostFbLibs
-VESASYSLIBS = StdKdSysLibs
-
-#if HasParallelMake
-MakeMutex($(VESADIRS) $(VESAOBJS) $(VESALIBS) $(VESASYSLIBS))
+SetUIDServerTarget(Xorg,$(XF86SERVERSUBDIRS),$(XF86SERVEROBJS) $(SERVERDEFFILE), \
+ $(XF86SERVERLIBS),$(XF86SERVERSYSLIBS))
+#if DoLoadableServer
+ServerDriverSDKTarget(Xorg)
#endif
-#if ForceServerRemake
-$(VESAOBJS) $(XVESA) $(VESALIBS) $(VESASYSLIBS):: $(VESADIRS)
- @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
+#ifndef ServerToInstall
+#define ServerToInstall Xorg
#endif
-ServerTarget(Xvesa,$(VESADIRS),$(VESAOBJS), \
- $(VESALIBS),$(VESASYSLIBS))
-#endif /* XvesaServer */
-
-KDRIVEDIRS=$(KDDIRS) $(FBDEVDIR) $(SAVAGEDIR) $(TRIDENTDIR) $(I810DIR) \
- $(SIS530DIR) $(TRIODIR) $(TS300DIR) $(ITSYDIR) $(IGSDIR) \
- $(VESADIR) $(PCMCIADIR) $(IPAQDIR) $(MACH64DIR) $(CHIPSDIR)
-#endif /* KDriveXServer */
+#endif /* XorgServer */
#if defined(XprtServer) && XprtServer
XCOMM
More information about the xorg-commit-diffs
mailing list