---
configure.ac | 1 -
src/mapi/Makefile.am | 15 ++++++++++++---
src/mapi/shared-glapi/tests/Makefile.am | 19 -------------------
3 files changed, 12 insertions(+), 23 deletions(-)
delete mode 100644 src/mapi/shared-glapi/tests/Makefile.am
diff --git a/configure.ac b/configure.ac
index d8eea57..be6898f 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/shared-glapi/tests/Makefile
src/mapi/vgapi/Makefile
src/mapi/vgapi/vg.pc
src/mesa/Makefile
diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index d28baa4..b9b826b 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
@@ -64,6 +62,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
@@ -102,7 +111,7 @@ glapi_libglapi_la_SOURCES += \
TESTS += glapi-test
check_PROGRAMS += glapi-test
-glapi_test_SOURCES = check_table.cpp
+glapi_test_SOURCES = glapi/tests/check_table.cpp
glapi_test_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir)/src/gtest/include
diff --git a/src/mapi/shared-glapi/tests/Makefile.am
b/src/mapi/shared-glapi/tests/Makefile.am
deleted file mode 100644
index 7e71b4f..0000000
--- 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
--
1.8.5.5
_______________________________________________
mesa-dev mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
