diff options
| author | Ian Romanick <idr@umwelt.(none)> | 2006-07-21 15:25:35 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@umwelt.(none)> | 2006-07-21 15:25:35 -0700 |
| commit | 07ad92d2c4cb07db8487d76efc822fd7b88137cb (patch) | |
| tree | c968006cd181116d833a807f61d2e82373310ef9 /hw/xfree86/Makefile.am | |
| parent | 18624a9b7cf88e769c53cc3a876b3647c5d5057c (diff) | |
| parent | 22db3fdb54d2f7f6b72638b46c186af6db04e214 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/common/xf86DoScanPci.c
hw/xfree86/common/xf86Init.c
hw/xfree86/common/xf86pciBus.c
Diffstat (limited to 'hw/xfree86/Makefile.am')
| -rw-r--r-- | hw/xfree86/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index 80202a154..be0af3542 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -16,7 +16,7 @@ DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \ bin_PROGRAMS = Xorg -AM_CFLAGS = @XORG_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = @XORG_CFLAGS@ INCLUDES = @XORG_INCS@ Xorg_SOURCES = xorg.c |