aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ingmar Vanhassel <ingmar@exherbo.org> 2010-01-07 05:57:53 +0100
committerAvatar Ingmar Vanhassel <ingmar@exherbo.org> 2010-01-07 05:58:03 +0100
commita48da1e7a214dbfaaaeab24d65a02e097ac8f153 (patch)
tree6c45e8c4521d113180eca6a5de9bf9c801397413
parentdf660234fbbe8ff2d7df41f0ca5063fec9380b29 (diff)
downloadpaludis-a48da1e7a214dbfaaaeab24d65a02e097ac8f153.tar.gz
paludis-a48da1e7a214dbfaaaeab24d65a02e097ac8f153.tar.xz
Require automake 1.11 or newer for automake's parallel-tests
Fixes Exherbo #249
-rw-r--r--Makefile.am2
-rw-r--r--bash-completion/Makefile.am2
-rw-r--r--hooks/demos/Makefile.am2
-rw-r--r--misc/Makefile.am2
-rw-r--r--misc/common-makefile.am2
-rw-r--r--paludis/distributions/Makefile.am2
-rw-r--r--paludis/distributions/exherbo/Makefile.am2
-rw-r--r--paludis/distributions/gentoo/Makefile.am2
-rw-r--r--paludis/environments/Makefile.am2
-rw-r--r--paludis/environments/test/Makefile.am2
-rw-r--r--paludis/fetchers/demos/Makefile.am2
-rw-r--r--paludis/repositories/cran/cran/Makefile.am2
-rw-r--r--paludis/repositories/e/eapis/Makefile.am2
-rw-r--r--pkg-config/Makefile.am2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/clients/Makefile.am2
-rw-r--r--src/output/Makefile.am2
-rw-r--r--vim/Makefile.am2
-rw-r--r--vim/ftdetect/Makefile.am2
-rw-r--r--vim/syntax/Makefile.am2
-rw-r--r--zsh-completion/Makefile.am2
21 files changed, 21 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am
index dff2617..98b2eb7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ CLEANFILES = *~ done-check gmon.out *.gcov *.gcno *.gcda *.loT \
automake-deps-dist-hack.tmp automake-deps-built-hack.tmp *.epicfail
MAINTAINERCLEANFILES = Makefile.in configure config/* aclocal.m4 \
config.h config.h.in INSTALL
-AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip foreign parallel-tests
+AUTOMAKE_OPTIONS = 1.11 dist-bzip2 no-dist-gzip foreign parallel-tests
EXTRA_DIST = autogen.bash automake-deps-dist-hack.tmp
SUBDIRS = . misc test paludis python ruby src doc hooks vim bash-completion zsh-completion pkg-config
diff --git a/bash-completion/Makefile.am b/bash-completion/Makefile.am
index fac468a..1b33f47 100644
--- a/bash-completion/Makefile.am
+++ b/bash-completion/Makefile.am
@@ -5,7 +5,7 @@ noinst_DATA = paludis adjutrix \
importare
EXTRA_DIST = $(noinst_DATA)
-AUTOMAKE_OPTIONS = parallel-tests
+AUTOMAKE_OPTIONS = 1.11 parallel-tests
built-sources : $(BUILT_SOURCES)
for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || exit 1 ; done
diff --git a/hooks/demos/Makefile.am b/hooks/demos/Makefile.am
index ead375d..9429905 100644
--- a/hooks/demos/Makefile.am
+++ b/hooks/demos/Makefile.am
@@ -6,7 +6,7 @@ DEMOS = \
new_packages.bash \
pretend_resume.hook
-AUTOMAKE_OPTIONS = parallel-tests
+AUTOMAKE_OPTIONS = 1.11 parallel-tests
EXTRA_DIST = \
report.bash.in \
diff --git a/misc/Makefile.am b/misc/Makefile.am
index cc596b6..65ea672 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -2,7 +2,7 @@ CLEANFILES = *~ *.epicfail
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = generated-file.txt do_m4.bash make_se.bash make_nn.bash common-makefile.am
-AUTOMAKE_OPTIONS = parallel-tests
+AUTOMAKE_OPTIONS = 1.11 parallel-tests
built-sources : $(BUILT_SOURCES)
for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || exit 1 ; done
diff --git a/misc/common-makefile.am b/misc/common-makefile.am
index f5eaf5d..4cb0827 100644
--- a/misc/common-makefile.am
+++ b/misc/common-makefile.am
@@ -2,7 +2,7 @@
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
MAINTAINERCLEANFILES = Makefile.in
-AUTOMAKE_OPTIONS = parallel-tests
+AUTOMAKE_OPTIONS = 1.11 parallel-tests
LOG_COMPILER = \
unset PALUDIS_TESTS_REAL_STDOUT_FD 2>&1 >/dev/null ; \
diff --git a/paludis/distributions/Makefile.am b/paludis/distributions/Makefile.am
index 3508d2d..2a9d6b0 100644
--- a/paludis/distributions/Makefile.am
+++ b/paludis/distributions/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT .keep *.epicfail
SUBDIRS = . exherbo gentoo
-AUTOMAKE_OPTIONS = parallel-tests
+AUTOMAKE_OPTIONS = 1.11 parallel-tests
distributions = \
exherbo.conf \
diff --git a/paludis/distributions/exherbo/Makefile.am b/paludis/distributions/exherbo/Makefile.am
index 113afe1..5fa94ac 100644
--- a/paludis/distributions/exherbo/Makefile.am
+++ b/paludis/distributions/exherbo/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT .keep *.epicfail
SUBDIRS =
-AUTOMAKE_OPTIONS = parallel-tests
+AUTOMAKE_OPTIONS = 1.11 parallel-tests
distributiondir = $(datadir)/paludis/distributions/exherbo/
diff --git a/paludis/distributions/gentoo/Makefile.am b/paludis/distributions/gentoo/Makefile.am
index 4b253f9..3a2f5b9 100644
--- a/paludis/distributions/gentoo/Makefile.am
+++ b/paludis/distributions/gentoo/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT .keep *.epicfail
SUBDIRS =
-AUTOMAKE_OPTIONS = parallel-tests
+AUTOMAKE_OPTIONS = 1.11 parallel-tests
distributiondir = $(datadir)/paludis/distributions/gentoo/
diff --git a/paludis/environments/Makefile.am b/paludis/environments/Makefile.am
index 98fb71f..075675e 100644
--- a/paludis/environments/Makefile.am
+++ b/paludis/environments/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = . $(BUILD_ENVIRONMENTS)
DIST_SUBDIRS = $(ALL_ENVIRONMENTS)
-AUTOMAKE_OPTIONS = parallel-tests
+AUTOMAKE_OPTIONS = 1.11 parallel-tests
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
MAINTAINERCLEANFILES = Makefile.in
diff --git a/paludis/environments/test/Makefile.am b/paludis/environments/test/Makefile.am
index a72ae49..e5b5576 100644
--- a/paludis/environments/test/Makefile.am
+++ b/paludis/environments/test/Makefile.am
@@ -7,7 +7,7 @@ DEFS= \
-DDATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)\"
-AUTOMAKE_OPTIONS = parallel-tests
+AUTOMAKE_OPTIONS = 1.11 parallel-tests
libpaludistestenvironment_la_SOURCES = \
test_environment.cc test_environment.hh \
diff --git a/paludis/fetchers/demos/Makefile.am b/paludis/fetchers/demos/Makefile.am
index 9415207..3ba1ccf 100644
--- a/paludis/fetchers/demos/Makefile.am
+++ b/paludis/fetchers/demos/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = .
DEMOS = \
docurl
-AUTOMAKE_OPTIONS = parallel-tests
+AUTOMAKE_OPTIONS = 1.11 parallel-tests
MAINTAINERCLEANFILES = Makefile.in
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.o *.so *.epicfail
diff --git a/paludis/repositories/cran/cran/Makefile.am b/paludis/repositories/cran/cran/Makefile.am
index 442a71b..3d0f5c3 100644
--- a/paludis/repositories/cran/cran/Makefile.am
+++ b/paludis/repositories/cran/cran/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
CLEANFILES = *~ *.epicfail
SUBDIRS = .
-AUTOMAKE_OPTIONS = parallel-tests
+AUTOMAKE_OPTIONS = 1.11 parallel-tests
libexecprogdir = $(libexecdir)/paludis/
diff --git a/paludis/repositories/e/eapis/Makefile.am b/paludis/repositories/e/eapis/Makefile.am
index afc0176..d6bb57c 100644
--- a/paludis/repositories/e/eapis/Makefile.am
+++ b/paludis/repositories/e/eapis/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT .keep *.epicfail
SUBDIRS =
-AUTOMAKE_OPTIONS = parallel-tests
+AUTOMAKE_OPTIONS = 1.11 parallel-tests
eapis = \
0.conf \
diff --git a/pkg-config/Makefile.am b/pkg-config/Makefile.am
index 53d5398..890c1c3 100644
--- a/pkg-config/Makefile.am
+++ b/pkg-config/Makefile.am
@@ -4,7 +4,7 @@ pkgconfig_DATA = paludis.pc
EXTRA_DIST = paludis.pc.in
CLEANFILES = paludis.pc *.epicfail
-AUTOMAKE_OPTIONS = parallel-tests
+AUTOMAKE_OPTIONS = 1.11 parallel-tests
built-sources : $(BUILT_SOURCES)
for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || exit 1 ; done
diff --git a/src/Makefile.am b/src/Makefile.am
index 440beb4..c133923 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = output clients
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
MAINTAINERCLEANFILES = Makefile.in
-AUTOMAKE_OPTIONS = parallel-tests
+AUTOMAKE_OPTIONS = 1.11 parallel-tests
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
diff --git a/src/clients/Makefile.am b/src/clients/Makefile.am
index d913865..91968d2 100644
--- a/src/clients/Makefile.am
+++ b/src/clients/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = . $(BUILD_CLIENTS)
DIST_SUBDIRS = . $(ALL_CLIENTS)
-AUTOMAKE_OPTIONS = parallel-tests
+AUTOMAKE_OPTIONS = 1.11 parallel-tests
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/output/Makefile.am b/src/output/Makefile.am
index da9de2b..29e2b3a 100644
--- a/src/output/Makefile.am
+++ b/src/output/Makefile.am
@@ -1,7 +1,7 @@
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
MAINTAINERCLEANFILES = Makefile.in
-AUTOMAKE_OPTIONS = parallel-tests
+AUTOMAKE_OPTIONS = 1.11 parallel-tests
noinst_LIBRARIES = liboutput.a
liboutput_a_SOURCES = \
diff --git a/vim/Makefile.am b/vim/Makefile.am
index e5b189d..b7f85dd 100644
--- a/vim/Makefile.am
+++ b/vim/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT .keep *.epicfail
SUBDIRS = ftdetect syntax
-AUTOMAKE_OPTIONS = parallel-tests
+AUTOMAKE_OPTIONS = 1.11 parallel-tests
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
diff --git a/vim/ftdetect/Makefile.am b/vim/ftdetect/Makefile.am
index 172bec0..abfdfde 100644
--- a/vim/ftdetect/Makefile.am
+++ b/vim/ftdetect/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT .keep *.epicfail
SUBDIRS =
-AUTOMAKE_OPTIONS = parallel-tests
+AUTOMAKE_OPTIONS = 1.11 parallel-tests
vimscripts = \
paludis.vim
diff --git a/vim/syntax/Makefile.am b/vim/syntax/Makefile.am
index 236ca35..ee7314b 100644
--- a/vim/syntax/Makefile.am
+++ b/vim/syntax/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT .keep *.epicfail
SUBDIRS =
-AUTOMAKE_OPTIONS = parallel-tests
+AUTOMAKE_OPTIONS = 1.11 parallel-tests
vimscripts = \
paludis-environment-conf.vim \
diff --git a/zsh-completion/Makefile.am b/zsh-completion/Makefile.am
index ca6b26d..872be98 100644
--- a/zsh-completion/Makefile.am
+++ b/zsh-completion/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
noinst_DATA = _paludis _adjutrix _paludis_packages _inquisitio _importare _reconcilio
EXTRA_DIST = $(noinst_DATA)
-AUTOMAKE_OPTIONS = parallel-tests
+AUTOMAKE_OPTIONS = 1.11 parallel-tests
built-sources : $(BUILT_SOURCES)
for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || exit 1 ; done