summaryrefslogtreecommitdiffstats
path: root/src/mapi
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2014-08-15 10:08:14 -0700
committerMatt Turner <mattst88@gmail.com>2014-08-18 18:27:20 -0700
commite87106d1531267a052cb3decf03d35b6e0572616 (patch)
treee49233d974c72a98ec697f1659fa72c0db9696f9 /src/mapi
parent7172f02d7c85bef7a8f7b27567cd09d9dbd02325 (diff)
mapi: Inline shared-glapi/tests/Makefile.
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Diffstat (limited to 'src/mapi')
-rw-r--r--src/mapi/Makefile.am13
-rw-r--r--src/mapi/shared-glapi/tests/Makefile.am19
2 files changed, 11 insertions, 21 deletions
diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index ab60a7358e7..80ead821ccc 100644
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -46,8 +46,6 @@ include glapi/Makefile.sources
include glapi/gen/glapi_gen.mk
if HAVE_SHARED_GLAPI
-SUBDIRS += shared-glapi/tests
-
BUILT_SOURCES += shared-glapi/glapi_mapi_tmp.h
lib_LTLIBRARIES += shared-glapi/libglapi.la
@@ -66,6 +64,17 @@ shared_glapi_libglapi_la_LDFLAGS = \
shared-glapi/glapi_mapi_tmp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
$(call glapi_gen_mapi,$<,shared-glapi)
+
+TESTS += shared-glapi-test
+check_PROGRAMS += shared-glapi-test
+
+shared_glapi_test_SOURCES = shared-glapi/tests/check_table.cpp
+shared_glapi_test_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -I$(top_srcdir)/src/gtest/include
+shared_glapi_test_LDADD = \
+ $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
+ $(top_builddir)/src/gtest/libgtest.la
endif
if HAVE_OPENGL
diff --git a/src/mapi/shared-glapi/tests/Makefile.am b/src/mapi/shared-glapi/tests/Makefile.am
deleted file mode 100644
index 7e71b4fd1af..00000000000
--- a/src/mapi/shared-glapi/tests/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-if HAVE_SHARED_GLAPI
-AM_CFLAGS = $(PTHREAD_CFLAGS)
-AM_CPPFLAGS = \
- -I$(top_srcdir)/src/gtest/include \
- -I$(top_srcdir)/src/mapi \
- -I$(top_builddir)/src/mapi \
- -I$(top_srcdir)/include
-
-TESTS = shared-glapi-test
-check_PROGRAMS = shared-glapi-test
-
-shared_glapi_test_SOURCES = \
- check_table.cpp
-
-shared_glapi_test_LDADD = \
- $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
- $(top_builddir)/src/gtest/libgtest.la \
- $(PTHREAD_LIBS)
-endif