tests: AM_CPPFLAGS must include $(top_srcdir) instead of $(top_builddir).

Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>

diff --git a/src/glsl/tests/Makefile.am b/src/glsl/tests/Makefile.am
index 957bb55a7e6d2bff7e4febdf495e4bf598b16af8..eaf5a3c0ac106bf900f4c5579e0f8130980a2f65 100644 (file)
--- a/src/glsl/tests/Makefile.am
+++ b/src/glsl/tests/Makefile.am
@@ -1,8 +1,9 @@
 AM_CPPFLAGS = \
-       -I$(top_builddir)/src/gtest/include \
-       -I$(top_builddir)/src/mesa \
-       -I$(top_builddir)/src/mapi \
-       -I$(top_builddir)/src/glsl
+       -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); \

diff --git a/src/glx/tests/Makefile.am b/src/glx/tests/Makefile.am
index 83626fd41c67f8a86cd5c76dfebc1e8987b773fb..d940712a6c517dd655c72bcd01a4c52cb92e5983 100644 (file)
--- a/src/glx/tests/Makefile.am
+++ b/src/glx/tests/Makefile.am
@@ -1,11 +1,11 @@
 if HAVE_SHARED_GLAPI
 AM_CFLAGS = $(PTHREAD_CFLAGS)
 AM_CPPFLAGS = \
-       -I$(top_builddir)/src/gtest/include \
-       -I$(top_builddir)/src/mapi \
-       -I$(top_builddir)/src/mesa \
-       -I$(top_builddir)/src/glx \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/src/gtest/include \
+       -I$(top_srcdir)/src/mapi \
+       -I$(top_srcdir)/src/mesa \
+       -I$(top_srcdir)/src/glx \
+       -I$(top_srcdir)/include \
        $(X11_CFLAGS)
 
 TESTS = glx-test

diff --git a/src/mapi/shared-glapi/tests/Makefile.am b/src/mapi/shared-glapi/tests/Makefile.am
index 23d0208e86671fc0b0c62817e48bc215f2b95465..98065fc7607de73b92d46f6bf55b943a98065655 100644 (file)
--- a/src/mapi/shared-glapi/tests/Makefile.am
+++ b/src/mapi/shared-glapi/tests/Makefile.am
@@ -1,9 +1,9 @@
 if HAVE_SHARED_GLAPI
 AM_CFLAGS = $(PTHREAD_CFLAGS)
 AM_CPPFLAGS = \
-       -I$(top_builddir)/src/gtest/include \
-       -I$(top_builddir)/src/mapi \
-       -I$(top_builddir)/include
+       -I$(top_srcdir)/src/gtest/include \
+       -I$(top_srcdir)/src/mapi \
+       -I$(top_srcdir)/include
 
 TESTS = shared-glapi-test
 check_PROGRAMS = shared-glapi-test

diff --git a/src/mesa/main/tests/hash_table/Makefile.am b/src/mesa/main/tests/hash_table/Makefile.am
index 5a4aac395fbbc02beaddfa7a702d74a82003b50c..272c63aa5ed94241bfa9439a0784387f2861d138 100644 (file)
--- a/src/mesa/main/tests/hash_table/Makefile.am
+++ b/src/mesa/main/tests/hash_table/Makefile.am
@@ -19,7 +19,7 @@
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 AM_CPPFLAGS = \
-        -I../.. \
+       -I$(top_srcdir)/src/mesa/main \
        $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS)
 
 LDADD = \