diff options
| author | Matt Turner <[email protected]> | 2014-08-15 10:08:14 -0700 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2014-08-18 18:27:20 -0700 |
| commit | e87106d1531267a052cb3decf03d35b6e0572616 (patch) | |
| tree | e49233d974c72a98ec697f1659fa72c0db9696f9 | |
| parent | 7172f02d7c85bef7a8f7b27567cd09d9dbd02325 (diff) | |
mapi: Inline shared-glapi/tests/Makefile.
Reviewed-by: Kristian Høgsberg <[email protected]>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/mapi/Makefile.am | 13 | ||||
| -rw-r--r-- | src/mapi/shared-glapi/tests/Makefile.am | 19 |
3 files changed, 11 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index d8eea57a397..be6898f7dee 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 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 |