Mesa (master): build: Fix libdricore out-of-tree builds (v2)

[Matt Turner]

Module: Mesa
Branch: master
Commit: cd4a61100da889afec96dc79b33a88b7b8049cec
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cd4a61100da889afec96dc79b33a88b7b8049cec

Author: Christopher James Halse Rogers <christopher.halse.rogers at canonical.com>
Date:   Thu Jul 19 12:30:12 2012 +1000

build: Fix libdricore out-of-tree builds (v2)

v2: Add both top_srcdir and top_builddir to mesa asm include dirs.
    These require both in-tree and build-time-generated files.

Reviewed-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers at canonical.com>

---

 src/mesa/libdricore/Makefile.am |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am
index 367d8c0..8817034 100644
--- a/src/mesa/libdricore/Makefile.am
+++ b/src/mesa/libdricore/Makefile.am
@@ -44,7 +44,7 @@ libdricore at VERSION@_la_SOURCES = \
 	$(LIBGLSL_FILES) \
 	$(LIBGLSL_CXX_FILES) \
 	$(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
-	$(top_srcdir)/src/glsl/builtin_function.cpp
+	$(top_builddir)/src/glsl/builtin_function.cpp
 libdricore at VERSION@_la_LDFLAGS = -version-number 1:0
 libdricore at VERSION@_la_LIBADD = libdricore-asm.la
 
@@ -58,14 +58,23 @@ libdricore_asm_la_CCASFLAGS = $(AM_CCASFLAGS) -DWORKAROUND_AUTOMAKE_OBJ_FILE_CON
 
 if HAVE_X86_ASM
 libdricore_asm_la_SOURCES += $(X86_FILES)
+libdricore_asm_la_CPPFLAGS = $(AM_CPPFLAGS) \
+        -I$(top_builddir)/src/mesa/x86 \
+        -I$(top_srcdir)/src/mesa/x86
 endif
 
 if HAVE_X86_64_ASM
 libdricore_asm_la_SOURCES += $(X86_64_FILES)
+libdricore_asm_la_CPPFLAGS = $(AM_CPPFLAGS) \
+        -I$(top_builddir)/src/mesa/x86-64 \
+        -I$(top_srcdir)/src/mesa/x86-64
 endif
 
 if HAVE_SPARC_ASM
 libdricore_asm_la_SOURCES += $(SPARC_FILES)
+libdricore_asm_la_CPPFLAGS = $(AM_CPPFLAGS) \
+        -I$(top_builddir)/src/mesa/sparc \
+        -I$(top_srcdir)/src/mesa/sparc
 endif
 
 if HAVE_DRICORE