fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 22:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
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@anholt.net>
Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
This commit is contained in:
Christopher James Halse Rogers 2012-07-19 12:30:12 +10:00 • committed by Matt Turner
parent 73fef0178a
commit cd4a61100d
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/mesa/libdricore/Makefile.am
View file

@ -44,7 +44,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
@ -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