make: Fix test to be meson compatible

This has the same problem as the previous commit, generated headers and
hardcoded paths.

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index 83e32d2185edb884045febbddb85e209373e3123..3febe27d74f537e198ebc26653bffb9a55d9ef1a 100644 (file)
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -85,6 +85,7 @@ 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 \
@@ -148,6 +149,7 @@ 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 02d313c22d30a0cef3e50354bd28560f0893d2b8..314e6769b493c2f6c60cc918318561fe482da0b7 100644 (file)
--- 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 "glapi/glapitable.h"
+#include "glapitable.h"
 
 struct name_offset {
    const char *name;