diff options
author | Ian Romanick <idr@us.ibm.com> | 2006-12-08 17:24:15 -0800 |
---|---|---|
committer | Ian Romanick <idr@us.ibm.com> | 2006-12-08 17:24:15 -0800 |
commit | e1f73d220873fa091695e46b7fcd008663a95a6f (patch) | |
tree | e6e58038b6aea53eca32326a903de4074600df54 /hw/xfree86/Makefile.am | |
parent | 27d682fa030501611a5b52f41f29738134b45c0b (diff) | |
parent | d56249a15ead51ad4d2117d5538ada24af05b693 (diff) |
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/common/xf86Configure.c
hw/xfree86/common/xf86Helper.c
hw/xfree86/common/xf86pciBus.c
hw/xfree86/int10/helper_exec.c
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/linuxPci.c
hw/xfree86/os-support/linux/lnx_pci.c
hw/xfree86/scanpci/Makefile.am
hw/xfree86/utils/pcitweak/Makefile.am
hw/xfree86/utils/scanpci/Makefile.am
Diffstat (limited to 'hw/xfree86/Makefile.am')
-rw-r--r-- | hw/xfree86/Makefile.am | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index e138db88f..f0c9e56f3 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -22,7 +22,7 @@ DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \ bin_PROGRAMS = Xorg -AM_CFLAGS = @XORG_CFLAGS@ +AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ INCLUDES = @XORG_INCS@ Xorg_SOURCES = xorg.c @@ -58,12 +58,15 @@ Xorg_LDADD = $(XORG_LIBS) \ Xorg_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) +BUILT_SOURCES = xorg.conf.example +CLEAN = xorg.conf.example xorg.conf.example.pre +EXTRA_DIST = xorgconf.cpp if SOLARIS_ASM_INLINE # Needs to be built before any files are compiled when using Sun compilers # so in*/out* inline definitions are properly processed. -BUILT_SOURCES = os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il +BUILT_SOURCES += os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il: cd os-support/solaris ; make solaris-$(SOLARIS_INOUT_ARCH).il @@ -84,17 +87,12 @@ endif optionsdir = $(libdir)/X11 dist_options_DATA = Options -BUILT_SOURCES = xorg.conf.example -CLEAN = xorg.conf.example xorg.conf.example.pre -EXTRA_DIST = xorgconf.cpp - CPP_FILES_FLAGS = \ -DRGBPATH=\"$(RGB_DB)\" \ -DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \ -DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc\"" \ -DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \ -DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/TTF\"" \ - -DCIDFONTPATH="\"$(BASE_FONT_PATH)/CID\"" \ -DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi\"" \ -DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi\"" \ -DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\" @@ -103,4 +101,4 @@ relink: rm -f Xorg && $(MAKE) Xorg xorg.conf.example.pre: xorgconf.cpp - cp $< $@ + cp $(srcdir)/xorgconf.cpp $@ |