v2: Add both top_srcdir and top_builddir to mesa asm include dirs.
These require both in-tree and build-time-generated files.
Signed-off-by: Christopher James Halse Rogers
<christopher.halse.rog...@canonical.com>
---
src/mesa/libdricore/Makefile.am | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am
index 7e1c22a..60dfb7a 100644
--- a/src/mesa/libdricore/Makefile.am
+++ b/src/mesa/libdricore/Makefile.am
@@ -41,7 +41,7 @@ libdricore@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@VERSION@_la_LDFLAGS = -version-number 1:0
libdricore@VERSION@_la_LIBADD = libdricore-asm.la
@@ -55,14 +55,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
--
1.7.10.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
