---
configure.ac | 1 -
src/mapi/Makefile.am | 15 +++++++++++++--
src/mapi/glapi/tests/Makefile.am | 20 --------------------
3 files changed, 13 insertions(+), 23 deletions(-)
delete mode 100644 src/mapi/glapi/tests/Makefile.am
diff --git a/configure.ac b/configure.ac
index 4635dff..d8eea57 100644
--- 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 8b00832..d28baa4 100644
--- 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 =
@@ -66,8 +67,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
@@ -99,6 +98,18 @@ glapi_libglapi_la_SOURCES += \
$(GLAPI_SOURCES) \
$(GLAPI_ASM_SOURCES) \
$(MAPI_UTIL_FILES)
+
+TESTS += glapi-test
+check_PROGRAMS += glapi-test
+
+glapi_test_SOURCES = 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
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
--
1.8.5.5
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
