aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-11-03 21:21:36 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-11-03 21:21:36 +0000
commita3da76a7780eb98017b185127693962316fd12ac (patch)
tree0dd3b22916f2868705032e71a47c8a0547d54a9b
parent262df8c46ae1fee336bfa93f1381adf8d9387f7a (diff)
downloadpaludis-a3da76a7780eb98017b185127693962316fd12ac.tar.gz
paludis-a3da76a7780eb98017b185127693962316fd12ac.tar.xz
Make parallel tests betterer
-rw-r--r--doc/Makefile.am10
-rw-r--r--doc/api/Makefile.am12
-rw-r--r--doc/clients/Makefile.am15
-rw-r--r--doc/configuration/Makefile.am11
-rw-r--r--doc/configuration/repositories/Makefile.am11
-rw-r--r--doc/faq/Makefile.am11
-rw-r--r--doc/overview/Makefile.am11
-rw-r--r--hooks/Makefile.am.m433
-rw-r--r--misc/Makefile.am2
-rw-r--r--misc/common-makefile.am67
-rw-r--r--paludis/Makefile.am.m448
-rw-r--r--paludis/args/Makefile.am17
-rw-r--r--paludis/environments/no_config/Makefile.am20
-rw-r--r--paludis/environments/paludis/Makefile.am34
-rw-r--r--paludis/environments/portage/Makefile.am35
-rw-r--r--paludis/fetchers/Makefile.am17
-rw-r--r--paludis/repositories/Makefile.am16
-rw-r--r--paludis/repositories/accounts/Makefile.am28
-rw-r--r--paludis/repositories/cran/Makefile.am22
-rw-r--r--paludis/repositories/e/Makefile.am36
-rw-r--r--paludis/repositories/e/ebuild/0/Makefile.am28
-rw-r--r--paludis/repositories/e/ebuild/1/Makefile.am25
-rw-r--r--paludis/repositories/e/ebuild/2/Makefile.am25
-rw-r--r--paludis/repositories/e/ebuild/3/Makefile.am25
-rw-r--r--paludis/repositories/e/ebuild/Makefile.am28
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/Makefile.am28
-rw-r--r--paludis/repositories/e/ebuild/kdebuild-1/Makefile.am25
-rw-r--r--paludis/repositories/e/ebuild/paludis-1/Makefile.am24
-rw-r--r--paludis/repositories/e/ebuild/pbin-1/Makefile.am24
-rw-r--r--paludis/repositories/e/ebuild/utils/3/Makefile.am23
-rw-r--r--paludis/repositories/e/ebuild/utils/Makefile.am27
-rw-r--r--paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am22
-rw-r--r--paludis/repositories/e/ebuild/utils/kdebuild-1/Makefile.am22
-rw-r--r--paludis/repositories/fake/Makefile.am24
-rw-r--r--paludis/repositories/gems/Makefile.am25
-rw-r--r--paludis/repositories/unavailable/Makefile.am28
-rw-r--r--paludis/repositories/unpackaged/Makefile.am27
-rw-r--r--paludis/repositories/unwritten/Makefile.am28
-rw-r--r--paludis/repositories/virtuals/Makefile.am25
-rw-r--r--paludis/resolver/Makefile.am34
-rw-r--r--paludis/selinux/Makefile.am21
-rw-r--r--paludis/syncers/Makefile.am21
-rw-r--r--paludis/util/Makefile.am.m417
-rw-r--r--python/Makefile.am41
-rw-r--r--ruby/Makefile.am39
-rw-r--r--ruby/demos/Makefile.am26
-rw-r--r--src/clients/accerso/Makefile.am31
-rw-r--r--src/clients/adjutrix/Makefile.am31
-rw-r--r--src/clients/appareo/Makefile.am31
-rw-r--r--src/clients/cave/Makefile.am32
-rw-r--r--src/clients/importare/Makefile.am30
-rw-r--r--src/clients/inquisitio/Makefile.am26
-rw-r--r--src/clients/instruo/Makefile.am30
-rw-r--r--src/clients/paludis/Makefile.am33
-rw-r--r--src/clients/reconcilio/Makefile.am46
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/Makefile.am16
-rw-r--r--src/clients/reconcilio/littlelf/Makefile.am16
-rw-r--r--src/clients/reconcilio/util/Makefile.am16
-rw-r--r--test/Makefile.am16
-rwxr-xr-xtest/run_test.sh46
60 files changed, 256 insertions, 1282 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index e6f4479..18c3b0d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,8 @@
+include $(top_srcdir)/misc/common-makefile.am
+
SUBDIRS = . api clients configuration faq overview
-MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = *~ *.epicfail \
+CLEANFILES += \
header.html.part \
toplinks.html.part \
footer.html.part \
@@ -40,7 +41,7 @@ dist_check_SCRIPTS = \
if HAVE_HTMLTIDY
TESTS = $(paludishtml_DATA)
-TESTS_ENVIRONMENT = bash $(top_srcdir)/doc/htmltidy.bash
+LOG_COMPILER_INTERP = $(top_srcdir)/doc/htmltidy.bash
endif
@@ -99,9 +100,6 @@ changelog.subst :
-e 's,ticket:\([0-9]\+\),<a href="http://trac.pioto.org/paludis/ticket/\1">ticket:\1</a>,g' \
> changelog.subst
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
documentation : doxygen epydoc htmldocs
htmldocs : htmldocs-subdirs
diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am
index 8c05e0d..c9a430c 100644
--- a/doc/api/Makefile.am
+++ b/doc/api/Makefile.am
@@ -1,6 +1,8 @@
+include $(top_srcdir)/misc/common-makefile.am
+
SUBDIRS = cplusplus python ruby .
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail \
+CLEANFILES += \
header.html.part \
toplinks.html.part \
footer.html.part \
@@ -10,8 +12,6 @@ EXTRA_DIST = \
toplinks.html.part.in \
index.html.part
-MAINTAINERCLEANFILES = Makefile.in
-
paludisapihtmldir = $(htmldir)/api
paludisapihtml_DATA = \
@@ -20,7 +20,7 @@ paludisapihtml_DATA = \
if HAVE_HTMLTIDY
TESTS = $(paludisapihtml_DATA)
-TESTS_ENVIRONMENT = bash $(top_srcdir)/doc/htmltidy.bash
+LOG_COMPILER_INTERP = $(top_srcdir)/doc/htmltidy.bash
endif
@@ -42,10 +42,6 @@ toplinks.html.part : $(srcdir)/toplinks.html.part.in
footer.html.part : $(srcdir)/../footer.html.part.in
sed -e 's,###TOPURI###,./,g' < $(srcdir)/../footer.html.part.in > footer.html.part
-
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
doxygen :
$(MAKE) -C cplusplus $@
diff --git a/doc/clients/Makefile.am b/doc/clients/Makefile.am
index c2494f5..23e7cd5 100644
--- a/doc/clients/Makefile.am
+++ b/doc/clients/Makefile.am
@@ -1,13 +1,13 @@
+include $(top_srcdir)/misc/common-makefile.am
+
SUBDIRS = .
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail \
+CLEANFILES += \
header.html.part \
toplinks.html.part \
footer.html.part \
index.html
-MAINTAINERCLEANFILES = Makefile.in
-
DISTCLEANFILES = \
$(ALL_CLIENTS_HTML)
@@ -25,10 +25,14 @@ paludisclientshtml_DATA = \
if HAVE_HTMLTIDY
TESTS = $(paludisclientshtml_DATA)
-TESTS_ENVIRONMENT = bash $(top_srcdir)/doc/htmltidy.bash
+LOG_COMPILER_INTERP = $(top_srcdir)/doc/htmltidy.bash
endif
+# automake is retartded
+TEST_EXTENSIONS = .html
+HTML_LOG_COMPILER = $(LOG_COMPILER)
+
index.html : header.html.part $(srcdir)/index.html.part footer.html.part
cat header.html.part $(srcdir)/index.html.part footer.html.part > $@
@@ -127,9 +131,6 @@ toplinks.html.part : $(srcdir)/toplinks.html.part.in
footer.html.part : $(srcdir)/../footer.html.part.in
sed -e 's,###TOPURI###,./,g' < $(srcdir)/../footer.html.part.in > footer.html.part
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
htmldocs : htmldocs-subdirs
htmldocs-subdirs :
diff --git a/doc/configuration/Makefile.am b/doc/configuration/Makefile.am
index 99cf1ef..d3efbda 100644
--- a/doc/configuration/Makefile.am
+++ b/doc/configuration/Makefile.am
@@ -1,6 +1,8 @@
+include $(top_srcdir)/misc/common-makefile.am
+
SUBDIRS = repositories .
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail \
+CLEANFILES += \
header.html.part \
toplinks.html.part \
footer.html.part \
@@ -34,8 +36,6 @@ CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail \
configfiles.html \
specs.html
-MAINTAINERCLEANFILES = Makefile.in
-
EXTRA_DIST = \
toplinks.html.part.in \
index.html.part \
@@ -79,7 +79,7 @@ paludisconfigurationhtml_DATA = \
if HAVE_HTMLTIDY
TESTS = $(paludisconfigurationhtml_DATA)
-TESTS_ENVIRONMENT = bash $(top_srcdir)/doc/htmltidy.bash
+LOG_COMPILER_INTERP = $(top_srcdir)/doc/htmltidy.bash
endif
@@ -254,9 +254,6 @@ toplinks.html.part : $(srcdir)/toplinks.html.part.in
footer.html.part : $(srcdir)/../footer.html.part.in
sed -e 's,###TOPURI###,./,g' < $(srcdir)/../footer.html.part.in > footer.html.part
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
htmldocs : htmldocs-subdirs
htmldocs-subdirs :
diff --git a/doc/configuration/repositories/Makefile.am b/doc/configuration/repositories/Makefile.am
index 01df0cc..cf69e7b 100644
--- a/doc/configuration/repositories/Makefile.am
+++ b/doc/configuration/repositories/Makefile.am
@@ -1,6 +1,8 @@
+include $(top_srcdir)/misc/common-makefile.am
+
SUBDIRS = .
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail \
+CLEANFILES += \
header.html.part \
toplinks.html.part \
footer.html.part \
@@ -14,8 +16,6 @@ CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail \
unwritten.html \
vdb.html
-MAINTAINERCLEANFILES = Makefile.in
-
EXTRA_DIST = \
toplinks.html.part.in \
index.html.part \
@@ -44,7 +44,7 @@ paludisconfigurationrepositorieshtml_DATA = \
if HAVE_HTMLTIDY
TESTS = $(paludisconfigurationhtml_DATA)
-TESTS_ENVIRONMENT = bash $(top_srcdir)/doc/htmltidy.bash
+LOG_COMPILER_INTERP = $(top_srcdir)/doc/htmltidy.bash
endif
@@ -90,9 +90,6 @@ toplinks.html.part : $(srcdir)/toplinks.html.part.in
footer.html.part : $(srcdir)/../../footer.html.part.in
sed -e 's,###TOPURI###,../../,g' < $(srcdir)/../../footer.html.part.in > footer.html.part
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
htmldocs : htmldocs-subdirs
htmldocs-subdirs :
diff --git a/doc/faq/Makefile.am b/doc/faq/Makefile.am
index d5b4f23..ceeae69 100644
--- a/doc/faq/Makefile.am
+++ b/doc/faq/Makefile.am
@@ -1,6 +1,8 @@
+include $(top_srcdir)/misc/common-makefile.am
+
SUBDIRS = .
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail \
+CLEANFILES += \
header.html.part \
toplinks.html.part \
footer.html.part \
@@ -42,7 +44,7 @@ paludisfaqhtml_DATA = \
if HAVE_HTMLTIDY
TESTS = $(paludisfaqhtml_DATA)
-TESTS_ENVIRONMENT = bash $(top_srcdir)/doc/htmltidy.bash
+LOG_COMPILER_INTERP = $(top_srcdir)/doc/htmltidy.bash
endif
@@ -88,11 +90,6 @@ toplinks.html.part : $(srcdir)/toplinks.html.part.in
footer.html.part : $(srcdir)/../footer.html.part.in
sed -e 's,###TOPURI###,./,g' < $(srcdir)/../footer.html.part.in > footer.html.part
-MAINTAINERCLEANFILES = Makefile.in
-
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
htmldocs : htmldocs-subdirs
htmldocs-subdirs :
diff --git a/doc/overview/Makefile.am b/doc/overview/Makefile.am
index 80ab241..bbbad9e 100644
--- a/doc/overview/Makefile.am
+++ b/doc/overview/Makefile.am
@@ -1,6 +1,8 @@
+include $(top_srcdir)/misc/common-makefile.am
+
SUBDIRS = .
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail \
+CLEANFILES += \
header.html.part \
toplinks.html.part \
footer.html.part \
@@ -16,8 +18,6 @@ EXTRA_DIST = \
gettingstarted.html.part \
contact.html.part
-MAINTAINERCLEANFILES = Makefile.in
-
paludisoverviewhtmldir = $(htmldir)/overview
paludisoverviewhtml_DATA = \
@@ -29,7 +29,7 @@ paludisoverviewhtml_DATA = \
if HAVE_HTMLTIDY
TESTS = $(paludisoverviewhtml_DATA)
-TESTS_ENVIRONMENT = bash $(top_srcdir)/doc/htmltidy.bash
+LOG_COMPILER_INTERP = $(top_srcdir)/doc/htmltidy.bash
endif
@@ -60,9 +60,6 @@ toplinks.html.part : $(srcdir)/toplinks.html.part.in
footer.html.part : $(srcdir)/../footer.html.part.in
sed -e 's,###TOPURI###,./,g' < $(srcdir)/../footer.html.part.in > footer.html.part
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
htmldocs : htmldocs-subdirs
htmldocs-subdirs :
diff --git a/hooks/Makefile.am.m4 b/hooks/Makefile.am.m4
index 7082413..4868e42 100644
--- a/hooks/Makefile.am.m4
+++ b/hooks/Makefile.am.m4
@@ -3,11 +3,11 @@ ifdef(`__gnu__',`',`errprint(`This is not GNU m4...
dnl vim: set ft=m4 noet :
-MAINTAINERCLEANFILES = Makefile.in Makefile.am
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT .keep *.epicfail
-SUBDIRS = . demos
+include $(top_srcdir)/misc/common-makefile.am
-AUTOMAKE_OPTIONS = parallel-tests
+CLEANFILES += .keep
+MAINTAINERCLEANFILES += Makefile.am
+SUBDIRS = . demos
installvarlibpaludisnewsdir = $(localstatedir)/gentoo/news
@@ -272,31 +272,6 @@ uninstall-local :
Makefile.am : Makefile.am.m4
$(top_srcdir)/misc/do_m4.bash Makefile.am
-changequote(`<', `>')
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
-TESTS_ENVIRONMENT = env \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PATH="${PATH}:/sbin:/usr/sbin" \
- PALUDIS_COMMAND="$(top_builddir)/src/clients/paludis/paludis" \
- PALUDIS_HOOKER_DIR="$(top_srcdir)/paludis/" \
- PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_ECHO_FUNCTIONS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/e/ebuild/" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- PALUDIS_SKIP_CONFIG="yes" \
- PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
- PALUDIS_ENVIRONMENT_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments`" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TOP_SRCDIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)`" \
- TOP_BUILDDIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)`" \
- bash $(top_srcdir)/hooks/run_test.bash
-
all-local :
chmod +x $(builddir)/news.hook $(builddir)/eselect_env_update.bash
diff --git a/misc/Makefile.am b/misc/Makefile.am
index eb9ca92..cc596b6 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -1,6 +1,6 @@
CLEANFILES = *~ *.epicfail
MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = generated-file.txt do_m4.bash make_se.bash make_nn.bash
+EXTRA_DIST = generated-file.txt do_m4.bash make_se.bash make_nn.bash common-makefile.am
AUTOMAKE_OPTIONS = parallel-tests
diff --git a/misc/common-makefile.am b/misc/common-makefile.am
new file mode 100644
index 0000000..d7a883a
--- /dev/null
+++ b/misc/common-makefile.am
@@ -0,0 +1,67 @@
+# vim: ft=automake :
+
+CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
+MAINTAINERCLEANFILES = Makefile.in
+AUTOMAKE_OPTIONS = parallel-tests
+
+LOG_COMPILER = \
+ unset PALUDIS_TESTS_REAL_STDOUT_FD 2>&1 >/dev/null ; \
+ test "x$$BASH_VERSION" == x || eval "exec 3<&1 ; export PALUDIS_TESTS_REAL_STDOUT_FD=3" ; \
+ env \
+ ACCERSO_OPTIONS="" \
+ ADJUTRIX_OPTIONS="" \
+ APPAREO_OPTIONS="" \
+ CRAN_BASH_DIR="$(top_srcdir)/paludis/repositories/cran/cran/" \
+ INQUISITIO_OPTIONS="" \
+ LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
+ $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/.libs/ \
+ `:`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/.libs/ \
+ `:`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/ruby/.libs/ \
+ `:`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/python/.libs/ \
+ `:`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/.libs/`" \
+ PALUDIS_BYPASS_USERPRIV_CHECKS="yes" \
+ PALUDIS_COMMAND="$(top_builddir)/src/clients/paludis/paludis" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
+ PALUDIS_DISTRIBUTION="gentoo" \
+ PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
+ PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
+ PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
+ PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
+ PALUDIS_ECHO_FUNCTIONS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
+ PALUDIS_ENABLE_VIRTUALS_REPOSITORY="$(PALUDIS_ENABLE_VIRTUALS_REPOSITORY_VALUE)" \
+ PALUDIS_EXTRA_EBUILD_MODULES_DIRS="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
+ PALUDIS_FETCHERS_DIR="$(top_srcdir)/paludis/fetchers/" \
+ PALUDIS_GEMS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/gems/`" \
+ PALUDIS_HOOKER_DIR="$(top_srcdir)/paludis/" \
+ PALUDIS_NO_CHOWN="yupyup" \
+ PALUDIS_NO_GLOBAL_HOOKS="yes" \
+ PALUDIS_NO_XTERM_TITLES="yes" \
+ PALUDIS_OPTIONS="" \
+ PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
+ PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
+ PALUDIS_PC_SLOT=@PALUDIS_PC_SLOT@ \
+ PALUDIS_PIPE_COMMAND_READ_FD="" \
+ PALUDIS_PIPE_COMMAND_WRITE_FD="" \
+ PALUDIS_PORTAGE_BASHRC="$(top_srcdir)/paludis/environments/portage/bashrc" \
+ PALUDIS_PORTAGE_BASHRC="$(top_srcdir)/paludis/environments/portage/bashrc" \
+ PALUDIS_PYTHON_DIR="$(top_srcdir)/python/" \
+ PALUDIS_REDUCED_USERNAME="`id -un`" \
+ PALUDIS_SKIP_CONFIG="yes" \
+ PALUDIS_SUFFIXES_FILE="$(top_srcdir)/paludis/repositories/e/ebuild_entries_suffixes.conf" \
+ PALUDIS_SYNCERS_DIR="$(top_srcdir)/paludis/syncers/" \
+ PALUDIS_TMPDIR="`pwd`" \
+ PATH="${PATH}:/sbin:/usr/sbin" \
+ PYTHON="$(PYTHON)" \
+ RUBY="$(RUBY)" \
+ SO_SUFFIX=@VERSION_LIB_CURRENT@ \
+ SYSCONFDIR="$(sysconfdir)" \
+ PYTHONPATH="$(top_builddir)/python/:$(top_builddir)/python/.libs/" \
+ TEST_SCRIPT_DIR="$(srcdir)/" \
+ TOP_SRCDIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)`" \
+ TOP_BUILDDIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)`" \
+ $(LOG_COMPILER_EXTRA) \
+ bash $(top_srcdir)/test/run_test.sh $(LOG_COMPILER_INTERP)
+
+built-sources : $(BUILT_SOURCES)
+ for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
+
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index 85c0f7d..e352c7a 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -3,6 +3,8 @@ ifdef(`__gnu__',`',`errprint(`This is not GNU m4...
dnl vim: set ft=m4 noet :
+include $(top_srcdir)/misc/common-makefile.am
+
define(`filelist', `')dnl
define(`testlist', `')dnl
define(`headerlist', `')dnl
@@ -16,7 +18,6 @@ define(`testscriptlist', `')dnl
define(`addtest', `define(`testlist', testlist `$1_TEST')dnl
$1_TEST_SOURCES = $1_TEST.cc
$1_TEST_LDADD = \
- ihateautomake.o \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -67,8 +68,7 @@ AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
include(`paludis/files.m4')
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT ihateautomake.cc ihateautomake.o *.epicfail
-MAINTAINERCLEANFILES = Makefile.in Makefile.am about.hh paludis.hh
+MAINTAINERCLEANFILES += Makefile.am about.hh paludis.hh
DISTCLEANFILES = srcleanlist secleanlist
DEFS= \
-DSYSCONFDIR=\"$(sysconfdir)\" \
@@ -83,8 +83,6 @@ EXTRA_DIST = about.hh.in Makefile.am.m4 paludis.hh.m4 files.m4 \
SUBDIRS = distributions fetchers syncers util selinux repositories environments . args resolver
BUILT_SOURCES = srcleanlist secleanlist
-AUTOMAKE_OPTIONS = parallel-tests
-
libpaludis_@PALUDIS_PC_SLOT@_la_SOURCES = filelist
libpaludis_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0 $(PTHREAD_LIBS)
@@ -153,7 +151,6 @@ dep_list_TEST_SOURCES += dep_list_TEST.hh
define(`testlist', testlist `dep_list_TEST_blockers')dnl
dep_list_TEST_blockers_SOURCES = dep_list_TEST_blockers.cc dep_list_TEST.hh
dep_list_TEST_blockers_LDADD = \
- ihateautomake.o \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
libpaludis_@PALUDIS_PC_SLOT@.la \
@@ -172,12 +169,6 @@ stripper_TEST_binary_SOURCES = stripper_TEST_binary.cc
paludis_libexecdir = $(libexecdir)/paludis
paludis_libexec_SCRIPTS = hooker.bash
-if MONOLITHIC
-
-noinst_LTLIBRARIES = libpaludis_@PALUDIS_PC_SLOT@.la libpaludismanpagethings_@PALUDIS_PC_SLOT@.la
-
-else
-
lib_LTLIBRARIES = libpaludis_@PALUDIS_PC_SLOT@.la
noinst_LTLIBRARIES = libpaludismanpagethings_@PALUDIS_PC_SLOT@.la
@@ -185,9 +176,6 @@ if ENABLE_PYTHON_HOOKS
lib_LTLIBRARIES += libpaludispythonhooks_@PALUDIS_PC_SLOT@.la
endif
-endif
-
-
paludis_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/
paludis_include_HEADERS = headerlist srheaderlist seheaderlist
@@ -200,33 +188,3 @@ paludis.hh : paludis.hh.m4 files.m4
comparison_policy.hh : comparison_policy.hh.m4
$(top_srcdir)/misc/do_m4.bash comparison_policy.hh.m4
-ihateautomake.cc : all
- test -f $@ || touch $@
-
-changequote(`<', `>')
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
-TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/e/ebuild/" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_HOOKER_DIR="$(top_srcdir)/paludis/" \
- PALUDIS_OPTIONS="" \
- PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_SKIP_CONFIG="yes" \
- PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- SO_SUFFIX=@VERSION_LIB_CURRENT@ \
- PALUDIS_PC_SLOT=@PALUDIS_PC_SLOT@ \
- PYTHONPATH="$(top_builddir)/python/" \
- PALUDIS_PYTHON_DIR="$(top_srcdir)/python/" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
- $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/.libs/ \
- `:`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/.libs/ \
- `:`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/python/.libs/`" \
- bash $(top_srcdir)/test/run_test.sh
-
diff --git a/paludis/args/Makefile.am b/paludis/args/Makefile.am
index 1979236..01f6de4 100644
--- a/paludis/args/Makefile.am
+++ b/paludis/args/Makefile.am
@@ -1,12 +1,10 @@
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
-MAINTAINERCLEANFILES = Makefile.in
+include $(top_srcdir)/misc/common-makefile.am
+
DISTCLEANFILES = args_handler-se.hh args_handler-se.cc
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
EXTRA_DIST = args_handler-se.hh args_handler-se.cc args_handler.se
BUILT_SOURCES = args_handler-se.hh args_handler-se.cc
-AUTOMAKE_OPTIONS = parallel-tests
-
TESTS = \
args_TEST
@@ -53,15 +51,9 @@ libpaludisman_@PALUDIS_PC_SLOT@_a_SOURCES = \
libpaludisargs_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
libpaludisargs_@PALUDIS_PC_SLOT@_la_LIBADD = \
- $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la
+ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la
-TESTS_ENVIRONMENT = env PALUDIS_OPTIONS="" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
- PALUDIS_DISTRIBUTION="gentoo" \
- bash $(top_srcdir)/test/run_test.sh
-
lib_LTLIBRARIES = libpaludisargs_@PALUDIS_PC_SLOT@.la
noinst_LIBRARIES = libpaludisman_@PALUDIS_PC_SLOT@.a
@@ -77,9 +69,6 @@ args_TEST_SOURCES = args_TEST.cc
args_TEST_LDADD = $(test_ldadd)
args_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
args_handler-se.hh : args_handler.se $(top_srcdir)/misc/make_se.bash
if ! $(top_srcdir)/misc/make_se.bash --header $(srcdir)/args_handler.se > $@ ; then rm -f $@ ; exit 1 ; fi
diff --git a/paludis/environments/no_config/Makefile.am b/paludis/environments/no_config/Makefile.am
index 3ef5486..8b24815 100644
--- a/paludis/environments/no_config/Makefile.am
+++ b/paludis/environments/no_config/Makefile.am
@@ -1,6 +1,6 @@
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT ihateautomake.cc ihateautomake.o *.epicfail
+include $(top_srcdir)/misc/common-makefile.am
+
DISTCLEANFILES = no_config_environment-se.hh no_config_environment-se.cc
-MAINTAINERCLEANFILES = Makefile.in
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS= \
-DSYSCONFDIR=\"$(sysconfdir)\" \
@@ -8,8 +8,6 @@ DEFS= \
-DDATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)\"
-AUTOMAKE_OPTIONS = parallel-tests
-
libpaludisnoconfigenvironment_la_SOURCES = \
no_config_environment.cc no_config_environment.hh \
registration.cc
@@ -31,17 +29,6 @@ EXTRA_DIST = \
TESTS = no_config_environment_TEST
-TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="$(top_srcdir)/ebuild/" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- PALUDIS_SKIP_CONFIG="yes" \
- PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- bash $(top_srcdir)/test/run_test.sh
-
check_PROGRAMS = $(TESTS)
check_SCRIPTS = no_config_environment_TEST_setup.sh no_config_environment_TEST_cleanup.sh
@@ -66,6 +53,3 @@ no_config_environment-se.hh : no_config_environment.se $(top_srcdir)/misc/make_s
no_config_environment-se.cc : no_config_environment.se $(top_srcdir)/misc/make_se.bash
$(top_srcdir)/misc/make_se.bash --source $(srcdir)/no_config_environment.se > $@
-built-sources : $(BUILT_SOURCES)
- for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/environments/paludis/Makefile.am b/paludis/environments/paludis/Makefile.am
index 274bbb3..e0e46e7 100644
--- a/paludis/environments/paludis/Makefile.am
+++ b/paludis/environments/paludis/Makefile.am
@@ -1,7 +1,6 @@
+include $(top_srcdir)/misc/common-makefile.am
+
SUBDIRS = output_managers .
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
-BUILT_SOURCES = $(DISTCLEANFILES)
-MAINTAINERCLEANFILES = Makefile.in
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS= \
-DSYSCONFDIR=\"$(sysconfdir)\" \
@@ -10,8 +9,6 @@ DEFS= \
-DLIBDIR=\"$(libdir)\" \
-DSHAREDIR=\"$(datarootdir)\"
-AUTOMAKE_OPTIONS = parallel-tests
-
libpaludispaludisenvironment_la_SOURCES = \
action_to_string.cc action_to_string.hh \
bashable_conf.cc bashable_conf.hh \
@@ -58,30 +55,6 @@ EXTRA_DIST = \
TESTS = paludis_environment_TEST
-TESTS_ENVIRONMENT = env \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
- PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EXTRA_EBUILD_MODULES_DIRS="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_SUFFIXES_FILE="$(top_srcdir)/paludis/repositories/e/ebuild_entries_suffixes.conf" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- PALUDIS_FETCHERS_DIR="$(top_srcdir)/paludis/fetchers/" \
- PALUDIS_SKIP_CONFIG="yes" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
- PALUDIS_NO_CHOWN="yes" \
- PALUDIS_TESTS_KEEP_STDERR="yes" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
- $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/`:` \
- $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/.libs/`" \
- bash $(top_srcdir)/test/run_test.sh
-
check_PROGRAMS = $(TESTS)
check_SCRIPTS = paludis_environment_TEST_setup.sh paludis_environment_TEST_cleanup.sh
@@ -96,6 +69,3 @@ paludis_environment_TEST_LDADD = \
paludis_environment_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/environments/portage/Makefile.am b/paludis/environments/portage/Makefile.am
index b417333..ae3f2b5 100644
--- a/paludis/environments/portage/Makefile.am
+++ b/paludis/environments/portage/Makefile.am
@@ -1,7 +1,5 @@
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
-DISTCLEANFILES =
-BUILT_SOURCES = $(DISTCLEANFILES)
-MAINTAINERCLEANFILES = Makefile.in
+include $(top_srcdir)/misc/common-makefile.am
+
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS= \
-DSYSCONFDIR=\"$(sysconfdir)\" \
@@ -9,8 +7,6 @@ DEFS= \
-DDATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)\"
-AUTOMAKE_OPTIONS = parallel-tests
-
libpaludisportageenvironment_la_SOURCES = \
registration.cc \
portage_environment.cc portage_environment.hh
@@ -32,30 +28,6 @@ EXTRA_DIST = \
TESTS = portage_environment_TEST
-TESTS_ENVIRONMENT = env \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
- PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EXTRA_EBUILD_MODULES_DIRS="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_SUFFIXES_FILE="$(top_srcdir)/paludis/repositories/e/ebuild_entries_suffixes.conf" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- PALUDIS_FETCHERS_DIR="$(top_srcdir)/paludis/fetchers/" \
- PALUDIS_SKIP_CONFIG="yes" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
- PALUDIS_NO_CHOWN="yes" \
- PALUDIS_TESTS_KEEP_STDERR="yes" \
- SYSCONFDIR="$(sysconfdir)" \
- PALUDIS_PORTAGE_BASHRC="$(top_srcdir)/paludis/environments/portage/bashrc" \
- LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
- $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/`:` \
- $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/.libs/`" \
- bash $(top_srcdir)/test/run_test.sh
-
portage_environment_TEST_SOURCES = portage_environment_TEST.cc
portage_environment_TEST_LDADD = \
$(top_builddir)/paludis/util/test_extras.o \
@@ -69,6 +41,3 @@ portage_environment_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGIN
check_PROGRAMS = $(TESTS)
check_SCRIPTS = portage_environment_TEST_setup.sh portage_environment_TEST_cleanup.sh
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/fetchers/Makefile.am b/paludis/fetchers/Makefile.am
index ac40e83..b68d035 100644
--- a/paludis/fetchers/Makefile.am
+++ b/paludis/fetchers/Makefile.am
@@ -1,8 +1,8 @@
-MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = *~ dohttp dohttps doftp .keep *.epicfail
+include $(top_srcdir)/misc/common-makefile.am
+
SUBDIRS = . demos
-AUTOMAKE_OPTIONS = parallel-tests
+CLEANFILES += .keep
.keep :
touch $@
@@ -14,14 +14,6 @@ libexecprog_SCRIPTS = \
dohttps \
doftp \
dofile
-
-TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="$(srcdir)/ebuild/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- bash $(top_srcdir)/test/run_test.sh
-
installuserfetchersdir = $(datadir)/paludis/fetchers
installuserfetchers_DATA = .keep
@@ -36,6 +28,3 @@ AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
dohttp dohttps doftp : dowget.in
cat $? > $@
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/repositories/Makefile.am b/paludis/repositories/Makefile.am
index 6393e45..968f599 100644
--- a/paludis/repositories/Makefile.am
+++ b/paludis/repositories/Makefile.am
@@ -1,23 +1,9 @@
-if MONOLITHIC
-
-SUBDIRS = $(BUILD_REPOSITORIES) .
-
-else
+include $(top_srcdir)/misc/common-makefile.am
SUBDIRS = . $(BUILD_REPOSITORIES)
-endif
-
DIST_SUBDIRS = $(ALL_REPOSITORIES)
-AUTOMAKE_OPTIONS = parallel-tests
-
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
-MAINTAINERCLEANFILES = Makefile.in
-
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS= \
-DSYSCONFDIR=\"$(sysconfdir)\" \
diff --git a/paludis/repositories/accounts/Makefile.am b/paludis/repositories/accounts/Makefile.am
index e8e3583..f9d94a0 100644
--- a/paludis/repositories/accounts/Makefile.am
+++ b/paludis/repositories/accounts/Makefile.am
@@ -1,10 +1,6 @@
-SUBDIRS = .
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
-DISTCLEANFILES =
-
-MAINTAINERCLEANFILES = Makefile.in
+include $(top_srcdir)/misc/common-makefile.am
-AUTOMAKE_OPTIONS = parallel-tests
+SUBDIRS = .
AM_CXXFLAGS = -I$(top_srcdir) -I$(top_builddir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS= \
@@ -57,28 +53,8 @@ EXTRA_DIST = \
check_SCRIPTS =
-TESTS_ENVIRONMENT = env \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
- PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_FETCHERS_DIR="$(top_srcdir)/paludis/fetchers/" \
- PALUDIS_OPTIONS="" \
- PALUDIS_SKIP_CONFIG="yes" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
- PALUDIS_NO_CHOWN="yes" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- bash $(top_srcdir)/test/run_test.sh
-
TESTS = \
accounts_repository_TEST
check_PROGRAMS = $(TESTS)
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/repositories/cran/Makefile.am b/paludis/repositories/cran/Makefile.am
index 6ca9eb2..63e3138 100644
--- a/paludis/repositories/cran/Makefile.am
+++ b/paludis/repositories/cran/Makefile.am
@@ -1,9 +1,6 @@
-SUBDIRS = cran .
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
-MAINTAINERCLEANFILES = Makefile.in
-
-AUTOMAKE_OPTIONS = parallel-tests
+include $(top_srcdir)/misc/common-makefile.am
+SUBDIRS = cran .
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS= \
-DSYSCONFDIR=\"$(sysconfdir)\" \
@@ -103,18 +100,3 @@ check_SCRIPTS = \
cran_repository_TEST_setup.sh cran_repository_TEST_cleanup.sh \
cran_installed_repository_TEST_setup.sh cran_installed_repository_TEST_cleanup.sh
-TESTS_ENVIRONMENT = env \
- CRAN_BASH_DIR="$(top_srcdir)/paludis/repositories/cran/cran/" \
- PALUDIS_SKIP_CONFIG="yes" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
- bash $(top_srcdir)/test/run_test.sh
-
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/repositories/e/Makefile.am b/paludis/repositories/e/Makefile.am
index 0a6cfea..c67ef0d 100644
--- a/paludis/repositories/e/Makefile.am
+++ b/paludis/repositories/e/Makefile.am
@@ -1,14 +1,11 @@
+include $(top_srcdir)/misc/common-makefile.am
+
SUBDIRS = eapis ebuild .
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
DISTCLEANFILES = \
e_repository_params-se.hh e_repository_params-se.cc \
dep_parser-se.hh dep_parser-se.cc \
iuse-se.hh iuse-se.cc
-MAINTAINERCLEANFILES = Makefile.in
-
-AUTOMAKE_OPTIONS = parallel-tests
-
AM_CXXFLAGS = -I$(top_srcdir) -I$(top_builddir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS= \
-DSYSCONFDIR=\"$(sysconfdir)\" \
@@ -421,32 +418,6 @@ check_SCRIPTS = \
e_repository_sets_TEST_setup.sh e_repository_sets_TEST_cleanup.sh \
fetch_visitor_TEST_setup.sh fetch_visitor_TEST_cleanup.sh
-TESTS_ENVIRONMENT = env \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
- PALUDIS_OPTIONS="" \
- PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EXTRA_EBUILD_MODULES_DIRS="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_SUFFIXES_FILE="$(top_srcdir)/paludis/repositories/e/ebuild_entries_suffixes.conf" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_FETCHERS_DIR="$(top_srcdir)/paludis/fetchers/" \
- PALUDIS_SKIP_CONFIG="yes" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
- PALUDIS_NO_CHOWN="yes" \
- PALUDIS_TESTS_KEEP_STDERR="yes" \
- PALDUIS_TMPDIR="`pwd`" \
- PALUDIS_BYPASS_USERPRIV_CHECKS="yes" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
- $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/`:` \
- $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/.libs/`" \
- bash $(top_srcdir)/test/run_test.sh
-
dep_parser-se.hh : dep_parser.se $(top_srcdir)/misc/make_se.bash
if ! $(top_srcdir)/misc/make_se.bash --header $(srcdir)/dep_parser.se > $@ ; then rm -f $@ ; exit 1 ; fi
@@ -518,6 +489,3 @@ TESTS = \
check_PROGRAMS = $(TESTS)
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/repositories/e/ebuild/0/Makefile.am b/paludis/repositories/e/ebuild/0/Makefile.am
index 8eb843d..56ff489 100644
--- a/paludis/repositories/e/ebuild/0/Makefile.am
+++ b/paludis/repositories/e/ebuild/0/Makefile.am
@@ -1,8 +1,6 @@
-MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = *~ *.epicfail
-SUBDIRS = .
+include $(top_srcdir)/misc/common-makefile.am
-AUTOMAKE_OPTIONS = parallel-tests
+SUBDIRS = .
libexecprog0dir = $(libexecdir)/paludis/0/
@@ -39,28 +37,14 @@ libexecprog0_SCRIPTS = \
src_test.bash \
src_unpack.bash
-TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/e/ebuild/" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EXTRA_EBUILD_MODULES_DIRS="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_EBUILD_MODULE_SUFFIXES="0" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
+LOG_COMPILER_EXTRA = \
PALUDIS_EBUILD_LOG_LEVEL="warning" \
- PALUDIS_OPTIONS="" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_TMPDIR="`pwd`/" \
- bash $(top_srcdir)/test/run_test.sh $(top_srcdir)/paludis/repositories/e/ebuild/run_test.bash
+ PALUDIS_EBUILD_MODULE_SUFFIXES="0"
+
+LOG_COMPILER_INTERP = $(top_srcdir)/paludis/repositories/e/ebuild/run_test.bash
TESTS = conditional_functions_TEST.bash list_functions_TEST.bash
check_SCRIPTS = $(TESTS)
EXTRA_DIST = $(libexecprog0_SCRIPTS) $(check_SCRIPTS)
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/repositories/e/ebuild/1/Makefile.am b/paludis/repositories/e/ebuild/1/Makefile.am
index a6a3142..c690624 100644
--- a/paludis/repositories/e/ebuild/1/Makefile.am
+++ b/paludis/repositories/e/ebuild/1/Makefile.am
@@ -1,8 +1,6 @@
-MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = *~ *.epicfail
-SUBDIRS = .
+include $(top_srcdir)/misc/common-makefile.am
-AUTOMAKE_OPTIONS = parallel-tests
+SUBDIRS = .
libexecprog1dir = $(libexecdir)/paludis/1
@@ -10,27 +8,8 @@ libexecprog1_SCRIPTS = \
src_compile.bash \
output_functions.bash
-TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/e/ebuild/" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_MODULE_SUFFIXES="1 0" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- PALUDIS_EBUILD_LOG_LEVEL="warning" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_TMPDIR="`pwd`/" \
- bash $(top_srcdir)/test/run_test.sh $(top_srcdir)/paludis/repositories/e/ebuild/run_test.bash
-
TESTS =
check_SCRIPTS = $(TESTS)
EXTRA_DIST = $(libexecprog1_SCRIPTS)
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/repositories/e/ebuild/2/Makefile.am b/paludis/repositories/e/ebuild/2/Makefile.am
index e020a1d..5aff4bd 100644
--- a/paludis/repositories/e/ebuild/2/Makefile.am
+++ b/paludis/repositories/e/ebuild/2/Makefile.am
@@ -1,8 +1,6 @@
-MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = *~ *.epicfail
-SUBDIRS = .
+include $(top_srcdir)/misc/common-makefile.am
-AUTOMAKE_OPTIONS = parallel-tests
+SUBDIRS = .
libexecprog2dir = $(libexecdir)/paludis/2
@@ -17,27 +15,8 @@ libexecprog2_SCRIPTS = \
src_unpack.bash \
output_functions.bash
-TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/e/ebuild/" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_MODULE_SUFFIXES="1 0" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- PALUDIS_EBUILD_LOG_LEVEL="warning" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_TMPDIR="`pwd`/" \
- bash $(top_srcdir)/test/run_test.sh $(top_srcdir)/paludis/repositories/e/ebuild/run_test.bash
-
TESTS =
check_SCRIPTS = $(TESTS)
EXTRA_DIST = $(libexecprog2_SCRIPTS)
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/repositories/e/ebuild/3/Makefile.am b/paludis/repositories/e/ebuild/3/Makefile.am
index 82e475d..2c7759f 100644
--- a/paludis/repositories/e/ebuild/3/Makefile.am
+++ b/paludis/repositories/e/ebuild/3/Makefile.am
@@ -1,8 +1,6 @@
-MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = *~ *.epicfail
-SUBDIRS = .
+include $(top_srcdir)/misc/common-makefile.am
-AUTOMAKE_OPTIONS = parallel-tests
+SUBDIRS = .
libexecprog3dir = $(libexecdir)/paludis/3
@@ -12,27 +10,8 @@ libexecprog3_SCRIPTS = \
die_functions.bash \
output_functions.bash
-TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/e/ebuild/" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_MODULE_SUFFIXES="1 0" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- PALUDIS_EBUILD_LOG_LEVEL="warning" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_TMPDIR="`pwd`/" \
- bash $(top_srcdir)/test/run_test.sh $(top_srcdir)/paludis/repositories/e/ebuild/run_test.bash
-
TESTS =
check_SCRIPTS = $(TESTS)
EXTRA_DIST = $(libexecprog3_SCRIPTS)
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/repositories/e/ebuild/Makefile.am b/paludis/repositories/e/ebuild/Makefile.am
index d9291a6..d3d3c2a 100644
--- a/paludis/repositories/e/ebuild/Makefile.am
+++ b/paludis/repositories/e/ebuild/Makefile.am
@@ -1,8 +1,6 @@
-MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = *~ *.epicfail
-SUBDIRS = . 0 1 2 3 exheres-0 kdebuild-1 paludis-1 pbin-1 utils
+include $(top_srcdir)/misc/common-makefile.am
-AUTOMAKE_OPTIONS = parallel-tests
+SUBDIRS = . 0 1 2 3 exheres-0 kdebuild-1 paludis-1 pbin-1 utils
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
@@ -24,27 +22,13 @@ libexecprog_SCRIPTS = \
write_vdb_entry.bash \
write_binary_ebuild.bash
-TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/e/ebuild/" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EXTRA_EBUILD_MODULES_DIRS="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_EBUILD_MODULE_SUFFIXES="0" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
+LOG_COMPILER_EXTRA = \
PALUDIS_EBUILD_LOG_LEVEL="warning" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_TMPDIR="`pwd`/" \
- bash $(top_srcdir)/test/run_test.sh $(top_srcdir)/paludis/repositories/e/ebuild/run_test.bash
+ PALUDIS_EBUILD_MODULE_SUFFIXES="0"
+
+LOG_COMPILER_INTERP = $(top_srcdir)/paludis/repositories/e/ebuild/run_test.bash
TESTS = kernel_functions_TEST.bash
EXTRA_DIST = $(libexecprog_SCRIPTS) run_test.bash $(TESTS) $(check_SCRIPTS)
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/repositories/e/ebuild/exheres-0/Makefile.am b/paludis/repositories/e/ebuild/exheres-0/Makefile.am
index 53d48f6..68562df 100644
--- a/paludis/repositories/e/ebuild/exheres-0/Makefile.am
+++ b/paludis/repositories/e/ebuild/exheres-0/Makefile.am
@@ -1,8 +1,6 @@
-MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = *~ *.epicfail
-SUBDIRS = .
+include $(top_srcdir)/misc/common-makefile.am
-AUTOMAKE_OPTIONS = parallel-tests
+SUBDIRS = .
libexecprogexheresdir = $(libexecdir)/paludis/exheres-0
@@ -45,28 +43,14 @@ libexecprogexheres_SCRIPTS = \
src_prepare.bash \
src_unpack.bash
-TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/e/ebuild/" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
- PALUDIS_EXTRA_EBUILD_MODULES_DIRS="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
+LOG_COMPILER_EXTRA = \
PALUDIS_EBUILD_LOG_LEVEL="warning" \
- PALUDIS_EBUILD_MODULE_SUFFIXES="exheres-0" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_TMPDIR="`pwd`/" \
- bash $(top_srcdir)/test/run_test.sh $(top_srcdir)/paludis/repositories/e/ebuild/run_test.bash
+ PALUDIS_EBUILD_MODULE_SUFFIXES="exheres-0"
+
+LOG_COMPILER_INTERP = $(top_srcdir)/paludis/repositories/e/ebuild/run_test.bash
TESTS = conditional_functions_TEST.bash
check_SCRIPTS = $(TESTS)
EXTRA_DIST = $(libexecprogexheres_SCRIPTS) $(check_SCRIPTS)
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/repositories/e/ebuild/kdebuild-1/Makefile.am b/paludis/repositories/e/ebuild/kdebuild-1/Makefile.am
index 73d3c2c..60e84a1 100644
--- a/paludis/repositories/e/ebuild/kdebuild-1/Makefile.am
+++ b/paludis/repositories/e/ebuild/kdebuild-1/Makefile.am
@@ -1,35 +1,14 @@
-MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = *~ *.epicfail
-SUBDIRS = .
+include $(top_srcdir)/misc/common-makefile.am
-AUTOMAKE_OPTIONS = parallel-tests
+SUBDIRS = .
libexecprogkdebuild1dir = $(libexecdir)/paludis/kdebuild-1
libexecprogkdebuild1_SCRIPTS = \
output_functions.bash
-TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/e/ebuild/" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_MODULE_SUFFIXES="1 0" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- PALUDIS_EBUILD_LOG_LEVEL="warning" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_TMPDIR="`pwd`/" \
- bash $(top_srcdir)/test/run_test.sh $(top_srcdir)/paludis/repositories/e/ebuild/run_test.bash
-
TESTS =
check_SCRIPTS = $(TESTS)
EXTRA_DIST = $(libexecprogkdebuild1_SCRIPTS)
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/repositories/e/ebuild/paludis-1/Makefile.am b/paludis/repositories/e/ebuild/paludis-1/Makefile.am
index 6d5ea0c..91d7983 100644
--- a/paludis/repositories/e/ebuild/paludis-1/Makefile.am
+++ b/paludis/repositories/e/ebuild/paludis-1/Makefile.am
@@ -1,34 +1,14 @@
-MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = *~ *.epicfail
-SUBDIRS = .
+include $(top_srcdir)/misc/common-makefile.am
-AUTOMAKE_OPTIONS = parallel-tests
+SUBDIRS = .
libexecprogpaludis1dir = $(libexecdir)/paludis/paludis-1
libexecprogpaludis1_SCRIPTS = \
output_functions.bash
-TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/e/ebuild/" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_MODULE_SUFFIXES="1 0" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- PALUDIS_EBUILD_LOG_LEVEL="warning" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- bash $(top_srcdir)/test/run_test.sh $(top_srcdir)/paludis/repositories/e/ebuild/run_test.bash
-
TESTS =
check_SCRIPTS = $(TESTS)
EXTRA_DIST = $(libexecprogpaludis1_SCRIPTS)
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/repositories/e/ebuild/pbin-1/Makefile.am b/paludis/repositories/e/ebuild/pbin-1/Makefile.am
index 56bcd02..d0a069a 100644
--- a/paludis/repositories/e/ebuild/pbin-1/Makefile.am
+++ b/paludis/repositories/e/ebuild/pbin-1/Makefile.am
@@ -1,35 +1,15 @@
-MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = *~ *.epicfail
-SUBDIRS = .
+include $(top_srcdir)/misc/common-makefile.am
-AUTOMAKE_OPTIONS = parallel-tests
+SUBDIRS = .
libexecprogpaludisbinary1dir = $(libexecdir)/paludis/pbin-1
libexecprogpaludisbinary1_SCRIPTS = \
builtin_installbin.bash \
builtin_pivotbin.bash
-TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/e/ebuild/" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_MODULE_SUFFIXES="1 0" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- PALUDIS_EBUILD_LOG_LEVEL="warning" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_TMPDIR="`pwd`/" \
- bash $(top_srcdir)/test/run_test.sh $(top_srcdir)/paludis/repositories/e/ebuild/run_test.bash
EXTRA_DIST = $(libexecprogpaludisbinary1_SCRIPTS)
TESTS =
check_SCRIPTS = $(TESTS)
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/repositories/e/ebuild/utils/3/Makefile.am b/paludis/repositories/e/ebuild/utils/3/Makefile.am
index 992e9ca..578ec38 100644
--- a/paludis/repositories/e/ebuild/utils/3/Makefile.am
+++ b/paludis/repositories/e/ebuild/utils/3/Makefile.am
@@ -1,7 +1,6 @@
-MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = .
+include $(top_srcdir)/misc/common-makefile.am
-AUTOMAKE_OPTIONS = parallel-tests
+SUBDIRS = .
libexecprog3dir = $(libexecdir)/paludis/utils/3/
@@ -11,19 +10,6 @@ libexecprog3_SCRIPTS = \
dosed \
banned_in_eapi_3
-TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise \
- $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
- PALUDIS_EBUILD_LOG_LEVEL="silent" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- PALUDIS_NO_CHOWN="yes" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_TMPDIR="`pwd`/" \
- bash $(top_srcdir)/paludis/repositories/e/ebuild/utils/run_test.bash
-
TESTS =
EXTRA_DIST = \
$(libexecprog3_SCRIPTS) \
@@ -35,8 +21,5 @@ $(bannedscripts) : banned_in_eapi_3
cat $? > $@
chmod +x $@
-CLEANFILES = *~ $(bannedscripts) *.epicfail
-
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
+CLEANFILES += $(bannedscripts)
diff --git a/paludis/repositories/e/ebuild/utils/Makefile.am b/paludis/repositories/e/ebuild/utils/Makefile.am
index 4f2043d..59c160e 100644
--- a/paludis/repositories/e/ebuild/utils/Makefile.am
+++ b/paludis/repositories/e/ebuild/utils/Makefile.am
@@ -1,7 +1,6 @@
-MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = . 3 exheres-0 kdebuild-1
+include $(top_srcdir)/misc/common-makefile.am
-AUTOMAKE_OPTIONS = parallel-tests
+SUBDIRS = . 3 exheres-0 kdebuild-1
libexecprogdir = $(libexecdir)/paludis/utils
@@ -67,18 +66,11 @@ locked_pipe_command_SOURCES = locked_pipe_command.cc
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
-TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise \
- $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
- PALUDIS_EBUILD_LOG_LEVEL="silent" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- PALUDIS_NO_CHOWN="yes" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_TMPDIR="`pwd`/" \
- bash $(top_srcdir)/paludis/repositories/e/ebuild/utils/run_test.bash
+LOG_COMPILER_EXTRA = \
+ PALUDIS_EBUILD_LOG_LEVEL="warning" \
+ PALUDIS_EBUILD_MODULE_SUFFIXES="0"
+
+LOG_COMPILER_INTERP = $(top_srcdir)/paludis/repositories/e/ebuild/run_test.bash
TESTS = \
wrapped_getfsize_TEST.bash
@@ -87,13 +79,10 @@ prep_scripts = prepall prepallstrip prepallman prepallinfo prepstrip prepman pre
EXTRA_DIST = $(libexecprog_SCRIPTS) $(check_SCRIPTS) run_test.bash prep.in $(TESTS)
-CLEANFILES = *~ $(prep_scripts) *.epicfail
+CLEANFILES += $(prep_scripts)
$(prep_scripts) : prep.in
cat $? > $@
check_PROGRAMS =
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am b/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am
index a545c53..ba43d43 100644
--- a/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am
+++ b/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am
@@ -1,7 +1,6 @@
-MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = .
+include $(top_srcdir)/misc/common-makefile.am
-AUTOMAKE_OPTIONS = parallel-tests
+SUBDIRS = .
libexecprogdir = $(libexecdir)/paludis/utils/exheres-0
@@ -34,18 +33,6 @@ libexecprog_SCRIPTS = \
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
-TESTS_ENVIRONMENT = env \
- PALUDIS_UTILITY_PATH_SUFFIXES="exheres-0" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise \
- $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
- PALUDIS_EBUILD_LOG_LEVEL="silent" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- bash $(top_srcdir)/paludis/repositories/e/ebuild/utils/run_test.bash
-
TESTS =
EXTRA_DIST = \
@@ -57,7 +44,7 @@ bannedscripts = prepall prepallstrip prepstrip prepallman prepman prepallinfo \
prepinfo prepdocs prepalldocs dohard donewins dosed dohtml \
ecompress ecompressdir
-CLEANFILES = *~ $(bannedscripts) *.epicfail
+CLEANFILES += $(bannedscripts)
$(bannedscripts) : banned_in_eapi_exheres-0
cat $? > $@
@@ -65,6 +52,3 @@ $(bannedscripts) : banned_in_eapi_exheres-0
check_PROGRAMS =
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/repositories/e/ebuild/utils/kdebuild-1/Makefile.am b/paludis/repositories/e/ebuild/utils/kdebuild-1/Makefile.am
index 426bb83..044ee4c 100644
--- a/paludis/repositories/e/ebuild/utils/kdebuild-1/Makefile.am
+++ b/paludis/repositories/e/ebuild/utils/kdebuild-1/Makefile.am
@@ -1,7 +1,6 @@
-MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = .
+include $(top_srcdir)/misc/common-makefile.am
-AUTOMAKE_OPTIONS = parallel-tests
+SUBDIRS = .
libexecprogdir = $(libexecdir)/paludis/utils/kdebuild-1
@@ -25,18 +24,6 @@ libexecprog_SCRIPTS = \
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
-TESTS_ENVIRONMENT = env \
- PALUDIS_UTILITY_PATH_SUFFIXES="exheres-0" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise \
- $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
- PALUDIS_EBUILD_LOG_LEVEL="silent" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- bash $(top_srcdir)/paludis/repositories/e/ebuild/utils/run_test.bash
-
TESTS =
EXTRA_DIST = $(libexecprog_SCRIPTS) $(check_SCRIPTS) \
@@ -46,7 +33,7 @@ bannedscripts = prepall prepallstrip prepstrip prepallman prepman prepallinfo \
prepinfo prepdocs prepalldocs dohard donewins dosed dohtml \
ecompress ecompressdir
-CLEANFILES = *~ $(bannedscripts) *.epicfail
+CLEANFILES += $(bannedscripts)
$(bannedscripts) : banned_in_eapi_kdebuild-1
cat $? > $@
@@ -54,6 +41,3 @@ $(bannedscripts) : banned_in_eapi_kdebuild-1
check_PROGRAMS =
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/repositories/fake/Makefile.am b/paludis/repositories/fake/Makefile.am
index 863c2da..faa7faa 100644
--- a/paludis/repositories/fake/Makefile.am
+++ b/paludis/repositories/fake/Makefile.am
@@ -1,7 +1,4 @@
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
-MAINTAINERCLEANFILES = Makefile.in
-
-AUTOMAKE_OPTIONS = parallel-tests
+include $(top_srcdir)/misc/common-makefile.am
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS= \
@@ -9,22 +6,6 @@ DEFS= \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DDATADIR=\"$(datadir)\"
-TESTS_ENVIRONMENT = env \
- PALUDIS_GEMS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/gems/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- PALUDIS_SKIP_CONFIG="yes" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
- LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
- $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gems/`:` \
- $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gems/.libs/`" \
- bash $(top_srcdir)/test/run_test.sh
-
TESTS = fake_repository_TEST fake_installed_repository_TEST dep_parser_TEST
check_PROGRAMS = $(TESTS)
@@ -84,6 +65,3 @@ paludis_repositories_fake_include_HEADERS = \
fake_installed_repository.hh \
fake_package_id.hh
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/repositories/gems/Makefile.am b/paludis/repositories/gems/Makefile.am
index 03662f0..c432311 100644
--- a/paludis/repositories/gems/Makefile.am
+++ b/paludis/repositories/gems/Makefile.am
@@ -1,8 +1,6 @@
-SUBDIRS = .
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
-MAINTAINERCLEANFILES = Makefile.in
+include $(top_srcdir)/misc/common-makefile.am
-AUTOMAKE_OPTIONS = parallel-tests
+SUBDIRS = .
AM_CXXFLAGS = -I$(top_srcdir) -I$(top_builddir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS = \
@@ -103,25 +101,6 @@ check_SCRIPTS = \
paludis_gems_libexec_SCRIPTS = gems.bash
-TESTS_ENVIRONMENT = env \
- PALUDIS_GEMS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/gems/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- PALUDIS_SKIP_CONFIG="yes" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
- LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
- $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gems/`:` \
- $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gems/.libs/`" \
- bash $(top_srcdir)/test/run_test.sh
-
TESTS = gems_repository_TEST installed_gems_repository_TEST yaml_TEST gem_specification_TEST gem_specifications_TEST
check_PROGRAMS = $(TESTS)
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/repositories/unavailable/Makefile.am b/paludis/repositories/unavailable/Makefile.am
index c8b3ff4..7769cf9 100644
--- a/paludis/repositories/unavailable/Makefile.am
+++ b/paludis/repositories/unavailable/Makefile.am
@@ -1,10 +1,6 @@
-SUBDIRS = .
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
-DISTCLEANFILES =
-
-AUTOMAKE_OPTIONS = parallel-tests
+include $(top_srcdir)/misc/common-makefile.am
-MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = .
AM_CXXFLAGS = -I$(top_srcdir) -I$(top_builddir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS= \
@@ -51,28 +47,8 @@ check_SCRIPTS = \
unavailable_repository_TEST_setup.sh \
unavailable_repository_TEST_cleanup.sh
-TESTS_ENVIRONMENT = env \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
- PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_FETCHERS_DIR="$(top_srcdir)/paludis/fetchers/" \
- PALUDIS_OPTIONS="" \
- PALUDIS_SKIP_CONFIG="yes" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
- PALUDIS_NO_CHOWN="yes" \
- bash $(top_srcdir)/test/run_test.sh
-
TESTS = \
unavailable_repository_TEST
check_PROGRAMS = $(TESTS)
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/repositories/unpackaged/Makefile.am b/paludis/repositories/unpackaged/Makefile.am
index cfb339d..af8e867 100644
--- a/paludis/repositories/unpackaged/Makefile.am
+++ b/paludis/repositories/unpackaged/Makefile.am
@@ -1,9 +1,6 @@
-SUBDIRS = .
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
-
-MAINTAINERCLEANFILES = Makefile.in
+include $(top_srcdir)/misc/common-makefile.am
-AUTOMAKE_OPTIONS = parallel-tests
+SUBDIRS = .
AM_CXXFLAGS = -I$(top_srcdir) -I$(top_builddir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS= \
@@ -87,23 +84,6 @@ check_SCRIPTS = \
installed_repository_TEST_setup.sh \
installed_repository_TEST_cleanup.sh
-TESTS_ENVIRONMENT = env \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
- PALUDIS_OPTIONS="" \
- PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_FETCHERS_DIR="$(top_srcdir)/paludis/fetchers/" \
- PALUDIS_SKIP_CONFIG="yes" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
- PALUDIS_NO_CHOWN="yes" \
- bash $(top_srcdir)/test/run_test.sh
-
TESTS = \
unpackaged_repository_TEST \
installed_repository_TEST \
@@ -111,6 +91,3 @@ TESTS = \
check_PROGRAMS = $(TESTS)
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/repositories/unwritten/Makefile.am b/paludis/repositories/unwritten/Makefile.am
index c40caa5..7533657 100644
--- a/paludis/repositories/unwritten/Makefile.am
+++ b/paludis/repositories/unwritten/Makefile.am
@@ -1,10 +1,6 @@
-SUBDIRS = .
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
-DISTCLEANFILES =
-
-AUTOMAKE_OPTIONS = parallel-tests
+include $(top_srcdir)/misc/common-makefile.am
-MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = .
AM_CXXFLAGS = -I$(top_srcdir) -I$(top_builddir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS= \
@@ -51,28 +47,8 @@ check_SCRIPTS = \
unwritten_repository_TEST_setup.sh \
unwritten_repository_TEST_cleanup.sh
-TESTS_ENVIRONMENT = env \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
- PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_FETCHERS_DIR="$(top_srcdir)/paludis/fetchers/" \
- PALUDIS_OPTIONS="" \
- PALUDIS_SKIP_CONFIG="yes" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.tests_output`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
- PALUDIS_NO_CHOWN="yes" \
- bash $(top_srcdir)/test/run_test.sh
-
TESTS = \
unwritten_repository_TEST
check_PROGRAMS = $(TESTS)
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/repositories/virtuals/Makefile.am b/paludis/repositories/virtuals/Makefile.am
index f9007f2..3afc3c2 100644
--- a/paludis/repositories/virtuals/Makefile.am
+++ b/paludis/repositories/virtuals/Makefile.am
@@ -1,8 +1,4 @@
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
-DISTCLEANFILES =
-MAINTAINERCLEANFILES = Makefile.in
-
-AUTOMAKE_OPTIONS = parallel-tests
+include $(top_srcdir)/misc/common-makefile.am
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS= \
@@ -34,22 +30,6 @@ check_SCRIPTS =
EXTRA_DIST = $(virtuals_repository_TEST_SOURCES) $(installed_virtuals_repository_TEST_SOURCES)
-TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- PALUDIS_SKIP_CONFIG="yes" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
- LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
- $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/`:` \
- $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/.libs/`" \
- bash $(top_srcdir)/test/run_test.sh
-
virtuals_repository_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/paludis/util/test_extras.o \
@@ -72,6 +52,3 @@ virtuals_repository_TEST_SOURCES = \
installed_virtuals_repository_TEST_SOURCES = \
installed_virtuals_repository_TEST.cc
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/resolver/Makefile.am b/paludis/resolver/Makefile.am
index 9626a94..e00e40f 100644
--- a/paludis/resolver/Makefile.am
+++ b/paludis/resolver/Makefile.am
@@ -1,5 +1,5 @@
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
-MAINTAINERCLEANFILES = Makefile.in
+include $(top_srcdir)/misc/common-makefile.am
+
DISTCLEANFILES = \
destination_types-se.hh destination_types-se.cc \
use_existing-se.hh use_existing-se.cc
@@ -12,8 +12,6 @@ BUILT_SOURCES = \
destination_types-se.hh destination_types-se.cc \
use_existing-se.hh use_existing-se.cc
-AUTOMAKE_OPTIONS = parallel-tests
-
noinst_HEADERS = \
arrow.hh arrow-fwd.hh \
constraint.hh constraint-fwd.hh \
@@ -49,31 +47,6 @@ libpaludisresolver_a_SOURCES = \
unsuitable_candidates.cc \
use_existing.cc
-TESTS_ENVIRONMENT = env \
- PALUDIS_OPTIONS="" \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
- PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EXTRA_EBUILD_MODULES_DIRS="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_SUFFIXES_FILE="$(top_srcdir)/paludis/repositories/e/ebuild_entries_suffixes.conf" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- PALUDIS_FETCHERS_DIR="$(top_srcdir)/paludis/fetchers/" \
- PALUDIS_SKIP_CONFIG="yes" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
- PALUDIS_NO_CHOWN="yes" \
- PALUDIS_TESTS_KEEP_STDERR="yes" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
- $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/`:` \
- $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/.libs/`" \
- bash $(top_srcdir)/test/run_test.sh
-
if ENABLE_VIRTUALS_REPOSITORY
virtuals_tests = resolver_TEST_virtuals
endif
@@ -153,9 +126,6 @@ resolver_TEST_serialisation_LDADD = \
resolver_TEST_serialisation_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
use_existing-se.hh : use_existing.se $(top_srcdir)/misc/make_se.bash
if ! $(top_srcdir)/misc/make_se.bash --header $(srcdir)/use_existing.se > $@ ; then rm -f $@ ; exit 1 ; fi
diff --git a/paludis/selinux/Makefile.am b/paludis/selinux/Makefile.am
index 30b42f0..530462a 100644
--- a/paludis/selinux/Makefile.am
+++ b/paludis/selinux/Makefile.am
@@ -1,8 +1,6 @@
-MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = *~ *.epicfail
-SUBDIRS = .
+include $(top_srcdir)/misc/common-makefile.am
-AUTOMAKE_OPTIONS = parallel-tests
+SUBDIRS = .
paludis_selinux_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/selinux/
@@ -13,26 +11,14 @@ libpaludisselinux_@PALUDIS_PC_SLOT@_la_SOURCES = \
$(paludis_selinux_include_HEADERS) \
security_context.cc
-if ! MONOLITHIC
-
libpaludisselinux_@PALUDIS_PC_SLOT@_la_LIBADD = \
$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
@DYNAMIC_LD_LIBS@
-endif
-
libpaludisselinux_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-if MONOLITHIC
-
-noinst_LTLIBRARIES = libpaludisselinux_@PALUDIS_PC_SLOT@.la
-
-else
-
lib_LTLIBRARIES = libpaludisselinux_@PALUDIS_PC_SLOT@.la
-endif
-
TESTS =
EXTRA_DIST =
@@ -40,6 +26,3 @@ check_PROGRAMS = $(TESTS)
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/syncers/Makefile.am b/paludis/syncers/Makefile.am
index 0b4d7fb..727f355 100644
--- a/paludis/syncers/Makefile.am
+++ b/paludis/syncers/Makefile.am
@@ -1,5 +1,10 @@
-MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = *~ .keep dobzr dobzr+aftp dobzr+file dobzr+ftp dobzr+http dobzr+https dobzr+sftp dobzr+ssh docvs+ext docvs+pserver docvs+ssh dodarcs+file dodarcs+http dodarcs+https dodarcs+ssh dofile dogit dogit+file dogit+http dogit+https dogit+rsync dogit+ssh dohg+file dohg+http dohg+https dohg+ssh dohg+static-http dorsync dorsync+ssh dosvn dosvn+file dosvn+http dosvn+https dosvn+ssh dotar+file dotar+ftp dotar+http dotar+https *.epicfail
+include $(top_srcdir)/misc/common-makefile.am
+
+CLEANFILES += +*~ .keep dobzr dobzr+aftp dobzr+file dobzr+ftp dobzr+http dobzr+https dobzr+sftp \
+ dobzr+ssh docvs+ext docvs+pserver docvs+ssh dodarcs+file dodarcs+http dodarcs+https \
+ dodarcs+ssh dofile dogit dogit+file dogit+http dogit+https dogit+rsync dogit+ssh \
+ dohg+file dohg+http dohg+https dohg+ssh dohg+static-http dorsync dorsync+ssh dosvn \
+ dosvn+file dosvn+http dosvn+https dosvn+ssh dotar+file dotar+ftp dotar+http dotar+https
SUBDIRS = .
.keep :
@@ -48,13 +53,6 @@ libexecprog_SCRIPTS = \
dotar+https \
dodummy
-TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="$(srcdir)/paludis/syncers/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- bash $(top_srcdir)/test/run_test.sh
-
installusersyncersdir = $(datadir)/paludis/syncers
installusersyncers_DATA = .keep
@@ -64,8 +62,6 @@ EXTRA_DIST = $(libexecprog_SCRIPTS) dobzr.in docvs.in dodarcs.in dogit.in dohg.i
check_SCRIPTS =
check_PROGRAMS = $(TESTS)
-AUTOMAKE_OPTIONS = parallel-tests
-
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
dobzr dobzr+aftp dobzr+file dobzr+ftp dobzr+http dobzr+https dobzr+sftp dobzr+ssh : dobzr.in
@@ -85,6 +81,3 @@ dosvn dosvn+file dosvn+http dosvn+https dosvn+ssh : dosvn.in
dotar+file dotar+ftp dotar+http dotar+https : dotar.in
cat $? > $@
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/util/Makefile.am.m4 b/paludis/util/Makefile.am.m4
index b9e42ff..9f3846f 100644
--- a/paludis/util/Makefile.am.m4
+++ b/paludis/util/Makefile.am.m4
@@ -3,6 +3,8 @@ ifdef(`__gnu__',`',`errprint(`This is not GNU m4...
dnl vim: set ft=m4 noet :
+include $(top_srcdir)/misc/common-makefile.am
+
define(`filelist', `')dnl
define(`headerlist', `')dnl
define(`testlist', `')dnl
@@ -64,8 +66,7 @@ AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_NO_WOLD_STYLE
include(`paludis/util/files.m4')
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
-MAINTAINERCLEANFILES = Makefile.in Makefile.am paludis.hh \
+MAINTAINERCLEANFILES += Makefile.am paludis.hh \
hashed_containers.hh util.hh echo_functions.bash
DISTCLEANFILES = srcleanlist secleanlist
BUILT_SOURCES = srcleanlist secleanlist
@@ -78,20 +79,12 @@ EXTRA_DIST = util.hh.m4 Makefile.am.m4 files.m4 srlist srcleanlist selist seclea
echo_functions.bash.in
SUBDIRS = .
-AUTOMAKE_OPTIONS = parallel-tests
-
libpaludisutil_@PALUDIS_PC_SLOT@_la_SOURCES = filelist
libpaludisutil_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0 $(PTHREAD_LIBS) $(RT_LIBS)
libpaludisutil_@PALUDIS_PC_SLOT@_la_LIBADD = $(PTHREAD_LIBS) $(RT_LIBS)
TESTS = testlist
-TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="$(srcdir)/ebuild/" \
- PALUDIS_OPTIONS="" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- bash $(top_srcdir)/test/run_test.sh
-
check_PROGRAMS = $(TESTS) system_TEST_become_child
check_SCRIPTS = testscriptlist
@@ -118,7 +111,3 @@ libexecpaludis_SCRIPTS = echo_functions.bash
outputwrapper_SOURCES = output_wrapper.cc
-changequote(`<', `>')
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/python/Makefile.am b/python/Makefile.am
index ca2741f..de4b0ec 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -1,6 +1,6 @@
-SUBDIRS = .
+include $(top_srcdir)/misc/common-makefile.am
-AUTOMAKE_OPTIONS = parallel-tests
+SUBDIRS = .
AM_CXXFLAGS = -I$(top_srcdir) -I$(srcdir)/ \
-I$(top_builddir)/ \
@@ -21,9 +21,8 @@ DEFS= \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DLIBDIR=\"$(libdir)\"
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.o paludis.so *.epicfail
+CLEANFILES += paludis.so
DISTCLEANFILES = *-nn.hh *-nn.cc
-MAINTAINERCLEANFILES = Makefile.in
IF_PYTHON_TESTS = \
action_TEST.py \
@@ -108,37 +107,6 @@ else
PALUDIS_ENABLE_VIRTUALS_REPOSITORY_VALUE=no
endif
-TESTS_ENVIRONMENT = env \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
- PALUDIS_OPTIONS="" \
- PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_NO_GLOBAL_HOOKS="yes" \
- PALUDIS_NO_XTERM_TITLES="yes" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EXTRA_EBUILD_MODULES_DIRS="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_SUFFIXES_FILE="$(top_srcdir)/paludis/repositories/e/ebuild_entries_suffixes.conf" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
- PALUDIS_ENVIRONMENT_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments`" \
- PALUDIS_ENABLE_VIRTUALS_REPOSITORY="$(PALUDIS_ENABLE_VIRTUALS_REPOSITORY_VALUE)" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- SYSCONFDIR="$(sysconfdir)" \
- LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
- echo "\`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/.libs\`: \
- \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/.libs\`: \
- \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/.libs\`: \
- \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/no_config/.libs\`: \
- \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/.libs\`: \
- \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/fake/.libs\`: \
- \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/python/.libs\`" \
- | tr -d ' '`" \
- PYTHONPATH="./.libs" \
- bash $(top_srcdir)/test/run_test.sh "$(PYTHON)"
-
if ENABLE_PYTHON
lib_LTLIBRARIES = libpaludispython_@PALUDIS_PC_SLOT@.la
@@ -214,6 +182,3 @@ nice_names-nn.hh : nice_names.nn $(top_srcdir)/misc/make_nn.bash
nice_names-nn.cc : nice_names.nn $(top_srcdir)/misc/make_nn.bash
if ! $(top_srcdir)/misc/make_nn.bash --source $(srcdir)/nice_names.nn > $@ ; then rm -f $@ ; exit 1 ; fi
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index 7b6d29e..6018778 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -1,6 +1,6 @@
-SUBDIRS = . demos
+include $(top_srcdir)/misc/common-makefile.am
-AUTOMAKE_OPTIONS = parallel-tests
+SUBDIRS = . demos
AM_CXXFLAGS = -I$(top_srcdir) -I$(srcdir)/ \
-I$(top_builddir)/ \
@@ -16,8 +16,7 @@ DEFS= \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DLIBDIR=\"$(libdir)\"
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.o Paludis.so .libs/Paludis.so *.epicfail
-MAINTAINERCLEANFILES = Makefile.in
+CLEANFILES += Paludis.so .libs/Paludis.so
IF_RUBY_TESTS = \
action_TEST.rb \
@@ -91,35 +90,6 @@ else
PALUDIS_ENABLE_VIRTUALS_REPOSITORY_VALUE=no
endif
-TESTS_ENVIRONMENT = env \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
- PALUDIS_OPTIONS="" \
- PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_NO_GLOBAL_HOOKS="yes" \
- PALUDIS_NO_XTERM_TITLES="yes" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EXTRA_EBUILD_MODULES_DIRS="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_SUFFIXES_FILE="$(top_srcdir)/paludis/repositories/e/ebuild_entries_suffixes.conf" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
- PALUDIS_ENVIRONMENT_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments`" \
- PALUDIS_ENABLE_VIRTUALS_REPOSITORY="$(PALUDIS_ENABLE_VIRTUALS_REPOSITORY_VALUE)" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- SYSCONFDIR="$(sysconfdir)" \
- LD_LIBRARY_PATH=`echo "\`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/.libs\`: \
- \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/.libs\`: \
- \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/.libs\`: \
- \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/no_config/.libs\`: \
- \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/test/.libs\`: \
- \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/.libs\`: \
- \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/ruby/.libs\`:$$LD_LIBRARY_PATH" \
- | tr -d ' '` \
- bash $(top_srcdir)/test/run_test.sh "$(RUBY) -I ./.libs/"
-
if ENABLE_RUBY
lib_LTLIBRARIES = libpaludisruby_@PALUDIS_PC_SLOT@.la
@@ -171,6 +141,3 @@ nice_names-nn.hh : nice_names.nn $(top_srcdir)/misc/make_nn.bash
nice_names-nn.cc : nice_names.nn $(top_srcdir)/misc/make_nn.bash
if ! $(top_srcdir)/misc/make_nn.bash --source $(srcdir)/nice_names.nn > $@ ; then rm -f $@ ; exit 1 ; fi
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/ruby/demos/Makefile.am b/ruby/demos/Makefile.am
index 5bc5b06..deed283 100644
--- a/ruby/demos/Makefile.am
+++ b/ruby/demos/Makefile.am
@@ -1,6 +1,6 @@
-SUBDIRS = .
+include $(top_srcdir)/misc/common-makefile.am
-AUTOMAKE_OPTIONS = parallel-tests
+SUBDIRS = .
AM_CXXFLAGS = -I$(top_srcdir) -I$(srcdir)/ -I$(top_srcdir)/ruby/ \
@PALUDIS_CXXFLAGS_WITHOUT_PEDANTIC@ \
@@ -13,9 +13,6 @@ DEFS= \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DLIBDIR=\"$(libdir)\"
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.o *.so *.epicfail
-MAINTAINERCLEANFILES = Makefile.in
-
IF_RUBY_DEMOS = \
version_spec_distributions.rb \
find_unused_distfiles.rb \
@@ -25,22 +22,6 @@ IF_RUBY_DEMOS = \
EXTRA_DIST = $(IF_RUBY_DEMOS)
-TESTS_ENVIRONMENT = env \
- PALUDIS_NO_GLOBAL_HOOKS="yes" \
- PALUDIS_NO_XTERM_TITLES="yes" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/ebuild/utils/canonicalise $(top_srcdir)/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/ebuild/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- SYSCONFDIR="$(sysconfdir)" \
- LD_LIBRARY_PATH="`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/.libs`" \
- bash $(top_srcdir)/test/run_test.sh "ruby -I ../.libs/"
-
if ENABLE_RUBY
rubydemosdir = $(datadir)/paludis/ruby/demos/
@@ -55,6 +36,3 @@ uninstall-local :
endif
-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/accerso/Makefile.am b/src/clients/accerso/Makefile.am
index cf32c04..7da67a0 100644
--- a/src/clients/accerso/Makefile.am
+++ b/src/clients/accerso/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/misc/common-makefile.am
+
AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src \
@PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS= \
@@ -8,8 +10,6 @@ DEFS= \
SUBDIRS = .
-AUTOMAKE_OPTIONS = parallel-tests
-
bin_PROGRAMS = accerso
noinst_PROGRAMS = man-accerso
man_MANS = accerso.1
@@ -41,28 +41,6 @@ accerso_LDADD = \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
-TESTS_ENVIRONMENT = env \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_NO_GLOBAL_HOOKS="yes" \
- PALUDIS_NO_XTERM_TITLES="yes" \
- PALUDIS_OPTIONS="" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EXTRA_EBUILD_MODULES_DIRS="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
- PALUDIS_ENVIRONMENT_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments`" \
- PALUDIS_NO_CHOWN="yupyup" \
- PALUDIS_REDUCED_USERNAME="`id -un`" \
- PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
- SYSCONFDIR="$(sysconfdir)" \
- bash $(top_srcdir)/test/run_test.sh bash
-
TESTS = version_TEST \
help_TEST
@@ -70,10 +48,5 @@ EXTRA_DIST = \
$(man_MANS) \
$(TESTS)
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
DISTCLEANFILES = $(man_MANS) $(noinst_DATA)
-MAINTAINERCLEANFILES = Makefile.in
-
-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/adjutrix/Makefile.am b/src/clients/adjutrix/Makefile.am
index 5f44a0b..785296b 100644
--- a/src/clients/adjutrix/Makefile.am
+++ b/src/clients/adjutrix/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/misc/common-makefile.am
+
AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS= \
-DSYSCONFDIR=\"$(sysconfdir)\" \
@@ -7,8 +9,6 @@ DEFS= \
SUBDIRS = .
-AUTOMAKE_OPTIONS = parallel-tests
-
bin_PROGRAMS = adjutrix
noinst_PROGRAMS = man-adjutrix
@@ -51,28 +51,6 @@ adjutrix_LDADD = \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
-TESTS_ENVIRONMENT = env \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
- PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_NO_GLOBAL_HOOKS="yes" \
- PALUDIS_NO_XTERM_TITLES="yes" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EXTRA_EBUILD_MODULES_DIRS="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_SUFFIXES_FILE="$(top_srcdir)/paludis/repositories/e/ebuild_entries_suffixes.conf" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_OPTIONS="" \
- PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- SYSCONFDIR="$(sysconfdir)" \
- ADJUTRIX_OPTIONS="" \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
- bash $(top_srcdir)/test/run_test.sh bash
-
TESTS = version_TEST help_TEST find_stable_candidates_TEST args_from_environment_TEST
EXTRA_DIST = \
@@ -80,10 +58,5 @@ EXTRA_DIST = \
$(TESTS) \
find_stable_candidates_TEST_setup.sh find_stable_candidates_TEST_cleanup.sh
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
DISTCLEANFILES = $(man_MANS) $(noinst_DATA)
-MAINTAINERCLEANFILES = Makefile.in
-
-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/appareo/Makefile.am b/src/clients/appareo/Makefile.am
index 27f11b4..e8e9bfe 100644
--- a/src/clients/appareo/Makefile.am
+++ b/src/clients/appareo/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/misc/common-makefile.am
+
AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src \
@PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS= \
@@ -8,8 +10,6 @@ DEFS= \
SUBDIRS = .
-AUTOMAKE_OPTIONS = parallel-tests
-
bin_PROGRAMS = appareo
noinst_PROGRAMS = man-appareo
man_MANS = appareo.1
@@ -41,28 +41,6 @@ appareo_LDADD = \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
-TESTS_ENVIRONMENT = env \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_NO_GLOBAL_HOOKS="yes" \
- PALUDIS_NO_XTERM_TITLES="yes" \
- PALUDIS_OPTIONS="" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EXTRA_EBUILD_MODULES_DIRS="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
- PALUDIS_ENVIRONMENT_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments`" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- PALUDIS_NO_CHOWN="yupyup" \
- PALUDIS_REDUCED_USERNAME="`id -un`" \
- PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
- SYSCONFDIR="$(sysconfdir)" \
- bash $(top_srcdir)/test/run_test.sh bash
-
TESTS = version_TEST \
help_TEST
@@ -70,10 +48,5 @@ EXTRA_DIST = \
$(man_MANS) \
$(TESTS)
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
DISTCLEANFILES = $(man_MANS) $(noinst_DATA)
-MAINTAINERCLEANFILES = Makefile.in
-
-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/cave/Makefile.am b/src/clients/cave/Makefile.am
index 9c549a2..b53d3c2 100644
--- a/src/clients/cave/Makefile.am
+++ b/src/clients/cave/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/misc/common-makefile.am
+
AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src \
@PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_NO_WOLD_STYLE_CAST@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS= \
@@ -11,8 +13,6 @@ DEFS= \
SUBDIRS = .
-AUTOMAKE_OPTIONS = parallel-tests
-
bin_PROGRAMS = cave
noinst_PROGRAMS = man-cave
@@ -130,39 +130,11 @@ libcave_a_SOURCES = \
# cmd_uninstall.cc \
# cmd_uninstall_unused.cc
-TESTS_ENVIRONMENT = env \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_NO_GLOBAL_HOOKS="yes" \
- PALUDIS_NO_XTERM_TITLES="yes" \
- PALUDIS_OPTIONS="" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EXTRA_EBUILD_MODULES_DIRS="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_SUFFIXES_FILE="$(top_srcdir)/paludis/repositories/e/ebuild_entries_suffixes.conf" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
- PALUDIS_ENVIRONMENT_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments`" \
- PALUDIS_NO_CHOWN="yupyup" \
- PALUDIS_REDUCED_USERNAME="`id -un`" \
- PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
- SYSCONFDIR="$(sysconfdir)" \
- bash $(top_srcdir)/test/run_test.sh bash
-
TESTS =
EXTRA_DIST = \
$(man_MANS) \
$(TESTS)
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT
DISTCLEANFILES = $(man_MANS) $(noinst_DATA)
-MAINTAINERCLEANFILES = Makefile.in
-
-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/importare/Makefile.am b/src/clients/importare/Makefile.am
index 79d3ab3..f55c224 100644
--- a/src/clients/importare/Makefile.am
+++ b/src/clients/importare/Makefile.am
@@ -1,10 +1,10 @@
+include $(top_srcdir)/misc/common-makefile.am
+
AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src \
@PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
SUBDIRS = .
-AUTOMAKE_OPTIONS = parallel-tests
-
bin_PROGRAMS = importare
noinst_PROGRAMS = man-importare
man_MANS = importare.1
@@ -37,37 +37,11 @@ importare_LDADD = \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
-TESTS_ENVIRONMENT = env \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_NO_GLOBAL_HOOKS="yes" \
- PALUDIS_NO_XTERM_TITLES="yes" \
- PALUDIS_OPTIONS="" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
- PALUDIS_ENVIRONMENT_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments`" \
- PALUDIS_NO_CHOWN="yupyup" \
- PALUDIS_REDUCED_USERNAME="`id -un`" \
- PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
- SYSCONFDIR="$(sysconfdir)" \
- bash $(top_srcdir)/test/run_test.sh bash
-
TESTS =
EXTRA_DIST = \
$(man_MANS) \
$(TESTS)
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
DISTCLEANFILES = $(man_MANS) $(noinst_DATA)
-MAINTAINERCLEANFILES = Makefile.in
-
-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/inquisitio/Makefile.am b/src/clients/inquisitio/Makefile.am
index 38e4860..a2eab4d 100644
--- a/src/clients/inquisitio/Makefile.am
+++ b/src/clients/inquisitio/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/misc/common-makefile.am
+
AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS= \
-DSYSCONFDIR=\"$(sysconfdir)\" \
@@ -7,8 +9,6 @@ DEFS= \
SUBDIRS = .
-AUTOMAKE_OPTIONS = parallel-tests
-
bin_PROGRAMS = inquisitio
noinst_PROGRAMS = man-inquisitio
man_MANS = inquisitio.1
@@ -52,33 +52,11 @@ inquisitio_LDADD = \
inquisitio_CXXFLAGS = $(AM_CXXFLAGS) $(PCRECPPDEPS_CFLAGS)
-TESTS_ENVIRONMENT = env \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_NO_GLOBAL_HOOKS="yes" \
- PALUDIS_NO_XTERM_TITLES="yes" \
- INQUISITIO_OPTIONS="" \
- PALUDIS_OPTIONS="" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- SYSCONFDIR="$(sysconfdir)" \
- bash $(top_srcdir)/test/run_test.sh bash
-
TESTS = version_TEST help_TEST
EXTRA_DIST = \
$(man_MANS) \
$(TESTS)
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
DISTCLEANFILES = $(man_MANS) $(noinst_DATA)
-MAINTAINERCLEANFILES = Makefile.in
-
-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/instruo/Makefile.am b/src/clients/instruo/Makefile.am
index 457ccae..5d80154 100644
--- a/src/clients/instruo/Makefile.am
+++ b/src/clients/instruo/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/misc/common-makefile.am
+
AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src \
@PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS= \
@@ -8,8 +10,6 @@ DEFS= \
SUBDIRS = .
-AUTOMAKE_OPTIONS = parallel-tests
-
bin_PROGRAMS = instruo
noinst_PROGRAMS = man-instruo
man_MANS = instruo.1
@@ -41,27 +41,6 @@ instruo_LDADD = \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
-TESTS_ENVIRONMENT = env \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_NO_GLOBAL_HOOKS="yes" \
- PALUDIS_NO_XTERM_TITLES="yes" \
- PALUDIS_OPTIONS="" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
- PALUDIS_ENVIRONMENT_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments`" \
- PALUDIS_NO_CHOWN="yupyup" \
- PALUDIS_REDUCED_USERNAME="`id -un`" \
- PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
- SYSCONFDIR="$(sysconfdir)" \
- bash $(top_srcdir)/test/run_test.sh bash
-
TESTS = version_TEST \
help_TEST
@@ -69,10 +48,5 @@ EXTRA_DIST = \
$(man_MANS) \
$(TESTS)
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
DISTCLEANFILES = $(man_MANS) $(noinst_DATA)
-MAINTAINERCLEANFILES = Makefile.in
-
-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/paludis/Makefile.am b/src/clients/paludis/Makefile.am
index 01ce134..27506c7 100644
--- a/src/clients/paludis/Makefile.am
+++ b/src/clients/paludis/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/misc/common-makefile.am
+
AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src \
@PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_NO_WOLD_STYLE_CAST@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS= \
@@ -10,8 +12,6 @@ DEFS= \
SUBDIRS = .
-AUTOMAKE_OPTIONS = parallel-tests
-
bin_PROGRAMS = paludis
noinst_PROGRAMS = man-paludis
man_MANS = paludis.1
@@ -55,30 +55,6 @@ paludis_LDADD = \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
-TESTS_ENVIRONMENT = env \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_NO_GLOBAL_HOOKS="yes" \
- PALUDIS_NO_XTERM_TITLES="yes" \
- PALUDIS_OPTIONS="" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EXTRA_EBUILD_MODULES_DIRS="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_SUFFIXES_FILE="$(top_srcdir)/paludis/repositories/e/ebuild_entries_suffixes.conf" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
- PALUDIS_ENVIRONMENT_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments`" \
- PALUDIS_NO_CHOWN="yupyup" \
- PALUDIS_REDUCED_USERNAME="`id -un`" \
- PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_BYPASS_USERPRIV_CHECKS="yes" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
- SYSCONFDIR="$(sysconfdir)" \
- bash $(top_srcdir)/test/run_test.sh bash
-
TESTS = version_TEST help_TEST \
list_repository_formats_TEST \
exception_TEST install_TEST pretend_TEST upgrade_TEST args_from_environment_TEST \
@@ -92,10 +68,5 @@ EXTRA_DIST = \
upgrade_TEST_setup.sh upgrade_TEST_cleanup.sh \
continue_on_failure_TEST_setup.sh continue_on_failure_TEST_cleanup.sh
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
DISTCLEANFILES = $(man_MANS) $(noinst_DATA)
-MAINTAINERCLEANFILES = Makefile.in
-
-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/reconcilio/Makefile.am b/src/clients/reconcilio/Makefile.am
index 712798a..d455097 100644
--- a/src/clients/reconcilio/Makefile.am
+++ b/src/clients/reconcilio/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/misc/common-makefile.am
+
AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src \
@PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
@@ -7,8 +9,6 @@ bin_PROGRAMS = reconcilio
noinst_PROGRAMS = man-reconcilio
man_MANS = reconcilio.1
-AUTOMAKE_OPTIONS = parallel-tests
-
reconcilio.1 : man-reconcilio
./man-reconcilio > $@
@@ -31,8 +31,6 @@ reconcilio_SOURCES = \
install.hh install.cc \
reconcilio.cc
-if MONOLITHIC
-
reconcilio_LDADD = \
broken_linkage_finder/libbrokenlinkagefinder.a \
littlelf/liblittlelf.a \
@@ -43,51 +41,11 @@ reconcilio_LDADD = \
$(top_builddir)/src/output/liboutput.a \
$(DYNAMIC_LD_LIBS)
-else
-
-reconcilio_LDADD = \
- broken_linkage_finder/libbrokenlinkagefinder.a \
- littlelf/liblittlelf.a \
- util/libreconcilioutil.a \
- $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/src/output/liboutput.a \
- $(DYNAMIC_LD_LIBS)
-
-endif
-
-TESTS_ENVIRONMENT = env \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- PALUDIS_NO_GLOBAL_HOOKS="yes" \
- PALUDIS_NO_XTERM_TITLES="yes" \
- PALUDIS_OPTIONS="" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
- PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
- PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_DISTRIBUTION="gentoo" \
- PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
- PALUDIS_ENVIRONMENT_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments`" \
- PALUDIS_NO_CHOWN="yupyup" \
- PALUDIS_REDUCED_USERNAME="`id -un`" \
- PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
- PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
- SYSCONFDIR="$(sysconfdir)" \
- bash $(top_srcdir)/test/run_test.sh bash
-
TESTS =
EXTRA_DIST = \
$(man_MANS) \
$(TESTS)
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
DISTCLEANFILES = $(man_MANS) $(noinst_DATA)
-MAINTAINERCLEANFILES = Makefile.in
-
-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/reconcilio/broken_linkage_finder/Makefile.am b/src/clients/reconcilio/broken_linkage_finder/Makefile.am
index 0741716..bdaac56 100644
--- a/src/clients/reconcilio/broken_linkage_finder/Makefile.am
+++ b/src/clients/reconcilio/broken_linkage_finder/Makefile.am
@@ -1,11 +1,11 @@
+include $(top_srcdir)/misc/common-makefile.am
+
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_NO_WOLD_STYLE_CAST@ @PALUDIS_CXXFLAGS_NO_WSHADOW@
SUBDIRS = .
noinst_LIBRARIES = libbrokenlinkagefinder.a
-AUTOMAKE_OPTIONS = parallel-tests
-
libbrokenlinkagefinder_a_SOURCES = \
broken_linkage_finder.cc broken_linkage_finder.hh \
configuration.cc configuration.hh \
@@ -13,12 +13,6 @@ libbrokenlinkagefinder_a_SOURCES = \
libtool_linkage_checker.cc libtool_linkage_checker.hh \
elf_linkage_checker.cc elf_linkage_checker.hh
-TESTS_ENVIRONMENT = env \
- PALUDIS_OPTIONS="" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
- bash $(top_srcdir)/test/run_test.sh bash
-
TESTS = configuration_TEST
check_PROGRAMS = $(TESTS)
@@ -36,9 +30,3 @@ configuration_TEST_LDADD = \
$(top_builddir)/test/libtest.a
configuration_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
-MAINTAINERCLEANFILES = Makefile.in
-
-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/reconcilio/littlelf/Makefile.am b/src/clients/reconcilio/littlelf/Makefile.am
index 4b7a6c7..570454d 100644
--- a/src/clients/reconcilio/littlelf/Makefile.am
+++ b/src/clients/reconcilio/littlelf/Makefile.am
@@ -1,9 +1,9 @@
+include $(top_srcdir)/misc/common-makefile.am
+
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_NO_WOLD_STYLE_CAST@ @PALUDIS_CXXFLAGS_VISIBILITY@
SUBDIRS = .
-AUTOMAKE_OPTIONS = parallel-tests
-
noinst_LIBRARIES = liblittlelf.a
liblittlelf_a_SOURCES = \
@@ -14,21 +14,9 @@ liblittlelf_a_SOURCES = \
elf_symbol_section.cc elf_symbol_section.hh \
elf_types.hh
-TESTS_ENVIRONMENT = env \
- PALUDIS_OPTIONS="" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
- bash $(top_srcdir)/test/run_test.sh bash
-
TESTS =
check_PROGRAMS = $(TESTS)
EXTRA_DIST = \
$(TESTS)
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
-MAINTAINERCLEANFILES = Makefile.in
-
-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/reconcilio/util/Makefile.am b/src/clients/reconcilio/util/Makefile.am
index 9ead7b9..6a49e9c 100644
--- a/src/clients/reconcilio/util/Makefile.am
+++ b/src/clients/reconcilio/util/Makefile.am
@@ -1,21 +1,15 @@
+include $(top_srcdir)/misc/common-makefile.am
+
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
SUBDIRS = .
noinst_LIBRARIES = libreconcilioutil.a
-AUTOMAKE_OPTIONS = parallel-tests
-
libreconcilioutil_a_SOURCES = \
realpath.cc realpath.hh \
wildcard_expander.cc wildcard_expander.hh
-TESTS_ENVIRONMENT = env \
- PALUDIS_OPTIONS="" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
- bash $(top_srcdir)/test/run_test.sh bash
-
TESTS = realpath_TEST wildcard_expander_TEST
check_PROGRAMS = $(TESTS)
@@ -41,9 +35,3 @@ wildcard_expander_TEST_LDADD = \
wildcard_expander_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
-MAINTAINERCLEANFILES = Makefile.in
-
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/test/Makefile.am b/test/Makefile.am
index 2b14798..a1137b7 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,10 +1,8 @@
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
-MAINTAINERCLEANFILES = Makefile.in
+include $(top_srcdir)/misc/common-makefile.am
+
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
EXTRA_DIST = run_test.sh
-AUTOMAKE_OPTIONS = parallel-tests
-
libtest_a_SOURCES = \
test_framework.cc \
test_framework.hh \
@@ -17,11 +15,10 @@ libtestnomain_a_SOURCES = \
test_framework.hh \
test_concepts.hh
-XFAIL_TESTS = test_fail_TEST
-TESTS = test_pass_TEST $(XFAIL_TESTS)
+my_XFAIL_TESTS = test_fail_TEST
+XFAIL_TESTS = $(my_XFAIL_TESTS)
+TESTS = test_pass_TEST $(my_XFAIL_TESTS)
-TESTS_ENVIRONMENT = env PALUDIS_OPTIONS="" \
- TEST_SCRIPT_DIR="$(srcdir)/" bash $(top_srcdir)/test/run_test.sh
check_LIBRARIES = libtest.a libtestnomain.a
check_PROGRAMS = $(TESTS) $(XFAIL_TESTS)
check_SCRIPTS = run_test.sh
@@ -34,6 +31,3 @@ test_fail_TEST_SOURCES = test_fail_TEST.cc
test_fail_TEST_LDADD = libtest.a
test_fail_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
-built-sources : $(BUILT_SOURCES)
- for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/test/run_test.sh b/test/run_test.sh
index 0c435ac..62e3da0 100755
--- a/test/run_test.sh
+++ b/test/run_test.sh
@@ -2,66 +2,64 @@
# vim: set ft=sh sw=4 sts=4 et :
testname=${2:-${1}}
+interp=
+[[ ${testname%.py} != ${testname} ]] && interp="${PYTHON}"
+[[ ${testname%.rb} != ${testname} ]] && interp="${RUBY} -I ./.libs/"
+
testname=${testname%.rb}
testname=${testname%.py}
testname=${testname%.bash}
-TEST_OUTPUT_WRAPPER="${OVERRIDE_TEST_OUTPUT_WRAPPER-${TEST_OUTPUT_WRAPPER}}"
+[[ -z "PALUDIS_TESTS_REAL_STDOUT_FD" ]] && export PALUDIS_TESTS_REAL_STDOUT_FD=1
if test -f "$TEST_SCRIPT_DIR""${testname}"_"cleanup.sh" ; then
- echo ">>> cleanup for test ${testname}"
+ echo ">>> cleanup for test ${testname}" 1>&$PALUDIS_TESTS_REAL_STDOUT_FD
if ! "$TEST_SCRIPT_DIR""${testname}"_"cleanup.sh" ; then
- echo ">>> exiting with error for test ${testname}"
+ echo ">>> exiting with error for test ${testname}" 1>&$PALUDIS_TESTS_REAL_STDOUT_FD
exit 255
fi
else
- echo ">>> No $TEST_SCRIPT_DIR${testname}_cleanup.sh to run"
+ echo ">>> No $TEST_SCRIPT_DIR${testname}_cleanup.sh to run" 1>&$PALUDIS_TESTS_REAL_STDOUT_FD
fi
if test -f "$TEST_SCRIPT_DIR""${testname}"_"setup.sh" ; then
- echo ">>> setup for test ${testname}"
+ echo ">>> setup for test ${testname}" 1>&$PALUDIS_TESTS_REAL_STDOUT_FD
if ! "$TEST_SCRIPT_DIR""${testname}"_"setup.sh" ; then
- echo ">>> exiting with error for test ${testname}"
+ echo ">>> exiting with error for test ${testname}" 1>&$PALUDIS_TESTS_REAL_STDOUT_FD
exit 255
fi
else
- echo ">>> No $TEST_SCRIPT_DIR${testname}_setup.sh to run"
+ echo ">>> No $TEST_SCRIPT_DIR${testname}_setup.sh to run" 1>&$PALUDIS_TESTS_REAL_STDOUT_FD
fi
-echo ">>> test ${testname}"
-if [[ -n "${TEST_OUTPUT_WRAPPER}" ]] ; then
- $TEST_OUTPUT_WRAPPER --stdout-prefix "${testname#./}> " --stderr-prefix \
- "${testname#./}> " --wrap-blanks -- ${@}
- code=$?
-else
- ${@}
- code=$?
-fi
+echo ">>> test ${testname}" 1>&$PALUDIS_TESTS_REAL_STDOUT_FD 1>&$PALUDIS_TESTS_REAL_STDOUT_FD
+$interp ${@}
+code=$?
if [[ 0 != ${code} ]] ; then
- echo ">>> test ${testname} returned ${code}"
+ echo ">>> test ${testname} returned ${code}" 1>&$PALUDIS_TESTS_REAL_STDOUT_FD
if [[ -z "${PALUDIS_TESTS_RERUN_VERBOSELY}" ]] && [[ "${testname#./}" != "test_fail_TEST" ]] ; then
out=`pwd`/${testname#./}.epicfail
- echo ">>> rerunning test ${testname} verbosely redirected to ${out}"
+ echo ">>> rerunning test ${testname} verbosely redirected to ${out}" 1>&$PALUDIS_TESTS_REAL_STDOUT_FD
env PALUDIS_TESTS_RERUN_VERBOSELY=no PALUDIS_TESTS_KEEP_STDERR=yes \
PALUDIS_TESTS_KEEP_LOG=yes TEST_OUTPUT_WRAPPER= $0 $@ > $out 2>&1
- echo ">>> saved output of verbose ${testname} rerun to ${out}"
+ echo ">>> saved output of verbose ${testname} rerun to ${out}" 1>&$PALUDIS_TESTS_REAL_STDOUT_FD
fi
- echo ">>> exiting with error for test ${testname}"
+ echo ">>> exiting with error for test ${testname}" 1>&$PALUDIS_TESTS_REAL_STDOUT_FD
exit 255
fi
if test -f "$TEST_SCRIPT_DIR""${testname}"_"cleanup.sh" ; then
- echo ">>> cleanup for test ${testname}"
+ echo ">>> cleanup for test ${testname}" 1>&$PALUDIS_TESTS_REAL_STDOUT_FD
if ! "$TEST_SCRIPT_DIR""${testname}"_"cleanup.sh" ; then
- echo ">>> exiting with error for test ${testname}"
+ echo ">>> exiting with error for test ${testname}" 1>&$PALUDIS_TESTS_REAL_STDOUT_FD
exit 255
fi
else
- echo ">>> No $TEST_SCRIPT_DIR${testname}_cleanup.sh to run"
+ echo ">>> No $TEST_SCRIPT_DIR${testname}_cleanup.sh to run" 1>&$PALUDIS_TESTS_REAL_STDOUT_FD
fi
-echo ">>> exiting with success for test ${testname}"
+echo ">>> exiting with success for test ${testname}" 1>&$PALUDIS_TESTS_REAL_STDOUT_FD
exit 0