From: Matt Turner <mattst88@gmail.com>
Date: Mon, 4 Nov 2013 22:36:53 +0000 (-0800)
Subject: mesa: Clean up use of top_srcdir/top_builddir.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b0bfb7c41ea0874d71530698ac9343936fc2e5bd;p=mesa.git

mesa: Clean up use of top_srcdir/top_builddir.
---

diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index f86caee351e..6ce31d2f81c 100644
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -85,8 +85,7 @@ if HAVE_GALLIUM
 noinst_LTLIBRARIES += libmesagallium.la
 endif
 
-SRCDIR = $(top_srcdir)/src/mesa/
-BUILDDIR = $(top_builddir)/src/mesa/
+BUILDDIR = $(builddir)/
 include Makefile.sources
 
 AM_CPPFLAGS = $(DEFINES) $(INCLUDE_DIRS)
@@ -97,21 +96,15 @@ MESA_ASM_FILES_FOR_ARCH =
 
 if HAVE_X86_ASM
 MESA_ASM_FILES_FOR_ARCH += $(X86_FILES)
-AM_CPPFLAGS += \
-        -I$(top_builddir)/src/mesa/x86 \
-        -I$(top_srcdir)/src/mesa/x86
+AM_CPPFLAGS += -I$(builddir)/x86 -I$(srcdir)/x86
 endif
 if HAVE_X86_64_ASM
 MESA_ASM_FILES_FOR_ARCH += $(X86_64_FILES)
-AM_CPPFLAGS += \
-        -I$(top_builddir)/src/mesa/x86-64 \
-        -I$(top_srcdir)/src/mesa/x86-64
+AM_CPPFLAGS += -I$(builddir)/x86-64 -I$(srcdir)/x86-64
 endif
 if HAVE_SPARC_ASM
 MESA_ASM_FILES_FOR_ARCH += $(SPARC_FILES)
-AM_CPPFLAGS += \
-        -I$(top_builddir)/src/mesa/sparc \
-        -I$(top_srcdir)/src/mesa/sparc
+AM_CPPFLAGS += -I$(builddir)/sparc -I$(srcdir)/sparc
 endif
 
 libmesa_la_SOURCES = \