From c73da7bc63b65051286f316e45fdca6f679d692f Mon Sep 17 00:00:00 2001 From: Matthias Hopf Date: Thu, 9 Mar 2006 14:26:37 +0000 Subject: [PATCH] added missing glapi to SUBDIRS. Added missing -I$(top_srcdir)/hw/xfree86/common. --- ChangeLog | 6 ++++++ GL/mesa/Makefile.am | 2 +- cfb/Makefile.am | 2 +- cfb16/Makefile.am | 2 +- cfb24/Makefile.am | 2 +- cfb32/Makefile.am | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9bcaa4548..26f457235 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-03-09 Matthias Hopf + + * 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 * configure.ac: Do Xorg configure checks for Xgl only as well diff --git a/GL/mesa/Makefile.am b/GL/mesa/Makefile.am index 72b699476..18eebfc92 100644 --- a/GL/mesa/Makefile.am +++ b/GL/mesa/Makefile.am @@ -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 diff --git a/cfb/Makefile.am b/cfb/Makefile.am index 54064c395..3699adaa8 100644 --- a/cfb/Makefile.am +++ b/cfb/Makefile.am @@ -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 \ diff --git a/cfb16/Makefile.am b/cfb16/Makefile.am index b062ddd6b..384d8bd74 100644 --- a/cfb16/Makefile.am +++ b/cfb16/Makefile.am @@ -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@ diff --git a/cfb24/Makefile.am b/cfb24/Makefile.am index 9a40ac780..223904ebf 100644 --- a/cfb24/Makefile.am +++ b/cfb24/Makefile.am @@ -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 diff --git a/cfb32/Makefile.am b/cfb32/Makefile.am index 0ec8f2a7e..a549d1839 100644 --- a/cfb32/Makefile.am +++ b/cfb32/Makefile.am @@ -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@