[Mesa-dev] [PATCH 08/11] tests: AM_CPPFLAGS must include $(top_srcdir) instead of $(top_builddir).

[Johannes Obermayr]

---
 src/glsl/tests/Makefile.am                 |    9 +++++----
 src/glx/tests/Makefile.am                  |   10 +++++-----
 src/mapi/shared-glapi/tests/Makefile.am    |    6 +++---
 src/mesa/main/tests/hash_table/Makefile.am |    2 +-
 4 Dateien geändert, 14 Zeilen hinzugefügt(+), 13 Zeilen entfernt(-)

diff --git a/src/glsl/tests/Makefile.am b/src/glsl/tests/Makefile.am
index 957bb55..eaf5a3c 100644
--- 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
--- 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
--- 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 5a4aac3..272c63a 100644
--- 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 = \
-- 
1.7.10.4