src/glsl/tests/Makefile.am: Specify -I... in AM_CPPFLAGS
authorMatt Turner <mattst88@gmail.com>
Thu, 25 Oct 2012 18:55:07 +0000 (11:55 -0700)
committerMatt Turner <mattst88@gmail.com>
Thu, 25 Oct 2012 20:31:24 +0000 (13:31 -0700)
When specifying per-target CFLAGS (e.g., ralloc_test_CFLAGS) AM_CFLAGS
are not used. AM_CPPFLAGS should be used for includes anyway.

Fixes a build problem since 41b14d125:

CC       ralloc_test-ralloc.o
In file included from ../../../src/glsl/ralloc.c:42:0:
../../../src/glsl/ralloc.h:57:27: fatal error: main/compiler.h: No such file or directory

Acked-by: Paul Berry <stereotype441@gmail.com>
src/glsl/tests/Makefile.am

index ee3cef635075415aaeaa243a8359ed1acd02ee92..957bb55a7e6d2bff7e4febdf495e4bf598b16af8 100644 (file)
@@ -1,12 +1,9 @@
-INC = \
+AM_CPPFLAGS = \
        -I$(top_builddir)/src/gtest/include \
        -I$(top_builddir)/src/mesa \
        -I$(top_builddir)/src/mapi \
        -I$(top_builddir)/src/glsl
 
-AM_CFLAGS =  $(INC)
-AM_CXXFLAGS = $(INC)
-
 TESTS_ENVIRONMENT= \
        export PYTHON2=$(PYTHON2); \
        export PYTHON_FLAGS=$(PYTHON_FLAGS);