From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Fri, 13 Oct 2017 13:54:53 +0000 (+0100)
Subject: Revert "make: Fix test to be meson compatible"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ee779c93d5c8aa12151b2f375e727d36ecc0c573;p=mesa.git

Revert "make: Fix test to be meson compatible"

This reverts commit fc48ad24272799b154de37f6a944eb391bdbbb82.

There commit reference the previous commit as it justification of
changing behaviour. Although unlike the said commit, there's nothing
obviously wrong there.

I'll take a look close why Meson fails to pick the file, but in the
interim reverting this commit fixes the normal distcheck target.
---

diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index 3febe27d74f..83e32d2185e 100644
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -85,7 +85,6 @@ check_PROGRAMS += shared-glapi-test
 shared_glapi_test_SOURCES = shared-glapi/tests/check_table.cpp
 shared_glapi_test_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
-	-I$(top_builddir)/src/mapi/glapi \
 	-I$(top_srcdir)/src/gtest/include
 shared_glapi_test_LDADD = \
 	$(top_builddir)/src/mapi/shared-glapi/libglapi.la \
@@ -149,7 +148,6 @@ check_PROGRAMS += glapi-test
 glapi_test_SOURCES = glapi/tests/check_table.cpp
 glapi_test_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
-	-I$(top_builddir)/src/mapi/glapi \
 	-I$(top_srcdir)/src/gtest/include
 
 glapi_test_LDADD = \
diff --git a/src/mapi/shared-glapi/tests/check_table.cpp b/src/mapi/shared-glapi/tests/check_table.cpp
index 314e6769b49..02d313c22d3 100644
--- a/src/mapi/shared-glapi/tests/check_table.cpp
+++ b/src/mapi/shared-glapi/tests/check_table.cpp
@@ -25,7 +25,7 @@
 #include "../../../mesa/main/glheader.h"
 
 #include "glapi/glapi.h"
-#include "glapitable.h"
+#include "glapi/glapitable.h"
 
 struct name_offset {
    const char *name;