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

Continuing Makefile cleanup; add DIX_CFLAGS and XORG_CFLAGS everywhere.

This commit is contained in:
Daniel Stone 2005-07-02 18:59:44 +00:00
parent e58c09d31b
commit 826a6f029f
57 changed files with 144 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
GL/glx/glcontextmodes.c
View File

@ -31,6 +31,9 @@
* \author Ian Romanick <idr@us.ibm.com> * \author Ian Romanick <idr@us.ibm.com>
*/ */
#ifdef HAVE_CONFIG_H
#include <dix-config.h>
#endif
#ifdef DRI_NEW_INTERFACE_ONLY #ifdef DRI_NEW_INTERFACE_ONLY
# include <stdlib.h> # include <stdlib.h>
# include <string.h> # include <string.h>

3
GL/glx/glcontextmodes.h
View File

@ -27,6 +27,9 @@
* \author Ian Romanick <idr@us.ibm.com> * \author Ian Romanick <idr@us.ibm.com>
*/ */
#ifdef HAVE_CONFIG_H
#include <dix-config.h>
#endif
#ifndef GLCONTEXTMODES_H #ifndef GLCONTEXTMODES_H
#define GLCONTEXTMODES_H #define GLCONTEXTMODES_H

2
Makefile.am
View File

@ -1,4 +1,4 @@
AUTOMAKE_OPTIONS=dist-bzip2 foreign AUTOMAKE_OPTIONS=dist-bzip2 foreign nostdinc
if COMPOSITE if COMPOSITE
COMPOSITE_DIR=composite COMPOSITE_DIR=composite

2
XTrap/Makefile.am
View File

@ -1,3 +1,5 @@
module_LTLIBRARIES = libxtrap.la module_LTLIBRARIES = libxtrap.la
AM_CFLAGS = $(DIX_CFLAGS)
libxtrap_la_SOURCES = xf86XTrapModule.c xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c libxtrap_la_SOURCES = xf86XTrapModule.c xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c

4
Xext/Makefile.am
View File

@ -32,7 +32,9 @@ if XEVIE
XEVIE_SRCS = xevie.c EVIstruct.h XEVIE_SRCS = xevie.c EVIstruct.h
endif endif
AM_CFLAGS = -I$(srcdir)/extmod INCLUDES = -I$(srcdir)/extmod
AM_CFLAGS = $(DIX_CFLAGS)
EXTRA_DIST = \ EXTRA_DIST = \
dgaproc.h \ dgaproc.h \

2
Xext/extmod/Makefile.am
View File

@ -1 +1,3 @@
AM_CFLAGS = $(DIX_CFLAGS)
EXTRA_DIST = modinit.h EXTRA_DIST = modinit.h

2
Xi/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = libXi.la noinst_LTLIBRARIES = libXi.la
AM_CFLAGS = $(DIX_CFLAGS)
libXi_la_SOURCES = \ libXi_la_SOURCES = \
allowev.c \ allowev.c \
allowev.h \ allowev.h \

2
afb/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = libafb.la noinst_LTLIBRARIES = libafb.la
AM_CFLAGS = $(DIX_CFLAGS)
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
DISTCLEANFILES = $(libafb_gen_sources) DISTCLEANFILES = $(libafb_gen_sources)

2
cfb/Makefile.am
View File

@ -9,7 +9,7 @@ libcfb_la_SOURCES = cfb8bit.c cfbcmap.c cfbteblt8.c cfbglrop8.c cfbpush8.c \
libcfb_la_LIBADD = ../mfb/libmfb.la libcfb_la_LIBADD = ../mfb/libmfb.la
AM_CFLAGS = -DPSZ=8 AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS)
INCLUDES = $(CFB_INCLUDES) INCLUDES = $(CFB_INCLUDES)

2
cfb16/Makefile.am
View File

@ -6,4 +6,4 @@ libcfb16_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources)
INCLUDES = $(CFB_INCLUDES) INCLUDES = $(CFB_INCLUDES)
AM_CFLAGS = -DPSZ=16 AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS)

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 AM_CFLAGS = -DPSZ=24 $(DIX_CFLAGS)
INCLUDES = $(CFB_INCLUDES) INCLUDES = $(CFB_INCLUDES)

2
cfb32/Makefile.am
View File

@ -4,6 +4,6 @@ include $(top_srcdir)/cfb/Makefile.am.inc
libcfb32_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources) libcfb32_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources)
INCLUDES = $(CFB_INCLUDES) INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS)
AM_CFLAGS = -DPSZ=32 AM_CFLAGS = -DPSZ=32

2
composite/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = libcomposite.la noinst_LTLIBRARIES = libcomposite.la
AM_CFLAGS = $(DIX_CFLAGS)
libcomposite_la_SOURCES = \ libcomposite_la_SOURCES = \
compalloc.c \ compalloc.c \
compext.c \ compext.c \

21
configure.ac
View File

@ -129,7 +129,6 @@ VERSION_STRING="${DEFAULT_VENDOR_RELEASE//./,},0"
DEFAULT_VENDOR_WEB="http://wiki.x.org" DEFAULT_VENDOR_WEB="http://wiki.x.org"
EXTENSION_LIBS='$(top_builddir)/Xext/libXext.la' EXTENSION_LIBS='$(top_builddir)/Xext/libXext.la'
DMX_EXTENSIONS='$(top_builddir)/Xext/libXext.la'" "'$(top_builddir)/render/librender.la' DMX_EXTENSIONS='$(top_builddir)/Xext/libXext.la'" "'$(top_builddir)/render/librender.la'
CORE_INCS='-I$(top_srcdir)/include'
EXTENSION_INCS='-I$(top_srcdir)/Xext' EXTENSION_INCS='-I$(top_srcdir)/Xext'
AC_DEFINE(XORG_SERVER, 1, [Build X.Org X server]) AC_DEFINE(XORG_SERVER, 1, [Build X.Org X server])
@ -225,6 +224,7 @@ fi
AC_DEFINE(XKB,1,[Build XKB]) AC_DEFINE(XKB,1,[Build XKB])
AC_DEFINE(XKB_IN_SERVER,1,[Build XKB server]) AC_DEFINE(XKB_IN_SERVER,1,[Build XKB server])
AC_DEFINE(XKB_DFLT_DISABLED,0,[Enable XKB per default]) AC_DEFINE(XKB_DFLT_DISABLED,0,[Enable XKB per default])
REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
AC_DEFINE(XINPUT,,[Build XInput]) AC_DEFINE(XINPUT,,[Build XInput])
AC_SUBST([XKB]) AC_SUBST([XKB])
@ -426,6 +426,7 @@ XPSTUBS_LIB='$(top_builddir)/dix/libxpstubs.la'
XKB_LIB='$(top_builddir)/xkb/libxkb.la' XKB_LIB='$(top_builddir)/xkb/libxkb.la'
XI_LIB='$(top_builddir)/Xi/libXi.la' XI_LIB='$(top_builddir)/Xi/libXi.la'
XI_INC='-I$(top_srcdir)/Xi' XI_INC='-I$(top_srcdir)/Xi'
CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/inc'
PKG_CHECK_MODULES([XSERVER], [$REQUIRED_MODULES]) PKG_CHECK_MODULES([XSERVER], [$REQUIRED_MODULES])
XSERVER_LIBS="${XSERVER_LIBS} -lm -lz" XSERVER_LIBS="${XSERVER_LIBS} -lm -lz"
@ -443,30 +444,25 @@ else
ENDIAN="X_LITTLE_ENDIAN" ENDIAN="X_LITTLE_ENDIAN"
fi fi
AC_DEFINE_UNQUOTED(X_BYTE_ORDER,[$ENDIAN],[Endian order]) AC_DEFINE_UNQUOTED(X_BYTE_ORDER,[$ENDIAN],[Endian order])
XORG_CFLAGS="$XORGSERVER_CFLAGS $XORG_INCS" XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
case $host_os in case $host_os in
linux-gnu*) linux-gnu*)
# support: yea
XORG_OS="linux" XORG_OS="linux"
XORG_OS_SUBDIR="linux" XORG_OS_SUBDIR="linux"
;; ;;
freebsd*) freebsd*)
# support: nay
XORG_OS="freebsd" XORG_OS="freebsd"
XORG_OS_SUBDIR="bsd" XORG_OS_SUBDIR="bsd"
;; ;;
netbsd*) netbsd*)
# support: nay
XORG_OS="netbsd" XORG_OS="netbsd"
XORG_OS_SUBDIR="bsd" XORG_OS_SUBDIR="bsd"
;; ;;
openbsd*) openbsd*)
# support: nay
XORG_OS="openbsd" XORG_OS="openbsd"
XORG_OS_SUBDIR="bsd" XORG_OS_SUBDIR="bsd"
;; ;;
solaris*) solaris*)
# support: nay
XORG_OS="solaris" XORG_OS="solaris"
XORG_OS_SUBDIR="solaris" XORG_OS_SUBDIR="solaris"
;; ;;
@ -510,6 +506,14 @@ AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBDIR, [Path to XKB data])
AC_DEFINE(XORGSERVER,,[Build Xorg server]) AC_DEFINE(XORGSERVER,,[Build Xorg server])
AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support]) AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])
dnl only used in hw/xfree86/scanpci, TTBOMK
AC_PATH_PROG(PERL, perl, no)
dnl unlikely as this may be ...
if test "x$PERL" = xno; then
AC_MSG_ERROR([Perl is required to build the XFree86/Xorg DDX.])
fi
AC_SUBST(PERL)
dnl and the rest of these are generic, so they're in config.h dnl and the rest of these are generic, so they're in config.h
AC_DEFINE(XFree86XDGA,1,[Build XDGA support]) AC_DEFINE(XFree86XDGA,1,[Build XDGA support])
AC_DEFINE(XF86BIGFONT,1,[Build XFree86 BigFont extension]) AC_DEFINE(XF86BIGFONT,1,[Build XFree86 BigFont extension])
@ -539,6 +543,9 @@ AC_SUBST([CFLAGS])
BUILD_DATE="$(date +'%Y%m%d')" BUILD_DATE="$(date +'%Y%m%d')"
AC_SUBST([BUILD_DATE]) AC_SUBST([BUILD_DATE])
DIX_CFLAGS="-DHAVE_DIX_CONFIG_H"
AC_SUBST([DIX_CFLAGS])
AC_MSG_CHECKING(if unaligned word accesses behave as expected) AC_MSG_CHECKING(if unaligned word accesses behave as expected)
AC_TRY_RUN([ AC_TRY_RUN([
#include <stdio.h> #include <stdio.h>

2
damageext/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = libdamageext.la noinst_LTLIBRARIES = libdamageext.la
AM_CFLAGS = $(DIX_CFLAGS)
libdamageext_la_SOURCES = \ libdamageext_la_SOURCES = \
damageext.c \ damageext.c \
damageext.h \ damageext.h \

2
dix/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = libdix.la libxpstubs.la noinst_LTLIBRARIES = libdix.la libxpstubs.la
AM_CFLAGS = $(DIX_CFLAGS)
libdix_la_SOURCES = \ libdix_la_SOURCES = \
atom.c \ atom.c \
colormap.c \ colormap.c \

2
fb/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = libfb.la noinst_LTLIBRARIES = libfb.la
AM_CFLAGS = $(DIX_CFLAGS)
sdk_HEADERS = fb.h fbrop.h sdk_HEADERS = fb.h fbrop.h
libfb_la_SOURCES = \ libfb_la_SOURCES = \

2
hw/xfree86/Makefile.am
View File

@ -32,5 +32,3 @@ Xorg_LDADD = $(XORG_LIBS) \
-ldl -ldl
Xorg_LDFLAGS = -rdynamic Xorg_LDFLAGS = -rdynamic
sdk_HEADERS = xf86Date.h xf86Version.h xorgVersion.h

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

@ -44,9 +44,9 @@ libcommon_a_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
xf86Cursor.c xf86DGA.c xf86DPMS.c xf86DefModes.c \ xf86Cursor.c xf86DGA.c xf86DPMS.c xf86DefModes.c \
xf86DoProbe.c xf86DoScanPci.c xf86Events.c \ xf86DoProbe.c xf86DoScanPci.c xf86Events.c \
xf86Globals.c xf86Io.c xf86AutoConfig.c \ xf86Globals.c xf86Io.c xf86AutoConfig.c \
xf86MiscExt.c xf86Option.c xf86PM.c \ xf86MiscExt.c xf86Option.c \
xf86VidMode.c xf86fbman.c xf86cmap.c \ xf86VidMode.c xf86fbman.c xf86cmap.c \
../scanpci/xf86ScanPci.c xf86Helper.c \ xf86Helper.c \
xf86Mode.c xf86Build.h xorgHelper.c xf86Versions.c \ xf86Mode.c xf86Build.h xorgHelper.c xf86Versions.c \
$(XVSOURCES) $(BUSSOURCES) $(XKBSOURCES) \ $(XVSOURCES) $(BUSSOURCES) $(XKBSOURCES) \
$(DEBUGSOURCES) $(XISOURCES) $(RANDRSOURCES) \ $(DEBUGSOURCES) $(XISOURCES) $(RANDRSOURCES) \
@ -92,6 +92,9 @@ EXTRA_DIST = \
xf86xvmc.h \ xf86xvmc.h \
xf86xvpriv.h \ xf86xvpriv.h \
xisb.h \ xisb.h \
xf86Build.h.in xf86Build.h.in \
xf86Version.h \
xorgVersion.h \
xf86Date.h
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(XORG_CFLAGS)

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

@ -6,4 +6,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)
EXTRA_DIST = ddcPriv.h EXTRA_DIST = ddcPriv.h

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

@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libdixmods.la
module_LTLIBRARIES = libbitmap.la libfb.la module_LTLIBRARIES = libbitmap.la libfb.la
# yes, this is a cheesy hack. # yes, this is a cheesy hack.
AM_CFLAGS = -include xorg-config.h $(XORG_CFLAGS) AM_CFLAGS = $(XORG_CFLAGS) -include xorg-config.h
INCLUDES = $(XORG_INCS) -I$(top_srcdir)/afb -I$(top_srcdir)/mfb \ INCLUDES = $(XORG_INCS) -I$(top_srcdir)/afb -I$(top_srcdir)/mfb \
-I$(top_srcdir)/cfb -I$(top_srcdir)/dbe -I$(srcdir)/../loader \ -I$(top_srcdir)/cfb -I$(top_srcdir)/dbe -I$(srcdir)/../loader \
-I$(top_srcdir)/miext/layer -I$(top_srcdir)/miext/shadow -I$(top_srcdir)/miext/layer -I$(top_srcdir)/miext/shadow
@ -32,7 +32,7 @@ libdixmods_la_SOURCES = \
$(top_srcdir)/Xext/xf86misc.c \ $(top_srcdir)/Xext/xf86misc.c \
$(top_srcdir)/Xext/xf86vmode.c $(top_srcdir)/Xext/xf86vmode.c
xkb%.c: $(srcdir)/ddx$*.c xkb%.c:
echo "#define XF86DDXACTIONS" > $@ echo "#define XF86DDXACTIONS" > $@
echo "#include \"$(top_srcdir)/xkb/ddx$*.c\"" >> $@ echo "#include \"$(top_srcdir)/xkb/ddx$*.c\"" >> $@

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

@ -2,6 +2,8 @@ noinst_LIBRARIES = libdummy.a
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS)
libdummy_a_SOURCES = getvalidbios.c \ libdummy_a_SOURCES = getvalidbios.c \
pcitestmulti.c xf86allocscripi.c \ pcitestmulti.c xf86allocscripi.c \
xf86addrestolist.c xf86drvmsg.c xf86drvmsgverb.c \ xf86addrestolist.c xf86drvmsg.c xf86drvmsgverb.c \

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

@ -8,6 +8,8 @@ libfbdevhw_la_SOURCES = fbdevhw.c
INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
AM_CFLAGS = $(XORG_CFLAGS)
sdk_HEADERS = fbdevhw.h sdk_HEADERS = fbdevhw.h
EXTRA_DIST = fbpriv.h EXTRA_DIST = fbpriv.h

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

@ -4,4 +4,6 @@ libi2c_la_SOURCES = xf86i2c.c xf86i2cmodule.c
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS)
sdk_HEADERS = xf86i2c.h sdk_HEADERS = xf86i2c.h

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

@ -23,7 +23,7 @@ libint10_la_SOURCES = pci.c xf86int10module.c helper_exec.c helper_mem.c \
endif endif
if INT10_STUB if INT10_STUB
AM_CFLAGS = -D_PC -D_VM86_LINUX AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS)
libint10_la_SOURCES = stub.c xf86int10module.c libint10_la_SOURCES = stub.c xf86int10module.c
endif endif

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

@ -5,7 +5,7 @@ INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../vbe \
-I$(srcdir)/../vgahw -I$(srcdir)/../ramdac -I$(srcdir)/../shadowfb -I$(srcdir)/../vgahw -I$(srcdir)/../ramdac -I$(srcdir)/../shadowfb
#AM_LDFLAGS = -r #AM_LDFLAGS = -r
AM_CFLAGS = -DIN_LOADER AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS)
EXTRA_DIST = \ EXTRA_DIST = \
aout.h \ aout.h \

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

@ -11,6 +11,8 @@ endif
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS)
EXTRA_DIST = \ EXTRA_DIST = \
460gxPCI.h \ 460gxPCI.h \
Pci.h \ Pci.h \

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

@ -5,18 +5,20 @@ endif
noinst_LIBRARIES = liblinux.a noinst_LIBRARIES = liblinux.a
liblinux_a_SOURCES = lnx_init.c lnx_video.c lnx_io.c lnx_kbd.c lnx_mouse.c \ liblinux_a_SOURCES = lnx_init.c lnx_video.c lnx_io.c lnx_kbd.c lnx_mouse.c \
lnx_pci.c lnx_apm.c lnx_agp.c lnx_kmod.c lnx_KbdMap.c \ lnx_pci.c lnx_agp.c lnx_kmod.c lnx_KbdMap.c \
../shared/bios_mmap.c ../shared/VTsw_usl.c \ $(srcdir)/../shared/bios_mmap.c \
../shared/std_kbdEv.c ../shared/posix_tty.c \ $(srcdir)/../shared/VTsw_usl.c \
../shared/vidmem.c ../shared/sigio.c \ $(srcdir)/../shared/std_kbdEv.c \
../shared/stdResource.c ../shared/libc_wrapper.c \ $(srcdir)/../shared/posix_tty.c \
../shared/at_scancode.c $(srcdir)/../shared/vidmem.c \
#libxorglinux_a_LIBADD = int10/libxorglinuxint10.a \ $(srcdir)/../shared/sigio.c \
# $(DRI_LIBS) $(srcdir)/../shared/stdResource.c \
$(srcdir)/../shared/libc_wrapper.c \
$(srcdir)/../shared/at_scancode.c
sdk_HEADERS = agpgart.h sdk_HEADERS = agpgart.h
AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS)
SUBDIRS = $(DRI_SUBDIRS) SUBDIRS = $(DRI_SUBDIRS)

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

@ -1,8 +1,8 @@
INCLUDES = -I$(srcdir)/../../shared/drm/kernel INCLUDES = -I$(srcdir)/../../shared/drm/kernel
noinst_LIBRARIES = libxorglinuxdrm.a sdklibdir = $(libdir)/xorg
sdklib_LIBRARIES = libxorglinuxdrm.a
libxorglinuxdrm_a_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c \ libxorglinuxdrm_a_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c \
xf86drmSL.c drmmodule.c xf86drmSL.c drmmodule.c
sdk_LIBDIR = $(libdir)/xorg AM_CFLAGS = $(XORG_CFLAGS)
sdk_LIBS = libxorglinuxdrm.a

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

@ -1,5 +1,7 @@
INCLUDES = -I$(srcdir)/../../../int10 INCLUDES = -I$(srcdir)/../../../int10
AM_CFLAGS = $(XORG_CFLAGS)
noinst_LIBRARIES = libxorglinuxint10.a noinst_LIBRARIES = libxorglinuxint10.a
libxorglinuxint10_a_SOURCES = linux.c ../../../int10/helper_mem.c \ libxorglinuxint10_a_SOURCES = linux.c ../../../int10/helper_mem.c \
../../../int10/pci.c \ ../../../int10/pci.c \

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

@ -2,6 +2,8 @@ noinst_LIBRARIES = libmisc.a
libmisc_a_SOURCES = Delay.c IODelay.c BUSmemcpy.c SlowBcopy.c libmisc_a_SOURCES = Delay.c IODelay.c BUSmemcpy.c SlowBcopy.c
AM_LDFLAGS = -r #AM_LDFLAGS = -r
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS)

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

@ -3,6 +3,8 @@ libparser_a_SOURCES = Device.c Files.c Flags.c Input.c Keyboard.c Layout.c \
Module.c Video.c Monitor.c Pointer.c Screen.c \ Module.c Video.c Monitor.c Pointer.c Screen.c \
Vendor.c read.c scan.c write.c DRI.c Extensions.c Vendor.c read.c scan.c write.c DRI.c Extensions.c
AM_CFLAGS = $(XORG_CFLAGS)
EXTRA_DIST = \ EXTRA_DIST = \
Configint.h \ Configint.h \
configProcs.h \ configProcs.h \

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

@ -4,3 +4,5 @@ librac_la_SOURCES = xf86RACmodule.c xf86RAC.c
sdk_HEADERS = xf86RAC.h sdk_HEADERS = xf86RAC.h
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS)

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

@ -8,7 +8,8 @@ sdk_HEADERS = BT.h IBM.h TI.h xf86Cursor.h xf86RamDac.h
DISTCLEANFILES = xf86BitOrder.c DISTCLEANFILES = xf86BitOrder.c
EXTRA_DIST = BTPriv.h IBMPriv.h TIPriv.h xf86CursorPriv.h xf86RamDacPriv.h EXTRA_DIST = BTPriv.h IBMPriv.h TIPriv.h xf86CursorPriv.h xf86RamDacPriv.h
AM_CFLAGS = -DXAAReverseBitOrder=xf86ReverseBitOrder -DRAMDAC_MODULE AM_CFLAGS = -DXAAReverseBitOrder=xf86ReverseBitOrder -DRAMDAC_MODULE \
$(XORG_CFLAGS)
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
xf86BitOrder.c: xf86BitOrder.c:

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

@ -5,6 +5,10 @@ libscanpci_la_SOURCES = xf86ScanPci.c
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS)
BUILT_SOURCES = xf86PciIds.h
EXTRA_DIST = \ EXTRA_DIST = \
xf86PciData.h \ xf86PciData.h \
xf86PciIds.h \ xf86PciIds.h \
@ -16,4 +20,7 @@ xf86PciData.c:
echo "#define PCIDATA" > $@ echo "#define PCIDATA" > $@
echo "#include \"$(srcdir)/xf86ScanPci.c\"" >> $@ echo "#include \"$(srcdir)/xf86ScanPci.c\"" >> $@
DISTCLEANFILES = xf86PciData.c xf86PciIds.h: $(srcdir)/../common/xf86PciInfo.h
$(PERL) $(srcdir)/pciid2c.pl $(srcdir)/../common/xf86PciInfo.h < $(srcdir)/pci.ids > xf86PciIds.h
DISTCLEANFILES = xf86PciData.c xf86PciIds.h

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

@ -4,3 +4,5 @@ libshadowfb_la_SOURCES = sfbmodule.c shadow.c
sdk_HEADERS = shadowfb.h sdk_HEADERS = shadowfb.h
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS)

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

@ -3,5 +3,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)
INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \ INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
-I$(srcdir)/../int10 -I$(srcdir)/../int10

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

@ -1,5 +1,6 @@
module_LTLIBRARIES = libvgahw.la module_LTLIBRARIES = libvgahw.la
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)
sdk_HEADERS = vgaHW.h sdk_HEADERS = vgaHW.h

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

@ -61,3 +61,5 @@ EXTRA_DIST = xaaWrapper.h xaacexp.h xaawrap.h xaaLine.c xaaDashLine.c \
xaaStipple.c xaaTEGlyph.c xaaBitmap.c xaaStipple.c xaaTEGlyph.c xaaBitmap.c
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS)

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

@ -58,7 +58,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 AM_CFLAGS = -DXF86MONO -include mfbmap.h $(XORG_CFLAGS)
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
mfbseg.c: mfbseg.c:

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

@ -44,7 +44,7 @@ libxf4bpp_la_SOURCES = \
mfbzerarc.c \ mfbzerarc.c \
vgamodule.c vgamodule.c
libxf4bpp_la_LIBADD=../xf1bpp/libxf1bpp.la libxf4bpp_la_LIBADD = ../xf1bpp/libxf1bpp.la
EXTRA_DIST = OScompiler.h ibmTrace.h ppcGCstr.h ppcSpMcro.h vgaReg.h \ EXTRA_DIST = OScompiler.h ibmTrace.h ppcGCstr.h ppcSpMcro.h vgaReg.h \
vgaVideo.h wm3.h vgaVideo.h wm3.h
@ -55,5 +55,6 @@ mfbseg.c:
echo "#define POLYSEGMENT" > $@ echo "#define POLYSEGMENT" > $@
echo "#include \"$(top_srcdir)/mfb/mfbline.c\"" >> $@ echo "#include \"$(top_srcdir)/mfb/mfbline.c\"" >> $@
INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb \ INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp
-I$(top_srcdir)/cfb
AM_CFLAGS = $(XORG_CFLAGS)

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

@ -2,7 +2,9 @@ module_LTLIBRARIES = libxf8_16bpp.la
sdk_HEADERS = cfb8_16.h sdk_HEADERS = cfb8_16.h
INCLUDES = $(XORG_INCS) -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS)
libxf8_16bpp_la_SOURCES = \ libxf8_16bpp_la_SOURCES = \
cfb8_16module.c \ cfb8_16module.c \

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

@ -2,7 +2,8 @@ module_LTLIBRARIES = libxf8_32bpp.la
sdk_HEADERS = cfb8_32.h sdk_HEADERS = cfb8_32.h
INCLUDES = -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS)
libxf8_32bpp_la_SOURCES = \ libxf8_32bpp_la_SOURCES = \
cfbbstore.c \ cfbbstore.c \

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

@ -2,7 +2,8 @@ module_LTLIBRARIES = libxf8_32wid.la
sdk_HEADERS = cfb8_32wid.h sdk_HEADERS = cfb8_32wid.h
INCLUDES = $(XORG_INCS) -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS)
libxf8_32wid_la_SOURCES = \ libxf8_32wid_la_SOURCES = \
cfb8_32widmodule.c \ cfb8_32widmodule.c \

2
include/Makefile.am
View File

@ -45,4 +45,6 @@ sdk_HEADERS = \
windowstr.h \ windowstr.h \
xorg-server.h xorg-server.h
AM_CFLAGS = $(DIX_CFLAGS)
EXTRA_DIST = $(sdk_HEADERS) do-not-use-config.h dix-config.h xorg-config.h EXTRA_DIST = $(sdk_HEADERS) do-not-use-config.h dix-config.h xorg-config.h

2
mfb/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = libmfb.la noinst_LTLIBRARIES = libmfb.la
AM_CFLAGS = $(DIX_CFLAGS)
libmfb_gen_sources = mfbseg.c mfbpgbwht.c mfbpgbblak.c mfbpgbinv.c mfbigbwht.c \ libmfb_gen_sources = mfbseg.c mfbpgbwht.c mfbpgbblak.c mfbpgbinv.c mfbigbwht.c \
mfbigbblak.c mfbpawhite.c mfbpablack.c mfbpainv.c mfbtewhite.c \ mfbigbblak.c mfbpawhite.c mfbpablack.c mfbpainv.c mfbtewhite.c \
mfbteblack.c mfbbltC.c mfbbltX.c mfbbltCI.c mfbbltO.c mfbbltG.c \ mfbteblack.c mfbbltC.c mfbbltX.c mfbbltCI.c mfbbltO.c mfbbltG.c \

2
mi/Makefile.am
View File

@ -3,6 +3,8 @@ noinst_LTLIBRARIES = libminimi.la libmi.la
sdk_HEADERS = mibank.h micmap.h miline.h mipointer.h mi.h mibstore.h \ sdk_HEADERS = mibank.h micmap.h miline.h mipointer.h mi.h mibstore.h \
migc.h mipointrst.h mizerarc.h micoord.h migc.h mipointrst.h mizerarc.h micoord.h
AM_CFLAGS = $(DIX_CFLAGS)
# 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 = \
cbrt.c \ cbrt.c \

2
miext/cw/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = libcw.la noinst_LTLIBRARIES = libcw.la
AM_CFLAGS = $(DIX_CFLAGS)
libcw_la_SOURCES = \ libcw_la_SOURCES = \
cw.c \ cw.c \
cw_ops.c \ cw_ops.c \

2
miext/damage/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = libdamage.la noinst_LTLIBRARIES = libdamage.la
AM_CFLAGS = $(DIX_CFLAGS)
libdamage_la_SOURCES = \ libdamage_la_SOURCES = \
damage.c \ damage.c \
damage.h \ damage.h \

2
miext/layer/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = liblayer.la noinst_LTLIBRARIES = liblayer.la
AM_CFLAGS = $(DIX_CFLAGS)
liblayer_la_SOURCES = \ liblayer_la_SOURCES = \
layer.h \ layer.h \
layergc.c \ layergc.c \

2
miext/shadow/Makefile.am
View File

@ -1,5 +1,7 @@
module_LTLIBRARIES = libshadow.la module_LTLIBRARIES = libshadow.la
AM_CFLAGS = $(DIX_CFLAGS)
sdk_HEADERS = shadow.h sdk_HEADERS = shadow.h
libshadow_la_SOURCES = \ libshadow_la_SOURCES = \

5
os/Makefile.am
View File

@ -1,8 +1,7 @@
noinst_LTLIBRARIES = libos.la noinst_LTLIBRARIES = libos.la
#ifdef HAVE_CONFIG_H AM_CFLAGS = $(DIX_CFLAGS)
#include <config.h>
#endif
# k5auth.c \ # k5auth.c \
# lbxio.c \ # lbxio.c \
# rpcauth.c \ # rpcauth.c \

2
randr/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = librandr.la noinst_LTLIBRARIES = librandr.la
AM_CFLAGS = $(DIX_CFLAGS)
librandr_la_SOURCES = \ librandr_la_SOURCES = \
mirandr.c \ mirandr.c \
randr.c \ randr.c \

2
record/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = librecord.la noinst_LTLIBRARIES = librecord.la
AM_CFLAGS = $(DIX_CFLAGS)
librecord_la_SOURCES = record.c set.c librecord_la_SOURCES = record.c set.c
EXTRA_DIST = set.h EXTRA_DIST = set.h

2
render/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = librender.la noinst_LTLIBRARIES = librender.la
AM_CFLAGS = $(DIX_CFLAGS)
librender_la_SOURCES = \ librender_la_SOURCES = \
animcur.c \ animcur.c \
filter.c \ filter.c \

2
xfixes/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = libxfixes.la noinst_LTLIBRARIES = libxfixes.la
AM_CFLAGS = $(DIX_CFLAGS)
libxfixes_la_SOURCES = \ libxfixes_la_SOURCES = \
cursor.c \ cursor.c \
region.c \ region.c \

2
xkb/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = libxkb.la noinst_LTLIBRARIES = libxkb.la
AM_CFLAGS = $(DIX_CFLAGS)
DDX_SRCS = \ DDX_SRCS = \
ddxBeep.c \ ddxBeep.c \
ddxCtrls.c \ ddxCtrls.c \