mapi: Inline glapi/tests/Makefile.

Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>

diff --git a/configure.ac b/configure.ac
index 4635dffd0dfd0e97049735001925d239b5ba911d..d8eea57a397aba0a653aafdc42f14cbe4852b264 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2239,7 +2239,6 @@ AC_CONFIG_FILES([Makefile
                src/mapi/es1api/glesv1_cm.pc
                src/mapi/es2api/glesv2.pc
                src/mapi/glapi/gen/Makefile
-               src/mapi/glapi/tests/Makefile
                src/mapi/shared-glapi/tests/Makefile
                src/mapi/vgapi/Makefile
                src/mapi/vgapi/vg.pc

diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index 4f1e2264f929b47d1a17f9a3bed9a20ae1799678..ab60a7358e72fe9f0649d306faf3768bed761eee 100644 (file)
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -28,6 +28,7 @@ BUILT_SOURCES =
 CLEANFILES = $(BUILT_SOURCES)
 
 lib_LTLIBRARIES =
+check_PROGRAMS =
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA =
 
@@ -68,8 +69,6 @@ shared-glapi/glapi_mapi_tmp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_
 endif
 
 if HAVE_OPENGL
-SUBDIRS += glapi/tests
-
 noinst_LTLIBRARIES = glapi/libglapi.la
 
 if HAVE_X86_ASM
@@ -101,6 +100,18 @@ glapi_libglapi_la_SOURCES += \
        $(GLAPI_SOURCES) \
        $(GLAPI_ASM_SOURCES) \
        $(MAPI_UTIL_FILES)
+
+TESTS += glapi-test
+check_PROGRAMS += glapi-test
+
+glapi_test_SOURCES = glapi/tests/check_table.cpp
+glapi_test_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -I$(top_srcdir)/src/gtest/include
+
+glapi_test_LDADD = \
+       $(top_builddir)/src/mapi/glapi/libglapi.la \
+       $(top_builddir)/src/gtest/libgtest.la
 endif
 endif
 

diff --git a/src/mapi/glapi/tests/Makefile.am b/src/mapi/glapi/tests/Makefile.am
deleted file mode 100644 (file)
index da1094b..0000000
--- a/src/mapi/glapi/tests/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-if !HAVE_SHARED_GLAPI
-AM_CFLAGS = $(PTHREAD_CFLAGS)
-AM_CPPFLAGS = \
-       $(DEFINES) \
-       -I$(top_srcdir)/src/gtest/include \
-       -I$(top_builddir)/src/mapi \
-       -I$(top_srcdir)/src/mapi \
-       -I$(top_srcdir)/include
-
-TESTS = glapi-test
-check_PROGRAMS = glapi-test
-
-glapi_test_SOURCES =                   \
-       check_table.cpp
-
-glapi_test_LDADD = \
-       $(top_builddir)/src/mapi/glapi/libglapi.la \
-       $(top_builddir)/src/gtest/libgtest.la \
-       $(PTHREAD_LIBS)
-endif