diff options
65 files changed, 323 insertions, 232 deletions
diff --git a/Makefile.am b/Makefile.am index 700543e91..abfd049c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,7 @@ automake-deps-built-hack.tmp : built-sources-subdirs BUILT_SOURCES = automake-deps-built-hack.tmp -automake-deps-dist-hack.tmp : built-sources-subdirs distcheck-deps-subdirs +automake-deps-dist-hack.tmp : distcheck-deps-subdirs touch $@ dist-hook : @@ -45,7 +45,6 @@ built-sources-subdirs : distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs -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 - diff --git a/bash-completion/Makefile.am b/bash-completion/Makefile.am index a26d481b9..e05fc1e70 100644 --- a/bash-completion/Makefile.am +++ b/bash-completion/Makefile.am @@ -7,9 +7,11 @@ EXTRA_DIST = $(noinst_DATA) 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/doc/Makefile.am b/doc/Makefile.am index a91380223..f5ee32d5e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -332,9 +332,11 @@ upload-homepage-real : 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/doc/examples/Makefile.am b/doc/examples/Makefile.am index 6773fdca9..238fc6c97 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -177,8 +177,10 @@ example_name_LDFLAGS = \ 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/eselect/Makefile.am b/eselect/Makefile.am index 2cf79d87c..2cc1c3e83 100644 --- a/eselect/Makefile.am +++ b/eselect/Makefile.am @@ -24,9 +24,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/hooks/Makefile.am.m4 b/hooks/Makefile.am.m4 index 6a6302442..b92344e65 100644 --- a/hooks/Makefile.am.m4 +++ b/hooks/Makefile.am.m4 @@ -272,10 +272,13 @@ 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-local : $(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 + 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)/" \ diff --git a/hooks/demos/Makefile.am b/hooks/demos/Makefile.am index 594aa56e2..ecc938254 100644 --- a/hooks/demos/Makefile.am +++ b/hooks/demos/Makefile.am @@ -28,9 +28,11 @@ elog.bash : $(srcdir)/elog.bash.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-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/misc/Makefile.am b/misc/Makefile.am index 1e031ecb1..a59665409 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -5,8 +5,10 @@ EXTRA_DIST = generated-file.txt do_m4.bash make_sr.bash make_se.bash 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/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 diff --git a/pkg-config/Makefile.am b/pkg-config/Makefile.am index 33e5642e2..d6ad76383 100644 --- a/pkg-config/Makefile.am +++ b/pkg-config/Makefile.am @@ -7,10 +7,13 @@ CLEANFILES = paludis.pc 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 : distcheck-deps-subdirs distcheck-deps-subdirs : - for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s distcheck-deps || exit 1 ; done + 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 \ diff --git a/python/Makefile.am b/python/Makefile.am index b45fbe981..3b8884c5b 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -210,8 +210,10 @@ 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 : $(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/ruby/Makefile.am b/ruby/Makefile.am index d76207a17..ee4026fde 100644 --- a/ruby/Makefile.am +++ b/ruby/Makefile.am @@ -150,8 +150,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-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/ruby/demos/Makefile.am b/ruby/demos/Makefile.am index 8ecb23822..b2fdc21cd 100644 --- a/ruby/demos/Makefile.am +++ b/ruby/demos/Makefile.am @@ -47,9 +47,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/src/Makefile.am b/src/Makefile.am index 63b356e42..43c3219a2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,8 +6,10 @@ 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-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/src/clients/Makefile.am b/src/clients/Makefile.am index 5191743f4..9eaebffc0 100644 --- a/src/clients/Makefile.am +++ b/src/clients/Makefile.am @@ -9,9 +9,10 @@ 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 : $(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 +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 8376aa8b4..caf191fec 100644 --- a/src/clients/accerso/Makefile.am +++ b/src/clients/accerso/Makefile.am @@ -79,9 +79,10 @@ built-sources : $(BUILT_SOURCES) DISTCHECK_DEPS = accerso.1 accerso.html -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/src/clients/adjutrix/Makefile.am b/src/clients/adjutrix/Makefile.am index dd5d4d464..ac7f09156 100644 --- a/src/clients/adjutrix/Makefile.am +++ b/src/clients/adjutrix/Makefile.am @@ -114,9 +114,10 @@ built-sources : $(BUILT_SOURCES) DISTCHECK_DEPS = adjutrix.1 adjutrix.html -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/src/clients/contrarius/Makefile.am b/src/clients/contrarius/Makefile.am index 6c4679d02..7369949b7 100644 --- a/src/clients/contrarius/Makefile.am +++ b/src/clients/contrarius/Makefile.am @@ -97,8 +97,10 @@ built-sources : $(BUILT_SOURCES) DISTCHECK_DEPS = contrarius.1 contrarius.html -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/src/clients/gtkpaludis/Makefile.am b/src/clients/gtkpaludis/Makefile.am index 518d8f8a3..684b4f57b 100644 --- a/src/clients/gtkpaludis/Makefile.am +++ b/src/clients/gtkpaludis/Makefile.am @@ -24,9 +24,10 @@ gtkpaludis_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 +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/gtkpaludis/libgtkpaludis/Makefile.am b/src/clients/gtkpaludis/libgtkpaludis/Makefile.am index 26750c09e..07fe2a301 100644 --- a/src/clients/gtkpaludis/libgtkpaludis/Makefile.am +++ b/src/clients/gtkpaludis/libgtkpaludis/Makefile.am @@ -56,8 +56,10 @@ AM_CXXFLAGS = @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@ -I$(top_srcdir)/s 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/src/clients/gtkpaludis/vtemm/Makefile.am b/src/clients/gtkpaludis/vtemm/Makefile.am index 9fc0ff671..5b63a6f7c 100644 --- a/src/clients/gtkpaludis/vtemm/Makefile.am +++ b/src/clients/gtkpaludis/vtemm/Makefile.am @@ -69,9 +69,10 @@ 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 $(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/src/clients/gtkpaludis/vtemm/converts/Makefile.am b/src/clients/gtkpaludis/vtemm/converts/Makefile.am index 6f0355ab2..09447d24a 100644 --- a/src/clients/gtkpaludis/vtemm/converts/Makefile.am +++ b/src/clients/gtkpaludis/vtemm/converts/Makefile.am @@ -6,9 +6,10 @@ EXTRA_DIST = $(noinst_DATA) 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/src/clients/gtkpaludis/vtemm/defs/Makefile.am b/src/clients/gtkpaludis/vtemm/defs/Makefile.am index ba3448dd7..3ad7047d7 100644 --- a/src/clients/gtkpaludis/vtemm/defs/Makefile.am +++ b/src/clients/gtkpaludis/vtemm/defs/Makefile.am @@ -48,9 +48,10 @@ EXTRA_DIST = enum.pl generate_defs_vte.cc 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/src/clients/importare/Makefile.am b/src/clients/importare/Makefile.am index 8cfa7d83c..05f83c122 100644 --- a/src/clients/importare/Makefile.am +++ b/src/clients/importare/Makefile.am @@ -73,9 +73,10 @@ built-sources : $(BUILT_SOURCES) DISTCHECK_DEPS = importare.1 importare.html -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/src/clients/inquisitio/Makefile.am b/src/clients/inquisitio/Makefile.am index 2bee7ff03..6671760c7 100644 --- a/src/clients/inquisitio/Makefile.am +++ b/src/clients/inquisitio/Makefile.am @@ -82,9 +82,10 @@ built-sources : $(BUILT_SOURCES) DISTCHECK_DEPS = inquisitio.1 inquisitio.html -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/src/clients/instruo/Makefile.am b/src/clients/instruo/Makefile.am index c86ad11a6..e5cbd97d3 100644 --- a/src/clients/instruo/Makefile.am +++ b/src/clients/instruo/Makefile.am @@ -79,9 +79,10 @@ built-sources : $(BUILT_SOURCES) DISTCHECK_DEPS = instruo.1 instruo.html -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/src/clients/paludis/Makefile.am b/src/clients/paludis/Makefile.am index 63cb4842e..9139b23f0 100644 --- a/src/clients/paludis/Makefile.am +++ b/src/clients/paludis/Makefile.am @@ -94,9 +94,10 @@ built-sources : $(BUILT_SOURCES) DISTCHECK_DEPS = paludis.1 paludis.html -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/src/clients/qualudis/Makefile.am b/src/clients/qualudis/Makefile.am index 33f1436c8..ee0d03b20 100644 --- a/src/clients/qualudis/Makefile.am +++ b/src/clients/qualudis/Makefile.am @@ -74,9 +74,11 @@ built-sources : $(BUILT_SOURCES) DISTCHECK_DEPS = qualudis.1 qualudis.html -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/src/clients/reconcilio/Makefile.am b/src/clients/reconcilio/Makefile.am index 38f05d143..80d240262 100644 --- a/src/clients/reconcilio/Makefile.am +++ b/src/clients/reconcilio/Makefile.am @@ -93,9 +93,10 @@ built-sources : $(BUILT_SOURCES) DISTCHECK_DEPS = reconcilio.1 reconcilio.html -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/src/clients/reconcilio/broken_linkage_finder/Makefile.am b/src/clients/reconcilio/broken_linkage_finder/Makefile.am index ba9224038..e44c691a2 100644 --- a/src/clients/reconcilio/broken_linkage_finder/Makefile.am +++ b/src/clients/reconcilio/broken_linkage_finder/Makefile.am @@ -37,9 +37,10 @@ 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 $(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/src/clients/reconcilio/littlelf/Makefile.am b/src/clients/reconcilio/littlelf/Makefile.am index 8bcb363f1..fde603f01 100644 --- a/src/clients/reconcilio/littlelf/Makefile.am +++ b/src/clients/reconcilio/littlelf/Makefile.am @@ -29,9 +29,10 @@ 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 $(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/src/clients/reconcilio/util/Makefile.am b/src/clients/reconcilio/util/Makefile.am index 31f28b5bc..d57f4ce11 100644 --- a/src/clients/reconcilio/util/Makefile.am +++ b/src/clients/reconcilio/util/Makefile.am @@ -48,9 +48,10 @@ 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 $(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/src/output/Makefile.am b/src/output/Makefile.am index 6b9a45c3f..b3d023938 100644 --- a/src/output/Makefile.am +++ b/src/output/Makefile.am @@ -20,10 +20,13 @@ built-sources : $(BUILT_SOURCES) DISTCHECK_DEPS = liboutput.a -distcheck-deps : $(DISTCHECK_DEPS) distcheck-deps-subdirs +distcheck-deps-local : $(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 + 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 console_install_task-sr.hh : console_install_task.sr $(top_srcdir)/misc/make_sr.bash $(top_srcdir)/misc/make_sr.bash --header $(srcdir)/console_install_task.sr > $@ diff --git a/test/Makefile.am b/test/Makefile.am index 546c47e37..16e21f892 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -30,9 +30,10 @@ test_fail_TEST_LDADD = libtest.a 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/vim/Makefile.am b/vim/Makefile.am index 6079f7fe9..d464f07b6 100644 --- a/vim/Makefile.am +++ b/vim/Makefile.am @@ -5,8 +5,10 @@ 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 : $(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/vim/ftdetect/Makefile.am b/vim/ftdetect/Makefile.am index 540359bac..23b5a27ec 100644 --- a/vim/ftdetect/Makefile.am +++ b/vim/ftdetect/Makefile.am @@ -18,9 +18,10 @@ 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 : $(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/vim/syntax/Makefile.am b/vim/syntax/Makefile.am index ba8c0dc6a..2c95f50f1 100644 --- a/vim/syntax/Makefile.am +++ b/vim/syntax/Makefile.am @@ -25,9 +25,10 @@ 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 : $(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/zsh-completion/Makefile.am b/zsh-completion/Makefile.am index 2e44bed75..f53157f07 100644 --- a/zsh-completion/Makefile.am +++ b/zsh-completion/Makefile.am @@ -5,9 +5,10 @@ EXTRA_DIST = $(noinst_DATA) 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 |