Fix for automake < 1.13

bfabiszewski · Oct 24, 2015 · 3bee261 · 3bee261
1 parent 716ae5a
commit 3bee261
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,6 +1,9 @@
 # project Makefile.am
 
 SUBDIRS = src tools tests
+
+test: check
+
 ACLOCAL_AMFLAGS = -I m4
 
 pkgconfigdir = $(libdir)/pkgconfig

diff --git a/configure.ac b/configure.ac
@@ -7,7 +7,6 @@ AC_CONFIG_SRCDIR([src/buffer.c])
 
 # Enable automake
 AM_INIT_AUTOMAKE([-Wall foreign])
-AM_EXTRA_RECURSIVE_TARGETS([test])
 # all defined C macros (HAVE_*) will be saved to this file
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -10,13 +10,7 @@
 # suffix "_rawml" for rawml checksum and "_markup" for all markup files checksums.
 # Re-run ./configure after adding new samples
 
-.PHONY: test-local
-test-local:  tool check
-
-.PHONY: tool
-tool:
-	make -C $(top_builddir) $*
-
+AUTOMAKE_OPTIONS = parallel-tests
 TESTS = @PASSLIST@
 XFAIL_TESTS = @FAILLIST@
 TEST_EXTENSIONS = .mobi .fail