aboutsummaryrefslogtreecommitdiff
path: root/paludis
diff options
context:
space:
mode:
authorAvatar Piotr Jaroszyński <peper@gentoo.org> 2007-10-13 14:55:49 +0000
committerAvatar Piotr Jaroszyński <peper@gentoo.org> 2007-10-13 14:55:49 +0000
commit180c924bcab6c349f54ed4e861ec74af2cadbf3f (patch)
treef24a5d5bccb255d46f0da53f4aec52997f3549ad /paludis
parent6202af39e927546fe5503d5bd7a0b9a25c0a8997 (diff)
downloadpaludis-180c924bcab6c349f54ed4e861ec74af2cadbf3f.tar.gz
paludis-180c924bcab6c349f54ed4e861ec74af2cadbf3f.tar.xz
Fix distcheck.
Diffstat (limited to 'paludis')
-rw-r--r--paludis/Makefile.am.m410
-rw-r--r--paludis/args/Makefile.am10
-rw-r--r--paludis/distributions/Makefile.am9
-rw-r--r--paludis/environments/Makefile.am9
-rw-r--r--paludis/environments/adapted/Makefile.am9
-rw-r--r--paludis/environments/no_config/Makefile.am8
-rw-r--r--paludis/environments/paludis/Makefile.am8
-rw-r--r--paludis/environments/portage/Makefile.am9
-rw-r--r--paludis/environments/test/Makefile.am9
-rw-r--r--paludis/fetchers/Makefile.am9
-rw-r--r--paludis/repositories/Makefile.am9
-rw-r--r--paludis/repositories/cran/Makefile.am9
-rw-r--r--paludis/repositories/cran/cran/Makefile.am9
-rw-r--r--paludis/repositories/e/Makefile.am9
-rw-r--r--paludis/repositories/e/eapis/Makefile.am9
-rw-r--r--paludis/repositories/e/ebuild/0/Makefile.am9
-rw-r--r--paludis/repositories/e/ebuild/Makefile.am9
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/Makefile.am9
-rw-r--r--paludis/repositories/e/ebuild/utils/Makefile.am9
-rw-r--r--paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am8
-rw-r--r--paludis/repositories/e/qa/Makefile.am9
-rw-r--r--paludis/repositories/fake/Makefile.am9
-rw-r--r--paludis/repositories/gems/Makefile.am9
-rw-r--r--paludis/repositories/unpackaged/Makefile.am9
-rw-r--r--paludis/repositories/virtuals/Makefile.am9
-rw-r--r--paludis/selinux/Makefile.am2
-rw-r--r--paludis/syncers/Makefile.am9
-rw-r--r--paludis/util/Makefile.am.m410
28 files changed, 141 insertions, 104 deletions
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index 4ef0ccb8b..ca63f7d78 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -176,13 +176,15 @@ changequote(`<', `>')
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-DISTCHECK_DEPS = libpaludis.la
+DISTCHECK_DEPS = libpaludis.la libpaludismanpagethings.la
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
+distcheck-deps-local : $(DISTCHECK_DEPS)
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
TESTS_ENVIRONMENT = env \
PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/e/ebuild/" \
diff --git a/paludis/args/Makefile.am b/paludis/args/Makefile.am
index 953353f89..06155780c 100644
--- a/paludis/args/Makefile.am
+++ b/paludis/args/Makefile.am
@@ -72,11 +72,13 @@ args_TEST_LDADD = $(test_ldadd)
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-DISTCHECK_DEPS = libpaludisargs.la
+DISTCHECK_DEPS = libpaludisargs.la libpaludisman.a
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
+distcheck-deps-local : $(DISTCHECK_DEPS)
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/distributions/Makefile.am b/paludis/distributions/Makefile.am
index 20364bdd3..44faedcb4 100644
--- a/paludis/distributions/Makefile.am
+++ b/paludis/distributions/Makefile.am
@@ -14,9 +14,10 @@ EXTRA_DIST = $(distributions)
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
-
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps-local : $(DISTCHECK_DEPS)
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/environments/Makefile.am b/paludis/environments/Makefile.am
index 261f1a5f9..b060e1143 100644
--- a/paludis/environments/Makefile.am
+++ b/paludis/environments/Makefile.am
@@ -14,9 +14,10 @@ DEFS= \
-DDATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)\"
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
-
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps-local : $(DISTCHECK_DEPS)
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/environments/adapted/Makefile.am b/paludis/environments/adapted/Makefile.am
index a6536390f..c99ecff65 100644
--- a/paludis/environments/adapted/Makefile.am
+++ b/paludis/environments/adapted/Makefile.am
@@ -56,9 +56,10 @@ BUILT_SOURCES =
built-sources : $(BUILT_SOURCES)
for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
-
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps-local : $(DISTCHECK_DEPS)
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/environments/no_config/Makefile.am b/paludis/environments/no_config/Makefile.am
index 576a12e49..e9706aab2 100644
--- a/paludis/environments/no_config/Makefile.am
+++ b/paludis/environments/no_config/Makefile.am
@@ -83,9 +83,11 @@ no_config_environment-sr.cc : no_config_environment.sr $(top_srcdir)/misc/make_s
built-sources : $(BUILT_SOURCES)
for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
+distcheck-deps-local : $(DISTCHECK_DEPS)
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/environments/paludis/Makefile.am b/paludis/environments/paludis/Makefile.am
index bd792544f..aa39e7634 100644
--- a/paludis/environments/paludis/Makefile.am
+++ b/paludis/environments/paludis/Makefile.am
@@ -119,8 +119,10 @@ repository_config_entry-sr.hh : repository_config_entry.sr $(top_srcdir)/misc/ma
repository_config_entry-sr.cc : repository_config_entry.sr $(top_srcdir)/misc/make_sr.bash
$(top_srcdir)/misc/make_sr.bash --source $(srcdir)/repository_config_entry.sr > $@
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
+distcheck-deps-local : $(DISTCHECK_DEPS)
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/environments/portage/Makefile.am b/paludis/environments/portage/Makefile.am
index 3fb0bd70e..446b9dbfd 100644
--- a/paludis/environments/portage/Makefile.am
+++ b/paludis/environments/portage/Makefile.am
@@ -65,9 +65,10 @@ check_SCRIPTS = portage_environment_TEST_setup.sh portage_environment_TEST_clean
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
-
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps-local : $(DISTCHECK_DEPS)
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/environments/test/Makefile.am b/paludis/environments/test/Makefile.am
index abced5fd2..6693515d6 100644
--- a/paludis/environments/test/Makefile.am
+++ b/paludis/environments/test/Makefile.am
@@ -37,9 +37,10 @@ paludis_environment_test_include_HEADERS = test_environment.hh
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
-
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps-local : $(DISTCHECK_DEPS)
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/fetchers/Makefile.am b/paludis/fetchers/Makefile.am
index d82913c8a..65b44afa5 100644
--- a/paludis/fetchers/Makefile.am
+++ b/paludis/fetchers/Makefile.am
@@ -36,9 +36,10 @@ dohttp dohttps doftp : dowget.in
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
-
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps-local : $(DISTCHECK_DEPS)
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/repositories/Makefile.am b/paludis/repositories/Makefile.am
index dd5e60d86..368da7cd7 100644
--- a/paludis/repositories/Makefile.am
+++ b/paludis/repositories/Makefile.am
@@ -23,9 +23,10 @@ DEFS= \
-DDATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)\"
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
-
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps-local : $(DISTCHECK_DEPS)
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/repositories/cran/Makefile.am b/paludis/repositories/cran/Makefile.am
index e2e21b139..20083e0ff 100644
--- a/paludis/repositories/cran/Makefile.am
+++ b/paludis/repositories/cran/Makefile.am
@@ -151,9 +151,10 @@ cran_installed_repository-sr.cc : cran_installed_repository.sr $(top_srcdir)/mis
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
-
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps-local : $(DISTCHECK_DEPS)
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/repositories/cran/cran/Makefile.am b/paludis/repositories/cran/cran/Makefile.am
index 8f445853e..2c9702d99 100644
--- a/paludis/repositories/cran/cran/Makefile.am
+++ b/paludis/repositories/cran/cran/Makefile.am
@@ -12,9 +12,10 @@ EXTRA_DIST = $(libexecprog_SCRIPTS)
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
-
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps-local : $(DISTCHECK_DEPS)
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/repositories/e/Makefile.am b/paludis/repositories/e/Makefile.am
index 61f69c664..14029b23d 100644
--- a/paludis/repositories/e/Makefile.am
+++ b/paludis/repositories/e/Makefile.am
@@ -512,9 +512,10 @@ check_PROGRAMS = $(TESTS)
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
-
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps-local : $(DISTCHECK_DEPS)
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/repositories/e/eapis/Makefile.am b/paludis/repositories/e/eapis/Makefile.am
index 44fa3ac0b..454e3db23 100644
--- a/paludis/repositories/e/eapis/Makefile.am
+++ b/paludis/repositories/e/eapis/Makefile.am
@@ -16,9 +16,10 @@ EXTRA_DIST = $(eapis)
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
-
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps-local : $(DISTCHECK_DEPS)
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/repositories/e/ebuild/0/Makefile.am b/paludis/repositories/e/ebuild/0/Makefile.am
index 1e4b9be47..65d5c12ff 100644
--- a/paludis/repositories/e/ebuild/0/Makefile.am
+++ b/paludis/repositories/e/ebuild/0/Makefile.am
@@ -24,9 +24,10 @@ EXTRA_DIST = $(libexecprog_SCRIPTS)
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
-
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps-local : $(DISTCHECK_DEPS)
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/repositories/e/ebuild/Makefile.am b/paludis/repositories/e/ebuild/Makefile.am
index 55c387c14..1a1a09756 100644
--- a/paludis/repositories/e/ebuild/Makefile.am
+++ b/paludis/repositories/e/ebuild/Makefile.am
@@ -64,9 +64,10 @@ 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
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
-
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps-local : $(DISTCHECK_DEPS)
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/repositories/e/ebuild/exheres-0/Makefile.am b/paludis/repositories/e/ebuild/exheres-0/Makefile.am
index 2d90bfa2f..49fb54f46 100644
--- a/paludis/repositories/e/ebuild/exheres-0/Makefile.am
+++ b/paludis/repositories/e/ebuild/exheres-0/Makefile.am
@@ -29,9 +29,10 @@ EXTRA_DIST = $(libexecprogexheres_SCRIPTS)
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
-
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps-local : $(DISTCHECK_DEPS)
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/repositories/e/ebuild/utils/Makefile.am b/paludis/repositories/e/ebuild/utils/Makefile.am
index 620bbe721..2e14541d0 100644
--- a/paludis/repositories/e/ebuild/utils/Makefile.am
+++ b/paludis/repositories/e/ebuild/utils/Makefile.am
@@ -92,9 +92,10 @@ check_PROGRAMS =
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
-
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps-local : $(DISTCHECK_DEPS)
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am b/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am
index 5c0856335..f904a5382 100644
--- a/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am
+++ b/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am
@@ -51,9 +51,11 @@ check_PROGRAMS =
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
+distcheck-deps-local : $(DISTCHECK_DEPS)
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/repositories/e/qa/Makefile.am b/paludis/repositories/e/qa/Makefile.am
index 7bed44199..1140e74cc 100644
--- a/paludis/repositories/e/qa/Makefile.am
+++ b/paludis/repositories/e/qa/Makefile.am
@@ -145,9 +145,10 @@ endif
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
-
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps-local : $(DISTCHECK_DEPS)
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/repositories/fake/Makefile.am b/paludis/repositories/fake/Makefile.am
index 2e10f5ffe..aed0cb74c 100644
--- a/paludis/repositories/fake/Makefile.am
+++ b/paludis/repositories/fake/Makefile.am
@@ -78,9 +78,10 @@ paludis_repositories_fake_include_HEADERS = \
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
-
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps-local : $(DISTCHECK_DEPS)
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/repositories/gems/Makefile.am b/paludis/repositories/gems/Makefile.am
index cdce4be31..75a73c687 100644
--- a/paludis/repositories/gems/Makefile.am
+++ b/paludis/repositories/gems/Makefile.am
@@ -147,9 +147,10 @@ params-sr.hh : params.sr $(top_srcdir)/misc/make_sr.bash
params-sr.cc : params.sr $(top_srcdir)/misc/make_sr.bash
if ! $(top_srcdir)/misc/make_sr.bash --source $(srcdir)/params.sr > $@ ; then rm -f $@ ; exit 1 ; fi
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
-
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps-local : $(DISTCHECK_DEPS)
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/repositories/unpackaged/Makefile.am b/paludis/repositories/unpackaged/Makefile.am
index 6f66d2a87..8a9280b1a 100644
--- a/paludis/repositories/unpackaged/Makefile.am
+++ b/paludis/repositories/unpackaged/Makefile.am
@@ -167,9 +167,10 @@ installed_unpackaged_repository-sr.hh : installed_unpackaged_repository.sr $(top
installed_unpackaged_repository-sr.cc : installed_unpackaged_repository.sr $(top_srcdir)/misc/make_sr.bash
if ! $(top_srcdir)/misc/make_sr.bash --source $(srcdir)/installed_unpackaged_repository.sr > $@ ; then rm -f $@ ; exit 1 ; fi
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
-
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps-local : $(DISTCHECK_DEPS)
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/repositories/virtuals/Makefile.am b/paludis/repositories/virtuals/Makefile.am
index bff25045e..f04a6c011 100644
--- a/paludis/repositories/virtuals/Makefile.am
+++ b/paludis/repositories/virtuals/Makefile.am
@@ -92,9 +92,10 @@ installed_virtuals_repository_TEST_SOURCES = \
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
-
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps-local : $(DISTCHECK_DEPS)
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/selinux/Makefile.am b/paludis/selinux/Makefile.am
index 14e9cc535..2a0ebf496 100644
--- a/paludis/selinux/Makefile.am
+++ b/paludis/selinux/Makefile.am
@@ -41,6 +41,8 @@ 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
+DISTCHECK_DEPS = libpaludisselinux.la
+
distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
distcheck-deps-subdirs :
diff --git a/paludis/syncers/Makefile.am b/paludis/syncers/Makefile.am
index 73e01d628..dc7ee6109 100644
--- a/paludis/syncers/Makefile.am
+++ b/paludis/syncers/Makefile.am
@@ -59,9 +59,10 @@ dotar+file dotar+ftp dotar+http : dotar.in
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
-
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps-local : $(DISTCHECK_DEPS)
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done
diff --git a/paludis/util/Makefile.am.m4 b/paludis/util/Makefile.am.m4
index 7453c9229..be38dd5ec 100644
--- a/paludis/util/Makefile.am.m4
+++ b/paludis/util/Makefile.am.m4
@@ -110,8 +110,12 @@ changequote(`<', `>')
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
+DISTCHECK_DEPS = libpaludisutil.la
-distcheck-deps-subdirs :
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
+distcheck-deps-local : $(DISTCHECK_DEPS)
+
+distcheck-deps : distcheck-deps-subdirs
+distcheck-deps-subdirs :
+ for s in $(SUBDIRS) . ; do if test x$$s = x. ; then make distcheck-deps-local || exit 1 ; \
+ else $(MAKE) -C $$s distcheck-deps || exit 1 ; fi ; done