aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-07-18 08:33:31 +0200
committermarha <marha@users.sourceforge.net>2012-07-18 08:33:31 +0200
commit2ff5448bcca8cba4b62026d5493cb08aaf2838d8 (patch)
tree355bad312548535d148aa058c089aefc81e10ab3 /mesalib/src/mesa/Makefile.am
parentd09d7be8bbbb39926f44834023d7120535155829 (diff)
downloadvcxsrv-2ff5448bcca8cba4b62026d5493cb08aaf2838d8.tar.gz
vcxsrv-2ff5448bcca8cba4b62026d5493cb08aaf2838d8.tar.bz2
vcxsrv-2ff5448bcca8cba4b62026d5493cb08aaf2838d8.zip
fontconfig mesa xserver git update 18 Jul 2012
Diffstat (limited to 'mesalib/src/mesa/Makefile.am')
-rw-r--r--mesalib/src/mesa/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/mesalib/src/mesa/Makefile.am b/mesalib/src/mesa/Makefile.am
index 54c1bf8ad..2b023d727 100644
--- a/mesalib/src/mesa/Makefile.am
+++ b/mesalib/src/mesa/Makefile.am
@@ -98,8 +98,9 @@ noinst_LTLIBRARIES = libmesa.la libmesagallium.la
SRCDIR = $(top_srcdir)/src/mesa
include sources.mak
-AM_CFLAGS = $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS) $(LLVM_CFLAGS) $(CFLAGS)
-AM_CXXFLAGS = $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS) $(LLVM_CFLAGS) $(CXXFLAGS)
+AM_CPPFLAGS = $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS)
+AM_CFLAGS = $(LLVM_CFLAGS)
+AM_CXXFLAGS = $(LLVM_CFLAGS)
# cannot just add $(MESA_ASM_FILES) to libmesa_la_SOURCES as it contains a configure substitution
MESA_ASM_FILES_FOR_ARCH =