summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2005-07-03 15:51:23 +0000
committerDaniel Stone <daniel@fooishbar.org>2005-07-03 15:51:23 +0000
commitd010de6979a6c51a628f2f8e6d7f479a542d1e8b (patch)
treea7614e4e364e2960b0d38c93acb047c5d7c26a6f
parentb0d80e76d28dbc1ee14453950db000bb4d7f377f (diff)
Abandon the nostdinc experiment.
-rw-r--r--configure.ac2
-rw-r--r--hw/xfree86/common/Makefile.am2
-rw-r--r--hw/xfree86/scanpci/Makefile.am2
3 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 34e5d7956..f6e3380d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ dnl we aren't intelligent about padding the version, so it always has to be four
dnl digits. ho hum.
AC_INIT([xorg-server], 6.9.99.0, [daniel@freedesktop.org], xorg-server)
AC_CONFIG_SRCDIR([Makefile.am])
-AM_INIT_AUTOMAKE([dist-bzip2 foreign nostdinc])
+AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
dnl this gets generated by autoheader, and thus contains all the defines. we
dnl don't ever actually use it, internally.
diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index 7dc87e31a..e67d14dd3 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -53,7 +53,7 @@ libcommon_a_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
$(KBDSOURCES)
libinit_a_SOURCES = xf86Build.h xf86Init.c
-INCLUDES = $(XORG_INCS) -I. -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
+INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
-I$(srcdir)/../loader -I$(srcdir)/../rac -I$(srcdir)/../parser \
-I$(srcdir)/../scanpci -I$(srcdir)/../vbe -I$(srcdir)/../int10 \
-I$(srcdir)/../vgahw
diff --git a/hw/xfree86/scanpci/Makefile.am b/hw/xfree86/scanpci/Makefile.am
index 0acfe6ea1..78aaffdd2 100644
--- a/hw/xfree86/scanpci/Makefile.am
+++ b/hw/xfree86/scanpci/Makefile.am
@@ -3,7 +3,7 @@ module_LTLIBRARIES = libscanpci.la libpcidata.la
libpcidata_la_SOURCES = xf86PciData.c
libscanpci_la_SOURCES = xf86ScanPci.c
-INCLUDES = $(XORG_INCS) -I.
+INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS)