added missing glapi to SUBDIRS.

Added missing -I$(top_srcdir)/hw/xfree86/common.
This commit is contained in:
Matthias Hopf 2006-03-09 14:26:37 +00:00
parent a0c002f2ea
commit c73da7bc63
6 changed files with 11 additions and 5 deletions

View file

@ -1,3 +1,9 @@
2006-03-09 Matthias Hopf <mhopf@suse.de>
* GL/mesa/Makefile.am: added missing glapi to SUBDIRS.
* cfb/Makefile.am, cfb16/Makefile.am, cfb24/Makefile.am, cfb32/Makefile.am:
Added missing -I$(top_srcdir)/hw/xfree86/common.
2006-03-09 Matthias Hopf <mhopf@suse.de>
* configure.ac: Do Xorg configure checks for Xgl only as well

View file

@ -1,4 +1,4 @@
SUBDIRS = main math array_cache swrast swrast_setup tnl shader X
SUBDIRS = main math array_cache swrast swrast_setup tnl shader X glapi
noinst_LTLIBRARIES = libGLcore.la

View file

@ -11,7 +11,7 @@ libcfb_la_LIBADD = ../mfb/libmfb.la
AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/common
EXTRA_DIST = cfbline.c cfbfillarc.c cfbzerarc.c cfbblt.c cfbsolid.c \
cfbtileodd.c cfbtile32.c cfb8line.c cfbply1rct.c cfbglblt8.c \

View file

@ -4,6 +4,6 @@ include $(top_srcdir)/cfb/Makefile.am.inc
libcfb16_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources)
INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/common
AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@

View file

@ -8,4 +8,4 @@ EXTRA_DIST = cfbrrop24.h
AM_CFLAGS = -DPSZ=24 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/common

View file

@ -4,6 +4,6 @@ include $(top_srcdir)/cfb/Makefile.am.inc
libcfb32_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources)
INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS) -I$(top_srcdir)/hw/xfree86/os-support
INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS) -I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/common
AM_CFLAGS = -DPSZ=32 $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@