summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2005-07-03 12:17:04 +0000
committerDaniel Stone <daniel@fooishbar.org>2005-07-03 12:17:04 +0000
commitb0d80e76d28dbc1ee14453950db000bb4d7f377f (patch)
treedecd7a8a3ae9b14d0a7b5ed97b0a561216cbc3b1
parent461eb6ebd9273dc3dcd601ee0a0491981a98acd9 (diff)
Add missing include paths.
-rw-r--r--GL/glx/glcontextmodes.c3
-rw-r--r--GL/glx/glcontextmodes.h3
-rw-r--r--configure.ac4
-rw-r--r--hw/xfree86/common/Makefile.am2
-rw-r--r--hw/xfree86/scanpci/Makefile.am2
-rw-r--r--hw/xfree86/xf1bpp/Makefile.am2
-rw-r--r--hw/xfree86/xf4bpp/Makefile.am2
-rw-r--r--hw/xfree86/xf8_16bpp/Makefile.am2
-rw-r--r--hw/xfree86/xf8_32bpp/Makefile.am2
-rw-r--r--hw/xfree86/xf8_32wid/Makefile.am2
10 files changed, 13 insertions, 11 deletions
diff --git a/GL/glx/glcontextmodes.c b/GL/glx/glcontextmodes.c
index 1893a9e69..b5b9f2c89 100644
--- a/GL/glx/glcontextmodes.c
+++ b/GL/glx/glcontextmodes.c
@@ -31,9 +31,10 @@
* \author Ian Romanick <idr@us.ibm.com>
*/
-#ifdef HAVE_CONFIG_H
+#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
+
#ifdef DRI_NEW_INTERFACE_ONLY
# include <stdlib.h>
# include <string.h>
diff --git a/GL/glx/glcontextmodes.h b/GL/glx/glcontextmodes.h
index d8f2064d5..31de4eb5a 100644
--- a/GL/glx/glcontextmodes.h
+++ b/GL/glx/glcontextmodes.h
@@ -27,9 +27,10 @@
* \author Ian Romanick <idr@us.ibm.com>
*/
-#ifdef HAVE_CONFIG_H
+#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
+
#ifndef GLCONTEXTMODES_H
#define GLCONTEXTMODES_H
diff --git a/configure.ac b/configure.ac
index e8d8c6dd9..34e5d7956 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])
+AM_INIT_AUTOMAKE([dist-bzip2 foreign nostdinc])
AM_MAINTAINER_MODE
dnl this gets generated by autoheader, and thus contains all the defines. we
dnl don't ever actually use it, internally.
@@ -426,7 +426,7 @@ XPSTUBS_LIB='$(top_builddir)/dix/libxpstubs.la'
XKB_LIB='$(top_builddir)/xkb/libxkb.la'
XI_LIB='$(top_builddir)/Xi/libXi.la'
XI_INC='-I$(top_srcdir)/Xi'
-CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/inc'
+CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include'
PKG_CHECK_MODULES([XSERVER], [$REQUIRED_MODULES])
XSERVER_LIBS="${XSERVER_LIBS} -lm -lz"
diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index e67d14dd3..7dc87e31a 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$(srcdir)/../ddc -I$(srcdir)/../i2c \
+INCLUDES = $(XORG_INCS) -I. -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 78aaffdd2..0acfe6ea1 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)
+INCLUDES = $(XORG_INCS) -I.
AM_CFLAGS = $(XORG_CFLAGS)
diff --git a/hw/xfree86/xf1bpp/Makefile.am b/hw/xfree86/xf1bpp/Makefile.am
index 0758e6709..6525d3bb6 100644
--- a/hw/xfree86/xf1bpp/Makefile.am
+++ b/hw/xfree86/xf1bpp/Makefile.am
@@ -59,7 +59,7 @@ libxf1bppmfb_a_SOURCES = \
libxf1bpp_la_SOURCES = $(libxf1bppmfb_a_SOURCES) $(libxf1bppgen_a_SOURCES)
AM_CFLAGS = -DXF86MONO -include mfbmap.h $(XORG_CFLAGS)
-INCLUDES = $(XORG_INCS)
+INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb
mfbseg.c:
echo "#define POLYSEGMENT" > $@
diff --git a/hw/xfree86/xf4bpp/Makefile.am b/hw/xfree86/xf4bpp/Makefile.am
index 2dfc20b8c..863c0e9c9 100644
--- a/hw/xfree86/xf4bpp/Makefile.am
+++ b/hw/xfree86/xf4bpp/Makefile.am
@@ -55,6 +55,6 @@ mfbseg.c:
echo "#define POLYSEGMENT" > $@
echo "#include \"$(top_srcdir)/mfb/mfbline.c\"" >> $@
-INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp
+INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb
AM_CFLAGS = $(XORG_CFLAGS)
diff --git a/hw/xfree86/xf8_16bpp/Makefile.am b/hw/xfree86/xf8_16bpp/Makefile.am
index 1ead8f1bd..450db2712 100644
--- a/hw/xfree86/xf8_16bpp/Makefile.am
+++ b/hw/xfree86/xf8_16bpp/Makefile.am
@@ -2,7 +2,7 @@ module_LTLIBRARIES = libxf8_16bpp.la
sdk_HEADERS = cfb8_16.h
-INCLUDES = $(XORG_INCS)
+INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb
AM_CFLAGS = $(XORG_CFLAGS)
diff --git a/hw/xfree86/xf8_32bpp/Makefile.am b/hw/xfree86/xf8_32bpp/Makefile.am
index f96fb6b19..a5dfcec2d 100644
--- a/hw/xfree86/xf8_32bpp/Makefile.am
+++ b/hw/xfree86/xf8_32bpp/Makefile.am
@@ -2,7 +2,7 @@ module_LTLIBRARIES = libxf8_32bpp.la
sdk_HEADERS = cfb8_32.h
-INCLUDES = $(XORG_INCS)
+INCLUDES = $(XORG_INCS) -I$(top_srcdir)/cfb
AM_CFLAGS = $(XORG_CFLAGS)
libxf8_32bpp_la_SOURCES = \
diff --git a/hw/xfree86/xf8_32wid/Makefile.am b/hw/xfree86/xf8_32wid/Makefile.am
index 0e1860e5d..fc3dd6ebd 100644
--- a/hw/xfree86/xf8_32wid/Makefile.am
+++ b/hw/xfree86/xf8_32wid/Makefile.am
@@ -2,7 +2,7 @@ module_LTLIBRARIES = libxf8_32wid.la
sdk_HEADERS = cfb8_32wid.h
-INCLUDES = $(XORG_INCS)
+INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb
AM_CFLAGS = $(XORG_CFLAGS)
libxf8_32wid_la_SOURCES = \