diff options
| author | Matt Turner <[email protected]> | 2013-11-04 14:36:53 -0800 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2013-11-06 11:26:19 -0800 |
| commit | b0bfb7c41ea0874d71530698ac9343936fc2e5bd (patch) | |
| tree | c4498240409e2655b449b9f0b7a67010b47d2f22 /src | |
| parent | 8bc126cd37ff65773aec113956b8e442e595e630 (diff) | |
mesa: Clean up use of top_srcdir/top_builddir.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/Makefile.am | 15 |
1 files changed, 4 insertions, 11 deletions
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 = \ |