glsl/build: Build glcpp via the glsl Makefile

[mesa.git] / src / glsl / tests / Makefile.am

diff --git a/src/glsl/tests/Makefile.am b/src/glsl/tests/Makefile.am
index 4829fb2fe0d26c18190396c50d74e3e451c2f7b2..eaf5a3c0ac106bf900f4c5579e0f8130980a2f65 100644 (file)
--- a/src/glsl/tests/Makefile.am
+++ b/src/glsl/tests/Makefile.am
@@ -1,11 +1,9 @@
-INC = \
-       -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)
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/gtest/include \
+       -I$(top_srcdir)/src/mesa \
+       -I$(top_srcdir)/src/mapi \
+       -I$(top_srcdir)/src/glsl \
+       -I$(top_srcdir)/include
 
 TESTS_ENVIRONMENT= \
        export PYTHON2=$(PYTHON2); \
@@ -24,12 +22,14 @@ uniform_initializer_test_SOURCES =          \
        copy_constant_to_storage_tests.cpp      \
        set_uniform_initializer_tests.cpp       \
        uniform_initializer_utils.cpp
-
+uniform_initializer_test_CFLAGS =              \
+       $(PTHREAD_CFLAGS)
 uniform_initializer_test_LDADD =               \
        $(top_builddir)/src/gtest/libgtest.la   \
        $(top_builddir)/src/glsl/libglsl.la     \
-       $(top_builddir)/src/mesa/libmesa.a      \
-       -lpthread
+       $(top_builddir)/src/mesa/libmesa.la     \
+       $(PTHREAD_LIBS)
 
 ralloc_test_SOURCES = ralloc_test.cpp $(top_builddir)/src/glsl/ralloc.c
-ralloc_test_LDADD = $(top_builddir)/src/gtest/libgtest.la -lpthread
+ralloc_test_CFLAGS = $(PTHREAD_CFLAGS)
+ralloc_test_LDADD = $(top_builddir)/src/gtest/libgtest.la $(PTHREAD_LIBS)