summaryrefslogtreecommitdiff
path: root/hw/xgl
diff options
context:
space:
mode:
authorKeith Packard <keithp@neko.keithp.com>2006-11-07 12:49:28 -0800
committerKeith Packard <keithp@neko.keithp.com>2006-11-07 12:49:28 -0800
commit20e9144c0746943624ff77a61791b8596f3f8458 (patch)
tree6aa23f1b627390bfabb165eed31b50e7ef8c1fb9 /hw/xgl
parent1dcda4f3c56214464c0b6123fea6daa69aae69fc (diff)
Add $(DIX_CFLAGS) to remaining Makefile.am files
Diffstat (limited to 'hw/xgl')
-rw-r--r--hw/xgl/Makefile.am2
-rw-r--r--hw/xgl/egl/Makefile.am2
-rw-r--r--hw/xgl/egl/module/Makefile.am1
-rw-r--r--hw/xgl/glx/Makefile.am2
-rw-r--r--hw/xgl/glx/module/Makefile.am2
-rw-r--r--hw/xgl/glxext/Makefile.am2
-rw-r--r--hw/xgl/glxext/module/Makefile.am2
7 files changed, 7 insertions, 6 deletions
diff --git a/hw/xgl/Makefile.am b/hw/xgl/Makefile.am
index 48a9825d2..965060cd7 100644
--- a/hw/xgl/Makefile.am
+++ b/hw/xgl/Makefile.am
@@ -19,7 +19,7 @@ SUBDIRS = \
$(XEGL_SUBDIRS)
AM_CFLAGS = \
- \
+ $(DIX_CFLAGS) \
-DHAVE_XGL_CONFIG_H \
-DHAVE_DIX_CONFIG_H \
-I$(top_srcdir)/GL/glx \
diff --git a/hw/xgl/egl/Makefile.am b/hw/xgl/egl/Makefile.am
index ded4a15e2..5136e58b1 100644
--- a/hw/xgl/egl/Makefile.am
+++ b/hw/xgl/egl/Makefile.am
@@ -9,7 +9,7 @@ SUBDIRS = \
$(XGL_MODULE_DIRS)
AM_CFLAGS = \
- \
+ $(DIX_CFLAGS) \
-DHAVE_XGL_CONFIG_H \
-DHAVE_DIX_CONFIG_H \
$(XEGLMODULES_CFLAGS)
diff --git a/hw/xgl/egl/module/Makefile.am b/hw/xgl/egl/module/Makefile.am
index 7ed217322..c84f85c90 100644
--- a/hw/xgl/egl/module/Makefile.am
+++ b/hw/xgl/egl/module/Makefile.am
@@ -1,4 +1,5 @@
AM_CFLAGS = \
+ $(DIX_CFLAGS) \
-I$(srcdir)/.. \
-I$(srcdir)/../.. \
$(XEGLMODULES_CFLAGS)
diff --git a/hw/xgl/glx/Makefile.am b/hw/xgl/glx/Makefile.am
index 10a831f94..314c02e96 100644
--- a/hw/xgl/glx/Makefile.am
+++ b/hw/xgl/glx/Makefile.am
@@ -15,7 +15,7 @@ AM_CFLAGS = \
-I$(top_srcdir)/GL/include \
-I@MESA_SOURCE@/include \
-I@MESA_SOURCE@/src/mesa/glapi \
- \
+ $(DIX_CFLAGS) \
-DHAVE_XGL_CONFIG_H \
-DHAVE_DIX_CONFIG_H \
$(XGLXMODULES_CFLAGS)
diff --git a/hw/xgl/glx/module/Makefile.am b/hw/xgl/glx/module/Makefile.am
index 846942a43..bd1c4b08f 100644
--- a/hw/xgl/glx/module/Makefile.am
+++ b/hw/xgl/glx/module/Makefile.am
@@ -2,7 +2,7 @@ if GLX
GLX_LIB = $(top_builddir)/hw/xgl/glxext/libxglglxext.la
endif
-AM_CFLAGS = \
+AM_CFLAGS = $(DIX_CFLAGS) \
-I$(srcdir)/.. \
-I$(srcdir)/../.. \
$(XGLXMODULES_CFLAGS)
diff --git a/hw/xgl/glxext/Makefile.am b/hw/xgl/glxext/Makefile.am
index c400f364a..98a9b13c4 100644
--- a/hw/xgl/glxext/Makefile.am
+++ b/hw/xgl/glxext/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = module
AM_CFLAGS = \
- \
+ $(DIX_CFLAGS) \
-DHAVE_XGL_CONFIG_H \
-DHAVE_DIX_CONFIG_H \
$(XGLMODULES_CFLAGS) \
diff --git a/hw/xgl/glxext/module/Makefile.am b/hw/xgl/glxext/module/Makefile.am
index 82c4211d8..4633f7ffa 100644
--- a/hw/xgl/glxext/module/Makefile.am
+++ b/hw/xgl/glxext/module/Makefile.am
@@ -1,5 +1,5 @@
AM_CFLAGS = \
- \
+ $(DIX_CFLAGS) \
-DHAVE_XGL_CONFIG_H \
-DHAVE_DIX_CONFIG_H \
$(XGLMODULES_CFLAGS) \