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

Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>
(cherry picked from commit ebcabb88cfd19b35cd1b0a327fa055fff0c1b2be)

Additionally it fixes the missing $(top_srcdir)/include in
src/glsl/tests/Makefile.am

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59383

diff --git a/src/glsl/tests/Makefile.am b/src/glsl/tests/Makefile.am
index 957bb55..eaf5a3c 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 83626fd..d940712 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 23d0208..98065fc 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