[Mesa-dev] [PATCH 6/6] build: Fix libdricore out-of-tree builds

[Ian Romanick]

On 07/17/2012 10:08 PM, Christopher James Halse Rogers wrote:
> Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers at canonical.com>
> ---
>   src/mesa/libdricore/Makefile.am |    8 +++++++-
>   1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am
> index 7e1c22a..e46d5bd 100644
> --- a/src/mesa/libdricore/Makefile.am
> +++ b/src/mesa/libdricore/Makefile.am
> @@ -41,7 +41,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

Should this go with the previous patch?

>   libdricore at VERSION@_la_LDFLAGS = -version-number 1:0
>   libdricore at VERSION@_la_LIBADD = libdricore-asm.la
>
> @@ -55,14 +55,20 @@ 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

top_srcdir?

>   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
>   endif
>
>   if HAVE_SPARC_ASM
>   libdricore_asm_la_SOURCES += $(SPARC_FILES)
> +libdricore_asm_la_CPPFLAGS = $(AM_CPPFLAGS) \
> +        -I$(top_builddir)/src/mesa/sparc
>   endif
>
>   if HAVE_DRICORE
>