Attachment 4089 Details for Bug 5332 – xfree86server.patch

[patch] xfree86server.patch

xfree86server.patch (text/plain), 53.15 KB, created by Donnie Berkholz on 2005-12-15 15:43:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Donnie Berkholz

Created: 2005-12-15 15:43:33 UTC

Size: 53.15 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/configure.ac,v
>retrieving revision 1.136
>retrieving revision 1.137
>diff -u -b -B -r1.136 -r1.137
>--- configure.ac	1 Dec 2005 22:06:48 -0000	1.136
>+++ configure.ac	2 Dec 2005 06:02:36 -0000	1.137
>@@ -789,9 +789,10 @@
> dnl DDX section.
> dnl ---------------------------------------------------------------------------
> 
>-dnl These are used to define Xorg module and loader defines
>+dnl These are used to define Xorg module, loader and general server defines
> MODULE_DEFINES=""
> LOADER_DEFINES=""
>+SERVER_DEFINES=""
> 
> dnl DMX DDX
> 
>@@ -1078,8 +1079,9 @@
> 	AC_SUBST([LD_EXPORT_SYMBOLS_FLAG])
> 
> 	dnl Module defines are used in the Xorg server and the drivers
>-	MODULE_DEFINES="-DIN_MODULE -DXFree86Module"
>-	LOADER_DEFINES="-DXFree86LOADER"
>+	MODULE_DEFINES="$MODULE_DEFINES -DIN_MODULE -DXFree86Module"
>+	LOADER_DEFINES="$LOADER_DEFINES -DXFree86LOADER"
>+	SERVER_DEFINES="$SERVER_DEFINES -DXFree86Server"
> 
> 	dnl these only go in xorg-config.h
> 	XF86CONFIGFILE="xorg.conf"
>@@ -1131,9 +1133,6 @@
> AM_CONDITIONAL(CFB, [test "x$XORG" = xyes])
> AM_CONDITIONAL(AFB, [test "x$XORG" = xyes])
> 
>-AC_SUBST([MODULE_DEFINES])
>-AC_SUBST([LOADER_DEFINES])
>-
> dnl Xprint DDX
> 
> AC_MSG_CHECKING([whether to build Xprint DDX])
>@@ -1315,6 +1314,10 @@
> AM_CONDITIONAL(BSD_KBD_MODE, [test x$KBD_MODE_TYPE = xbsd])
> AM_CONDITIONAL(SUN_KBD_MODE, [test x$KBD_MODE_TYPE = xsun])
> 
>+AC_SUBST([MODULE_DEFINES])
>+AC_SUBST([LOADER_DEFINES])
>+AC_SUBST([SERVER_DEFINES])
>+
> CFLAGS="$XSERVER_CFLAGS $CFLAGS"
> AC_SUBST([CFLAGS])
> 
>Index: xorg-server.pc.in
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/xorg-server.pc.in,v
>retrieving revision 1.5
>retrieving revision 1.6
>diff -u -b -B -r1.5 -r1.6
>--- xorg-server.pc.in	29 Nov 2005 16:39:24 -0000	1.5
>+++ xorg-server.pc.in	2 Dec 2005 06:02:36 -0000	1.6
>@@ -8,5 +8,5 @@
> Name: xorg-server
> Description: Modular X.Org X Server
> Version: @PACKAGE_VERSION@
>-Cflags: -I${sdkdir} @MODULE_DEFINES@ @LOADER_DEFINES@
>+Cflags: -I${sdkdir} @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> Libs: -L${libdir}
>Index: GL/glx/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/GL/glx/Makefile.am,v
>retrieving revision 1.8
>retrieving revision 1.9
>diff -u -b -B -r1.8 -r1.9
>--- GL/glx/Makefile.am	29 Nov 2005 16:39:24 -0000	1.8
>+++ GL/glx/Makefile.am	2 Dec 2005 06:02:36 -0000	1.9
>@@ -5,7 +5,7 @@
> 	@GL_CFLAGS@ \
> 	@XLIB_CFLAGS@ \
> 	-I@MESA_SOURCE@/include \
>-	-DXFree86Server \
>+	@SERVER_DEFINES@ \
> 	@MODULE_DEFINES@ \
> 	@LOADER_DEFINES@
> 
>Index: GL/mesa/X/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/GL/mesa/X/Makefile.am,v
>retrieving revision 1.12
>retrieving revision 1.13
>diff -u -b -B -r1.12 -r1.13
>--- GL/mesa/X/Makefile.am	1 Dec 2005 23:39:00 -0000	1.12
>+++ GL/mesa/X/Makefile.am	2 Dec 2005 06:02:36 -0000	1.13
>@@ -16,8 +16,7 @@
>            -I$(top_srcdir)/GL/include \
>            -I$(top_srcdir)/hw/xfree86/os-support
> 
>-# terribly gross hack.  i need a shower now.
>-AM_CFLAGS = $(DIX_CFLAGS) -DXFree86Server @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> libX_la_SOURCES = xf86glx.c \
>                   xf86glx_util.c \
>Index: GL/mesa/array_cache/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/GL/mesa/array_cache/Makefile.am,v
>retrieving revision 1.6
>retrieving revision 1.7
>diff -u -b -B -r1.6 -r1.7
>--- GL/mesa/array_cache/Makefile.am	29 Nov 2005 16:39:25 -0000	1.6
>+++ GL/mesa/array_cache/Makefile.am	2 Dec 2005 06:02:36 -0000	1.7
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libac.la
> 
>-AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = -I@MESA_SOURCE@/include \
>            -I../X \
>Index: GL/mesa/glapi/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/GL/mesa/glapi/Makefile.am,v
>retrieving revision 1.4
>retrieving revision 1.5
>diff -u -b -B -r1.4 -r1.5
>--- GL/mesa/glapi/Makefile.am	29 Nov 2005 16:39:25 -0000	1.4
>+++ GL/mesa/glapi/Makefile.am	2 Dec 2005 06:02:36 -0000	1.5
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libglapi.la
> 
>-AM_CFLAGS = -DXFree86Server @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = -I@MESA_SOURCE@/include \
>            -I../X \
>Index: GL/mesa/main/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/GL/mesa/main/Makefile.am,v
>retrieving revision 1.7
>retrieving revision 1.8
>diff -u -b -B -r1.7 -r1.8
>--- GL/mesa/main/Makefile.am	29 Nov 2005 16:39:25 -0000	1.7
>+++ GL/mesa/main/Makefile.am	2 Dec 2005 06:02:36 -0000	1.8
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libmain.la
> 
>-AM_CFLAGS = -DXFree86Server @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = -I@MESA_SOURCE@/include \
>            -I../X \
>Index: GL/mesa/math/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/GL/mesa/math/Makefile.am,v
>retrieving revision 1.6
>retrieving revision 1.7
>diff -u -b -B -r1.6 -r1.7
>--- GL/mesa/math/Makefile.am	29 Nov 2005 16:39:25 -0000	1.6
>+++ GL/mesa/math/Makefile.am	2 Dec 2005 06:02:37 -0000	1.7
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libmath.la
> 
>-AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = -I@MESA_SOURCE@/include \
>            -I../X \
>Index: GL/mesa/shader/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/GL/mesa/shader/Makefile.am,v
>retrieving revision 1.7
>retrieving revision 1.8
>diff -u -b -B -r1.7 -r1.8
>--- GL/mesa/shader/Makefile.am	29 Nov 2005 16:39:25 -0000	1.7
>+++ GL/mesa/shader/Makefile.am	2 Dec 2005 06:02:37 -0000	1.8
>@@ -2,7 +2,7 @@
> 
> noinst_LTLIBRARIES = libshader.la
> 
>-AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = -I@MESA_SOURCE@/include \
>            -I../X \
>Index: GL/mesa/shader/grammar/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/GL/mesa/shader/grammar/Makefile.am,v
>retrieving revision 1.4
>retrieving revision 1.5
>diff -u -b -B -r1.4 -r1.5
>--- GL/mesa/shader/grammar/Makefile.am	29 Nov 2005 16:39:25 -0000	1.4
>+++ GL/mesa/shader/grammar/Makefile.am	2 Dec 2005 06:02:37 -0000	1.5
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libgrammar.la
> 
>-AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = -I@MESA_SOURCE@/include \
>            -I../../X \
>Index: GL/mesa/shader/slang/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/GL/mesa/shader/slang/Makefile.am,v
>retrieving revision 1.4
>retrieving revision 1.5
>diff -u -b -B -r1.4 -r1.5
>--- GL/mesa/shader/slang/Makefile.am	29 Nov 2005 16:39:25 -0000	1.4
>+++ GL/mesa/shader/slang/Makefile.am	2 Dec 2005 06:02:37 -0000	1.5
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libslang.la
> 
>-AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = -I@MESA_SOURCE@/include \
>            -I../grammar \
>Index: GL/mesa/swrast/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/GL/mesa/swrast/Makefile.am,v
>retrieving revision 1.6
>retrieving revision 1.7
>diff -u -b -B -r1.6 -r1.7
>--- GL/mesa/swrast/Makefile.am	29 Nov 2005 16:39:25 -0000	1.6
>+++ GL/mesa/swrast/Makefile.am	2 Dec 2005 06:02:37 -0000	1.7
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libswrast.la
> 
>-AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = -I@MESA_SOURCE@/include \
>            -I../X \
>Index: GL/mesa/swrast_setup/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/GL/mesa/swrast_setup/Makefile.am,v
>retrieving revision 1.6
>retrieving revision 1.7
>diff -u -b -B -r1.6 -r1.7
>--- GL/mesa/swrast_setup/Makefile.am	29 Nov 2005 16:39:25 -0000	1.6
>+++ GL/mesa/swrast_setup/Makefile.am	2 Dec 2005 06:02:37 -0000	1.7
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libss.la
> 
>-AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = -I@MESA_SOURCE@/include \
>            -I../X \
>Index: GL/mesa/tnl/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/GL/mesa/tnl/Makefile.am,v
>retrieving revision 1.6
>retrieving revision 1.7
>diff -u -b -B -r1.6 -r1.7
>--- GL/mesa/tnl/Makefile.am	29 Nov 2005 16:39:26 -0000	1.6
>+++ GL/mesa/tnl/Makefile.am	2 Dec 2005 06:02:38 -0000	1.7
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libtnl.la
> 
>-AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = -I@MESA_SOURCE@/include \
>            -I../X \
>Index: XTrap/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/XTrap/Makefile.am,v
>retrieving revision 1.6
>retrieving revision 1.7
>diff -u -b -B -r1.6 -r1.7
>--- XTrap/Makefile.am	29 Nov 2005 16:39:26 -0000	1.6
>+++ XTrap/Makefile.am	2 Dec 2005 06:02:38 -0000	1.7
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libxtrap.la libxtrapmodule.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> libxtrap_la_SOURCES = xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c
> 
>Index: Xext/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/Xext/Makefile.am,v
>retrieving revision 1.11
>retrieving revision 1.12
>diff -u -b -B -r1.11 -r1.12
>--- Xext/Makefile.am	29 Nov 2005 16:39:26 -0000	1.11
>+++ Xext/Makefile.am	2 Dec 2005 06:02:38 -0000	1.12
>@@ -8,7 +8,7 @@
> 
> INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod -I$(top_srcdir)/hw/xfree86/os-support
> 
>-AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> sdk_HEADERS = xvdix.h xvmcext.h
> 
>Index: Xi/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/Xi/Makefile.am,v
>retrieving revision 1.4
>retrieving revision 1.5
>diff -u -b -B -r1.4 -r1.5
>--- Xi/Makefile.am	29 Nov 2005 16:39:26 -0000	1.4
>+++ Xi/Makefile.am	2 Dec 2005 06:02:38 -0000	1.5
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libXi.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> libXi_la_SOURCES =	\
> 	allowev.c \
>Index: Xprint/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/Xprint/Makefile.am,v
>retrieving revision 1.5
>retrieving revision 1.6
>diff -u -b -B -r1.5 -r1.6
>--- Xprint/Makefile.am	19 Nov 2005 07:15:49 -0000	1.5
>+++ Xprint/Makefile.am	2 Dec 2005 06:02:38 -0000	1.6
>@@ -2,7 +2,9 @@
> 
> bin_PROGRAMS = Xprt
> 
>-Xprt_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  -DXPRINTDIR=\"$(prefix)/X11/xserver\"  
>+Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
>+	-DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
>+	-DXPRINTDIR=\"$(prefix)/X11/xserver\"  
> 
> Xprt_LDFLAGS = -L$(top_srcdir)
> Xprt_LDADD = @XPRINT_LIBS@ pcl/libpcl.la raster/libraster.la
>Index: Xprint/pcl/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/Xprint/pcl/Makefile.am,v
>retrieving revision 1.2
>retrieving revision 1.3
>diff -u -b -B -r1.2 -r1.3
>--- Xprint/pcl/Makefile.am	19 Nov 2005 07:15:49 -0000	1.2
>+++ Xprint/pcl/Makefile.am	2 Dec 2005 06:02:38 -0000	1.3
>@@ -2,7 +2,8 @@
> 
> INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
> 
>-AM_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ -D_XP_PRINT_SERVER_ -DPSZ=8
>+AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
>+	-D_XP_PRINT_SERVER_ -DPSZ=8
> 
> libpcl_la_SOURCES =		\
> 	PclArc.c		\
>Index: Xprint/ps/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/Xprint/ps/Makefile.am,v
>retrieving revision 1.2
>retrieving revision 1.3
>diff -u -b -B -r1.2 -r1.3
>--- Xprint/ps/Makefile.am	19 Nov 2005 07:15:49 -0000	1.2
>+++ Xprint/ps/Makefile.am	2 Dec 2005 06:02:38 -0000	1.3
>@@ -2,7 +2,8 @@
> 
> INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
> 
>-AM_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ -D_XP_PRINT_SERVER_ -DPSZ=8 -DXP_PSTEXT
>+AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
>+	-D_XP_PRINT_SERVER_ -DPSZ=8 -DXP_PSTEXT
> 
> libps_la_SOURCES =		\
> 	PsArc.c			\
>Index: Xprint/raster/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/Xprint/raster/Makefile.am,v
>retrieving revision 1.2
>retrieving revision 1.3
>diff -u -b -B -r1.2 -r1.3
>--- Xprint/raster/Makefile.am	19 Nov 2005 07:15:50 -0000	1.2
>+++ Xprint/raster/Makefile.am	2 Dec 2005 06:02:39 -0000	1.3
>@@ -2,7 +2,8 @@
> 
> INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
> 
>-AM_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ -D_XP_PRINT_SERVER_ -DPSZ=8
>+AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
>+	-D_XP_PRINT_SERVER_ -DPSZ=8
> 
> libraster_la_SOURCES =		\
> 	RasterAttVal.c		\
>Index: afb/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/afb/Makefile.am,v
>retrieving revision 1.4
>retrieving revision 1.5
>diff -u -b -B -r1.4 -r1.5
>--- afb/Makefile.am	29 Nov 2005 16:39:26 -0000	1.4
>+++ afb/Makefile.am	2 Dec 2005 06:02:39 -0000	1.5
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libafb.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> libafb_gen_sources = afbbltC.c afbbltX.c afbbltCI.c afbbltO.c afbbltG.c afbtileC.c afbtileG.c afbseg.c
> 
>Index: cfb/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/cfb/Makefile.am,v
>retrieving revision 1.6
>retrieving revision 1.7
>diff -u -b -B -r1.6 -r1.7
>--- cfb/Makefile.am	29 Nov 2005 16:39:26 -0000	1.6
>+++ cfb/Makefile.am	2 Dec 2005 06:02:39 -0000	1.7
>@@ -9,7 +9,7 @@
> 
> libcfb_la_LIBADD = ../mfb/libmfb.la
> 
>-AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
> 
>Index: cfb16/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/cfb16/Makefile.am,v
>retrieving revision 1.3
>retrieving revision 1.4
>diff -u -b -B -r1.3 -r1.4
>--- cfb16/Makefile.am	29 Nov 2005 16:39:26 -0000	1.3
>+++ cfb16/Makefile.am	2 Dec 2005 06:02:39 -0000	1.4
>@@ -6,4 +6,4 @@
> 
> INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
> 
>-AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>Index: cfb24/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/cfb24/Makefile.am,v
>retrieving revision 1.3
>retrieving revision 1.4
>diff -u -b -B -r1.3 -r1.4
>--- cfb24/Makefile.am	29 Nov 2005 16:39:26 -0000	1.3
>+++ cfb24/Makefile.am	2 Dec 2005 06:02:39 -0000	1.4
>@@ -6,6 +6,6 @@
> 
> EXTRA_DIST = cfbrrop24.h
> 
>-AM_CFLAGS = -DPSZ=24 $(DIX_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = -DPSZ=24 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
>Index: cfb32/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/cfb32/Makefile.am,v
>retrieving revision 1.3
>retrieving revision 1.4
>diff -u -b -B -r1.3 -r1.4
>--- cfb32/Makefile.am	29 Nov 2005 16:39:27 -0000	1.3
>+++ cfb32/Makefile.am	2 Dec 2005 06:02:39 -0000	1.4
>@@ -6,4 +6,4 @@
> 
> INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS) -I$(top_srcdir)/hw/xfree86/os-support
> 
>-AM_CFLAGS = -DPSZ=32 @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = -DPSZ=32 @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>Index: composite/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/composite/Makefile.am,v
>retrieving revision 1.3
>retrieving revision 1.4
>diff -u -b -B -r1.3 -r1.4
>--- composite/Makefile.am	29 Nov 2005 16:39:27 -0000	1.3
>+++ composite/Makefile.am	2 Dec 2005 06:02:39 -0000	1.4
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libcomposite.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> libcomposite_la_SOURCES = 	\
> 	compalloc.c		\
>Index: damageext/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/damageext/Makefile.am,v
>retrieving revision 1.3
>retrieving revision 1.4
>diff -u -b -B -r1.3 -r1.4
>--- damageext/Makefile.am	29 Nov 2005 16:39:27 -0000	1.3
>+++ damageext/Makefile.am	2 Dec 2005 06:02:39 -0000	1.4
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libdamageext.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> libdamageext_la_SOURCES = 	\
> 	damageext.c		\
>Index: dbe/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/dbe/Makefile.am,v
>retrieving revision 1.3
>retrieving revision 1.4
>diff -u -b -B -r1.3 -r1.4
>--- dbe/Makefile.am	29 Nov 2005 16:39:27 -0000	1.3
>+++ dbe/Makefile.am	2 Dec 2005 06:02:39 -0000	1.4
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libdbe.la libdbemodule.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
> 
>Index: dix/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/dix/Makefile.am,v
>retrieving revision 1.5
>retrieving revision 1.6
>diff -u -b -B -r1.5 -r1.6
>--- dix/Makefile.am	29 Nov 2005 16:39:27 -0000	1.5
>+++ dix/Makefile.am	2 Dec 2005 06:02:39 -0000	1.6
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libdix.la libxpstubs.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ \
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ \
> 	-DVENDOR_STRING=\""@VENDOR_STRING@"\" \
> 	-DVENDOR_RELEASE="@VENDOR_RELEASE@"
> 
>Index: fb/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/fb/Makefile.am,v
>retrieving revision 1.11
>retrieving revision 1.12
>diff -u -b -B -r1.11 -r1.12
>--- fb/Makefile.am	29 Nov 2005 16:39:27 -0000	1.11
>+++ fb/Makefile.am	2 Dec 2005 06:02:39 -0000	1.12
>@@ -4,7 +4,7 @@
> 	-I$(top_srcdir)/hw/xfree86/os-support \
> 	-I$(top_srcdir)/hw/xfree86/os-support/bus \
> 	-I$(top_srcdir)/hw/xfree86/common
>-AM_CFLAGS = $(DIX_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> sdk_HEADERS = fb.h fbrop.h fbpseudocolor.h fboverlay.h
> 
>Index: hw/dmx/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/dmx/Makefile.am,v
>retrieving revision 1.11
>retrieving revision 1.12
>diff -u -b -B -r1.11 -r1.12
>--- hw/dmx/Makefile.am	28 Nov 2005 22:05:08 -0000	1.11
>+++ hw/dmx/Makefile.am	2 Dec 2005 06:02:40 -0000	1.12
>@@ -79,8 +79,8 @@
>              config/libdmxconfig.a \
>              @DMXMODULES_LIBS@
> 
>-Xdmx_CFLAGS = -DHAVE_DMX_CONFIG_H \
>-              -DXFree86Server \
>+Xdmx_CFLAGS = @SERVER_DEFINES@ \
>+              -DHAVE_DMX_CONFIG_H \
>               $(GLX_INCS) \
>               @DMXMODULES_CFLAGS@
> 
>Index: hw/dmx/config/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/dmx/config/Makefile.am,v
>retrieving revision 1.9
>retrieving revision 1.10
>diff -u -b -B -r1.9 -r1.10
>--- hw/dmx/config/Makefile.am	28 Nov 2005 22:05:08 -0000	1.9
>+++ hw/dmx/config/Makefile.am	2 Dec 2005 06:02:40 -0000	1.10
>@@ -22,6 +22,7 @@
> 
> AM_YFLAGS = -d
> AM_CFLAGS = \
>+	@SERVER_DEFINES@ \
> 	-I$(top_srcdir)/hw/dmx \
> 	-DHAVE_DMX_CONFIG_H \
> 	-DDMX_LOG_STANDALONE \
>Index: hw/dmx/glxProxy/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/dmx/glxProxy/Makefile.am,v
>retrieving revision 1.5
>retrieving revision 1.6
>diff -u -b -B -r1.5 -r1.6
>--- hw/dmx/glxProxy/Makefile.am	29 Nov 2005 16:39:27 -0000	1.5
>+++ hw/dmx/glxProxy/Makefile.am	2 Dec 2005 06:02:40 -0000	1.6
>@@ -31,12 +31,13 @@
>                         renderpixswap.c \
>                         unpack.h
> 
>-AM_CFLAGS = -I$(top_srcdir)/hw/dmx \
>+AM_CFLAGS = @SERVER_DEFINES@ \
>+            @MODULE_DEFINES@ \
>+            -I$(top_srcdir)/hw/dmx \
>             -I$(top_srcdir)/include \
>             -I$(top_srcdir)/GL/include \
>             -I$(top_builddir)/GL/include \
> 	    -I@MESA_SOURCE@/include \
>             -DHAVE_DMX_CONFIG_H \
>             @DMXMODULES_CFLAGS@ \
>-            @MODULE_DEFINES@ \
>             -I$(top_srcdir)/hw/xfree86/os-support
>Index: hw/dmx/input/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/dmx/input/Makefile.am,v
>retrieving revision 1.5
>retrieving revision 1.6
>diff -u -b -B -r1.5 -r1.6
>--- hw/dmx/input/Makefile.am	6 Oct 2005 02:35:22 -0000	1.5
>+++ hw/dmx/input/Makefile.am	2 Dec 2005 06:02:40 -0000	1.6
>@@ -55,7 +55,8 @@
>                         $(DMXSRCS) \
>                         $(LIBSRCS)
> 
>-AM_CFLAGS = -I$(top_srcdir)/hw/dmx \
>+AM_CFLAGS = @SERVER_DEFINES@ \
>+            -I$(top_srcdir)/hw/dmx \
>             -I$(top_srcdir)/hw/xfree86/common \
>             -DHAVE_DMX_CONFIG_H \
>             @DMXMODULES_CFLAGS@
>Index: hw/vfb/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/vfb/Makefile.am,v
>retrieving revision 1.9
>retrieving revision 1.10
>diff -u -b -B -r1.9 -r1.10
>--- hw/vfb/Makefile.am	28 Nov 2005 22:05:08 -0000	1.9
>+++ hw/vfb/Makefile.am	2 Dec 2005 06:02:40 -0000	1.10
>@@ -21,7 +21,7 @@
> AM_CFLAGS = -DHAVE_DIX_CONFIG_H \
>             -DNO_HW_ONLY_EXTS \
>             -DNO_MODULE_EXTS \
>-            -DXFree86Server \
>+            @SERVER_DEFINES@ \
>             $(XVFBMODULES_CFLAGS)
> 
> # Man page
>Index: hw/xfree86/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/Makefile.am,v
>retrieving revision 1.32
>retrieving revision 1.33
>diff -u -b -B -r1.32 -r1.33
>--- hw/xfree86/Makefile.am	29 Nov 2005 16:39:27 -0000	1.32
>+++ hw/xfree86/Makefile.am	2 Dec 2005 06:02:40 -0000	1.33
>@@ -17,7 +17,7 @@
> 
> bin_PROGRAMS = Xorg
> 
>-AM_CFLAGS = @XORG_CFLAGS@ @LOADER_DEFINES@
>+AM_CFLAGS = @XORG_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@
> INCLUDES = @XORG_INCS@ 
> 
> Xorg_SOURCES = xorg.c
>Index: hw/xfree86/common/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/common/Makefile.am,v
>retrieving revision 1.16
>retrieving revision 1.17
>diff -u -b -B -r1.16 -r1.17
>--- hw/xfree86/common/Makefile.am	29 Nov 2005 16:39:27 -0000	1.16
>+++ hw/xfree86/common/Makefile.am	2 Dec 2005 06:02:40 -0000	1.17
>@@ -98,4 +98,4 @@
> 	modeline2c.pl \
>         $(DISTKBDSOURCES)
> 
>-AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
>Index: hw/xfree86/ddc/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/ddc/Makefile.am,v
>retrieving revision 1.5
>retrieving revision 1.6
>diff -u -b -B -r1.5 -r1.6
>--- hw/xfree86/ddc/Makefile.am	29 Nov 2005 16:39:28 -0000	1.5
>+++ hw/xfree86/ddc/Makefile.am	2 Dec 2005 06:02:40 -0000	1.6
>@@ -8,6 +8,6 @@
> 
> INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
> 
>-AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> EXTRA_DIST = ddcPriv.h DDC.HOWTO
>Index: hw/xfree86/dixmods/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/dixmods/Makefile.am,v
>retrieving revision 1.19
>retrieving revision 1.20
>diff -u -b -B -r1.19 -r1.20
>--- hw/xfree86/dixmods/Makefile.am	29 Nov 2005 16:39:28 -0000	1.19
>+++ hw/xfree86/dixmods/Makefile.am	2 Dec 2005 06:02:40 -0000	1.20
>@@ -31,7 +31,7 @@
>                           libfreetype.la \
>                           libtype1.la
> 
>-AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ @LOADER_DEFINES@
>+AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@
> INCLUDES = @XORG_INCS@ \
>            -I$(top_srcdir)/afb \
>            -I$(top_srcdir)/cfb \
>@@ -74,7 +74,6 @@
> libdbe_la_LIBADD = $(top_builddir)/dbe/libdbemodule.la
> libdbe_la_SOURCES = dbemodule.c
> 
>-libfb_la_CFLAGS = -DXFree86Server $(AM_CFLAGS)
> libfb_la_LDFLAGS = -avoid-version
> libfb_la_LIBADD = $(top_builddir)/fb/libfb.la
> libfb_la_SOURCES = $(top_builddir)/fb/fbcmap.c fbmodule.c
>Index: hw/xfree86/dixmods/extmod/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/dixmods/extmod/Makefile.am,v
>retrieving revision 1.10
>retrieving revision 1.11
>diff -u -b -B -r1.10 -r1.11
>--- hw/xfree86/dixmods/extmod/Makefile.am	29 Nov 2005 16:39:28 -0000	1.10
>+++ hw/xfree86/dixmods/extmod/Makefile.am	2 Dec 2005 06:02:40 -0000	1.11
>@@ -11,7 +11,7 @@
> XV_SRCS = xvmod.c xvmodproc.h
> endif
> 
>-AM_CFLAGS = @XORG_CFLAGS@ -DEXTMODULE @LOADER_DEFINES@
>+AM_CFLAGS = @XORG_CFLAGS@ -DEXTMODULE @SERVER_DEFINES@ @LOADER_DEFINES@
> INCLUDES = @XORG_INCS@ \
>            -I$(top_srcdir)/afb \
>            -I$(top_srcdir)/mfb \
>Index: hw/xfree86/dri/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/dri/Makefile.am,v
>retrieving revision 1.9
>retrieving revision 1.10
>diff -u -b -B -r1.9 -r1.10
>--- hw/xfree86/dri/Makefile.am	29 Nov 2005 16:39:28 -0000	1.9
>+++ hw/xfree86/dri/Makefile.am	2 Dec 2005 06:02:40 -0000	1.10
>@@ -7,6 +7,7 @@
>                    -I$(top_builddir)/GL/include \
> 		   -I@MESA_SOURCE@/include \
>                    -DHAVE_XORG_CONFIG_H \
>+		   @SERVER_DEFINES@ \
> 		   @MODULE_DEFINES@ \
>                    @LOADER_DEFINES@ \
>                    @DRIPROTO_CFLAGS@ \
>Index: hw/xfree86/dummylib/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/dummylib/Makefile.am,v
>retrieving revision 1.6
>retrieving revision 1.7
>diff -u -b -B -r1.6 -r1.7
>--- hw/xfree86/dummylib/Makefile.am	29 Nov 2005 16:39:28 -0000	1.6
>+++ hw/xfree86/dummylib/Makefile.am	2 Dec 2005 06:02:41 -0000	1.7
>@@ -6,7 +6,7 @@
> 
> INCLUDES = $(XORG_INCS)
> 
>-AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> libdummy_a_SOURCES = getvalidbios.c \
>                      pcitestmulti.c xf86allocscripi.c \
>Index: hw/xfree86/exa/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/exa/Makefile.am,v
>retrieving revision 1.5
>retrieving revision 1.6
>diff -u -b -B -r1.5 -r1.6
>--- hw/xfree86/exa/Makefile.am	29 Nov 2005 16:39:28 -0000	1.5
>+++ hw/xfree86/exa/Makefile.am	2 Dec 2005 06:02:41 -0000	1.6
>@@ -8,7 +8,7 @@
> 	$(XORG_INCS) \
> 	-I$(srcdir)/../../../miext/cw
> 
>-AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> libexa_la_SOURCES = \
> 	exaasync.c \
>Index: hw/xfree86/fbdevhw/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/fbdevhw/Makefile.am,v
>retrieving revision 1.9
>retrieving revision 1.10
>diff -u -b -B -r1.9 -r1.10
>--- hw/xfree86/fbdevhw/Makefile.am	29 Nov 2005 16:39:28 -0000	1.9
>+++ hw/xfree86/fbdevhw/Makefile.am	2 Dec 2005 06:02:41 -0000	1.10
>@@ -11,7 +11,7 @@
> 
> INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
> 
>-AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> sdk_HEADERS = fbdevhw.h
> 
>Index: hw/xfree86/i2c/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/i2c/Makefile.am,v
>retrieving revision 1.8
>retrieving revision 1.9
>diff -u -b -B -r1.8 -r1.9
>--- hw/xfree86/i2c/Makefile.am	29 Nov 2005 16:39:28 -0000	1.8
>+++ hw/xfree86/i2c/Makefile.am	2 Dec 2005 06:02:41 -0000	1.9
>@@ -15,7 +15,7 @@
> 
> INCLUDES = $(XORG_INCS)
> 
>-AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> sdk_HEADERS = xf86i2c.h bt829.h fi1236.h msp3430.h tda8425.h tda9850.h tda9885.h uda1380.h i2c_def.h
> 
>Index: hw/xfree86/int10/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/int10/Makefile.am,v
>retrieving revision 1.9
>retrieving revision 1.10
>diff -u -b -B -r1.9 -r1.10
>--- hw/xfree86/int10/Makefile.am	29 Nov 2005 16:39:29 -0000	1.9
>+++ hw/xfree86/int10/Makefile.am	2 Dec 2005 06:02:41 -0000	1.10
>@@ -2,7 +2,7 @@
> 
> sdk_HEADERS = xf86int10.h
> 
>-EXTRA_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
>+EXTRA_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> libint10_la_LDFLAGS = -avoid-version
> 
>Index: hw/xfree86/loader/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/loader/Makefile.am,v
>retrieving revision 1.8
>retrieving revision 1.9
>diff -u -b -B -r1.8 -r1.9
>--- hw/xfree86/loader/Makefile.am	29 Nov 2005 16:39:29 -0000	1.8
>+++ hw/xfree86/loader/Makefile.am	2 Dec 2005 06:02:41 -0000	1.9
>@@ -7,7 +7,7 @@
>            -I$(srcdir)/../../../miext/damage
> 
> #AM_LDFLAGS = -r
>-AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS) @LOADER_DEFINES@
>+AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> if XORG_LOADER_SPARC
> SPARC_SOURCES = SparcMulDiv.S
>Index: hw/xfree86/os-support/bsd/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/os-support/bsd/Makefile.am,v
>retrieving revision 1.3
>retrieving revision 1.4
>diff -u -b -B -r1.3 -r1.4
>--- hw/xfree86/os-support/bsd/Makefile.am	29 Nov 2005 16:39:29 -0000	1.3
>+++ hw/xfree86/os-support/bsd/Makefile.am	2 Dec 2005 06:02:41 -0000	1.4
>@@ -49,7 +49,7 @@
> endif
> 
> # FIXME: NetBSD Aperture defines (configure.ac)
>-AM_CFLAGS = -DUSESTDRES -DUSE_DEV_IO $(XORG_CFLAGS) @LOADER_DEFINES@
>+AM_CFLAGS = -DUSESTDRES -DUSE_DEV_IO $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = $(XORG_INCS)
> 
>Index: hw/xfree86/os-support/bus/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/os-support/bus/Makefile.am,v
>retrieving revision 1.15
>retrieving revision 1.16
>diff -u -b -B -r1.15 -r1.16
>--- hw/xfree86/os-support/bus/Makefile.am	1 Dec 2005 05:04:07 -0000	1.15
>+++ hw/xfree86/os-support/bus/Makefile.am	2 Dec 2005 06:02:41 -0000	1.16
>@@ -53,4 +53,4 @@
> 
> INCLUDES = $(XORG_INCS)
> 
>-AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
>Index: hw/xfree86/os-support/drm/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/os-support/drm/Makefile.am,v
>retrieving revision 1.3
>retrieving revision 1.4
>diff -u -b -B -r1.3 -r1.4
>--- hw/xfree86/os-support/drm/Makefile.am	29 Nov 2005 16:39:29 -0000	1.3
>+++ hw/xfree86/os-support/drm/Makefile.am	2 Dec 2005 06:02:42 -0000	1.4
>@@ -8,6 +8,7 @@
>                    -I$(top_srcdir)/GL/include \
>                    -DHAVE_XORG_CONFIG_H \
>                    @LIBDRM_CFLAGS@ \
>+                   @SERVER_DEFINES@ \
>                    @LOADER_DEFINES@
> libdrm_la_LDFLAGS = -module -avoid-version
> libdrm_ladir = $(moduledir)/@XORG_OS@
>Index: hw/xfree86/os-support/linux/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/os-support/linux/Makefile.am,v
>retrieving revision 1.11
>retrieving revision 1.12
>diff -u -b -B -r1.11 -r1.12
>--- hw/xfree86/os-support/linux/Makefile.am	29 Nov 2005 16:39:30 -0000	1.11
>+++ hw/xfree86/os-support/linux/Makefile.am	2 Dec 2005 06:02:42 -0000	1.12
>@@ -22,7 +22,7 @@
>                      $(srcdir)/../shared/at_scancode.c \
>                      $(PLATFORM_PCI_SUPPORT)
> 
>-AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @LOADER_DEFINES@
>+AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack
> 
>Index: hw/xfree86/os-support/misc/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/os-support/misc/Makefile.am,v
>retrieving revision 1.5
>retrieving revision 1.6
>diff -u -b -B -r1.5 -r1.6
>--- hw/xfree86/os-support/misc/Makefile.am	29 Nov 2005 16:39:30 -0000	1.5
>+++ hw/xfree86/os-support/misc/Makefile.am	2 Dec 2005 06:02:42 -0000	1.6
>@@ -18,6 +18,6 @@
> 
> INCLUDES = $(XORG_INCS)
> 
>-AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> EXTRA_DIST = $(I386_SOURCES) $(PORTIO_SOURCES) $(ILHACK_SOURCES)
>Index: hw/xfree86/os-support/solaris/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/os-support/solaris/Makefile.am,v
>retrieving revision 1.10
>retrieving revision 1.11
>diff -u -b -B -r1.10 -r1.11
>--- hw/xfree86/os-support/solaris/Makefile.am	29 Nov 2005 16:39:30 -0000	1.10
>+++ hw/xfree86/os-support/solaris/Makefile.am	2 Dec 2005 06:02:42 -0000	1.11
>@@ -34,7 +34,7 @@
> sdk_HEADERS = agpgart.h
> nodist_sdk_HEADERS = solaris-$(SOLARIS_INOUT_ARCH).il
> 
>-AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @LOADER_DEFINES@
>+AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = $(XORG_INCS) 
> 
>Index: hw/xfree86/parser/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/parser/Makefile.am,v
>retrieving revision 1.5
>retrieving revision 1.6
>diff -u -b -B -r1.5 -r1.6
>--- hw/xfree86/parser/Makefile.am	29 Nov 2005 16:39:30 -0000	1.5
>+++ hw/xfree86/parser/Makefile.am	2 Dec 2005 06:02:42 -0000	1.6
>@@ -23,7 +23,7 @@
> 	DRI.c \
> 	Extensions.c
> 
>-AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@
>+AM_CFLAGS = $(XORG_CFLAGS)
> 
> EXTRA_DIST = \
> 	Configint.h \
>Index: hw/xfree86/rac/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/rac/Makefile.am,v
>retrieving revision 1.4
>retrieving revision 1.5
>diff -u -b -B -r1.4 -r1.5
>--- hw/xfree86/rac/Makefile.am	29 Nov 2005 16:39:30 -0000	1.4
>+++ hw/xfree86/rac/Makefile.am	2 Dec 2005 06:02:42 -0000	1.5
>@@ -6,4 +6,4 @@
> 
> INCLUDES = $(XORG_INCS)
> 
>-AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>Index: hw/xfree86/ramdac/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/ramdac/Makefile.am,v
>retrieving revision 1.5
>retrieving revision 1.6
>diff -u -b -B -r1.5 -r1.6
>--- hw/xfree86/ramdac/Makefile.am	29 Nov 2005 16:39:30 -0000	1.5
>+++ hw/xfree86/ramdac/Makefile.am	2 Dec 2005 06:02:42 -0000	1.6
>@@ -13,7 +13,7 @@
> 	CURSOR.NOTES
> 
> AM_CFLAGS = -DXAAReverseBitOrder=xf86ReverseBitOrder -DRAMDAC_MODULE \
>-            $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+            $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> INCLUDES = $(XORG_INCS)
> 
> xf86BitOrder.c:
>Index: hw/xfree86/scanpci/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/scanpci/Makefile.am,v
>retrieving revision 1.9
>retrieving revision 1.10
>diff -u -b -B -r1.9 -r1.10
>--- hw/xfree86/scanpci/Makefile.am	29 Nov 2005 16:39:30 -0000	1.9
>+++ hw/xfree86/scanpci/Makefile.am	2 Dec 2005 06:02:42 -0000	1.10
>@@ -8,7 +8,7 @@
> 
> INCLUDES = $(XORG_INCS)
> 
>-AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> BUILT_SOURCES = xf86PciIds.h
> 
>Index: hw/xfree86/shadowfb/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/shadowfb/Makefile.am,v
>retrieving revision 1.4
>retrieving revision 1.5
>diff -u -b -B -r1.4 -r1.5
>--- hw/xfree86/shadowfb/Makefile.am	29 Nov 2005 16:39:30 -0000	1.4
>+++ hw/xfree86/shadowfb/Makefile.am	2 Dec 2005 06:02:42 -0000	1.5
>@@ -6,4 +6,4 @@
> 
> INCLUDES = $(XORG_INCS)
> 
>-AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>Index: hw/xfree86/utils/xorgcfg/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/Makefile.am,v
>retrieving revision 1.15
>retrieving revision 1.16
>diff -u -b -B -r1.15 -r1.16
>--- hw/xfree86/utils/xorgcfg/Makefile.am	29 Nov 2005 16:39:30 -0000	1.15
>+++ hw/xfree86/utils/xorgcfg/Makefile.am	2 Dec 2005 06:02:42 -0000	1.16
>@@ -31,7 +31,8 @@
> 
> INCLUDES = $(XORG_INCS) -I$(top_srcdir)/hw/xfree86/parser
> 
>-xorgcfg_CFLAGS = $(XORG_CFLAGS) $(CURSESDEFINES) $(XORGCFG_DEP_CFLAGS)
>+xorgcfg_CFLAGS = @SERVER_DEFINES@ $(XORG_CFLAGS) $(CURSESDEFINES) \
>+	$(XORGCFG_DEP_CFLAGS)
> xorgcfg_LDADD = $(XORGCFG_DEP_LIBS) ../../parser/libxf86config.a $(LOADERLIB) \
> 	../../os-support/libxorgos.la ../../dummylib/libdummy-nonserver.a
> 
>Index: hw/xfree86/utils/xorgconfig/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgconfig/Makefile.am,v
>retrieving revision 1.7
>retrieving revision 1.8
>diff -u -b -B -r1.7 -r1.8
>--- hw/xfree86/utils/xorgconfig/Makefile.am	28 Nov 2005 22:05:09 -0000	1.7
>+++ hw/xfree86/utils/xorgconfig/Makefile.am	2 Dec 2005 06:02:42 -0000	1.8
>@@ -31,7 +31,7 @@
> X11dir = $(libdir)/X11
> dist_X11_DATA = Cards
> 
>-xorgconfig_CFLAGS = @XORGCONFIG_DEP_CFLAGS@ \
>+xorgconfig_CFLAGS = @SERVER_DEFINES@ @XORGCONFIG_DEP_CFLAGS@ \
> 	-DCARD_DATABASE_FILE='"$(X11dir)/Cards"' \
> 	-DPROJECTROOT='"$(prefix)"' \
>         -DFILEMANSUFFIX='"$(FILE_MAN_SUFFIX)"' \
>Index: hw/xfree86/vbe/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/vbe/Makefile.am,v
>retrieving revision 1.4
>retrieving revision 1.5
>diff -u -b -B -r1.4 -r1.5
>--- hw/xfree86/vbe/Makefile.am	29 Nov 2005 16:39:31 -0000	1.4
>+++ hw/xfree86/vbe/Makefile.am	2 Dec 2005 06:02:43 -0000	1.5
>@@ -4,7 +4,7 @@
> 
> sdk_HEADERS = vbe.h vbeModes.h
> 
>-AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
>            -I$(srcdir)/../int10
>Index: hw/xfree86/vgahw/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/vgahw/Makefile.am,v
>retrieving revision 1.5
>retrieving revision 1.6
>diff -u -b -B -r1.5 -r1.6
>--- hw/xfree86/vgahw/Makefile.am	29 Nov 2005 16:39:31 -0000	1.5
>+++ hw/xfree86/vgahw/Makefile.am	2 Dec 2005 06:02:43 -0000	1.6
>@@ -2,7 +2,7 @@
> libvgahw_la_LDFLAGS = -avoid-version
> libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c
> INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c
>-AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> sdk_HEADERS = vgaHW.h
> 
>Index: hw/xfree86/x86emu/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/x86emu/Makefile.am,v
>retrieving revision 1.5
>retrieving revision 1.6
>diff -u -b -B -r1.5 -r1.6
>--- hw/xfree86/x86emu/Makefile.am	29 Nov 2005 16:39:31 -0000	1.5
>+++ hw/xfree86/x86emu/Makefile.am	2 Dec 2005 06:02:43 -0000	1.6
>@@ -11,7 +11,7 @@
> 
> INCLUDES = 
> 
>-AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@
>+AM_CFLAGS = $(XORG_CFLAGS)
> 
> EXTRA_DIST = validate.c \
>              x86emu/debug.h \
>Index: hw/xfree86/xaa/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/xaa/Makefile.am,v
>retrieving revision 1.6
>retrieving revision 1.7
>diff -u -b -B -r1.6 -r1.7
>--- hw/xfree86/xaa/Makefile.am	29 Nov 2005 16:39:31 -0000	1.6
>+++ hw/xfree86/xaa/Makefile.am	2 Dec 2005 06:02:43 -0000	1.7
>@@ -65,4 +65,4 @@
> 
> INCLUDES = $(XORG_INCS)
> 
>-AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>Index: hw/xfree86/xf1bpp/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/xf1bpp/Makefile.am,v
>retrieving revision 1.6
>retrieving revision 1.7
>diff -u -b -B -r1.6 -r1.7
>--- hw/xfree86/xf1bpp/Makefile.am	29 Nov 2005 16:39:31 -0000	1.6
>+++ hw/xfree86/xf1bpp/Makefile.am	2 Dec 2005 06:02:43 -0000	1.7
>@@ -61,7 +61,7 @@
> libxf1bpp_la_SOURCES = $(libxf1bppmfb_a_SOURCES) $(libxf1bppgen_a_SOURCES)
> 
> AM_CFLAGS = -DXF86MONO -include mfbmap.h $(DIX_CFLAGS) $(XORG_CFLAGS) \
>-	@MODULE_DEFINES@ @LOADER_DEFINES@
>+	@SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb
> 
> mfbseg.c:
>Index: hw/xfree86/xf4bpp/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/xf4bpp/Makefile.am,v
>retrieving revision 1.7
>retrieving revision 1.8
>diff -u -b -B -r1.7 -r1.8
>--- hw/xfree86/xf4bpp/Makefile.am	29 Nov 2005 16:39:31 -0000	1.7
>+++ hw/xfree86/xf4bpp/Makefile.am	2 Dec 2005 06:02:43 -0000	1.8
>@@ -59,4 +59,4 @@
> 
> INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb
> 
>-AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
>Index: hw/xfree86/xf8_16bpp/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/xf8_16bpp/Makefile.am,v
>retrieving revision 1.5
>retrieving revision 1.6
>diff -u -b -B -r1.5 -r1.6
>--- hw/xfree86/xf8_16bpp/Makefile.am	29 Nov 2005 16:39:31 -0000	1.5
>+++ hw/xfree86/xf8_16bpp/Makefile.am	2 Dec 2005 06:02:43 -0000	1.6
>@@ -4,7 +4,7 @@
> 
> INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb
> 
>-AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> libxf8_16bpp_la_LDFLAGS = -avoid-version
> 
>Index: hw/xfree86/xf8_32bpp/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/xf8_32bpp/Makefile.am,v
>retrieving revision 1.6
>retrieving revision 1.7
>diff -u -b -B -r1.6 -r1.7
>--- hw/xfree86/xf8_32bpp/Makefile.am	29 Nov 2005 16:39:31 -0000	1.6
>+++ hw/xfree86/xf8_32bpp/Makefile.am	2 Dec 2005 06:02:43 -0000	1.7
>@@ -4,7 +4,7 @@
> 
> INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb
> 
>-AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> libxf8_32bpp_la_LDFLAGS = -avoid-version
> 
>Index: hw/xfree86/xf8_32wid/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/xf8_32wid/Makefile.am,v
>retrieving revision 1.6
>retrieving revision 1.7
>diff -u -b -B -r1.6 -r1.7
>--- hw/xfree86/xf8_32wid/Makefile.am	29 Nov 2005 16:39:32 -0000	1.6
>+++ hw/xfree86/xf8_32wid/Makefile.am	2 Dec 2005 06:02:43 -0000	1.7
>@@ -5,7 +5,7 @@
> libxf8_32wid_la_LDFLAGS = -avoid-version
> 
> INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb
>-AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> libxf8_32wid_la_SOURCES = \
> 	cfb8_32widmodule.c \
>Index: hw/xnest/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/hw/xnest/Makefile.am,v
>retrieving revision 1.6
>retrieving revision 1.7
>diff -u -b -B -r1.6 -r1.7
>--- hw/xnest/Makefile.am	28 Nov 2005 22:05:09 -0000	1.6
>+++ hw/xnest/Makefile.am	2 Dec 2005 06:02:43 -0000	1.7
>@@ -53,7 +53,7 @@
> 
> AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \
>             -DNO_HW_ONLY_EXTS \
>-            -DXFree86Server \
>+            @SERVER_DEFINES@ \
>             $(XNESTMODULES_CFLAGS)
> 
> EXTRA_DIST = os2Stub.c \
>Index: include/xorg-config.h.in
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/include/xorg-config.h.in,v
>retrieving revision 1.11
>retrieving revision 1.12
>diff -u -b -B -r1.11 -r1.12
>--- include/xorg-config.h.in	29 Nov 2005 16:39:32 -0000	1.11
>+++ include/xorg-config.h.in	2 Dec 2005 06:02:44 -0000	1.12
>@@ -12,9 +12,6 @@
> #include <dix-config.h>
> #include <xkb-config.h>
> 
>-/* Building XFree86-based server. */
>-#undef XFree86Server
>-
> /* Building Xorg server. */
> #undef XORGSERVER
> 
>Index: include/xorg-server.h.in
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/include/xorg-server.h.in,v
>retrieving revision 1.9
>retrieving revision 1.10
>diff -u -b -B -r1.9 -r1.10
>--- include/xorg-server.h.in	1 Dec 2005 22:06:49 -0000	1.9
>+++ include/xorg-server.h.in	2 Dec 2005 06:02:44 -0000	1.10
>@@ -139,12 +139,6 @@
> /* Support XFree86 Video Mode extension */
> #undef XF86VIDMODE
> 
>-/* Building XFree86 loader */
>-#undef XFree86LOADER
>-
>-/* Building XFree86 server */
>-#undef XFree86Server
>-
> /* Build XDGA support */
> #undef XFreeXDGA
> 
>Index: include/xwin-config.h.in
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/include/xwin-config.h.in,v
>retrieving revision 1.2
>retrieving revision 1.3
>diff -u -b -B -r1.2 -r1.3
>--- include/xwin-config.h.in	21 Aug 2005 19:23:17 -0000	1.2
>+++ include/xwin-config.h.in	2 Dec 2005 06:02:44 -0000	1.3
>@@ -6,9 +6,6 @@
>  */
> #include <dix-config.h>
> 
>-/* XFree86 based Xserver */
>-#undef XFree86Server
>-
> /* Winsock networking */
> #undef HAS_WINSOCK
> 
>Index: lbx/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/lbx/Makefile.am,v
>retrieving revision 1.2
>retrieving revision 1.3
>diff -u -b -B -r1.2 -r1.3
>--- lbx/Makefile.am	29 Nov 2005 16:39:32 -0000	1.2
>+++ lbx/Makefile.am	2 Dec 2005 06:02:44 -0000	1.3
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = liblbx.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> liblbx_la_SOURCES =				\
> 	lbxcmap.c				\
>Index: mfb/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/mfb/Makefile.am,v
>retrieving revision 1.3
>retrieving revision 1.4
>diff -u -b -B -r1.3 -r1.4
>--- mfb/Makefile.am	29 Nov 2005 16:39:32 -0000	1.3
>+++ mfb/Makefile.am	2 Dec 2005 06:02:44 -0000	1.4
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libmfb.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
> 
>Index: mi/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/mi/Makefile.am,v
>retrieving revision 1.7
>retrieving revision 1.8
>diff -u -b -B -r1.7 -r1.8
>--- mi/Makefile.am	29 Nov 2005 16:39:32 -0000	1.7
>+++ mi/Makefile.am	2 Dec 2005 06:02:44 -0000	1.8
>@@ -4,7 +4,7 @@
>               migc.h mipointrst.h mizerarc.h micoord.h mifillarc.h \
>               mispans.h miwideline.h mistruct.h mifpoly.h
> 
>-AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> # libminimi is for dmx - it has different defines for miinitext.c
> libminimi_la_SOURCES = 	\
>Index: miext/cw/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/miext/cw/Makefile.am,v
>retrieving revision 1.4
>retrieving revision 1.5
>diff -u -b -B -r1.4 -r1.5
>--- miext/cw/Makefile.am	29 Nov 2005 16:39:32 -0000	1.4
>+++ miext/cw/Makefile.am	2 Dec 2005 06:02:44 -0000	1.5
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libcw.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
> 
>Index: miext/damage/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/miext/damage/Makefile.am,v
>retrieving revision 1.4
>retrieving revision 1.5
>diff -u -b -B -r1.4 -r1.5
>--- miext/damage/Makefile.am	29 Nov 2005 16:39:32 -0000	1.4
>+++ miext/damage/Makefile.am	2 Dec 2005 06:02:44 -0000	1.5
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libdamage.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = -I$(srcdir)/../cw -I$(top_srcdir)/hw/xfree86/os-support
> 
>Index: miext/layer/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/miext/layer/Makefile.am,v
>retrieving revision 1.3
>retrieving revision 1.4
>diff -u -b -B -r1.3 -r1.4
>--- miext/layer/Makefile.am	29 Nov 2005 16:39:33 -0000	1.3
>+++ miext/layer/Makefile.am	2 Dec 2005 06:02:44 -0000	1.4
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = liblayer.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
> 
>Index: miext/shadow/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/miext/shadow/Makefile.am,v
>retrieving revision 1.4
>retrieving revision 1.5
>diff -u -b -B -r1.4 -r1.5
>--- miext/shadow/Makefile.am	29 Nov 2005 16:39:33 -0000	1.4
>+++ miext/shadow/Makefile.am	2 Dec 2005 06:02:44 -0000	1.5
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libshadow.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
> 
>Index: os/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/os/Makefile.am,v
>retrieving revision 1.5
>retrieving revision 1.6
>diff -u -b -B -r1.5 -r1.6
>--- os/Makefile.am	29 Nov 2005 16:39:33 -0000	1.5
>+++ os/Makefile.am	2 Dec 2005 06:02:44 -0000	1.6
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libos.la libcwrapper.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> # FIXME: Add support for these in configure.ac
> K5AUTH_SOURCES = k5auth.c
>Index: randr/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/randr/Makefile.am,v
>retrieving revision 1.3
>retrieving revision 1.4
>diff -u -b -B -r1.3 -r1.4
>--- randr/Makefile.am	29 Nov 2005 16:39:33 -0000	1.3
>+++ randr/Makefile.am	2 Dec 2005 06:02:44 -0000	1.4
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = librandr.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> librandr_la_SOURCES =	\
> 	mirandr.c	\
>Index: record/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/record/Makefile.am,v
>retrieving revision 1.3
>retrieving revision 1.4
>diff -u -b -B -r1.3 -r1.4
>--- record/Makefile.am	29 Nov 2005 16:39:33 -0000	1.3
>+++ record/Makefile.am	2 Dec 2005 06:02:45 -0000	1.4
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = librecord.la librecordmodule.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
> 
>Index: render/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/render/Makefile.am,v
>retrieving revision 1.3
>retrieving revision 1.4
>diff -u -b -B -r1.3 -r1.4
>--- render/Makefile.am	29 Nov 2005 16:39:33 -0000	1.3
>+++ render/Makefile.am	2 Dec 2005 06:02:45 -0000	1.4
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = librender.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> librender_la_SOURCES =	\
> 	animcur.c	\
>Index: xfixes/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/xfixes/Makefile.am,v
>retrieving revision 1.3
>retrieving revision 1.4
>diff -u -b -B -r1.3 -r1.4
>--- xfixes/Makefile.am	29 Nov 2005 16:39:33 -0000	1.3
>+++ xfixes/Makefile.am	2 Dec 2005 06:02:45 -0000	1.4
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libxfixes.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
> 
> libxfixes_la_SOURCES = 	\
> 	cursor.c	\
>Index: xkb/Makefile.am
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/xkb/Makefile.am,v
>retrieving revision 1.12
>retrieving revision 1.13
>diff -u -b -B -r1.12 -r1.13
>--- xkb/Makefile.am	29 Nov 2005 16:39:33 -0000	1.12
>+++ xkb/Makefile.am	2 Dec 2005 06:02:45 -0000	1.13
>@@ -1,6 +1,6 @@
> noinst_LTLIBRARIES = libxkb.la libxkbstubs.la
> 
>-AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ \
>+AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ \
> 	-DHAVE_XKB_CONFIG_H
> 
> DDX_SRCS = \

Actions: View | Splinter Review

Attachments on bug 5332: 4087 | 4088 | 4089

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.