Fix distcheck

84 files changed, 1 insertions, 656 deletions

diff --git a/Makefile.am b/Makefile.am
index 6f5fe6c82..96aff6840 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@ automake-deps-built-hack.tmp : built-sources-subdirs
 
 BUILT_SOURCES = automake-deps-built-hack.tmp
 
-automake-deps-dist-hack.tmp : distcheck-deps-subdirs
+automake-deps-dist-hack.tmp : all
 	touch $@
 
 dist-hook :
@@ -55,11 +55,6 @@ built-sources : $(BUILT_SOURCES) built-sources-subdirs
 built-sources-subdirs :
 	for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || exit 1 ; done
 
-distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs
-
-distcheck-deps-subdirs : built-sources-subdirs
-	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
-
 all-then-check :
 	$(MAKE) all
 	$(MAKE) check
diff --git a/bash-completion/Makefile.am b/bash-completion/Makefile.am
index 2e74f1009..bccd406b7 100644
--- a/bash-completion/Makefile.am
+++ b/bash-completion/Makefile.am
@@ -8,11 +8,3 @@ EXTRA_DIST = $(noinst_DATA)
 built-sources : $(BUILT_SOURCES)
 	for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || 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/doc/Makefile.am b/doc/Makefile.am
index 8b05d0e32..e6f447901 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -102,14 +102,6 @@ changelog.subst :
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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
-
 documentation : doxygen epydoc htmldocs
 
 htmldocs : htmldocs-subdirs
diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am
index 2a653bc8d..8c05e0daa 100644
--- a/doc/api/Makefile.am
+++ b/doc/api/Makefile.am
@@ -46,11 +46,6 @@ footer.html.part : $(srcdir)/../footer.html.part.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 $(DIST_SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
-
 doxygen :
 	$(MAKE) -C cplusplus $@
 
diff --git a/doc/api/cplusplus/Makefile.am b/doc/api/cplusplus/Makefile.am
index 812afee76..4ab5e8509 100644
--- a/doc/api/cplusplus/Makefile.am
+++ b/doc/api/cplusplus/Makefile.am
@@ -45,11 +45,6 @@ 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
-
 clean-local :
 	rm -fr cplusplus/
 
diff --git a/doc/api/cplusplus/examples/Makefile.am b/doc/api/cplusplus/examples/Makefile.am
index 2c3ad6e09..d0df5c15b 100644
--- a/doc/api/cplusplus/examples/Makefile.am
+++ b/doc/api/cplusplus/examples/Makefile.am
@@ -163,11 +163,6 @@ example_name_LDADD = \
 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
-
 htmldocs : htmldocs-subdirs
 
 htmldocs-subdirs :
diff --git a/doc/api/python/Makefile.am b/doc/api/python/Makefile.am
index c0f919b23..05391f481 100644
--- a/doc/api/python/Makefile.am
+++ b/doc/api/python/Makefile.am
@@ -56,11 +56,6 @@ 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 $(DIST_SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
-
 htmldocs : htmldocs-subdirs
 
 htmldocs-subdirs :
diff --git a/doc/api/ruby/Makefile.am b/doc/api/ruby/Makefile.am
index f0910094d..178ec522f 100644
--- a/doc/api/ruby/Makefile.am
+++ b/doc/api/ruby/Makefile.am
@@ -6,11 +6,6 @@ MAINTAINERCLEANFILES = Makefile.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 $(DIST_SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
-
 htmldocs : htmldocs-subdirs
 
 htmldocs-subdirs :
diff --git a/doc/clients/Makefile.am b/doc/clients/Makefile.am
index 93dcb11a9..dbe056749 100644
--- a/doc/clients/Makefile.am
+++ b/doc/clients/Makefile.am
@@ -140,11 +140,6 @@ footer.html.part : $(srcdir)/../footer.html.part.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 $(DIST_SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
-
 htmldocs : htmldocs-subdirs
 
 htmldocs-subdirs :
diff --git a/doc/configuration/Makefile.am b/doc/configuration/Makefile.am
index 065bd1569..99cf1efa8 100644
--- a/doc/configuration/Makefile.am
+++ b/doc/configuration/Makefile.am
@@ -257,11 +257,6 @@ footer.html.part : $(srcdir)/../footer.html.part.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 $(DIST_SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
-
 htmldocs : htmldocs-subdirs
 
 htmldocs-subdirs :
diff --git a/doc/configuration/repositories/Makefile.am b/doc/configuration/repositories/Makefile.am
index 78e5ea947..01df0cc91 100644
--- a/doc/configuration/repositories/Makefile.am
+++ b/doc/configuration/repositories/Makefile.am
@@ -93,11 +93,6 @@ footer.html.part : $(srcdir)/../../footer.html.part.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 $(DIST_SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
-
 htmldocs : htmldocs-subdirs
 
 htmldocs-subdirs :
diff --git a/doc/faq/Makefile.am b/doc/faq/Makefile.am
index b4ec17987..d5b4f2307 100644
--- a/doc/faq/Makefile.am
+++ b/doc/faq/Makefile.am
@@ -93,11 +93,6 @@ MAINTAINERCLEANFILES = Makefile.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 $(DIST_SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
-
 htmldocs : htmldocs-subdirs
 
 htmldocs-subdirs :
diff --git a/doc/overview/Makefile.am b/doc/overview/Makefile.am
index 6ac643483..80ab241c9 100644
--- a/doc/overview/Makefile.am
+++ b/doc/overview/Makefile.am
@@ -63,11 +63,6 @@ footer.html.part : $(srcdir)/../footer.html.part.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 $(DIST_SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done
-
 htmldocs : htmldocs-subdirs
 
 htmldocs-subdirs :
diff --git a/hooks/Makefile.am.m4 b/hooks/Makefile.am.m4
index 772078dc6..23009a2b9 100644
--- a/hooks/Makefile.am.m4
+++ b/hooks/Makefile.am.m4
@@ -274,14 +274,6 @@ changequote(`<', `>')
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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
-
 TESTS_ENVIRONMENT = env \
 	TEST_SCRIPT_DIR="$(srcdir)/" \
 	PATH="${PATH}:/sbin:/usr/sbin" \
diff --git a/hooks/demos/Makefile.am b/hooks/demos/Makefile.am
index 08eb7105a..8a12170ff 100644
--- a/hooks/demos/Makefile.am
+++ b/hooks/demos/Makefile.am
@@ -33,11 +33,3 @@ pretend_resume.hook : $(srcdir)/pretend_resume.hook.in
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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/misc/Makefile.am b/misc/Makefile.am
index 0f9aee79c..1fcf2c2c5 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -5,10 +5,3 @@ EXTRA_DIST = generated-file.txt do_m4.bash make_se.bash make_nn.bash
 built-sources : $(BUILT_SOURCES)
 	for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || 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/Makefile.am.m4 b/paludis/Makefile.am.m4
index 26415a0f0..2095d7852 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -205,16 +205,6 @@ changequote(`<', `>')
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
 
-DISTCHECK_DEPS = libpaludis_@PALUDIS_PC_SLOT@.la libpaludismanpagethings_@PALUDIS_PC_SLOT@.la
-
-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
-
 TESTS_ENVIRONMENT = env \
 	PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/e/ebuild/" \
 	PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
diff --git a/paludis/args/Makefile.am b/paludis/args/Makefile.am
index 149d6b0cb..9a3b00865 100644
--- a/paludis/args/Makefile.am
+++ b/paludis/args/Makefile.am
@@ -78,16 +78,6 @@ 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
 
-DISTCHECK_DEPS = libpaludisargs_@PALUDIS_PC_SLOT@.la libpaludisman_@PALUDIS_PC_SLOT@.a
-
-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
-
 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/distributions/Makefile.am b/paludis/distributions/Makefile.am
index 472af0811..0298a319f 100644
--- a/paludis/distributions/Makefile.am
+++ b/paludis/distributions/Makefile.am
@@ -15,10 +15,3 @@ 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-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/distributions/exherbo/Makefile.am b/paludis/distributions/exherbo/Makefile.am
index 61bb791e9..7e79e26da 100644
--- a/paludis/distributions/exherbo/Makefile.am
+++ b/paludis/distributions/exherbo/Makefile.am
@@ -11,11 +11,3 @@ EXTRA_DIST = $(distribution_DATA)
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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/distributions/gentoo/Makefile.am b/paludis/distributions/gentoo/Makefile.am
index df57f72ce..59bf293b1 100644
--- a/paludis/distributions/gentoo/Makefile.am
+++ b/paludis/distributions/gentoo/Makefile.am
@@ -11,11 +11,3 @@ EXTRA_DIST = $(distribution_DATA)
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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 e1eb25f87..b75e3807c 100644
--- a/paludis/environments/Makefile.am
+++ b/paludis/environments/Makefile.am
@@ -14,10 +14,3 @@ DEFS= \
 	-DDATADIR=\"$(datadir)\" \
 	-DLIBDIR=\"$(libdir)\"
 
-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 c44f34fbc..dea1f637e 100644
--- a/paludis/environments/no_config/Makefile.am
+++ b/paludis/environments/no_config/Makefile.am
@@ -67,11 +67,3 @@ no_config_environment-se.cc : no_config_environment.se $(top_srcdir)/misc/make_s
 built-sources : $(BUILT_SOURCES)
 	for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || 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/paludis/Makefile.am b/paludis/environments/paludis/Makefile.am
index a80e63c25..2d3ae9b18 100644
--- a/paludis/environments/paludis/Makefile.am
+++ b/paludis/environments/paludis/Makefile.am
@@ -97,11 +97,3 @@ paludis_environment_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGIN
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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/paludis/output_managers/Makefile.am b/paludis/environments/paludis/output_managers/Makefile.am
index 46cf87b37..b8f0d4084 100644
--- a/paludis/environments/paludis/output_managers/Makefile.am
+++ b/paludis/environments/paludis/output_managers/Makefile.am
@@ -31,12 +31,3 @@ log_DATA = .keep
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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/portage/Makefile.am b/paludis/environments/portage/Makefile.am
index 7df95f81e..368f9976b 100644
--- a/paludis/environments/portage/Makefile.am
+++ b/paludis/environments/portage/Makefile.am
@@ -70,11 +70,3 @@ 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-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 666ab2bca..f638849af 100644
--- a/paludis/environments/test/Makefile.am
+++ b/paludis/environments/test/Makefile.am
@@ -19,11 +19,3 @@ 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-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 217c88d5b..7d27ce254 100644
--- a/paludis/fetchers/Makefile.am
+++ b/paludis/fetchers/Makefile.am
@@ -37,10 +37,3 @@ 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-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/demos/Makefile.am b/paludis/fetchers/demos/Makefile.am
index a1f954d35..dc9095499 100644
--- a/paludis/fetchers/demos/Makefile.am
+++ b/paludis/fetchers/demos/Makefile.am
@@ -14,11 +14,3 @@ EXTRA_DIST = $(DEMOS)
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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 e7646e370..bb2db52bb 100644
--- a/paludis/repositories/Makefile.am
+++ b/paludis/repositories/Makefile.am
@@ -23,10 +23,3 @@ DEFS= \
 	-DDATADIR=\"$(datadir)\" \
 	-DLIBDIR=\"$(libdir)\"
 
-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/accounts/Makefile.am b/paludis/repositories/accounts/Makefile.am
index 6acb2dce3..f690604d2 100644
--- a/paludis/repositories/accounts/Makefile.am
+++ b/paludis/repositories/accounts/Makefile.am
@@ -80,12 +80,3 @@ 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-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 ad50c2741..e48eab9fb 100644
--- a/paludis/repositories/cran/Makefile.am
+++ b/paludis/repositories/cran/Makefile.am
@@ -116,11 +116,3 @@ TESTS_ENVIRONMENT = env \
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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 e37dbe411..735df7b86 100644
--- a/paludis/repositories/cran/cran/Makefile.am
+++ b/paludis/repositories/cran/cran/Makefile.am
@@ -12,10 +12,3 @@ 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-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 b90967eb1..898dacf5a 100644
--- a/paludis/repositories/e/Makefile.am
+++ b/paludis/repositories/e/Makefile.am
@@ -519,11 +519,3 @@ 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-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 45290f150..90e9c66fa 100644
--- a/paludis/repositories/e/eapis/Makefile.am
+++ b/paludis/repositories/e/eapis/Makefile.am
@@ -26,10 +26,3 @@ EXTRA_DIST = $(eapis) $(future_eapis)
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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 854792bf4..84d783bd6 100644
--- a/paludis/repositories/e/ebuild/0/Makefile.am
+++ b/paludis/repositories/e/ebuild/0/Makefile.am
@@ -62,10 +62,3 @@ 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
 
-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/1/Makefile.am b/paludis/repositories/e/ebuild/1/Makefile.am
index 9b77d2c0e..45155fa17 100644
--- a/paludis/repositories/e/ebuild/1/Makefile.am
+++ b/paludis/repositories/e/ebuild/1/Makefile.am
@@ -32,11 +32,3 @@ EXTRA_DIST = $(libexecprog1_SCRIPTS)
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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/2/Makefile.am b/paludis/repositories/e/ebuild/2/Makefile.am
index c780f9ec7..5d6ccb623 100644
--- a/paludis/repositories/e/ebuild/2/Makefile.am
+++ b/paludis/repositories/e/ebuild/2/Makefile.am
@@ -39,11 +39,3 @@ EXTRA_DIST = $(libexecprog2_SCRIPTS)
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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/3/Makefile.am b/paludis/repositories/e/ebuild/3/Makefile.am
index 803b9b523..01dce3d95 100644
--- a/paludis/repositories/e/ebuild/3/Makefile.am
+++ b/paludis/repositories/e/ebuild/3/Makefile.am
@@ -34,11 +34,3 @@ EXTRA_DIST = $(libexecprog3_SCRIPTS)
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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 05a7c1667..3ec2610dc 100644
--- a/paludis/repositories/e/ebuild/Makefile.am
+++ b/paludis/repositories/e/ebuild/Makefile.am
@@ -46,11 +46,3 @@ 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-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 2d5336445..57f90db26 100644
--- a/paludis/repositories/e/ebuild/exheres-0/Makefile.am
+++ b/paludis/repositories/e/ebuild/exheres-0/Makefile.am
@@ -68,11 +68,3 @@ 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
 
-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/kdebuild-1/Makefile.am b/paludis/repositories/e/ebuild/kdebuild-1/Makefile.am
index c8c85fcb4..0df828d5d 100644
--- a/paludis/repositories/e/ebuild/kdebuild-1/Makefile.am
+++ b/paludis/repositories/e/ebuild/kdebuild-1/Makefile.am
@@ -31,12 +31,3 @@ EXTRA_DIST = $(libexecprogkdebuild1_SCRIPTS)
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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/paludis-1/Makefile.am b/paludis/repositories/e/ebuild/paludis-1/Makefile.am
index 603276714..31c166d62 100644
--- a/paludis/repositories/e/ebuild/paludis-1/Makefile.am
+++ b/paludis/repositories/e/ebuild/paludis-1/Makefile.am
@@ -30,11 +30,3 @@ EXTRA_DIST = $(libexecprogpaludis1_SCRIPTS)
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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/pbin-1/Makefile.am b/paludis/repositories/e/ebuild/pbin-1/Makefile.am
index 98d0ba1fd..eb0f705fc 100644
--- a/paludis/repositories/e/ebuild/pbin-1/Makefile.am
+++ b/paludis/repositories/e/ebuild/pbin-1/Makefile.am
@@ -31,12 +31,3 @@ check_SCRIPTS = $(TESTS)
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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/3/Makefile.am b/paludis/repositories/e/ebuild/utils/3/Makefile.am
index 78e6ad1b6..8ae10a63f 100644
--- a/paludis/repositories/e/ebuild/utils/3/Makefile.am
+++ b/paludis/repositories/e/ebuild/utils/3/Makefile.am
@@ -38,11 +38,3 @@ CLEANFILES = *~ $(bannedscripts) *.epicfail
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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 2cbaba4ce..43057007a 100644
--- a/paludis/repositories/e/ebuild/utils/Makefile.am
+++ b/paludis/repositories/e/ebuild/utils/Makefile.am
@@ -95,11 +95,3 @@ check_PROGRAMS =
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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 f07cea184..5a7c43448 100644
--- a/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am
+++ b/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am
@@ -77,11 +77,3 @@ check_PROGRAMS =
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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/kdebuild-1/Makefile.am b/paludis/repositories/e/ebuild/utils/kdebuild-1/Makefile.am
index 40e2b3aa9..09f82313c 100644
--- a/paludis/repositories/e/ebuild/utils/kdebuild-1/Makefile.am
+++ b/paludis/repositories/e/ebuild/utils/kdebuild-1/Makefile.am
@@ -55,11 +55,3 @@ check_PROGRAMS =
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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/qa/Makefile.am b/paludis/repositories/e/qa/Makefile.am
index 01a3f0aa6..839fdd414 100644
--- a/paludis/repositories/e/qa/Makefile.am
+++ b/paludis/repositories/e/qa/Makefile.am
@@ -261,11 +261,3 @@ endif
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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 5dffa6374..5986aabf5 100644
--- a/paludis/repositories/fake/Makefile.am
+++ b/paludis/repositories/fake/Makefile.am
@@ -85,11 +85,3 @@ 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-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 b8780e01a..2bff123e0 100644
--- a/paludis/repositories/gems/Makefile.am
+++ b/paludis/repositories/gems/Makefile.am
@@ -123,11 +123,3 @@ 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-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/unavailable/Makefile.am b/paludis/repositories/unavailable/Makefile.am
index a89442adb..5ae6025ce 100644
--- a/paludis/repositories/unavailable/Makefile.am
+++ b/paludis/repositories/unavailable/Makefile.am
@@ -74,11 +74,3 @@ 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-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 9d3e3fec0..03845ec55 100644
--- a/paludis/repositories/unpackaged/Makefile.am
+++ b/paludis/repositories/unpackaged/Makefile.am
@@ -112,11 +112,3 @@ 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-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/unwritten/Makefile.am b/paludis/repositories/unwritten/Makefile.am
index 71fa08a50..872383296 100644
--- a/paludis/repositories/unwritten/Makefile.am
+++ b/paludis/repositories/unwritten/Makefile.am
@@ -74,12 +74,3 @@ 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-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 1d9026fb4..73d980872 100644
--- a/paludis/repositories/virtuals/Makefile.am
+++ b/paludis/repositories/virtuals/Makefile.am
@@ -73,11 +73,3 @@ 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-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/resolver/Makefile.am b/paludis/resolver/Makefile.am
index e9d293bd4..607cce782 100644
--- a/paludis/resolver/Makefile.am
+++ b/paludis/resolver/Makefile.am
@@ -152,16 +152,6 @@ resolver_TEST_serialisation_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUG
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
 
-DISTCHECK_DEPS = libpaludisresolver.a
-
-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
-
 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 fb65b1b9b..d76df3043 100644
--- a/paludis/selinux/Makefile.am
+++ b/paludis/selinux/Makefile.am
@@ -41,11 +41,3 @@ 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_@PALUDIS_PC_SLOT@.la
-
-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
-
-
diff --git a/paludis/syncers/Makefile.am b/paludis/syncers/Makefile.am
index 5bf77e5d9..44a472ec5 100644
--- a/paludis/syncers/Makefile.am
+++ b/paludis/syncers/Makefile.am
@@ -86,11 +86,3 @@ dotar+file dotar+ftp dotar+http dotar+https : dotar.in
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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 f79d383c1..075958889 100644
--- a/paludis/util/Makefile.am.m4
+++ b/paludis/util/Makefile.am.m4
@@ -120,13 +120,3 @@ changequote(`<', `>')
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
 
-DISTCHECK_DEPS = libpaludisutil_@PALUDIS_PC_SLOT@.la
-
-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/pkg-config/Makefile.am b/pkg-config/Makefile.am
index 21b0f258e..c99d06093 100644
--- a/pkg-config/Makefile.am
+++ b/pkg-config/Makefile.am
@@ -7,14 +7,6 @@ CLEANFILES = paludis.pc *.epicfail
 built-sources : $(BUILT_SOURCES)
 	for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || 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
-
 paludis.pc : paludis.pc.in Makefile
 	sed \
 	    -e "s,#PALUDIS_PC_PREFIX#,$(prefix)," \
diff --git a/python/Makefile.am b/python/Makefile.am
index 4c774e6b9..444de40ea 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -232,11 +232,3 @@ nice_names-nn.cc : nice_names.nn $(top_srcdir)/misc/make_nn.bash
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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/ruby/Makefile.am b/ruby/Makefile.am
index bf326ecd1..aa9c5f5c2 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -190,11 +190,3 @@ nice_names-nn.cc : nice_names.nn $(top_srcdir)/misc/make_nn.bash
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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/ruby/demos/Makefile.am b/ruby/demos/Makefile.am
index ac11c9942..6f88db7ce 100644
--- a/ruby/demos/Makefile.am
+++ b/ruby/demos/Makefile.am
@@ -56,10 +56,3 @@ endif
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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/src/Makefile.am b/src/Makefile.am
index d98e9fbc6..aac36ecde 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,10 +6,3 @@ MAINTAINERCLEANFILES = Makefile.in
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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/src/clients/Makefile.am b/src/clients/Makefile.am
index 4d1679b61..09aa6c1aa 100644
--- a/src/clients/Makefile.am
+++ b/src/clients/Makefile.am
@@ -9,10 +9,3 @@ AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src @PALUDIS_CXXFLAGS@ @PALUDIS_CX
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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/src/clients/accerso/Makefile.am b/src/clients/accerso/Makefile.am
index 449997cf6..f7cc9fcc7 100644
--- a/src/clients/accerso/Makefile.am
+++ b/src/clients/accerso/Makefile.am
@@ -75,13 +75,3 @@ MAINTAINERCLEANFILES = Makefile.in
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
 
-DISTCHECK_DEPS = accerso.1
-
-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/src/clients/adjutrix/Makefile.am b/src/clients/adjutrix/Makefile.am
index c2696eea9..2e86f4841 100644
--- a/src/clients/adjutrix/Makefile.am
+++ b/src/clients/adjutrix/Makefile.am
@@ -85,13 +85,3 @@ MAINTAINERCLEANFILES = Makefile.in
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
 
-DISTCHECK_DEPS = adjutrix.1
-
-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/src/clients/appareo/Makefile.am b/src/clients/appareo/Makefile.am
index c1a33d7de..05bae3171 100644
--- a/src/clients/appareo/Makefile.am
+++ b/src/clients/appareo/Makefile.am
@@ -75,13 +75,3 @@ MAINTAINERCLEANFILES = Makefile.in
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
 
-DISTCHECK_DEPS = appareo.1
-
-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/src/clients/cave/Makefile.am b/src/clients/cave/Makefile.am
index 1be86c3ec..3a3973db0 100644
--- a/src/clients/cave/Makefile.am
+++ b/src/clients/cave/Makefile.am
@@ -164,13 +164,3 @@ MAINTAINERCLEANFILES = Makefile.in
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
 
-DISTCHECK_DEPS = cave.1
-
-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/src/clients/importare/Makefile.am b/src/clients/importare/Makefile.am
index 697c5c5f8..213a2d05c 100644
--- a/src/clients/importare/Makefile.am
+++ b/src/clients/importare/Makefile.am
@@ -69,13 +69,3 @@ MAINTAINERCLEANFILES = Makefile.in
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
 
-DISTCHECK_DEPS = importare.1
-
-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/src/clients/inquisitio/Makefile.am b/src/clients/inquisitio/Makefile.am
index 921ccca55..00cbe76bf 100644
--- a/src/clients/inquisitio/Makefile.am
+++ b/src/clients/inquisitio/Makefile.am
@@ -80,13 +80,3 @@ MAINTAINERCLEANFILES = Makefile.in
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
 
-DISTCHECK_DEPS = inquisitio.1
-
-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/src/clients/instruo/Makefile.am b/src/clients/instruo/Makefile.am
index decdd6a36..255750a26 100644
--- a/src/clients/instruo/Makefile.am
+++ b/src/clients/instruo/Makefile.am
@@ -74,13 +74,3 @@ MAINTAINERCLEANFILES = Makefile.in
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
 
-DISTCHECK_DEPS = instruo.1
-
-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/src/clients/paludis/Makefile.am b/src/clients/paludis/Makefile.am
index d26df69d4..022f08c09 100644
--- a/src/clients/paludis/Makefile.am
+++ b/src/clients/paludis/Makefile.am
@@ -97,13 +97,3 @@ MAINTAINERCLEANFILES = Makefile.in
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
 
-DISTCHECK_DEPS = paludis.1
-
-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/src/clients/qualudis/Makefile.am b/src/clients/qualudis/Makefile.am
index 4342b42e6..1793ddc65 100644
--- a/src/clients/qualudis/Makefile.am
+++ b/src/clients/qualudis/Makefile.am
@@ -68,13 +68,3 @@ EXTRA_DIST = $(man_pages)
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
 
-DISTCHECK_DEPS = qualudis.1
-
-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/src/clients/reconcilio/Makefile.am b/src/clients/reconcilio/Makefile.am
index 17d3b10ee..e22e09348 100644
--- a/src/clients/reconcilio/Makefile.am
+++ b/src/clients/reconcilio/Makefile.am
@@ -89,13 +89,3 @@ MAINTAINERCLEANFILES = Makefile.in
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
 
-DISTCHECK_DEPS = reconcilio.1
-
-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/src/clients/reconcilio/broken_linkage_finder/Makefile.am b/src/clients/reconcilio/broken_linkage_finder/Makefile.am
index c0a498359..a9641f4c9 100644
--- a/src/clients/reconcilio/broken_linkage_finder/Makefile.am
+++ b/src/clients/reconcilio/broken_linkage_finder/Makefile.am
@@ -40,10 +40,3 @@ MAINTAINERCLEANFILES = Makefile.in
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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/src/clients/reconcilio/littlelf/Makefile.am b/src/clients/reconcilio/littlelf/Makefile.am
index dc0798290..cdb7d25e7 100644
--- a/src/clients/reconcilio/littlelf/Makefile.am
+++ b/src/clients/reconcilio/littlelf/Makefile.am
@@ -30,10 +30,3 @@ MAINTAINERCLEANFILES = Makefile.in
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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/src/clients/reconcilio/util/Makefile.am b/src/clients/reconcilio/util/Makefile.am
index 2a8fe33cf..596afca04 100644
--- a/src/clients/reconcilio/util/Makefile.am
+++ b/src/clients/reconcilio/util/Makefile.am
@@ -45,10 +45,3 @@ MAINTAINERCLEANFILES = Makefile.in
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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/src/output/Makefile.am b/src/output/Makefile.am
index ba596ef60..e79b861b5 100644
--- a/src/output/Makefile.am
+++ b/src/output/Makefile.am
@@ -15,13 +15,3 @@ AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src @PALUDIS_CXXFLAGS@ @PALUDIS_CX
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
 
-DISTCHECK_DEPS = liboutput.a
-
-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/test/Makefile.am b/test/Makefile.am
index 220d24bb2..de61faabc 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -35,10 +35,3 @@ 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
 
-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/vim/Makefile.am b/vim/Makefile.am
index 38da51f04..68a56738f 100644
--- a/vim/Makefile.am
+++ b/vim/Makefile.am
@@ -5,10 +5,3 @@ SUBDIRS = ftdetect syntax
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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/vim/ftdetect/Makefile.am b/vim/ftdetect/Makefile.am
index 5c4561b69..e9210d535 100644
--- a/vim/ftdetect/Makefile.am
+++ b/vim/ftdetect/Makefile.am
@@ -18,10 +18,3 @@ EXTRA_DIST = $(vimscripts)
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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/vim/syntax/Makefile.am b/vim/syntax/Makefile.am
index 08c92a964..7cbbea1d0 100644
--- a/vim/syntax/Makefile.am
+++ b/vim/syntax/Makefile.am
@@ -25,10 +25,3 @@ EXTRA_DIST = $(vimscripts)
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || 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/zsh-completion/Makefile.am b/zsh-completion/Makefile.am
index 5b59d43e1..5dbd140c5 100644
--- a/zsh-completion/Makefile.am
+++ b/zsh-completion/Makefile.am
@@ -5,10 +5,3 @@ EXTRA_DIST = $(noinst_DATA)
 built-sources : $(BUILT_SOURCES)
 	for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || 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