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

Add missing include paths.

This commit is contained in:
Daniel Stone 2005-07-03 12:17:04 +00:00
parent 461eb6ebd9
commit b0d80e76d2
10 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
GL/glx/glcontextmodes.c
View File

@ -31,9 +31,10 @@
* \author Ian Romanick <idr@us.ibm.com> * \author Ian Romanick <idr@us.ibm.com>
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h> #include <dix-config.h>
#endif #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,9 +27,10 @@
* \author Ian Romanick <idr@us.ibm.com> * \author Ian Romanick <idr@us.ibm.com>
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifndef GLCONTEXTMODES_H #ifndef GLCONTEXTMODES_H
#define GLCONTEXTMODES_H #define GLCONTEXTMODES_H

4
configure.ac
View File

@ -28,7 +28,7 @@ dnl we aren't intelligent about padding the version, so it always has to be four
dnl digits. ho hum. dnl digits. ho hum.
AC_INIT([xorg-server], 6.9.99.0, [daniel@freedesktop.org], xorg-server) AC_INIT([xorg-server], 6.9.99.0, [daniel@freedesktop.org], xorg-server)
AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2]) AM_INIT_AUTOMAKE([dist-bzip2 foreign nostdinc])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
dnl this gets generated by autoheader, and thus contains all the defines. we dnl this gets generated by autoheader, and thus contains all the defines. we
dnl don't ever actually use it, internally. 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' 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' CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include'
PKG_CHECK_MODULES([XSERVER], [$REQUIRED_MODULES]) PKG_CHECK_MODULES([XSERVER], [$REQUIRED_MODULES])
XSERVER_LIBS="${XSERVER_LIBS} -lm -lz" XSERVER_LIBS="${XSERVER_LIBS} -lm -lz"

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

@ -53,7 +53,7 @@ libcommon_a_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
$(KBDSOURCES) $(KBDSOURCES)
libinit_a_SOURCES = xf86Build.h xf86Init.c 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)/../loader -I$(srcdir)/../rac -I$(srcdir)/../parser \
-I$(srcdir)/../scanpci -I$(srcdir)/../vbe -I$(srcdir)/../int10 \ -I$(srcdir)/../scanpci -I$(srcdir)/../vbe -I$(srcdir)/../int10 \
-I$(srcdir)/../vgahw -I$(srcdir)/../vgahw

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

@ -3,7 +3,7 @@ module_LTLIBRARIES = libscanpci.la libpcidata.la
libpcidata_la_SOURCES = xf86PciData.c libpcidata_la_SOURCES = xf86PciData.c
libscanpci_la_SOURCES = xf86ScanPci.c libscanpci_la_SOURCES = xf86ScanPci.c
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS) -I.
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(XORG_CFLAGS)

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

@ -59,7 +59,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 $(XORG_CFLAGS) AM_CFLAGS = -DXF86MONO -include mfbmap.h $(XORG_CFLAGS)
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb
mfbseg.c: mfbseg.c:
echo "#define POLYSEGMENT" > $@ echo "#define POLYSEGMENT" > $@

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

@ -55,6 +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 INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(XORG_CFLAGS)

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

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

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

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

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

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