From 5e4e145025eabfc95e636d6c29da670e375649d0 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sun, 20 Jan 2013 18:00:14 -0800 Subject: build: Add tests directories to SUBDIRS Fixes a problem with distcheck. --- Makefile.am | 6 ------ src/mapi/glapi/Makefile.am | 2 ++ src/mapi/shared-glapi/Makefile.am | 2 ++ src/mesa/Makefile.am | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 29405a0..63e02c6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,12 +26,6 @@ ACLOCAL_AMFLAGS = -I m4 doxygen: cd doxygen && $(MAKE) -check-local: - $(MAKE) -C src/mapi/glapi/tests check - $(MAKE) -C src/mapi/shared-glapi/tests check - $(MAKE) -C src/mesa/main/tests check - $(MAKE) -C src/glx/tests check - .PHONY: doxygen # Rules for making release tarballs diff --git a/src/mapi/glapi/Makefile.am b/src/mapi/glapi/Makefile.am index 1698d14..05c67a6 100644 --- a/src/mapi/glapi/Makefile.am +++ b/src/mapi/glapi/Makefile.am @@ -19,6 +19,8 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. +SUBDIRS = . tests + TOP = $(top_srcdir) include Makefile.sources include ../Makefile.sources diff --git a/src/mapi/shared-glapi/Makefile.am b/src/mapi/shared-glapi/Makefile.am index 2021a73..e18c30a 100644 --- a/src/mapi/shared-glapi/Makefile.am +++ b/src/mapi/shared-glapi/Makefile.am @@ -1,5 +1,7 @@ # Used by OpenGL ES or when --enable-shared-glapi is specified +SUBDIRS = . tests + TOP = $(top_srcdir) GLAPI = $(top_srcdir)/src/mapi/glapi include $(top_srcdir)/src/mapi/Makefile.sources diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index d5f5f5b..e9c16e7 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -23,7 +23,7 @@ if NEED_LIBDRICORE DRICORE_SUBDIR = libdricore endif -SUBDIRS = program x86 x86-64 . $(DRICORE_SUBDIR) +SUBDIRS = program x86 x86-64 . $(DRICORE_SUBDIR) main/tests if HAVE_X11_DRIVER SUBDIRS += drivers/x11 -- cgit v1.1