frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Define XFree86Server only where it is required.

This commit is contained in:
Kevin E Martin 2005-12-02 06:02:45 +00:00
parent 924518605b
commit 7c00afd0ec
89 changed files with 194 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
ChangeLog
View File

@ -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> 2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
* GL/mesa/X/Makefile.am: * GL/mesa/X/Makefile.am:

2
GL/glx/Makefile.am
View File

@ -5,7 +5,7 @@ AM_CFLAGS = \
@GL_CFLAGS@ \ @GL_CFLAGS@ \
@XLIB_CFLAGS@ \ @XLIB_CFLAGS@ \
-I@MESA_SOURCE@/include \ -I@MESA_SOURCE@/include \
-DXFree86Server \ @SERVER_DEFINES@ \
@MODULE_DEFINES@ \ @MODULE_DEFINES@ \
@LOADER_DEFINES@ @LOADER_DEFINES@

3
GL/mesa/X/Makefile.am
View File

@ -16,8 +16,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I$(top_srcdir)/GL/include \ -I$(top_srcdir)/GL/include \
-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support
# terribly gross hack. i need a shower now. AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
AM_CFLAGS = $(DIX_CFLAGS) -DXFree86Server @MODULE_DEFINES@ @LOADER_DEFINES@
libX_la_SOURCES = xf86glx.c \ libX_la_SOURCES = xf86glx.c \
xf86glx_util.c \ xf86glx_util.c \

2
GL/mesa/array_cache/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libac.la noinst_LTLIBRARIES = libac.la
AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \

2
GL/mesa/glapi/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libglapi.la noinst_LTLIBRARIES = libglapi.la
AM_CFLAGS = -DXFree86Server @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \

2
GL/mesa/main/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libmain.la noinst_LTLIBRARIES = libmain.la
AM_CFLAGS = -DXFree86Server @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \

2
GL/mesa/math/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libmath.la noinst_LTLIBRARIES = libmath.la
AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \

2
GL/mesa/shader/Makefile.am
View File

@ -2,7 +2,7 @@ SUBDIRS = grammar slang
noinst_LTLIBRARIES = libshader.la noinst_LTLIBRARIES = libshader.la
AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \

2
GL/mesa/shader/grammar/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libgrammar.la noinst_LTLIBRARIES = libgrammar.la
AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \
-I../../X \ -I../../X \

2
GL/mesa/shader/slang/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libslang.la noinst_LTLIBRARIES = libslang.la
AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \
-I../grammar \ -I../grammar \

2
GL/mesa/swrast/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libswrast.la noinst_LTLIBRARIES = libswrast.la
AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \

2
GL/mesa/swrast_setup/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libss.la noinst_LTLIBRARIES = libss.la
AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \

2
GL/mesa/tnl/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libtnl.la noinst_LTLIBRARIES = libtnl.la
AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \

2
XTrap/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libxtrap.la libxtrapmodule.la 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 libxtrap_la_SOURCES = xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c

2
Xext/Makefile.am
View File

@ -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 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 sdk_HEADERS = xvdix.h xvmcext.h

2
Xi/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libXi.la noinst_LTLIBRARIES = libXi.la
AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
libXi_la_SOURCES = \ libXi_la_SOURCES = \
allowev.c \ allowev.c \

4
Xprint/Makefile.am
View File

@ -2,7 +2,9 @@ SUBDIRS = doc pcl raster ps etc
bin_PROGRAMS = Xprt 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_LDFLAGS = -L$(top_srcdir)
Xprt_LDADD = @XPRINT_LIBS@ pcl/libpcl.la raster/libraster.la Xprt_LDADD = @XPRINT_LIBS@ pcl/libpcl.la raster/libraster.la

3
Xprint/pcl/Makefile.am
View File

@ -2,7 +2,8 @@ noinst_LTLIBRARIES = libpcl.la
INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb 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 = \ libpcl_la_SOURCES = \
PclArc.c \ PclArc.c \

3
Xprint/ps/Makefile.am
View File

@ -2,7 +2,8 @@ noinst_LTLIBRARIES = libps.la
INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb 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 = \ libps_la_SOURCES = \
PsArc.c \ PsArc.c \

3
Xprint/raster/Makefile.am
View File

@ -2,7 +2,8 @@ noinst_LTLIBRARIES = libraster.la
INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb 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 = \ libraster_la_SOURCES = \
RasterAttVal.c \ RasterAttVal.c \

2
afb/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libafb.la 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 libafb_gen_sources = afbbltC.c afbbltX.c afbbltCI.c afbbltO.c afbbltG.c afbtileC.c afbtileG.c afbseg.c

2
cfb/Makefile.am
View File

@ -9,7 +9,7 @@ libcfb_la_SOURCES = cfb8bit.c cfbteblt8.c cfbglrop8.c cfbpush8.c cfbrctstp8.c \
libcfb_la_LIBADD = ../mfb/libmfb.la 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 INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support

2
cfb16/Makefile.am
View File

@ -6,4 +6,4 @@ libcfb16_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources)
INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support 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@

2
cfb24/Makefile.am
View File

@ -6,6 +6,6 @@ libcfb24_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources)
EXTRA_DIST = cfbrrop24.h 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 INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support

2
cfb32/Makefile.am
View File

@ -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 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@

2
composite/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libcomposite.la noinst_LTLIBRARIES = libcomposite.la
AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
libcomposite_la_SOURCES = \ libcomposite_la_SOURCES = \
compalloc.c \ compalloc.c \

15
configure.ac
View File

@ -789,9 +789,10 @@ dnl ---------------------------------------------------------------------------
dnl DDX section. dnl DDX section.
dnl --------------------------------------------------------------------------- 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="" MODULE_DEFINES=""
LOADER_DEFINES="" LOADER_DEFINES=""
SERVER_DEFINES=""
dnl DMX DDX dnl DMX DDX
@ -1078,8 +1079,9 @@ if test "x$XORG" = xyes; then
AC_SUBST([LD_EXPORT_SYMBOLS_FLAG]) AC_SUBST([LD_EXPORT_SYMBOLS_FLAG])
dnl Module defines are used in the Xorg server and the drivers dnl Module defines are used in the Xorg server and the drivers
MODULE_DEFINES="-DIN_MODULE -DXFree86Module" MODULE_DEFINES="$MODULE_DEFINES -DIN_MODULE -DXFree86Module"
LOADER_DEFINES="-DXFree86LOADER" LOADER_DEFINES="$LOADER_DEFINES -DXFree86LOADER"
SERVER_DEFINES="$SERVER_DEFINES -DXFree86Server"
dnl these only go in xorg-config.h dnl these only go in xorg-config.h
XF86CONFIGFILE="xorg.conf" XF86CONFIGFILE="xorg.conf"
@ -1131,9 +1133,6 @@ AM_CONDITIONAL(MFB, [test "x$XORG" = xyes])
AM_CONDITIONAL(CFB, [test "x$XORG" = xyes]) AM_CONDITIONAL(CFB, [test "x$XORG" = xyes])
AM_CONDITIONAL(AFB, [test "x$XORG" = xyes]) AM_CONDITIONAL(AFB, [test "x$XORG" = xyes])
AC_SUBST([MODULE_DEFINES])
AC_SUBST([LOADER_DEFINES])
dnl Xprint DDX dnl Xprint DDX
AC_MSG_CHECKING([whether to build 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(BSD_KBD_MODE, [test x$KBD_MODE_TYPE = xbsd])
AM_CONDITIONAL(SUN_KBD_MODE, [test x$KBD_MODE_TYPE = xsun]) 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" CFLAGS="$XSERVER_CFLAGS $CFLAGS"
AC_SUBST([CFLAGS]) AC_SUBST([CFLAGS])

2
damageext/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libdamageext.la noinst_LTLIBRARIES = libdamageext.la
AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
libdamageext_la_SOURCES = \ libdamageext_la_SOURCES = \
damageext.c \ damageext.c \

2
dbe/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libdbe.la libdbemodule.la 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 INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support

2
dix/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libdix.la libxpstubs.la 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_STRING=\""@VENDOR_STRING@"\" \
-DVENDOR_RELEASE="@VENDOR_RELEASE@" -DVENDOR_RELEASE="@VENDOR_RELEASE@"

2
exa/Makefile.am
View File

@ -8,7 +8,7 @@ INCLUDES = \
$(XORG_INCS) \ $(XORG_INCS) \
-I$(srcdir)/../../../miext/cw -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 = \ libexa_la_SOURCES = \
exaasync.c \ exaasync.c \

2
fb/Makefile.am
View File

@ -4,7 +4,7 @@ INCLUDES = \
-I$(top_srcdir)/hw/xfree86/os-support \ -I$(top_srcdir)/hw/xfree86/os-support \
-I$(top_srcdir)/hw/xfree86/os-support/bus \ -I$(top_srcdir)/hw/xfree86/os-support/bus \
-I$(top_srcdir)/hw/xfree86/common -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 sdk_HEADERS = fb.h fbrop.h fbpseudocolor.h fboverlay.h

4
hw/dmx/Makefile.am
View File

@ -79,8 +79,8 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \
config/libdmxconfig.a \ config/libdmxconfig.a \
@DMXMODULES_LIBS@ @DMXMODULES_LIBS@
Xdmx_CFLAGS = -DHAVE_DMX_CONFIG_H \ Xdmx_CFLAGS = @SERVER_DEFINES@ \
-DXFree86Server \ -DHAVE_DMX_CONFIG_H \
$(GLX_INCS) \ $(GLX_INCS) \
@DMXMODULES_CFLAGS@ @DMXMODULES_CFLAGS@

1
hw/dmx/config/Makefile.am
View File

@ -22,6 +22,7 @@ libdmxconfig_a_SOURCES = $(LIBSRCS)
AM_YFLAGS = -d AM_YFLAGS = -d
AM_CFLAGS = \ AM_CFLAGS = \
@SERVER_DEFINES@ \
-I$(top_srcdir)/hw/dmx \ -I$(top_srcdir)/hw/dmx \
-DHAVE_DMX_CONFIG_H \ -DHAVE_DMX_CONFIG_H \
-DDMX_LOG_STANDALONE \ -DDMX_LOG_STANDALONE \

5
hw/dmx/glxProxy/Makefile.am
View File

@ -31,12 +31,13 @@ libglxproxy_a_SOURCES = compsize.c \
renderpixswap.c \ renderpixswap.c \
unpack.h 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)/include \
-I$(top_srcdir)/GL/include \ -I$(top_srcdir)/GL/include \
-I$(top_builddir)/GL/include \ -I$(top_builddir)/GL/include \
-I@MESA_SOURCE@/include \ -I@MESA_SOURCE@/include \
-DHAVE_DMX_CONFIG_H \ -DHAVE_DMX_CONFIG_H \
@DMXMODULES_CFLAGS@ \ @DMXMODULES_CFLAGS@ \
@MODULE_DEFINES@ \
-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support

3
hw/dmx/input/Makefile.am
View File

@ -55,7 +55,8 @@ libdmxinput_a_SOURCES = ChkNotMaskEv.c \
$(DMXSRCS) \ $(DMXSRCS) \
$(LIBSRCS) $(LIBSRCS)
AM_CFLAGS = -I$(top_srcdir)/hw/dmx \ AM_CFLAGS = @SERVER_DEFINES@ \
-I$(top_srcdir)/hw/dmx \
-I$(top_srcdir)/hw/xfree86/common \ -I$(top_srcdir)/hw/xfree86/common \
-DHAVE_DMX_CONFIG_H \ -DHAVE_DMX_CONFIG_H \
@DMXMODULES_CFLAGS@ @DMXMODULES_CFLAGS@

2
hw/vfb/Makefile.am
View File

@ -21,7 +21,7 @@ Xvfb_LDFLAGS =
AM_CFLAGS = -DHAVE_DIX_CONFIG_H \ AM_CFLAGS = -DHAVE_DIX_CONFIG_H \
-DNO_HW_ONLY_EXTS \ -DNO_HW_ONLY_EXTS \
-DNO_MODULE_EXTS \ -DNO_MODULE_EXTS \
-DXFree86Server \ @SERVER_DEFINES@ \
$(XVFBMODULES_CFLAGS) $(XVFBMODULES_CFLAGS)
# Man page # Man page

2
hw/xfree86/Makefile.am
View File

@ -17,7 +17,7 @@ DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \
bin_PROGRAMS = Xorg bin_PROGRAMS = Xorg
AM_CFLAGS = @XORG_CFLAGS@ @LOADER_DEFINES@ AM_CFLAGS = @XORG_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@
INCLUDES = @XORG_INCS@ INCLUDES = @XORG_INCS@
Xorg_SOURCES = xorg.c Xorg_SOURCES = xorg.c

2
hw/xfree86/common/Makefile.am
View File

@ -98,4 +98,4 @@ EXTRA_DIST = \
modeline2c.pl \ modeline2c.pl \
$(DISTKBDSOURCES) $(DISTKBDSOURCES)
AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@ AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@

2
hw/xfree86/ddc/Makefile.am
View File

@ -8,6 +8,6 @@ libddc_la_SOURCES = xf86DDC.c edid.c interpret_edid.c print_edid.c \
INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c 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 EXTRA_DIST = ddcPriv.h DDC.HOWTO

3
hw/xfree86/dixmods/Makefile.am
View File

@ -31,7 +31,7 @@ fontsmodule_LTLIBRARIES = libbitmap.la \
libfreetype.la \ libfreetype.la \
libtype1.la libtype1.la
AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ @LOADER_DEFINES@ AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@
INCLUDES = @XORG_INCS@ \ INCLUDES = @XORG_INCS@ \
-I$(top_srcdir)/afb \ -I$(top_srcdir)/afb \
-I$(top_srcdir)/cfb \ -I$(top_srcdir)/cfb \
@ -74,7 +74,6 @@ libdbe_la_LDFLAGS = -avoid-version
libdbe_la_LIBADD = $(top_builddir)/dbe/libdbemodule.la libdbe_la_LIBADD = $(top_builddir)/dbe/libdbemodule.la
libdbe_la_SOURCES = dbemodule.c libdbe_la_SOURCES = dbemodule.c
libfb_la_CFLAGS = -DXFree86Server $(AM_CFLAGS)
libfb_la_LDFLAGS = -avoid-version libfb_la_LDFLAGS = -avoid-version
libfb_la_LIBADD = $(top_builddir)/fb/libfb.la libfb_la_LIBADD = $(top_builddir)/fb/libfb.la
libfb_la_SOURCES = $(top_builddir)/fb/fbcmap.c fbmodule.c libfb_la_SOURCES = $(top_builddir)/fb/fbcmap.c fbmodule.c

2
hw/xfree86/dixmods/extmod/Makefile.am
View File

@ -11,7 +11,7 @@ if XV
XV_SRCS = xvmod.c xvmodproc.h XV_SRCS = xvmod.c xvmodproc.h
endif endif
AM_CFLAGS = @XORG_CFLAGS@ -DEXTMODULE @LOADER_DEFINES@ AM_CFLAGS = @XORG_CFLAGS@ -DEXTMODULE @SERVER_DEFINES@ @LOADER_DEFINES@
INCLUDES = @XORG_INCS@ \ INCLUDES = @XORG_INCS@ \
-I$(top_srcdir)/afb \ -I$(top_srcdir)/afb \
-I$(top_srcdir)/mfb \ -I$(top_srcdir)/mfb \

1
hw/xfree86/dri/Makefile.am
View File

@ -7,6 +7,7 @@ libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \
-I$(top_builddir)/GL/include \ -I$(top_builddir)/GL/include \
-I@MESA_SOURCE@/include \ -I@MESA_SOURCE@/include \
-DHAVE_XORG_CONFIG_H \ -DHAVE_XORG_CONFIG_H \
@SERVER_DEFINES@ \
@MODULE_DEFINES@ \ @MODULE_DEFINES@ \
@LOADER_DEFINES@ \ @LOADER_DEFINES@ \
@DRIPROTO_CFLAGS@ \ @DRIPROTO_CFLAGS@ \

2
hw/xfree86/dummylib/Makefile.am
View File

@ -6,7 +6,7 @@ noinst_LIBRARIES = libdummy.a libdummy-nonserver.a
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@ AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
libdummy_a_SOURCES = getvalidbios.c \ libdummy_a_SOURCES = getvalidbios.c \
pcitestmulti.c xf86allocscripi.c \ pcitestmulti.c xf86allocscripi.c \

2
hw/xfree86/exa/Makefile.am
View File

@ -8,7 +8,7 @@ INCLUDES = \
$(XORG_INCS) \ $(XORG_INCS) \
-I$(srcdir)/../../../miext/cw -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 = \ libexa_la_SOURCES = \
exaasync.c \ exaasync.c \

2
hw/xfree86/fbdevhw/Makefile.am
View File

@ -11,7 +11,7 @@ endif
INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c 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 sdk_HEADERS = fbdevhw.h

2
hw/xfree86/i2c/Makefile.am
View File

@ -15,7 +15,7 @@ libi2c_la_SOURCES = xf86i2c.c xf86i2cmodule.c
INCLUDES = $(XORG_INCS) 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 sdk_HEADERS = xf86i2c.h bt829.h fi1236.h msp3430.h tda8425.h tda9850.h tda9885.h uda1380.h i2c_def.h

2
hw/xfree86/int10/Makefile.am
View File

@ -2,7 +2,7 @@ module_LTLIBRARIES = libint10.la
sdk_HEADERS = xf86int10.h sdk_HEADERS = xf86int10.h
EXTRA_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@ EXTRA_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
libint10_la_LDFLAGS = -avoid-version libint10_la_LDFLAGS = -avoid-version

2
hw/xfree86/loader/Makefile.am
View File

@ -7,7 +7,7 @@ INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../vbe \
-I$(srcdir)/../../../miext/damage -I$(srcdir)/../../../miext/damage
#AM_LDFLAGS = -r #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 if XORG_LOADER_SPARC
SPARC_SOURCES = SparcMulDiv.S SPARC_SOURCES = SparcMulDiv.S

2
hw/xfree86/os-support/bsd/Makefile.am
View File

@ -49,7 +49,7 @@ ARCH_SOURCES = \
endif endif
# FIXME: NetBSD Aperture defines (configure.ac) # 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) INCLUDES = $(XORG_INCS)

2
hw/xfree86/os-support/bus/Makefile.am
View File

@ -53,4 +53,4 @@ libbus_la_SOURCES = Pci.c Pci.h $(PCI_SOURCES) $(PLATFORM_PCI_SOURCES) \
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@ AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@

1
hw/xfree86/os-support/drm/Makefile.am
View File

@ -8,6 +8,7 @@ libdrm_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \
-I$(top_srcdir)/GL/include \ -I$(top_srcdir)/GL/include \
-DHAVE_XORG_CONFIG_H \ -DHAVE_XORG_CONFIG_H \
@LIBDRM_CFLAGS@ \ @LIBDRM_CFLAGS@ \
@SERVER_DEFINES@ \
@LOADER_DEFINES@ @LOADER_DEFINES@
libdrm_la_LDFLAGS = -module -avoid-version libdrm_la_LDFLAGS = -module -avoid-version
libdrm_ladir = $(moduledir)/@XORG_OS@ libdrm_ladir = $(moduledir)/@XORG_OS@

2
hw/xfree86/os-support/linux/Makefile.am
View File

@ -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 \ $(srcdir)/../shared/at_scancode.c \
$(PLATFORM_PCI_SUPPORT) $(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 INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack

2
hw/xfree86/os-support/misc/Makefile.am
View File

@ -18,6 +18,6 @@ libmisc_la_SOURCES = xf86_Util.c Delay.c $(ARCH_SOURCES)
INCLUDES = $(XORG_INCS) 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) EXTRA_DIST = $(I386_SOURCES) $(PORTIO_SOURCES) $(ILHACK_SOURCES)

2
hw/xfree86/os-support/solaris/Makefile.am
View File

@ -34,7 +34,7 @@ nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC)
sdk_HEADERS = agpgart.h sdk_HEADERS = agpgart.h
nodist_sdk_HEADERS = solaris-$(SOLARIS_INOUT_ARCH).il 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) INCLUDES = $(XORG_INCS)

2
hw/xfree86/parser/Makefile.am
View File

@ -23,7 +23,7 @@ libxf86config_a_SOURCES = \
DRI.c \ DRI.c \
Extensions.c Extensions.c
AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@ AM_CFLAGS = $(XORG_CFLAGS)
EXTRA_DIST = \ EXTRA_DIST = \
Configint.h \ Configint.h \

2
hw/xfree86/rac/Makefile.am
View File

@ -6,4 +6,4 @@ sdk_HEADERS = xf86RAC.h
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@

2
hw/xfree86/ramdac/Makefile.am
View File

@ -13,7 +13,7 @@ EXTRA_DIST = BTPriv.h IBMPriv.h TIPriv.h xf86CursorPriv.h xf86RamDacPriv.h \
CURSOR.NOTES CURSOR.NOTES
AM_CFLAGS = -DXAAReverseBitOrder=xf86ReverseBitOrder -DRAMDAC_MODULE \ AM_CFLAGS = -DXAAReverseBitOrder=xf86ReverseBitOrder -DRAMDAC_MODULE \
$(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
xf86BitOrder.c: xf86BitOrder.c:

2
hw/xfree86/scanpci/Makefile.am
View File

@ -8,7 +8,7 @@ libscanpci_la_SOURCES = xf86ScanPci.c
INCLUDES = $(XORG_INCS) 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 BUILT_SOURCES = xf86PciIds.h

2
hw/xfree86/shadowfb/Makefile.am
View File

@ -6,4 +6,4 @@ sdk_HEADERS = shadowfb.h
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@

3
hw/xfree86/utils/xorgcfg/Makefile.am
View File

@ -31,7 +31,8 @@ bin_PROGRAMS = xorgcfg
INCLUDES = $(XORG_INCS) -I$(top_srcdir)/hw/xfree86/parser 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) \ xorgcfg_LDADD = $(XORGCFG_DEP_LIBS) ../../parser/libxf86config.a $(LOADERLIB) \
../../os-support/libxorgos.la ../../dummylib/libdummy-nonserver.a ../../os-support/libxorgos.la ../../dummylib/libdummy-nonserver.a

2
hw/xfree86/utils/xorgconfig/Makefile.am
View File

@ -31,7 +31,7 @@ bin_PROGRAMS = xorgconfig
X11dir = $(libdir)/X11 X11dir = $(libdir)/X11
dist_X11_DATA = Cards dist_X11_DATA = Cards
xorgconfig_CFLAGS = @XORGCONFIG_DEP_CFLAGS@ \ xorgconfig_CFLAGS = @SERVER_DEFINES@ @XORGCONFIG_DEP_CFLAGS@ \
-DCARD_DATABASE_FILE='"$(X11dir)/Cards"' \ -DCARD_DATABASE_FILE='"$(X11dir)/Cards"' \
-DPROJECTROOT='"$(prefix)"' \ -DPROJECTROOT='"$(prefix)"' \
-DFILEMANSUFFIX='"$(FILE_MAN_SUFFIX)"' \ -DFILEMANSUFFIX='"$(FILE_MAN_SUFFIX)"' \

2
hw/xfree86/vbe/Makefile.am
View File

@ -4,7 +4,7 @@ libvbe_la_SOURCES = vbe.c vbeModes.c vbe_module.c
sdk_HEADERS = vbe.h vbeModes.h 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 \ INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
-I$(srcdir)/../int10 -I$(srcdir)/../int10

2
hw/xfree86/vgahw/Makefile.am
View File

@ -2,7 +2,7 @@ module_LTLIBRARIES = libvgahw.la
libvgahw_la_LDFLAGS = -avoid-version libvgahw_la_LDFLAGS = -avoid-version
libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c
INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c 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 sdk_HEADERS = vgaHW.h

2
hw/xfree86/x86emu/Makefile.am
View File

@ -11,7 +11,7 @@ libx86emu_a_SOURCES = debug.c \
INCLUDES = INCLUDES =
AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@ AM_CFLAGS = $(XORG_CFLAGS)
EXTRA_DIST = validate.c \ EXTRA_DIST = validate.c \
x86emu/debug.h \ x86emu/debug.h \

2
hw/xfree86/xaa/Makefile.am
View File

@ -65,4 +65,4 @@ EXTRA_DIST = xaacexp.h xaawrap.h xaaLine.c xaaDashLine.c \
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@

2
hw/xfree86/xf1bpp/Makefile.am
View File

@ -61,7 +61,7 @@ libxf1bppmfb_a_SOURCES = \
libxf1bpp_la_SOURCES = $(libxf1bppmfb_a_SOURCES) $(libxf1bppgen_a_SOURCES) libxf1bpp_la_SOURCES = $(libxf1bppmfb_a_SOURCES) $(libxf1bppgen_a_SOURCES)
AM_CFLAGS = -DXF86MONO -include mfbmap.h $(DIX_CFLAGS) $(XORG_CFLAGS) \ 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 INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb
mfbseg.c: mfbseg.c:

2
hw/xfree86/xf4bpp/Makefile.am
View File

@ -59,4 +59,4 @@ mfbseg.c:
INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb 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@

2
hw/xfree86/xf8_16bpp/Makefile.am
View File

@ -4,7 +4,7 @@ sdk_HEADERS = cfb8_16.h
INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb 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 libxf8_16bpp_la_LDFLAGS = -avoid-version

2
hw/xfree86/xf8_32bpp/Makefile.am
View File

@ -4,7 +4,7 @@ sdk_HEADERS = cfb8_32.h
INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb 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 libxf8_32bpp_la_LDFLAGS = -avoid-version

2
hw/xfree86/xf8_32wid/Makefile.am
View File

@ -5,7 +5,7 @@ sdk_HEADERS = cfb8_32wid.h
libxf8_32wid_la_LDFLAGS = -avoid-version libxf8_32wid_la_LDFLAGS = -avoid-version
INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb 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 = \ libxf8_32wid_la_SOURCES = \
cfb8_32widmodule.c \ cfb8_32widmodule.c \

2
hw/xnest/Makefile.am
View File

@ -53,7 +53,7 @@ Xnest_LDFLAGS =
AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \ AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \
-DNO_HW_ONLY_EXTS \ -DNO_HW_ONLY_EXTS \
-DXFree86Server \ @SERVER_DEFINES@ \
$(XNESTMODULES_CFLAGS) $(XNESTMODULES_CFLAGS)
EXTRA_DIST = os2Stub.c \ EXTRA_DIST = os2Stub.c \

3
include/xorg-config.h.in
View File

@ -12,9 +12,6 @@
#include <dix-config.h> #include <dix-config.h>
#include <xkb-config.h> #include <xkb-config.h>
/* Building XFree86-based server. */
#undef XFree86Server
/* Building Xorg server. */ /* Building Xorg server. */
#undef XORGSERVER #undef XORGSERVER

6
include/xorg-server.h.in
View File

@ -139,12 +139,6 @@
/* Support XFree86 Video Mode extension */ /* Support XFree86 Video Mode extension */
#undef XF86VIDMODE #undef XF86VIDMODE
/* Building XFree86 loader */
#undef XFree86LOADER
/* Building XFree86 server */
#undef XFree86Server
/* Build XDGA support */ /* Build XDGA support */
#undef XFreeXDGA #undef XFreeXDGA

3
include/xwin-config.h.in
View File

@ -6,9 +6,6 @@
*/ */
#include <dix-config.h> #include <dix-config.h>
/* XFree86 based Xserver */
#undef XFree86Server
/* Winsock networking */ /* Winsock networking */
#undef HAS_WINSOCK #undef HAS_WINSOCK

2
lbx/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = liblbx.la noinst_LTLIBRARIES = liblbx.la
AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
liblbx_la_SOURCES = \ liblbx_la_SOURCES = \
lbxcmap.c \ lbxcmap.c \

2
mfb/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libmfb.la 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 INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support

2
mi/Makefile.am
View File

@ -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 \ migc.h mipointrst.h mizerarc.h micoord.h mifillarc.h \
mispans.h miwideline.h mistruct.h mifpoly.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 is for dmx - it has different defines for miinitext.c
libminimi_la_SOURCES = \ libminimi_la_SOURCES = \

2
miext/cw/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libcw.la 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 INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support

2
miext/damage/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libdamage.la 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 INCLUDES = -I$(srcdir)/../cw -I$(top_srcdir)/hw/xfree86/os-support

2
miext/layer/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = liblayer.la 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 INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support

2
miext/shadow/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libshadow.la 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 INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support

2
os/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libos.la libcwrapper.la 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 # FIXME: Add support for these in configure.ac
K5AUTH_SOURCES = k5auth.c K5AUTH_SOURCES = k5auth.c

2
randr/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = librandr.la noinst_LTLIBRARIES = librandr.la
AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
librandr_la_SOURCES = \ librandr_la_SOURCES = \
mirandr.c \ mirandr.c \

2
record/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = librecord.la librecordmodule.la 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 INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support

2
render/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = librender.la noinst_LTLIBRARIES = librender.la
AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
librender_la_SOURCES = \ librender_la_SOURCES = \
animcur.c \ animcur.c \

2
xfixes/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libxfixes.la noinst_LTLIBRARIES = libxfixes.la
AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
libxfixes_la_SOURCES = \ libxfixes_la_SOURCES = \
cursor.c \ cursor.c \

2
xkb/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libxkb.la libxkbstubs.la noinst_LTLIBRARIES = libxkb.la libxkbstubs.la
AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ \ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ \
-DHAVE_XKB_CONFIG_H -DHAVE_XKB_CONFIG_H
DDX_SRCS = \ DDX_SRCS = \

2
xorg-server.pc.in
View File

@ -8,5 +8,5 @@ sdkdir=@sdkdir@
Name: xorg-server Name: xorg-server
Description: Modular X.Org X Server Description: Modular X.Org X Server
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Cflags: -I${sdkdir} @MODULE_DEFINES@ @LOADER_DEFINES@ Cflags: -I${sdkdir} @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
Libs: -L${libdir} Libs: -L${libdir}