diff options
| author | Kevin E Martin <kem@kem.org> | 2005-12-02 06:02:45 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-12-02 06:02:45 +0000 |
| commit | 7c00afd0ec94e491f1a9ef32d6543ed51ea3319d (patch) | |
| tree | ec85c667f59b7afcc9e263273552d4eba3e05632 | |
| parent | 924518605b613eb66aa569877fa9f131e6f2a2fd (diff) | |
Define XFree86Server only where it is required.
89 files changed, 194 insertions, 103 deletions
@@ -1,3 +1,94 @@ +2005-12-02 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * GL/glx/Makefile.am: + * GL/mesa/X/Makefile.am: + * GL/mesa/array_cache/Makefile.am: + * GL/mesa/glapi/Makefile.am: + * GL/mesa/main/Makefile.am: + * GL/mesa/math/Makefile.am: + * GL/mesa/shader/Makefile.am: + * GL/mesa/shader/grammar/Makefile.am: + * GL/mesa/shader/slang/Makefile.am: + * GL/mesa/swrast/Makefile.am: + * GL/mesa/swrast_setup/Makefile.am: + * GL/mesa/tnl/Makefile.am: + * XTrap/Makefile.am: + * Xext/Makefile.am: + * Xi/Makefile.am: + * Xprint/Makefile.am: + * Xprint/pcl/Makefile.am: + * Xprint/ps/Makefile.am: + * Xprint/raster/Makefile.am: + * afb/Makefile.am: + * cfb/Makefile.am: + * cfb16/Makefile.am: + * cfb24/Makefile.am: + * cfb32/Makefile.am: + * composite/Makefile.am: + * configure.ac: + * damageext/Makefile.am: + * dbe/Makefile.am: + * dix/Makefile.am: + * fb/Makefile.am: + * hw/dmx/Makefile.am: + * hw/dmx/config/Makefile.am: + * hw/dmx/glxProxy/Makefile.am: + * hw/dmx/input/Makefile.am: + * hw/vfb/Makefile.am: + * hw/xfree86/Makefile.am: + * hw/xfree86/common/Makefile.am: + * hw/xfree86/ddc/Makefile.am: + * hw/xfree86/dixmods/Makefile.am: + * hw/xfree86/dixmods/extmod/Makefile.am: + * hw/xfree86/dri/Makefile.am: + * hw/xfree86/dummylib/Makefile.am: + * hw/xfree86/exa/Makefile.am: + * hw/xfree86/fbdevhw/Makefile.am: + * hw/xfree86/i2c/Makefile.am: + * hw/xfree86/int10/Makefile.am: + * hw/xfree86/loader/Makefile.am: + * hw/xfree86/os-support/bsd/Makefile.am: + * hw/xfree86/os-support/bus/Makefile.am: + * hw/xfree86/os-support/drm/Makefile.am: + * hw/xfree86/os-support/linux/Makefile.am: + * hw/xfree86/os-support/misc/Makefile.am: + * hw/xfree86/os-support/solaris/Makefile.am: + * hw/xfree86/parser/Makefile.am: + * hw/xfree86/rac/Makefile.am: + * hw/xfree86/ramdac/Makefile.am: + * hw/xfree86/scanpci/Makefile.am: + * hw/xfree86/shadowfb/Makefile.am: + * hw/xfree86/utils/xorgcfg/Makefile.am: + * hw/xfree86/utils/xorgconfig/Makefile.am: + * hw/xfree86/vbe/Makefile.am: + * hw/xfree86/vgahw/Makefile.am: + * hw/xfree86/x86emu/Makefile.am: + * hw/xfree86/xaa/Makefile.am: + * hw/xfree86/xf1bpp/Makefile.am: + * hw/xfree86/xf4bpp/Makefile.am: + * hw/xfree86/xf8_16bpp/Makefile.am: + * hw/xfree86/xf8_32bpp/Makefile.am: + * hw/xfree86/xf8_32wid/Makefile.am: + * hw/xnest/Makefile.am: + * include/xorg-config.h.in: + * include/xorg-server.h.in: + * include/xwin-config.h.in: + * lbx/Makefile.am: + * mfb/Makefile.am: + * mi/Makefile.am: + * miext/cw/Makefile.am: + * miext/damage/Makefile.am: + * miext/layer/Makefile.am: + * miext/shadow/Makefile.am: + * os/Makefile.am: + * randr/Makefile.am: + * record/Makefile.am: + * render/Makefile.am: + * xfixes/Makefile.am: + * xkb/Makefile.am: + * xorg-server.pc.in: + Define XFree86Server only where it is required. + 2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> * GL/mesa/X/Makefile.am: diff --git a/GL/glx/Makefile.am b/GL/glx/Makefile.am index 8964a9f96..a62a095c1 100644 --- a/GL/glx/Makefile.am +++ b/GL/glx/Makefile.am @@ -5,7 +5,7 @@ AM_CFLAGS = \ @GL_CFLAGS@ \ @XLIB_CFLAGS@ \ -I@MESA_SOURCE@/include \ - -DXFree86Server \ + @SERVER_DEFINES@ \ @MODULE_DEFINES@ \ @LOADER_DEFINES@ diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am index 806e238f3..46b7e82f2 100644 --- a/GL/mesa/X/Makefile.am +++ b/GL/mesa/X/Makefile.am @@ -16,8 +16,7 @@ INCLUDES = -I@MESA_SOURCE@/include \ -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 \ diff --git a/GL/mesa/array_cache/Makefile.am b/GL/mesa/array_cache/Makefile.am index 045f12fc1..b341f01dc 100644 --- a/GL/mesa/array_cache/Makefile.am +++ b/GL/mesa/array_cache/Makefile.am @@ -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 \ diff --git a/GL/mesa/glapi/Makefile.am b/GL/mesa/glapi/Makefile.am index 9dafab35d..d8b7a53e2 100644 --- a/GL/mesa/glapi/Makefile.am +++ b/GL/mesa/glapi/Makefile.am @@ -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 \ diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am index 50014b11e..31e5751c6 100644 --- a/GL/mesa/main/Makefile.am +++ b/GL/mesa/main/Makefile.am @@ -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 \ diff --git a/GL/mesa/math/Makefile.am b/GL/mesa/math/Makefile.am index 1d85fb52e..34d53c600 100644 --- a/GL/mesa/math/Makefile.am +++ b/GL/mesa/math/Makefile.am @@ -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 \ diff --git a/GL/mesa/shader/Makefile.am b/GL/mesa/shader/Makefile.am index 4d92c783a..f3ad3d25e 100644 --- a/GL/mesa/shader/Makefile.am +++ b/GL/mesa/shader/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = grammar slang 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 \ diff --git a/GL/mesa/shader/grammar/Makefile.am b/GL/mesa/shader/grammar/Makefile.am index d56a60d51..7edd4f7c9 100644 --- a/GL/mesa/shader/grammar/Makefile.am +++ b/GL/mesa/shader/grammar/Makefile.am @@ -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 \ diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am index 6b072b88b..d0f7fec7d 100644 --- a/GL/mesa/shader/slang/Makefile.am +++ b/GL/mesa/shader/slang/Makefile.am @@ -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 \ diff --git a/GL/mesa/swrast/Makefile.am b/GL/mesa/swrast/Makefile.am index d8d86652f..a67573047 100644 --- a/GL/mesa/swrast/Makefile.am +++ b/GL/mesa/swrast/Makefile.am @@ -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 \ diff --git a/GL/mesa/swrast_setup/Makefile.am b/GL/mesa/swrast_setup/Makefile.am index ba09aeed7..d7d39ff64 100644 --- a/GL/mesa/swrast_setup/Makefile.am +++ b/GL/mesa/swrast_setup/Makefile.am @@ -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 \ diff --git a/GL/mesa/tnl/Makefile.am b/GL/mesa/tnl/Makefile.am index 1bbc4c4cb..cb88607ac 100644 --- a/GL/mesa/tnl/Makefile.am +++ b/GL/mesa/tnl/Makefile.am @@ -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 \ diff --git a/XTrap/Makefile.am b/XTrap/Makefile.am index 2d8a5f787..7635b1aed 100644 --- a/XTrap/Makefile.am +++ b/XTrap/Makefile.am @@ -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 diff --git a/Xext/Makefile.am b/Xext/Makefile.am index de5f6e73d..76e01e0cf 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -8,7 +8,7 @@ noinst_LTLIBRARIES = libXext.la libXextbuiltin.la libXextmodule.la 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 diff --git a/Xi/Makefile.am b/Xi/Makefile.am index 5d1cbf97b..8eac59bb6 100644 --- a/Xi/Makefile.am +++ b/Xi/Makefile.am @@ -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 \ diff --git a/Xprint/Makefile.am b/Xprint/Makefile.am index de8874493..4c5e6b586 100644 --- a/Xprint/Makefile.am +++ b/Xprint/Makefile.am @@ -2,7 +2,9 @@ SUBDIRS = doc pcl raster ps etc 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 diff --git a/Xprint/pcl/Makefile.am b/Xprint/pcl/Makefile.am index e98434167..144411c55 100644 --- a/Xprint/pcl/Makefile.am +++ b/Xprint/pcl/Makefile.am @@ -2,7 +2,8 @@ noinst_LTLIBRARIES = libpcl.la 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 \ diff --git a/Xprint/ps/Makefile.am b/Xprint/ps/Makefile.am index 617e2aa64..20f82e7b9 100644 --- a/Xprint/ps/Makefile.am +++ b/Xprint/ps/Makefile.am @@ -2,7 +2,8 @@ noinst_LTLIBRARIES = libps.la 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 \ diff --git a/Xprint/raster/Makefile.am b/Xprint/raster/Makefile.am index 2afd29c32..fe14a0780 100644 --- a/Xprint/raster/Makefile.am +++ b/Xprint/raster/Makefile.am @@ -2,7 +2,8 @@ noinst_LTLIBRARIES = libraster.la 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 \ diff --git a/afb/Makefile.am b/afb/Makefile.am index aa99bdd73..e7dedfabc 100644 --- a/afb/Makefile.am +++ b/afb/Makefile.am @@ -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 diff --git a/cfb/Makefile.am b/cfb/Makefile.am index 2385acb36..1f5687469 100644 --- a/cfb/Makefile.am +++ b/cfb/Makefile.am @@ -9,7 +9,7 @@ libcfb_la_SOURCES = cfb8bit.c cfbteblt8.c cfbglrop8.c cfbpush8.c cfbrctstp8.c \ 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 diff --git a/cfb16/Makefile.am b/cfb16/Makefile.am index 1262d386a..2bda708fc 100644 --- a/cfb16/Makefile.am +++ b/cfb16/Makefile.am @@ -6,4 +6,4 @@ libcfb16_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources) 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@ diff --git a/cfb24/Makefile.am b/cfb24/Makefile.am index e6320e7f0..97b460015 100644 --- a/cfb24/Makefile.am +++ b/cfb24/Makefile.am @@ -6,6 +6,6 @@ libcfb24_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources) 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 diff --git a/cfb32/Makefile.am b/cfb32/Makefile.am index 8430e3bd7..401ba2f4d 100644 --- a/cfb32/Makefile.am +++ b/cfb32/Makefile.am @@ -6,4 +6,4 @@ libcfb32_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources) 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@ diff --git a/composite/Makefile.am b/composite/Makefile.am index a5214fe37..dbcb8c61f 100644 --- a/composite/Makefile.am +++ b/composite/Makefile.am @@ -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 \ diff --git a/configure.ac b/configure.ac index 5abea6930..f2750e715 100644 --- a/configure.ac +++ b/configure.ac @@ -789,9 +789,10 @@ dnl --------------------------------------------------------------------------- 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 @@ if test "x$XORG" = xyes; then 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(MFB, [test "x$XORG" = xyes]) 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(BUILD_KBD_MODE, [test x$BUILD_KBD_MODE = xyes]) 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]) diff --git a/damageext/Makefile.am b/damageext/Makefile.am index fd1511894..171cd270c 100644 --- a/damageext/Makefile.am +++ b/damageext/Makefile.am @@ -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 \ diff --git a/dbe/Makefile.am b/dbe/Makefile.am index 1a71c98c0..3a6727744 100644 --- a/dbe/Makefile.am +++ b/dbe/Makefile.am @@ -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 diff --git a/dix/Makefile.am b/dix/Makefile.am index d2b533b5a..c9a19f77b 100644 --- a/dix/Makefile.am +++ b/dix/Makefile.am @@ -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@" diff --git a/exa/Makefile.am b/exa/Makefile.am index ad5265889..d2d149fa8 100644 --- a/exa/Makefile.am +++ b/exa/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = \ $(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 \ diff --git a/fb/Makefile.am b/fb/Makefile.am index e19a8d10c..9d95e7144 100644 --- a/fb/Makefile.am +++ b/fb/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = \ -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 diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am index c9ac49363..23263f6fb 100644 --- a/hw/dmx/Makefile.am +++ b/hw/dmx/Makefile.am @@ -79,8 +79,8 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \ config/libdmxconfig.a \ @DMXMODULES_LIBS@ -Xdmx_CFLAGS = -DHAVE_DMX_CONFIG_H \ - -DXFree86Server \ +Xdmx_CFLAGS = @SERVER_DEFINES@ \ + -DHAVE_DMX_CONFIG_H \ $(GLX_INCS) \ @DMXMODULES_CFLAGS@ diff --git a/hw/dmx/config/Makefile.am b/hw/dmx/config/Makefile.am index 8ddd06a66..568a4f4ae 100644 --- a/hw/dmx/config/Makefile.am +++ b/hw/dmx/config/Makefile.am @@ -22,6 +22,7 @@ libdmxconfig_a_SOURCES = $(LIBSRCS) AM_YFLAGS = -d AM_CFLAGS = \ + @SERVER_DEFINES@ \ -I$(top_srcdir)/hw/dmx \ -DHAVE_DMX_CONFIG_H \ -DDMX_LOG_STANDALONE \ diff --git a/hw/dmx/glxProxy/Makefile.am b/hw/dmx/glxProxy/Makefile.am index e325b5c8a..a798647cc 100644 --- a/hw/dmx/glxProxy/Makefile.am +++ b/hw/dmx/glxProxy/Makefile.am @@ -31,12 +31,13 @@ libglxproxy_a_SOURCES = compsize.c \ 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 diff --git a/hw/dmx/input/Makefile.am b/hw/dmx/input/Makefile.am index 5edf79dcc..197b8412e 100644 --- a/hw/dmx/input/Makefile.am +++ b/hw/dmx/input/Makefile.am @@ -55,7 +55,8 @@ libdmxinput_a_SOURCES = ChkNotMaskEv.c \ $(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@ diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am index ccc46ee80..175bd7b28 100644 --- a/hw/vfb/Makefile.am +++ b/hw/vfb/Makefile.am @@ -21,7 +21,7 @@ Xvfb_LDFLAGS = AM_CFLAGS = -DHAVE_DIX_CONFIG_H \ -DNO_HW_ONLY_EXTS \ -DNO_MODULE_EXTS \ - -DXFree86Server \ + @SERVER_DEFINES@ \ $(XVFBMODULES_CFLAGS) # Man page diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index 89ef3bbe7..281498904 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -17,7 +17,7 @@ DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \ bin_PROGRAMS = Xorg -AM_CFLAGS = @XORG_CFLAGS@ @LOADER_DEFINES@ +AM_CFLAGS = @XORG_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@ INCLUDES = @XORG_INCS@ Xorg_SOURCES = xorg.c diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am index 3a2ca19a4..8dfcf3696 100644 --- a/hw/xfree86/common/Makefile.am +++ b/hw/xfree86/common/Makefile.am @@ -98,4 +98,4 @@ EXTRA_DIST = \ modeline2c.pl \ $(DISTKBDSOURCES) -AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ diff --git a/hw/xfree86/ddc/Makefile.am b/hw/xfree86/ddc/Makefile.am index eb43195a2..0f563869a 100644 --- a/hw/xfree86/ddc/Makefile.am +++ b/hw/xfree86/ddc/Makefile.am @@ -8,6 +8,6 @@ libddc_la_SOURCES = xf86DDC.c edid.c interpret_edid.c print_edid.c \ 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 diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am index 68aaea8af..dc7ee5092 100644 --- a/hw/xfree86/dixmods/Makefile.am +++ b/hw/xfree86/dixmods/Makefile.am @@ -31,7 +31,7 @@ fontsmodule_LTLIBRARIES = libbitmap.la \ 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_LDFLAGS = -avoid-version 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 diff --git a/hw/xfree86/dixmods/extmod/Makefile.am b/hw/xfree86/dixmods/extmod/Makefile.am index 35b32f6d0..e35a71b8e 100644 --- a/hw/xfree86/dixmods/extmod/Makefile.am +++ b/hw/xfree86/dixmods/extmod/Makefile.am @@ -11,7 +11,7 @@ if XV 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 \ diff --git a/hw/xfree86/dri/Makefile.am b/hw/xfree86/dri/Makefile.am index 7740c10b3..6de88e2bb 100644 --- a/hw/xfree86/dri/Makefile.am +++ b/hw/xfree86/dri/Makefile.am @@ -7,6 +7,7 @@ libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \ -I$(top_builddir)/GL/include \ -I@MESA_SOURCE@/include \ -DHAVE_XORG_CONFIG_H \ + @SERVER_DEFINES@ \ @MODULE_DEFINES@ \ @LOADER_DEFINES@ \ @DRIPROTO_CFLAGS@ \ diff --git a/hw/xfree86/dummylib/Makefile.am b/hw/xfree86/dummylib/Makefile.am index 012008573..afe419a35 100644 --- a/hw/xfree86/dummylib/Makefile.am +++ b/hw/xfree86/dummylib/Makefile.am @@ -6,7 +6,7 @@ noinst_LIBRARIES = libdummy.a libdummy-nonserver.a 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 \ diff --git a/hw/xfree86/exa/Makefile.am b/hw/xfree86/exa/Makefile.am index ad5265889..d2d149fa8 100644 --- a/hw/xfree86/exa/Makefile.am +++ b/hw/xfree86/exa/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = \ $(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 \ diff --git a/hw/xfree86/fbdevhw/Makefile.am b/hw/xfree86/fbdevhw/Makefile.am index 05f78f8d1..9d79fa7f5 100644 --- a/hw/xfree86/fbdevhw/Makefile.am +++ b/hw/xfree86/fbdevhw/Makefile.am @@ -11,7 +11,7 @@ endif 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 diff --git a/hw/xfree86/i2c/Makefile.am b/hw/xfree86/i2c/Makefile.am index ed9acc184..6e36f0cc8 100644 --- a/hw/xfree86/i2c/Makefile.am +++ b/hw/xfree86/i2c/Makefile.am @@ -15,7 +15,7 @@ libi2c_la_SOURCES = xf86i2c.c xf86i2cmodule.c 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 diff --git a/hw/xfree86/int10/Makefile.am b/hw/xfree86/int10/Makefile.am index 18174769e..f606f5e12 100644 --- a/hw/xfree86/int10/Makefile.am +++ b/hw/xfree86/int10/Makefile.am @@ -2,7 +2,7 @@ module_LTLIBRARIES = libint10.la sdk_HEADERS = xf86int10.h -EXTRA_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@ +EXTRA_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ libint10_la_LDFLAGS = -avoid-version diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am index 6e4343df2..ad5d23c6f 100644 --- a/hw/xfree86/loader/Makefile.am +++ b/hw/xfree86/loader/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../vbe \ -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 diff --git a/hw/xfree86/os-support/bsd/Makefile.am b/hw/xfree86/os-support/bsd/Makefile.am index 39c1a9ed6..5d83d6f06 100644 --- a/hw/xfree86/os-support/bsd/Makefile.am +++ b/hw/xfree86/os-support/bsd/Makefile.am @@ -49,7 +49,7 @@ ARCH_SOURCES = \ 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) diff --git a/hw/xfree86/os-support/bus/Makefile.am b/hw/xfree86/os-support/bus/Makefile.am index 51850d87d..b830b6d8e 100644 --- a/hw/xfree86/os-support/bus/Makefile.am +++ b/hw/xfree86/os-support/bus/Makefile.am @@ -53,4 +53,4 @@ libbus_la_SOURCES = Pci.c Pci.h $(PCI_SOURCES) $(PLATFORM_PCI_SOURCES) \ INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ diff --git a/hw/xfree86/os-support/drm/Makefile.am b/hw/xfree86/os-support/drm/Makefile.am index a1f62b62d..8270f4304 100644 --- a/hw/xfree86/os-support/drm/Makefile.am +++ b/hw/xfree86/os-support/drm/Makefile.am @@ -8,6 +8,7 @@ libdrm_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \ -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@ diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am index 554c78d5a..3815b283e 100644 --- a/hw/xfree86/os-support/linux/Makefile.am +++ b/hw/xfree86/os-support/linux/Makefile.am @@ -22,7 +22,7 @@ liblinux_la_SOURCES = lnx_init.c lnx_video.c lnx_io.c lnx_kbd.c lnx_mouse.c \ $(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 diff --git a/hw/xfree86/os-support/misc/Makefile.am b/hw/xfree86/os-support/misc/Makefile.am index 29d8489b7..5ce23a1f1 100644 --- a/hw/xfree86/os-support/misc/Makefile.am +++ b/hw/xfree86/os-support/misc/Makefile.am @@ -18,6 +18,6 @@ libmisc_la_SOURCES = xf86_Util.c Delay.c $(ARCH_SOURCES) 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) diff --git a/hw/xfree86/os-support/solaris/Makefile.am b/hw/xfree86/os-support/solaris/Makefile.am index 74edc6900..63b8e9a90 100644 --- a/hw/xfree86/os-support/solaris/Makefile.am +++ b/hw/xfree86/os-support/solaris/Makefile.am @@ -34,7 +34,7 @@ nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC) 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) diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am index 7d801e975..acda83d27 100644 --- a/hw/xfree86/parser/Makefile.am +++ b/hw/xfree86/parser/Makefile.am @@ -23,7 +23,7 @@ libxf86config_a_SOURCES = \ DRI.c \ Extensions.c -AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) EXTRA_DIST = \ Configint.h \ diff --git a/hw/xfree86/rac/Makefile.am b/hw/xfree86/rac/Makefile.am index 9975db4ea..144159d5f 100644 --- a/hw/xfree86/rac/Makefile.am +++ b/hw/xfree86/rac/Makefile.am @@ -6,4 +6,4 @@ sdk_HEADERS = xf86RAC.h INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ diff --git a/hw/xfree86/ramdac/Makefile.am b/hw/xfree86/ramdac/Makefile.am index 4af131345..136bc7c57 100644 --- a/hw/xfree86/ramdac/Makefile.am +++ b/hw/xfree86/ramdac/Makefile.am @@ -13,7 +13,7 @@ EXTRA_DIST = BTPriv.h IBMPriv.h TIPriv.h xf86CursorPriv.h xf86RamDacPriv.h \ 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: diff --git a/hw/xfree86/scanpci/Makefile.am b/hw/xfree86/scanpci/Makefile.am index 202b984d6..d473833ed 100644 --- a/hw/xfree86/scanpci/Makefile.am +++ b/hw/xfree86/scanpci/Makefile.am @@ -8,7 +8,7 @@ libscanpci_la_SOURCES = xf86ScanPci.c 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 diff --git a/hw/xfree86/shadowfb/Makefile.am b/hw/xfree86/shadowfb/Makefile.am index e8e3fd826..c373e8178 100644 --- a/hw/xfree86/shadowfb/Makefile.am +++ b/hw/xfree86/shadowfb/Makefile.am @@ -6,4 +6,4 @@ sdk_HEADERS = shadowfb.h INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ diff --git a/hw/xfree86/utils/xorgcfg/Makefile.am b/hw/xfree86/utils/xorgcfg/Makefile.am index a4b0d9ef4..53e0b3366 100644 --- a/hw/xfree86/utils/xorgcfg/Makefile.am +++ b/hw/xfree86/utils/xorgcfg/Makefile.am @@ -31,7 +31,8 @@ bin_PROGRAMS = xorgcfg 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 diff --git a/hw/xfree86/utils/xorgconfig/Makefile.am b/hw/xfree86/utils/xorgconfig/Makefile.am index e0930e189..83301b1d9 100644 --- a/hw/xfree86/utils/xorgconfig/Makefile.am +++ b/hw/xfree86/utils/xorgconfig/Makefile.am @@ -31,7 +31,7 @@ bin_PROGRAMS = xorgconfig 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)"' \ diff --git a/hw/xfree86/vbe/Makefile.am b/hw/xfree86/vbe/Makefile.am index 162029263..7da8f124b 100644 --- a/hw/xfree86/vbe/Makefile.am +++ b/hw/xfree86/vbe/Makefile.am @@ -4,7 +4,7 @@ libvbe_la_SOURCES = vbe.c vbeModes.c vbe_module.c 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 diff --git a/hw/xfree86/vgahw/Makefile.am b/hw/xfree86/vgahw/Makefile.am index 4038ef427..6c7fe1b28 100644 --- a/hw/xfree86/vgahw/Makefile.am +++ b/hw/xfree86/vgahw/Makefile.am @@ -2,7 +2,7 @@ module_LTLIBRARIES = libvgahw.la 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 diff --git a/hw/xfree86/x86emu/Makefile.am b/hw/xfree86/x86emu/Makefile.am index 568eb56e9..5959c867a 100644 --- a/hw/xfree86/x86emu/Makefile.am +++ b/hw/xfree86/x86emu/Makefile.am @@ -11,7 +11,7 @@ libx86emu_a_SOURCES = debug.c \ INCLUDES = -AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) EXTRA_DIST = validate.c \ x86emu/debug.h \ diff --git a/hw/xfree86/xaa/Makefile.am b/hw/xfree86/xaa/Makefile.am index 593c8724b..a2d819944 100644 --- a/hw/xfree86/xaa/Makefile.am +++ b/hw/xfree86/xaa/Makefile.am @@ -65,4 +65,4 @@ EXTRA_DIST = xaacexp.h xaawrap.h xaaLine.c xaaDashLine.c \ INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ diff --git a/hw/xfree86/xf1bpp/Makefile.am b/hw/xfree86/xf1bpp/Makefile.am index 47ff33a16..b8e4c3d53 100644 --- a/hw/xfree86/xf1bpp/Makefile.am +++ b/hw/xfree86/xf1bpp/Makefile.am @@ -61,7 +61,7 @@ libxf1bppmfb_a_SOURCES = \ 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: diff --git a/hw/xfree86/xf4bpp/Makefile.am b/hw/xfree86/xf4bpp/Makefile.am index fcef297a1..56b690f4b 100644 --- a/hw/xfree86/xf4bpp/Makefile.am +++ b/hw/xfree86/xf4bpp/Makefile.am @@ -59,4 +59,4 @@ mfbseg.c: 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@ diff --git a/hw/xfree86/xf8_16bpp/Makefile.am b/hw/xfree86/xf8_16bpp/Makefile.am index 2942c9345..0475d85ba 100644 --- a/hw/xfree86/xf8_16bpp/Makefile.am +++ b/hw/xfree86/xf8_16bpp/Makefile.am @@ -4,7 +4,7 @@ sdk_HEADERS = cfb8_16.h 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 diff --git a/hw/xfree86/xf8_32bpp/Makefile.am b/hw/xfree86/xf8_32bpp/Makefile.am index 8b9329d8c..1212fc0de 100644 --- a/hw/xfree86/xf8_32bpp/Makefile.am +++ b/hw/xfree86/xf8_32bpp/Makefile.am @@ -4,7 +4,7 @@ sdk_HEADERS = cfb8_32.h 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 diff --git a/hw/xfree86/xf8_32wid/Makefile.am b/hw/xfree86/xf8_32wid/Makefile.am index 23f7ecbf3..ef46a9a6f 100644 --- a/hw/xfree86/xf8_32wid/Makefile.am +++ b/hw/xfree86/xf8_32wid/Makefile.am @@ -5,7 +5,7 @@ sdk_HEADERS = cfb8_32wid.h 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 \ diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am index f646f1202..6b38a46c4 100644 --- a/hw/xnest/Makefile.am +++ b/hw/xnest/Makefile.am @@ -53,7 +53,7 @@ Xnest_LDFLAGS = AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \ -DNO_HW_ONLY_EXTS \ - -DXFree86Server \ + @SERVER_DEFINES@ \ $(XNESTMODULES_CFLAGS) EXTRA_DIST = os2Stub.c \ diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in index 147bb813a..1dfc88066 100644 --- a/include/xorg-config.h.in +++ b/include/xorg-config.h.in @@ -12,9 +12,6 @@ #include <dix-config.h> #include <xkb-config.h> -/* Building XFree86-based server. */ -#undef XFree86Server - /* Building Xorg server. */ #undef XORGSERVER diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in index 5e14eb661..69c6102b3 100644 --- a/include/xorg-server.h.in +++ b/include/xorg-server.h.in @@ -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 diff --git a/include/xwin-config.h.in b/include/xwin-config.h.in index 9cea201fe..c8de11073 100644 --- a/include/xwin-config.h.in +++ b/include/xwin-config.h.in @@ -6,9 +6,6 @@ */ #include <dix-config.h> -/* XFree86 based Xserver */ -#undef XFree86Server - /* Winsock networking */ #undef HAS_WINSOCK diff --git a/lbx/Makefile.am b/lbx/Makefile.am index 6d7b63a96..a3c249a0a 100644 --- a/lbx/Makefile.am +++ b/lbx/Makefile.am @@ -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 \ diff --git a/mfb/Makefile.am b/mfb/Makefile.am index fd3f10eca..f72867e22 100644 --- a/mfb/Makefile.am +++ b/mfb/Makefile.am @@ -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 diff --git a/mi/Makefile.am b/mi/Makefile.am index add2eb6f4..5d614bf7d 100644 --- a/mi/Makefile.am +++ b/mi/Makefile.am @@ -4,7 +4,7 @@ sdk_HEADERS = mibank.h micmap.h miline.h mipointer.h mi.h mibstore.h \ 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 = \ diff --git a/miext/cw/Makefile.am b/miext/cw/Makefile.am index 2a6b25cb0..9b8e2c25e 100644 --- a/miext/cw/Makefile.am +++ b/miext/cw/Makefile.am @@ -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 diff --git a/miext/damage/Makefile.am b/miext/damage/Makefile.am index 44a1a047b..594fa3e68 100644 --- a/miext/damage/Makefile.am +++ b/miext/damage/Makefile.am @@ -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 diff --git a/miext/layer/Makefile.am b/miext/layer/Makefile.am index f028c53dc..3c5d2d75b 100644 --- a/miext/layer/Makefile.am +++ b/miext/layer/Makefile.am @@ -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 diff --git a/miext/shadow/Makefile.am b/miext/shadow/Makefile.am index b91c00465..69340e2f2 100644 --- a/miext/shadow/Makefile.am +++ b/miext/shadow/Makefile.am @@ -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 diff --git a/os/Makefile.am b/os/Makefile.am index d7b6b29c6..a363f29fe 100644 --- a/os/Makefile.am +++ b/os/Makefile.am @@ -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 diff --git a/randr/Makefile.am b/randr/Makefile.am index 6da56d911..28d90d2a8 100644 --- a/randr/Makefile.am +++ b/randr/Makefile.am @@ -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 \ diff --git a/record/Makefile.am b/record/Makefile.am index dbb5ca24b..10ec67a52 100644 --- a/record/Makefile.am +++ b/record/Makefile.am @@ -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 diff --git a/render/Makefile.am b/render/Makefile.am index 9a6d9f5c2..3d363c551 100644 --- a/render/Makefile.am +++ b/render/Makefile.am @@ -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 \ diff --git a/xfixes/Makefile.am b/xfixes/Makefile.am index 4bd3b4bde..a9ba7623a 100644 --- a/xfixes/Makefile.am +++ b/xfixes/Makefile.am @@ -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 \ diff --git a/xkb/Makefile.am b/xkb/Makefile.am index 333ca5d44..c85c13b56 100644 --- a/xkb/Makefile.am +++ b/xkb/Makefile.am @@ -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 = \ diff --git a/xorg-server.pc.in b/xorg-server.pc.in index cf29ee031..04206e4dc 100644 --- a/xorg-server.pc.in +++ b/xorg-server.pc.in @@ -8,5 +8,5 @@ sdkdir=@sdkdir@ 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} |