diff options
Diffstat (limited to 'Build/source/utils')
24 files changed, 150 insertions, 84 deletions
diff --git a/Build/source/utils/ChangeLog b/Build/source/utils/ChangeLog index 2d7b5ac2aa3..9425256ffd5 100644 --- a/Build/source/utils/ChangeLog +++ b/Build/source/utils/ChangeLog @@ -1,3 +1,7 @@ +2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Use the fragment ../am/dist_hook.am. + 2013-12-26 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am (ACLOCAL): Ensure aclocal.m4 is up to date. diff --git a/Build/source/utils/Makefile.am b/Build/source/utils/Makefile.am index fec2625c83d..a60030706aa 100644 --- a/Build/source/utils/Makefile.am +++ b/Build/source/utils/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory utils/ ## -## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ## Ensure aclocal.m4 is up to date @@ -9,9 +9,8 @@ ACLOCAL = @ACLOCAL@ --force SUBDIRS = . $(MAKE_SUBDIRS) DIST_SUBDIRS = $(CONF_SUBDIRS) -# just in case a subdirectory has added directories -dist-hook: - rm -rf `find $(distdir) -name .svn` +# Files not to be distributed +include $(srcdir)/../am/dist_hook.am ## Configure and build subdirs. ## diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in index 03d8795fcf3..5d659ef80ac 100644 --- a/Build/source/utils/Makefile.in +++ b/Build/source/utils/Makefile.in @@ -257,7 +257,8 @@ am__define_uniq_tagged_files = \ ETAGS = etags CTAGS = ctags CSCOPE = cscope -am__DIST_COMMON = $(srcdir)/../am/recurse.am $(srcdir)/Makefile.in \ +am__DIST_COMMON = $(srcdir)/../am/dist_hook.am \ + $(srcdir)/../am/recurse.am $(srcdir)/Makefile.in \ $(top_srcdir)/../build-aux/compile \ $(top_srcdir)/../build-aux/config.guess \ $(top_srcdir)/../build-aux/config.sub \ @@ -408,6 +409,12 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = . $(MAKE_SUBDIRS) DIST_SUBDIRS = $(CONF_SUBDIRS) +NEVER_DIST = `find . $(NEVER_NAMES)` +NEVER_NAMES = -name .svn +NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)' +NEVER_NAMES_LT = -o -name .libs -o -name '*.lo' + +# Files not to be distributed recurse_this = utils/ recurse_top = ../ @@ -426,7 +433,7 @@ all: all-recursive .SUFFIXES: am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/recurse.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/dist_hook.am $(srcdir)/../am/recurse.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -448,7 +455,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/../am/recurse.am $(am__empty): +$(srcdir)/../am/dist_hook.am $(srcdir)/../am/recurse.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -879,10 +886,8 @@ uninstall-am: .PRECIOUS: Makefile - -# just in case a subdirectory has added directories dist-hook: - rm -rf `find $(distdir) -name .svn` + cd "$(distdir)" && rm -rf $(NEVER_DIST) all-local: recurse diff --git a/Build/source/utils/m-tx/ChangeLog b/Build/source/utils/m-tx/ChangeLog index 0762e5a1eef..fce745bd047 100644 --- a/Build/source/utils/m-tx/ChangeLog +++ b/Build/source/utils/m-tx/ChangeLog @@ -1,3 +1,7 @@ +2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Use the fragment ../../am/dist_hook.am. + 2015-02-03 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Drop AC_HEADER_STDBOOL, AC_FUNC_ERROR_AT_LINE, diff --git a/Build/source/utils/m-tx/Makefile.am b/Build/source/utils/m-tx/Makefile.am index 3186970e3b4..c3773911066 100644 --- a/Build/source/utils/m-tx/Makefile.am +++ b/Build/source/utils/m-tx/Makefile.am @@ -8,9 +8,9 @@ EXTRA_DIST = $(MTX_TREE) ## Patches applied to the original source tree EXTRA_DIST += $(MTX_TREE)-PATCHES -# in case of an SVN repository -dist-hook: - rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` +# Files not to be distributed +include $(srcdir)/../../am/dist_hook.am +NEVER_NAMES += $(NEVER_NAMES_SUB) AM_CPPFLAGS = -I$(srcdir)/$(MTX_TREE)/libp2c -DNO_DECLARE_MALLOC AM_CFLAGS = #$(WARNING_CFLAGS) diff --git a/Build/source/utils/m-tx/Makefile.in b/Build/source/utils/m-tx/Makefile.in index cfbc77c62c5..ad56a54467e 100644 --- a/Build/source/utils/m-tx/Makefile.in +++ b/Build/source/utils/m-tx/Makefile.in @@ -374,8 +374,8 @@ am__set_b = \ *) \ b='$*';; \ esac -am__DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.in \ - $(top_srcdir)/../../build-aux/compile \ +am__DIST_COMMON = $(dist_man1_MANS) $(srcdir)/../../am/dist_hook.am \ + $(srcdir)/Makefile.in $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/depcomp \ $(top_srcdir)/../../build-aux/install-sh \ $(top_srcdir)/../../build-aux/missing \ @@ -496,6 +496,12 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = $(MTX_TREE) $(MTX_TREE)-PATCHES $(TESTS) tests/mozart.mtx \ tests/mozart.pmx +NEVER_DIST = `find . $(NEVER_NAMES)` + +# Files not to be distributed +NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB) +NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)' +NEVER_NAMES_LT = -o -name .libs -o -name '*.lo' AM_CPPFLAGS = -I$(srcdir)/$(MTX_TREE)/libp2c -DNO_DECLARE_MALLOC AM_CFLAGS = #$(WARNING_CFLAGS) prepmx_SOURCES = \ @@ -540,7 +546,7 @@ all: all-am .SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -562,6 +568,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; +$(srcdir)/../../am/dist_hook.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -1255,10 +1262,8 @@ uninstall-man: uninstall-man1 .PRECIOUS: Makefile - -# in case of an SVN repository dist-hook: - rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` + cd "$(distdir)" && rm -rf $(NEVER_DIST) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Build/source/utils/pmx/ChangeLog b/Build/source/utils/pmx/ChangeLog index d3b0d433d68..4bd452e19de 100644 --- a/Build/source/utils/pmx/ChangeLog +++ b/Build/source/utils/pmx/ChangeLog @@ -1,3 +1,7 @@ +2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Use the fragment ../../am/dist_hook.am. + 2014-11-17 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Replace KPSE_COND_WIN32_WRAP => KPSE_COND_WIN32. diff --git a/Build/source/utils/pmx/Makefile.am b/Build/source/utils/pmx/Makefile.am index d74baf66e62..5f8170542c9 100644 --- a/Build/source/utils/pmx/Makefile.am +++ b/Build/source/utils/pmx/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory utils/pmx/ ## -## Copyright (C) 2012-2014 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2012-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ## We want to re-distribute the whole original pmx source tree. @@ -8,12 +8,9 @@ EXTRA_DIST = $(PMX_TREE) ## Patches applied to the original source tree EXTRA_DIST += $(PMX_TREE)-PATCHES -dist-hook: - cd "$(distdir)" && rm -rf $(NEVER_DIST) - -## in case of an SVN repository -NEVER_DIST = `find . -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` - +# Files not to be distributed +include $(srcdir)/../../am/dist_hook.am +NEVER_NAMES += $(NEVER_NAMES_SUB) NEVER_DIST += $(PMX_TREE)/pmx.log $(PMX_TREE)/pmx.trs AM_CPPFLAGS = -I$(srcdir)/$(PMX_TREE)/libf2c $(PMX_DEFINES) diff --git a/Build/source/utils/pmx/Makefile.in b/Build/source/utils/pmx/Makefile.in index 92d8a762422..916e52fcfe2 100644 --- a/Build/source/utils/pmx/Makefile.in +++ b/Build/source/utils/pmx/Makefile.in @@ -623,8 +623,8 @@ am__set_b = \ *) \ b='$*';; \ esac -am__DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.in \ - $(top_srcdir)/../../build-aux/compile \ +am__DIST_COMMON = $(dist_man1_MANS) $(srcdir)/../../am/dist_hook.am \ + $(srcdir)/Makefile.in $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/depcomp \ $(top_srcdir)/../../build-aux/install-sh \ $(top_srcdir)/../../build-aux/missing \ @@ -745,8 +745,13 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = $(PMX_TREE) $(PMX_TREE)-PATCHES -NEVER_DIST = `find . -name .svn -o -name .deps -o -name .dirstamp -o \ - -name '*.$(OBJEXT)'` $(PMX_TREE)/pmx.log $(PMX_TREE)/pmx.trs +NEVER_DIST = `find . $(NEVER_NAMES)` $(PMX_TREE)/pmx.log \ + $(PMX_TREE)/pmx.trs + +# Files not to be distributed +NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB) +NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)' +NEVER_NAMES_LT = -o -name .libs -o -name '*.lo' AM_CPPFLAGS = -I$(srcdir)/$(PMX_TREE)/libf2c $(PMX_DEFINES) AM_CFLAGS = #$(WARNING_CFLAGS) pmxab_SOURCES = @PMX_TREE@/pmxab.c @@ -848,7 +853,7 @@ all: all-am .SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -870,6 +875,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; +$(srcdir)/../../am/dist_hook.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -2043,7 +2049,6 @@ uninstall-man: uninstall-man1 .PRECIOUS: Makefile - dist-hook: cd "$(distdir)" && rm -rf $(NEVER_DIST) diff --git a/Build/source/utils/ps2eps/ChangeLog b/Build/source/utils/ps2eps/ChangeLog index d64d9a4b7b0..8657f66b879 100644 --- a/Build/source/utils/ps2eps/ChangeLog +++ b/Build/source/utils/ps2eps/ChangeLog @@ -1,3 +1,7 @@ +2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Use the fragment ../../am/dist_hook.am. + 2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. diff --git a/Build/source/utils/ps2eps/Makefile.am b/Build/source/utils/ps2eps/Makefile.am index cf0995c4aa1..6353b0d31fa 100644 --- a/Build/source/utils/ps2eps/Makefile.am +++ b/Build/source/utils/ps2eps/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory utils/ps2eps/ ## -## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ## We want to re-distribute the whole original ps2eps source tree. @@ -8,9 +8,9 @@ EXTRA_DIST = $(PS2EPS_TREE) ## Patches applied to the original source tree EXTRA_DIST += $(PS2EPS_TREE)-PATCHES -# in case of an SVN repository -dist-hook: - rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` +# Files not to be distributed +include $(srcdir)/../../am/dist_hook.am +NEVER_NAMES += $(NEVER_NAMES_SUB) AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/utils/ps2eps/Makefile.in b/Build/source/utils/ps2eps/Makefile.in index 223aa3734c7..9795370f9ba 100644 --- a/Build/source/utils/ps2eps/Makefile.in +++ b/Build/source/utils/ps2eps/Makefile.in @@ -372,8 +372,9 @@ am__set_b = \ *) \ b='$*';; \ esac -am__DIST_COMMON = $(srcdir)/../../am/script_links.am \ - $(srcdir)/Makefile.in $(top_srcdir)/../../build-aux/compile \ +am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \ + $(srcdir)/../../am/script_links.am $(srcdir)/Makefile.in \ + $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/depcomp \ $(top_srcdir)/../../build-aux/install-sh \ $(top_srcdir)/../../build-aux/missing \ @@ -492,6 +493,12 @@ top_srcdir = @top_srcdir@ EXTRA_DIST = $(PS2EPS_TREE) $(PS2EPS_TREE)-PATCHES \ $(top_builddir)/../../build-aux/relpath $(TESTS) \ tests/plot.pbm tests/plot.out +NEVER_DIST = `find . $(NEVER_NAMES)` + +# Files not to be distributed +NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB) +NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)' +NEVER_NAMES_LT = -o -name .libs -o -name '*.lo' AM_CFLAGS = $(WARNING_CFLAGS) bbox_SOURCES = \ @PS2EPS_TREE@/src/C/bbox.c @@ -517,7 +524,7 @@ all: all-am .SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/script_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/script_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -539,7 +546,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/../../am/script_links.am $(am__empty): +$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/script_links.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -1269,10 +1276,8 @@ uninstall-man: uninstall-man1 .PRECIOUS: Makefile - -# in case of an SVN repository dist-hook: - rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` + cd "$(distdir)" && rm -rf $(NEVER_DIST) .PHONY: install-lua-links install-perl-links install-shell-links install-sh-links \ install-links uninstall-links @WIN32_TRUE@@WIN32_WRAP_TRUE@$(wrappers): $(runscript) diff --git a/Build/source/utils/t1utils/ChangeLog b/Build/source/utils/t1utils/ChangeLog index 85b1310c8f1..85a6ac202c7 100644 --- a/Build/source/utils/t1utils/ChangeLog +++ b/Build/source/utils/t1utils/ChangeLog @@ -1,3 +1,7 @@ +2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Use the fragment ../../am/dist_hook.am. + 2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. diff --git a/Build/source/utils/t1utils/Makefile.am b/Build/source/utils/t1utils/Makefile.am index 1fe50bb2a72..e52ad9aca0f 100644 --- a/Build/source/utils/t1utils/Makefile.am +++ b/Build/source/utils/t1utils/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory utils/t1utils/ ## -## Copyright (C) 2008-2014 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2008-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## #************************************************************************ @@ -20,9 +20,9 @@ EXTRA_DIST = $(T1UTILS_TREE) ## EXTRA_DIST += $(T1UTILS_TREE)-PATCHES -# in case of an SVN repository -dist-hook: - rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` +# Files not to be distributed +include $(srcdir)/../../am/dist_hook.am +NEVER_NAMES += $(NEVER_NAMES_SUB) AM_CPPFLAGS = -I$(top_srcdir)/$(T1UTILS_TREE)/include AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/utils/t1utils/Makefile.in b/Build/source/utils/t1utils/Makefile.in index f10b0c39ec2..78bde28d2e3 100644 --- a/Build/source/utils/t1utils/Makefile.in +++ b/Build/source/utils/t1utils/Makefile.in @@ -403,8 +403,9 @@ am__set_b = \ *) \ b='$*';; \ esac -am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \ - $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \ +am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/../../am/dist_hook.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/depcomp \ $(top_srcdir)/../../build-aux/install-sh \ $(top_srcdir)/../../build-aux/missing \ @@ -529,6 +530,12 @@ top_srcdir = @top_srcdir@ #************************************************************************ EXTRA_DIST = $(T1UTILS_TREE) $(T1UTILS_TREE)-PATCHES $(TESTS) \ tests/Symbol.pfa tests/Symbol.pfb tests/Symbol.raw +NEVER_DIST = `find . $(NEVER_NAMES)` + +# Files not to be distributed +NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB) +NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)' +NEVER_NAMES_LT = -o -name .libs -o -name '*.lo' AM_CPPFLAGS = -I$(top_srcdir)/$(T1UTILS_TREE)/include AM_CFLAGS = $(WARNING_CFLAGS) dist_man_MANS = \ @@ -579,7 +586,7 @@ all: config.h .SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -601,6 +608,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; +$(srcdir)/../../am/dist_hook.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -1311,10 +1319,8 @@ uninstall-man: uninstall-man1 .PRECIOUS: Makefile - -# in case of an SVN repository dist-hook: - rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` + cd "$(distdir)" && rm -rf $(NEVER_DIST) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Build/source/utils/vlna/ChangeLog b/Build/source/utils/vlna/ChangeLog index 8e1d22d1240..fb30024d342 100644 --- a/Build/source/utils/vlna/ChangeLog +++ b/Build/source/utils/vlna/ChangeLog @@ -1,3 +1,7 @@ +2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Use the fragment ../../am/dist_hook.am. + 2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. diff --git a/Build/source/utils/vlna/Makefile.am b/Build/source/utils/vlna/Makefile.am index 40f548bd2ac..baf91053afa 100644 --- a/Build/source/utils/vlna/Makefile.am +++ b/Build/source/utils/vlna/Makefile.am @@ -8,9 +8,8 @@ EXTRA_DIST = $(VLNA_TREE) ## Patches applied to the original source tree EXTRA_DIST += $(VLNA_TREE)-PATCHES -# in case of an SVN repository -dist-hook: - rm -rf `find $(distdir) -name .svn` +# Files not to be distributed +include $(srcdir)/../../am/dist_hook.am AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/utils/vlna/Makefile.in b/Build/source/utils/vlna/Makefile.in index e074c184dc0..2f42e498b58 100644 --- a/Build/source/utils/vlna/Makefile.in +++ b/Build/source/utils/vlna/Makefile.in @@ -192,8 +192,8 @@ ETAGS = etags CTAGS = ctags CSCOPE = cscope AM_RECURSIVE_TARGETS = cscope -am__DIST_COMMON = $(srcdir)/Makefile.in \ - $(top_srcdir)/../../build-aux/compile \ +am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \ + $(srcdir)/Makefile.in $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/depcomp \ $(top_srcdir)/../../build-aux/install-sh \ $(top_srcdir)/../../build-aux/missing ../../build-aux/compile \ @@ -310,6 +310,12 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = $(VLNA_TREE) $(VLNA_TREE)-PATCHES vlna.dvi vlna.tex \ vlna.idx vlna.scn +NEVER_DIST = `find . $(NEVER_NAMES)` +NEVER_NAMES = -name .svn +NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)' +NEVER_NAMES_LT = -o -name .libs -o -name '*.lo' + +# Files not to be distributed AM_CFLAGS = $(WARNING_CFLAGS) man1_MANS = $(VLNA_TREE)/vlna.man CLEANFILES = vlna.log vlna.toc @@ -319,7 +325,7 @@ all: all-am .SUFFIXES: .c .o .obj am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -341,6 +347,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; +$(srcdir)/../../am/dist_hook.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -821,10 +828,8 @@ uninstall-man: uninstall-man1 .PRECIOUS: Makefile - -# in case of an SVN repository dist-hook: - rm -rf `find $(distdir) -name .svn` + cd "$(distdir)" && rm -rf $(NEVER_DIST) vlna.dvi: vlna.tex vlna.idx vlna.scn TEXINPUTS=.:$(srcdir)/$(VLNA_TREE):$$TEXINPUTS $(CSPLAIN) vlna.tex diff --git a/Build/source/utils/xindy/ChangeLog b/Build/source/utils/xindy/ChangeLog index 309881e92c3..ecfcdee55a9 100644 --- a/Build/source/utils/xindy/ChangeLog +++ b/Build/source/utils/xindy/ChangeLog @@ -1,3 +1,7 @@ +2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Use the fragment ../../am/dist_hook.am. + 2014-09-15 Peter Breitenlohner <peb@mppmu.mpg.de> Import xindy-2.5.1. diff --git a/Build/source/utils/xindy/Makefile.am b/Build/source/utils/xindy/Makefile.am index 01ce9ea2057..1fc80e8b319 100644 --- a/Build/source/utils/xindy/Makefile.am +++ b/Build/source/utils/xindy/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory utils/xindy/ ## -## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## EXTRA_DIST = README-clisp @@ -22,9 +22,8 @@ EXTRA_DIST += \ $(XINDY_TREE)/configure.ac \ $(XINDY_TREE)/m4 -# in case of an SVN repository -dist-hook: - rm -rf `find $(distdir) -name .svn` +# Files not to be distributed +include $(srcdir)/../../am/dist_hook.am all-local: config.force diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in index ebf1d081bc3..d7f0420985c 100644 --- a/Build/source/utils/xindy/Makefile.in +++ b/Build/source/utils/xindy/Makefile.in @@ -188,8 +188,9 @@ am__define_uniq_tagged_files = \ ETAGS = etags CTAGS = ctags CSCOPE = cscope -am__DIST_COMMON = $(srcdir)/../../am/script_links.am \ - $(srcdir)/Makefile.in $(top_srcdir)/../../build-aux/compile \ +am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \ + $(srcdir)/../../am/script_links.am $(srcdir)/Makefile.in \ + $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/config.guess \ $(top_srcdir)/../../build-aux/config.sub \ $(top_srcdir)/../../build-aux/install-sh \ @@ -354,6 +355,10 @@ EXTRA_DIST = README-clisp $(XINDY_TREE)-PATCHES \ $(top_builddir)/../../build-aux/relpath SUBDIRS = . $(XINDY_TREE) DIST_SUBDIRS = $(SUBDIRS) +NEVER_DIST = `find . $(NEVER_NAMES)` +NEVER_NAMES = -name .svn +NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)' +NEVER_NAMES_LT = -o -name .libs -o -name '*.lo' DISTCLEANFILES = config.force perl_scripts = texindy xindy scriptsdir = texmf-dist/scripts/xindy @@ -369,7 +374,7 @@ all: all-recursive .SUFFIXES: am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/script_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/script_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -391,7 +396,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/../../am/script_links.am $(am__empty): +$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/script_links.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -905,10 +910,10 @@ uninstall-am: uninstall-nodist_binSCRIPTS \ .PRECIOUS: Makefile - -# in case of an SVN repository dist-hook: - rm -rf `find $(distdir) -name .svn` + cd "$(distdir)" && rm -rf $(NEVER_DIST) + +# Files not to be distributed all-local: config.force diff --git a/Build/source/utils/xpdfopen/ChangeLog b/Build/source/utils/xpdfopen/ChangeLog index d8165653c14..2056e213307 100644 --- a/Build/source/utils/xpdfopen/ChangeLog +++ b/Build/source/utils/xpdfopen/ChangeLog @@ -1,3 +1,7 @@ +2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Use the fragment ../../am/dist_hook.am. + 2014-05-28 Peter Breitenlohner <peb@mppmu.mpg.de> Import xpdfopen-0.86 (into versioned subdirectory). diff --git a/Build/source/utils/xpdfopen/Makefile.am b/Build/source/utils/xpdfopen/Makefile.am index 676bdcd3556..1fd9213dd23 100644 --- a/Build/source/utils/xpdfopen/Makefile.am +++ b/Build/source/utils/xpdfopen/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory utils/xpdfopen/ ## -## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## EXTRA_DIST = $(XPDFOPEN_TREE) @@ -9,9 +9,9 @@ EXTRA_DIST = $(XPDFOPEN_TREE) ## EXTRA_DIST += $(XPDFOPEN_TREE)-PATCHES -# in case of an SVN repository -dist-hook: - rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` +# Files not to be distributed +include $(srcdir)/../../am/dist_hook.am +NEVER_NAMES += $(NEVER_NAMES_SUB) AM_CPPFLAGS = $(X_CFLAGS) AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/utils/xpdfopen/Makefile.in b/Build/source/utils/xpdfopen/Makefile.in index f29f29f27bb..8970dac7814 100644 --- a/Build/source/utils/xpdfopen/Makefile.in +++ b/Build/source/utils/xpdfopen/Makefile.in @@ -203,8 +203,8 @@ ETAGS = etags CTAGS = ctags CSCOPE = cscope AM_RECURSIVE_TARGETS = cscope -am__DIST_COMMON = $(srcdir)/Makefile.in \ - $(top_srcdir)/../../am/man1_links.am \ +am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \ + $(srcdir)/Makefile.in $(top_srcdir)/../../am/man1_links.am \ $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/depcomp \ $(top_srcdir)/../../build-aux/install-sh \ @@ -325,6 +325,12 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = $(XPDFOPEN_TREE) $(XPDFOPEN_TREE)-PATCHES xpdfopen.pdf \ xpdfopen.tex +NEVER_DIST = `find . $(NEVER_NAMES)` + +# Files not to be distributed +NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB) +NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)' +NEVER_NAMES_LT = -o -name .libs -o -name '*.lo' AM_CPPFLAGS = $(X_CFLAGS) AM_CFLAGS = $(WARNING_CFLAGS) LDADD = $(X_LIBS) -lX11 -lXmu $(X_EXTRA_LIBS) @@ -350,7 +356,7 @@ all: all-am .SUFFIXES: .c .o .obj am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/man1_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(top_srcdir)/../../am/man1_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -372,7 +378,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/../../am/man1_links.am $(am__empty): +$(srcdir)/../../am/dist_hook.am $(top_srcdir)/../../am/man1_links.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -878,10 +884,8 @@ uninstall-man: uninstall-man1 .PRECIOUS: Makefile - -# in case of an SVN repository dist-hook: - rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` + cd "$(distdir)" && rm -rf $(NEVER_DIST) .PHONY: install-man1-links uninstall-man1-links install-man1-links: |