Separate out starpu.mk for the different cases

automake doesn't actually allow ifeq, because it steals the meaning of
else/endif.

doc/Makefile.am

@@ -16,8 +16,7 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
 
-TESTS_TYPE = none
-include $(top_srcdir)/starpu.mk
+include $(top_srcdir)/starpu-notests.mk
 
 SUBDIRS = doxygen
 SUBDIRS += doxygen_dev

mpi/Makefile.am

@@ -16,8 +16,7 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
 
-TESTS_TYPE = subdirs
-include $(top_srcdir)/starpu.mk
+include $(top_srcdir)/starpu-subdirtests.mk
 
 SUBDIRS=src tests examples
 

mpi/src/Makefile.am

@@ -16,8 +16,7 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
 
-TESTS_TYPE = none
-include $(top_srcdir)/starpu.mk
+include $(top_srcdir)/starpu-notests.mk
 
 CC=$(MPICC)
 CCLD=$(MPICC)

sc_hypervisor/Makefile.am

@@ -16,8 +16,7 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
 
-TESTS_TYPE = subdirs
-include $(top_srcdir)/starpu.mk
+include $(top_srcdir)/starpu-subdirtests.mk
 
 SUBDIRS = src examples
 

sc_hypervisor/src/Makefile.am

@@ -16,8 +16,7 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
 
-TESTS_TYPE = none
-include $(top_srcdir)/starpu.mk
+include $(top_srcdir)/starpu-notests.mk
 
 AM_CFLAGS = -Wall $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS) $(FXT_CFLAGS) $(MAGMA_CFLAGS) $(HWLOC_CFLAGS) $(GLOBAL_AM_CFLAGS)
 LIBS = $(top_builddir)/src/libstarpu-@STARPU_EFFECTIVE_VERSION@.la

socl/src/Makefile.am

@@ -16,8 +16,7 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
 
-TESTS_TYPE = none
-include $(top_srcdir)/starpu.mk
+include $(top_srcdir)/starpu-notests.mk
 
 CLEANFILES = *.gcno *.gcda
 

src/Makefile.am

@@ -17,8 +17,7 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
 
-TESTS_TYPE = none
-include $(top_srcdir)/starpu.mk
+include $(top_srcdir)/starpu-notests.mk
 
 SUBDIRS =
 

starpu-notests.mk

@@ -0,0 +1,11 @@
+recheck:
+	-cat /dev/null
+
+showfailed:
+	@-cat /dev/null
+
+showcheck:
+	-cat /dev/null
+
+showsuite:
+	-cat /dev/null

starpu-subdirtests.mk

@@ -0,0 +1,27 @@
+recheck:
+	RET=0 ; \
+	for i in $(SUBDIRS) ; do \
+		make -C $$i recheck || RET=1 ; \
+	done ; \
+	exit $$RET
+
+showfailed:
+	@RET=0 ; \
+	for i in $(SUBDIRS) ; do \
+		make -C $$i showfailed || RET=1 ; \
+	done ; \
+	exit $$RET
+
+showcheck:
+	RET=0 ; \
+	for i in $(SUBDIRS) ; do \
+		make -C $$i showcheck || RET=1 ; \
+	done ; \
+	exit $$RET
+
+showsuite:
+	RET=0 ; \
+	for i in $(SUBDIRS) ; do \
+		make -C $$i showsuite || RET=1 ; \
+	done ; \
+	exit $$RET

starpu.mk

@@ -16,52 +16,6 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
 
-ifeq ($(TESTS_TYPE),none)
-recheck:
-	-cat /dev/null
-
-showfailed:
-	@-cat /dev/null
-
-showcheck:
-	-cat /dev/null
-
-showsuite:
-	-cat /dev/null
-endif
-
-ifeq ($(TESTS_TYPE),subdirs)
-recheck:
-	RET=0 ; \
-	for i in $(SUBDIRS) ; do \
-		make -C $$i recheck || RET=1 ; \
-	done ; \
-	exit $$RET
-
-showfailed:
-	@RET=0 ; \
-	for i in $(SUBDIRS) ; do \
-		make -C $$i showfailed || RET=1 ; \
-	done ; \
-	exit $$RET
-
-showcheck:
-	RET=0 ; \
-	for i in $(SUBDIRS) ; do \
-		make -C $$i showcheck || RET=1 ; \
-	done ; \
-	exit $$RET
-
-showsuite:
-	RET=0 ; \
-	for i in $(SUBDIRS) ; do \
-		make -C $$i showsuite || RET=1 ; \
-	done ; \
-	exit $$RET
-endif
-
-ifeq ($(TESTS_TYPE),tests)
-
 if STARPU_USE_MPI_MASTER_SLAVE
 MPI_LAUNCHER 			= $(MPIEXEC)  $(MPIEXEC_ARGS) -np 4
 MPI_RUN_ARGS			= STARPU_WORKERS_NOBIND=1 STARPU_NCPU=4 STARPU_NMPIMSTHREADS=4
@@ -128,5 +82,3 @@ env:
 	@echo export STARPU_HOSTNAME=$(STARPU_HOSTNAME)
 	@echo export MALLOC_PERTURB_=$(MALLOC_PERTURB_)
 endif
-
-endif

starpufft/src/Makefile.am

@@ -16,8 +16,7 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
 
-TESTS_TYPE = none
-include $(top_srcdir)/starpu.mk
+include $(top_srcdir)/starpu-notests.mk
 
 AM_CFLAGS = $(GLOBAL_AM_CFLAGS) $(HWLOC_CFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_srcdir)/starpufft/include/ -I$(top_builddir)/include -I$(top_builddir)/src -I$(top_srcdir)/src/ $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS) $(HWLOC_CFLAGS)

starpurm/Makefile.am

@@ -14,8 +14,7 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
 
-TESTS_TYPE = subdirs
-include $(top_srcdir)/starpu.mk
+include $(top_srcdir)/starpu-subdirtests.mk
 
 SUBDIRS=src
 

starpurm/src/Makefile.am

@@ -16,8 +16,7 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
 
-TESTS_TYPE = none
-include $(top_srcdir)/starpu.mk
+include $(top_srcdir)/starpu-notests.mk
 
 SUBDIRS =