[xorg-commit-diffs] xc/programs/Xserver Imakefile, 1.1.4.4.2.2, 1.1.4.4.2.2.6.1

Roland Mainz xorg-commit at pdx.freedesktop.org
Sat Apr 10 02:04:19 PDT 2004 

Committed by: gisburn

Update of /cvs/xorg/xc/programs/Xserver
In directory pdx:/tmp/cvs-serv7662/xc/programs/Xserver

Modified Files:
      Tag: XPRINT
	Imakefile 
Log Message:
Resync to 2004-04-10 XORG-RELEASE-1 branch

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Imakefile,v
retrieving revision 1.1.4.4.2.2
retrieving revision 1.1.4.4.2.2.6.1
diff -u -d -r1.1.4.4.2.2 -r1.1.4.4.2.2.6.1
--- a/Imakefile	4 Mar 2004 17:47:16 -0000	1.1.4.4.2.2
+++ b/Imakefile	10 Apr 2004 09:04:11 -0000	1.1.4.4.2.2.6.1
@@ -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,6 +637,141 @@
 #endif
 #endif        /* XF86Server */
 
+#if defined(XorgServer) && XorgServer
+XCOMM
+XCOMM Xorg Server
+XCOMM
+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 XF86AFB
+AFBSUBDIR = afb
+#endif
+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 XF86VgaHw
+XF86VGAHWLIB = $(XF86SRC)/vgahw/LibraryTargetName(vgahw)
+#endif
+#if XF86FBDevHw
+XF86FBDEVHWLIB = $(XF86SRC)/fbdevhw/LibraryTargetName(fbdevhw)
+#endif
+#if XF1Bpp || XF4Bpp
+XF1BPPLIB = $(XF86SRC)/xf1bpp/LibraryTargetName(xf1bpp)
+#endif
+#if XF4Bpp
+XF4BPPLIB = $(XF86SRC)/xf4bpp/LibraryTargetName(xf4bpp)
+#endif
+#if XF8_32Wid
+XF8_32WIDLIB = $(XF86SRC)/xf8_32wid/LibraryTargetName(xf8_32wid)
+#endif
+#if XF8_32Bpp
+XF8_32BPPLIB = $(XF86SRC)/xf8_32bpp/LibraryTargetName(xf8_32bpp)
+#endif
+#if XF8_16Bpp
+XF8_16BPPLIB = $(XF86SRC)/xf8_16bpp/LibraryTargetName(xf8_16bpp)
+#endif
+#if XF24_32Bpp
+XF24_32BPPLIB = $(XF86SRC)/xf24_32bpp/LibraryTargetName(xf24_32bpp)
+#endif
+#if XFShadowFB
+XFSHADOWFBLIB = $(XF86SRC)/shadowfb/LibraryTargetName(shadowfb)
+#endif
+#if XF86AFB
+AFBLIB = afb/LibraryTargetName(afb)
+#endif
+XF86DRIVERLIB = $(XF86SRC)/drivers/LibraryTargetName(driver)
+#if XF86Ramdac
+XF86RAMDACLIB = $(XF86SRC)/ramdac/LibraryTargetName(ramdac)
+#endif
+#if XF86I2C
+XF86I2CLIB = $(XF86SRC)/i2c/LibraryTargetName(i2c)
+#endif
+#if XF86DDC
+XF86DDCLIB = $(XF86SRC)/ddc/LibraryTargetName(ddc)
+#endif
+#if XF86VBE
+XF86VBELIB = $(XF86SRC)/vbe/LibraryTargetName(vbe)
+#endif
+#if XF86RAC
+XF86RACLIB = $(XF86SRC)/rac/LibraryTargetName(rac)
+#endif
+#if XF86INT10_BUILD > X86EMU_GENERIC
+XF86INT10LIB = $(XF86OSSRC)/LibraryTargetName(int10)
+#else
+XF86INT10LIB = $(XF86SRC)/int10/LibraryTargetName(int10)
+#endif
+#if UseMemLeak
+MEMDEBUGLIB = $(TOP)/util/memleak/LibraryTargetName(memleak)
+#endif
+XF86IDRIVERLIB = $(XF86SRC)/input/LibraryTargetName(idriver)
+#if !DoLoadableServer
+XF86DRVOBJS = $(XF86SRC)/drivers/drvConf.o
+XF86DRVLIBS = $(XF86DRIVERLIB) $(XF86RAMDACLIB) $(XF86DDCLIB) $(XF86I2CLIB) \
+              $(XF86XAALIB) $(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 DoLoadableServer
+XF86LOADERLIB = $(XF86SRC)/loader/LibraryTargetName(loader)
+XF86MAINLIBS = PreFbLibsNoFont \
+	       $(FONTBASE) $(OTHEREXTS) $(XF86COMLIB) \
+	       NoMfbPostFbLibs
+XF86SERVERSYSLIBS = $(SYSLIBS) $(LIBDL) $(LIBREGEX)
+XF86SERVERLIBS = $(XF86DRVLIBS) $(XF86IDRVLIBS) $(XF86LIBS) $(XF86LOADERLIB) \
+		 $(XF86COMLIB) $(XF86MAINLIBS) $(XF86SCANLIB) $(XF86OSLIB)
+#else
+XF86MAINLIBS = MiExtLibs AllFBLibs $(XF86COMLIB) $(MI)
+XF86SERVERSYSLIBS = $(FONTLIBS) $(SYSLIBS) $(LIBDL) $(LIBREGEX)
+XF86SERVERLIBS = $(XF86DRVLIBS) $(XF86IDRVLIBS) $(XF86LIBS) $(XF86LOADERLIB) \
+		 $(XF86COMLIB) $(XF86MAINLIBS) $(XF86SCANLIB) $(XF86OSLIB) \
+		 $(XF86DDCLIB)
+#endif
+XF86SERVEROBJS = $(XF86XKBOBJS) $(XF86DRVOBJS) $(XF86IDRVOBJS)
+#if HasParallelMake
+MakeMutex($(XF86SERVERSUBDIRS) $(XF86SERVERLIBS) $(XF86SERVERSYSLIBS))
+#endif
+#if ForceServerRemake
+$(XF86SERVERLIBS) $(XF86SERVERSYSLIBS):: $(XF86SERVERSUBDIRS)
+	@if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
+#endif
+SetUIDServerTarget(Xorg,$(XF86SERVERSUBDIRS),$(XF86SERVEROBJS) $(SERVERDEFFILE), \
+	$(XF86SERVERLIBS),$(XF86SERVERSYSLIBS))
+#if DoLoadableServer
+ServerDriverSDKTarget(Xorg)
+#endif
+#ifndef ServerToInstall
+#define ServerToInstall Xorg
+#endif
+#endif        /* XorgServer */
+
 #if defined(XprtServer) && XprtServer
 XCOMM
 XCOMM Print Server

More information about the xorg-commit-diffs mailing list