diff options
author | 2010-01-07 05:57:53 +0100 | |
---|---|---|
committer | 2010-01-07 05:58:03 +0100 | |
commit | a48da1e7a214dbfaaaeab24d65a02e097ac8f153 (patch) | |
tree | 6c45e8c4521d113180eca6a5de9bf9c801397413 | |
parent | df660234fbbe8ff2d7df41f0ca5063fec9380b29 (diff) | |
download | paludis-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.am | 2 | ||||
-rw-r--r-- | bash-completion/Makefile.am | 2 | ||||
-rw-r--r-- | hooks/demos/Makefile.am | 2 | ||||
-rw-r--r-- | misc/Makefile.am | 2 | ||||
-rw-r--r-- | misc/common-makefile.am | 2 | ||||
-rw-r--r-- | paludis/distributions/Makefile.am | 2 | ||||
-rw-r--r-- | paludis/distributions/exherbo/Makefile.am | 2 | ||||
-rw-r--r-- | paludis/distributions/gentoo/Makefile.am | 2 | ||||
-rw-r--r-- | paludis/environments/Makefile.am | 2 | ||||
-rw-r--r-- | paludis/environments/test/Makefile.am | 2 | ||||
-rw-r--r-- | paludis/fetchers/demos/Makefile.am | 2 | ||||
-rw-r--r-- | paludis/repositories/cran/cran/Makefile.am | 2 | ||||
-rw-r--r-- | paludis/repositories/e/eapis/Makefile.am | 2 | ||||
-rw-r--r-- | pkg-config/Makefile.am | 2 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/clients/Makefile.am | 2 | ||||
-rw-r--r-- | src/output/Makefile.am | 2 | ||||
-rw-r--r-- | vim/Makefile.am | 2 | ||||
-rw-r--r-- | vim/ftdetect/Makefile.am | 2 | ||||
-rw-r--r-- | vim/syntax/Makefile.am | 2 | ||||
-rw-r--r-- | zsh-completion/Makefile.am | 2 |
21 files changed, 21 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am index dff26179d..98b2eb7f9 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 fac468a01..1b33f4749 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 ead375dac..9429905bc 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 cc596b6d3..65ea6726a 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 f5eaf5dce..4cb08275f 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 3508d2d3f..2a9d6b002 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 113afe120..5fa94ac94 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 4b253f98c..3a2f5b95a 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 98fb71fd9..075675e74 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 a72ae49a1..e5b557678 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 9415207a9..3ba1ccf59 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 442a71bcb..3d0f5c339 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 afc01762a..d6bb57c3e 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 53d53985b..890c1c3a1 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 440beb46a..c1339230a 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 d91386506..91968d2c8 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 da9de2b75..29e2b3a6d 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 e5b189dd6..b7f85dd00 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 172bec036..abfdfdeb4 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 236ca3594..ee7314bc2 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 ca6b26dac..872be98e2 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 |