xmlpool: Fix out-of-tree builds.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/gallium/state_trackers/dri/drm/Makefile.am b/src/gallium/state_trackers/dri/drm/Makefile.am
index 235c3b6..f8916b1 100644 (file)
--- a/src/gallium/state_trackers/dri/drm/Makefile.am
+++ b/src/gallium/state_trackers/dri/drm/Makefile.am
@@ -28,6 +28,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/mesa \
        -I$(top_srcdir)/src/gallium/state_trackers/dri/common \
        -I$(top_srcdir)/src/mesa/drivers/dri/common \
+       -I$(top_builddir)/src/mesa/drivers/dri/common \
        $(GALLIUM_CFLAGS) \
        $(LIBDRM_CFLAGS)
 

diff --git a/src/gallium/state_trackers/dri/sw/Makefile.am b/src/gallium/state_trackers/dri/sw/Makefile.am
index 9e4d976..b62161a 100644 (file)
--- a/src/gallium/state_trackers/dri/sw/Makefile.am
+++ b/src/gallium/state_trackers/dri/sw/Makefile.am
@@ -27,6 +27,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/mesa \
        -I$(top_srcdir)/src/gallium/state_trackers/dri/common \
        -I$(top_srcdir)/src/mesa/drivers/dri/common \
+       -I$(top_builddir)/src/mesa/drivers/dri/common \
        $(GALLIUM_CFLAGS) \
        $(LIBDRM_CFLAGS) \
        -D__NOT_HAVE_DRM_H

diff --git a/src/gallium/targets/dri-i915/Makefile.am b/src/gallium/targets/dri-i915/Makefile.am
index 842882c..f4f9030 100644 (file)
--- a/src/gallium/targets/dri-i915/Makefile.am
+++ b/src/gallium/targets/dri-i915/Makefile.am
@@ -31,6 +31,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/gallium/winsys \
        -I$(top_srcdir)/src/mesa \
        -I$(top_srcdir)/src/mapi \
+       -I$(top_builddir)/src/mesa/drivers/dri/common \
        -DGALLIUM_RBUG \
        -DGALLIUM_TRACE \
        -DGALLIUM_GALAHAD \

diff --git a/src/gallium/targets/dri-nouveau/Makefile.am b/src/gallium/targets/dri-nouveau/Makefile.am
index a232bb7..69ccf32 100644 (file)
--- a/src/gallium/targets/dri-nouveau/Makefile.am
+++ b/src/gallium/targets/dri-nouveau/Makefile.am
@@ -31,6 +31,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/gallium/winsys \
        -I$(top_srcdir)/src/mesa \
        -I$(top_srcdir)/src/mapi \
+       -I$(top_builddir)/src/mesa/drivers/dri/common \
        -DGALLIUM_RBUG \
        -DGALLIUM_TRACE
 

diff --git a/src/gallium/targets/dri-r300/Makefile.am b/src/gallium/targets/dri-r300/Makefile.am
index de70f35..8c0215d 100644 (file)
--- a/src/gallium/targets/dri-r300/Makefile.am
+++ b/src/gallium/targets/dri-r300/Makefile.am
@@ -31,6 +31,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/gallium/winsys \
        -I$(top_srcdir)/src/mesa \
        -I$(top_srcdir)/src/mapi \
+       -I$(top_builddir)/src/mesa/drivers/dri/common \
        -DGALLIUM_RBUG \
        -DGALLIUM_TRACE \
        -DGALLIUM_GALAHAD

diff --git a/src/gallium/targets/dri-r600/Makefile.am b/src/gallium/targets/dri-r600/Makefile.am
index ed8475b..2b3524b 100644 (file)
--- a/src/gallium/targets/dri-r600/Makefile.am
+++ b/src/gallium/targets/dri-r600/Makefile.am
@@ -31,6 +31,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/gallium/winsys \
        -I$(top_srcdir)/src/mesa \
        -I$(top_srcdir)/src/mapi \
+       -I$(top_builddir)/src/mesa/drivers/dri/common \
        -DGALLIUM_RBUG \
        -DGALLIUM_TRACE \
        -DGALLIUM_NOOP

diff --git a/src/gallium/targets/dri-radeonsi/Makefile.am b/src/gallium/targets/dri-radeonsi/Makefile.am
index 6751eeb..f7d87a6 100644 (file)
--- a/src/gallium/targets/dri-radeonsi/Makefile.am
+++ b/src/gallium/targets/dri-radeonsi/Makefile.am
@@ -31,6 +31,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/gallium/winsys \
        -I$(top_srcdir)/src/mesa \
        -I$(top_srcdir)/src/mapi \
+       -I$(top_builddir)/src/mesa/drivers/dri/common \
        -DGALLIUM_RBUG \
        -DGALLIUM_TRACE \
        -DGALLIUM_NOOP

diff --git a/src/gallium/targets/dri-vmwgfx/Makefile.am b/src/gallium/targets/dri-vmwgfx/Makefile.am
index d4feaab..06ebf88 100644 (file)
--- a/src/gallium/targets/dri-vmwgfx/Makefile.am
+++ b/src/gallium/targets/dri-vmwgfx/Makefile.am
@@ -31,6 +31,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/gallium/winsys \
        -I$(top_srcdir)/src/mesa \
        -I$(top_srcdir)/src/mapi \
+       -I$(top_builddir)/src/mesa/drivers/dri/common \
        -DGALLIUM_RBUG \
        -DGALLIUM_TRACE
 

diff --git a/src/mesa/drivers/dri/common/xmlpool/Makefile.am b/src/mesa/drivers/dri/common/xmlpool/Makefile.am
index b2a423c..b99df40 100644 (file)
--- 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 7db4398..72e0659 100644 (file)
--- 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 c59e6cc..dc140df 100644 (file)
--- 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 34ce531..4991399 100644 (file)
--- 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 f836162..b0aaa45 100644 (file)
--- 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) \