summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorJohannes Obermayr <johannesobermayr@gmx.de>2013-01-12 15:34:22 +0100
committerAndreas Boll <andreas.boll.dev@gmail.com>2013-01-13 12:38:50 +0100
commit6acef6c5f779ed0ba390f556479c428a36d70edb (patch)
treeeb7c894cc3af70c3b58757181b867839e5def6c1 /src/mesa
parent40a9b0f5d2498d86e2e6a8e61c0737938559d6db (diff)
xmlpool: Fix out-of-tree builds.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/common/xmlpool/Makefile.am2
-rw-r--r--src/mesa/drivers/dri/i915/Makefile.am1
-rw-r--r--src/mesa/drivers/dri/i965/Makefile.am1
-rw-r--r--src/mesa/drivers/dri/r200/Makefile.am1
-rw-r--r--src/mesa/drivers/dri/radeon/Makefile.am1
5 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/common/xmlpool/Makefile.am b/src/mesa/drivers/dri/common/xmlpool/Makefile.am
index b2a423cf20..b99df40d8b 100644
--- a/src/mesa/drivers/dri/common/xmlpool/Makefile.am
+++ b/src/mesa/drivers/dri/common/xmlpool/Makefile.am
@@ -62,7 +62,7 @@ clean:
# Default target options.h
options.h: LOCALEDIR := .
options.h: t_options.h $(MOS)
- $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/gen_xmlpool.py t_options.h $(LOCALEDIR) $(LANGS) > options.h
+ $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/gen_xmlpool.py $(srcdir)/t_options.h $(LOCALEDIR) $(LANGS) > options.h
# Update .mo files from the corresponding .po files.
%/LC_MESSAGES/options.mo: %.po
diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am
index 7db439893e..72e0659530 100644
--- a/src/mesa/drivers/dri/i915/Makefile.am
+++ b/src/mesa/drivers/dri/i915/Makefile.am
@@ -32,6 +32,7 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/mesa/drivers/dri/intel \
-I$(top_srcdir)/src/mesa/drivers/dri/intel/server \
+ -I$(top_builddir)/src/mesa/drivers/dri/common \
$(DEFINES) \
$(API_DEFINES) \
$(VISIBILITY_CFLAGS) \
diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index c59e6ccdd7..dc140df354 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -34,6 +34,7 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/drivers/dri/intel \
-I$(top_srcdir)/src/mesa/drivers/dri/intel/server \
-I$(top_srcdir)/src/gtest/include \
+ -I$(top_builddir)/src/mesa/drivers/dri/common \
$(DEFINES) \
$(API_DEFINES) \
$(VISIBILITY_CFLAGS) \
diff --git a/src/mesa/drivers/dri/r200/Makefile.am b/src/mesa/drivers/dri/r200/Makefile.am
index 34ce5311f5..49913991f8 100644
--- a/src/mesa/drivers/dri/r200/Makefile.am
+++ b/src/mesa/drivers/dri/r200/Makefile.am
@@ -31,6 +31,7 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/mesa/drivers/dri/r200/server \
+ -I$(top_builddir)/src/mesa/drivers/dri/common \
$(DEFINES) \
$(API_DEFINES) \
$(VISIBILITY_CFLAGS) \
diff --git a/src/mesa/drivers/dri/radeon/Makefile.am b/src/mesa/drivers/dri/radeon/Makefile.am
index f83616220b..b0aaa45292 100644
--- a/src/mesa/drivers/dri/radeon/Makefile.am
+++ b/src/mesa/drivers/dri/radeon/Makefile.am
@@ -31,6 +31,7 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/mesa/drivers/dri/radeon/server \
+ -I$(top_builddir)/src/mesa/drivers/dri/common \
$(DEFINES) \
$(API_DEFINES) \
$(VISIBILITY_CFLAGS) \