Module: Mesa
Branch: master
Commit: 67f1e7bf5f5d1482cb8684dd5a405b7bab5b1f34
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=67f1e7bf5f5d1482cb8684dd5a405b7bab5b1f34

Author: Matt Turner <[email protected]>
Date:   Thu Oct 25 11:55:07 2012 -0700

src/glsl/tests/Makefile.am: Specify -I... in AM_CPPFLAGS

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 <[email protected]>

---

 src/glsl/tests/Makefile.am |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/src/glsl/tests/Makefile.am b/src/glsl/tests/Makefile.am
index ee3cef6..957bb55 100644
--- a/src/glsl/tests/Makefile.am
+++ b/src/glsl/tests/Makefile.am
@@ -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);

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to