summaryrefslogtreecommitdiff
path: root/Build/source/libs
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-02-16 14:32:53 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-02-16 14:32:53 +0000
commit8a76c4cf53b01a6a34e6c4fe8ac2c531e23503cc (patch)
treef83da7c83bd9925137f9793803e604f66d3cb637 /Build/source/libs
parentb99e22bb614c3ff22ace371cbd9cb0575f4df20b (diff)
Build system: Use a Makefile fragment for the dist-hook target
git-svn-id: svn://tug.org/texlive/trunk@36292 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs')
-rw-r--r--Build/source/libs/ChangeLog4
-rw-r--r--Build/source/libs/Makefile.am7
-rw-r--r--Build/source/libs/Makefile.in17
-rw-r--r--Build/source/libs/cairo/ChangeLog4
-rw-r--r--Build/source/libs/cairo/Makefile.am8
-rw-r--r--Build/source/libs/cairo/Makefile.in22
-rw-r--r--Build/source/libs/freetype2/ChangeLog4
-rw-r--r--Build/source/libs/freetype2/Makefile.am7
-rw-r--r--Build/source/libs/freetype2/Makefile.in17
-rw-r--r--Build/source/libs/gd/ChangeLog4
-rw-r--r--Build/source/libs/gd/Makefile.am6
-rw-r--r--Build/source/libs/gd/Makefile.in21
-rw-r--r--Build/source/libs/gmp/ChangeLog4
-rw-r--r--Build/source/libs/gmp/Makefile.am8
-rw-r--r--Build/source/libs/gmp/Makefile.in21
-rw-r--r--Build/source/libs/graphite2/ChangeLog4
-rw-r--r--Build/source/libs/graphite2/Makefile.am8
-rw-r--r--Build/source/libs/graphite2/Makefile.in17
-rw-r--r--Build/source/libs/harfbuzz/ChangeLog4
-rw-r--r--Build/source/libs/harfbuzz/Makefile.am9
-rw-r--r--Build/source/libs/harfbuzz/Makefile.in22
-rw-r--r--Build/source/libs/icu/ChangeLog4
-rw-r--r--Build/source/libs/icu/Makefile.am7
-rw-r--r--Build/source/libs/icu/Makefile.in17
-rw-r--r--Build/source/libs/libpaper/ChangeLog4
-rw-r--r--Build/source/libs/libpaper/Makefile.am8
-rw-r--r--Build/source/libs/libpaper/Makefile.in17
-rw-r--r--Build/source/libs/libpng/ChangeLog4
-rw-r--r--Build/source/libs/libpng/Makefile.am15
-rw-r--r--Build/source/libs/libpng/Makefile.in28
-rw-r--r--Build/source/libs/lua52/ChangeLog4
-rw-r--r--Build/source/libs/lua52/Makefile.am8
-rw-r--r--Build/source/libs/lua52/Makefile.in17
-rw-r--r--Build/source/libs/luajit/ChangeLog4
-rw-r--r--Build/source/libs/luajit/Makefile.am8
-rw-r--r--Build/source/libs/luajit/Makefile.in21
-rw-r--r--Build/source/libs/mpfr/ChangeLog4
-rw-r--r--Build/source/libs/mpfr/Makefile.am8
-rw-r--r--Build/source/libs/mpfr/Makefile.in21
-rw-r--r--Build/source/libs/pixman/ChangeLog4
-rw-r--r--Build/source/libs/pixman/Makefile.am9
-rw-r--r--Build/source/libs/pixman/Makefile.in18
-rw-r--r--Build/source/libs/poppler/ChangeLog4
-rw-r--r--Build/source/libs/poppler/Makefile.am8
-rw-r--r--Build/source/libs/poppler/Makefile.in21
-rw-r--r--Build/source/libs/potrace/ChangeLog4
-rw-r--r--Build/source/libs/potrace/Makefile.am8
-rw-r--r--Build/source/libs/potrace/Makefile.in17
-rw-r--r--Build/source/libs/teckit/ChangeLog4
-rw-r--r--Build/source/libs/teckit/Makefile.am8
-rw-r--r--Build/source/libs/teckit/Makefile.in21
-rw-r--r--Build/source/libs/xpdf/ChangeLog4
-rw-r--r--Build/source/libs/xpdf/Makefile.am9
-rw-r--r--Build/source/libs/xpdf/Makefile.in18
-rw-r--r--Build/source/libs/zlib/ChangeLog4
-rw-r--r--Build/source/libs/zlib/Makefile.am9
-rw-r--r--Build/source/libs/zlib/Makefile.in18
-rw-r--r--Build/source/libs/zziplib/ChangeLog4
-rw-r--r--Build/source/libs/zziplib/Makefile.am12
-rw-r--r--Build/source/libs/zziplib/Makefile.in25
60 files changed, 396 insertions, 250 deletions
diff --git a/Build/source/libs/ChangeLog b/Build/source/libs/ChangeLog
index f1b847d5eff..d49a9e359d9 100644
--- a/Build/source/libs/ChangeLog
+++ b/Build/source/libs/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/libs/Makefile.am b/Build/source/libs/Makefile.am
index 121854667b7..fd306204bb3 100644
--- a/Build/source/libs/Makefile.am
+++ b/Build/source/libs/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory libs/
##
-## 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/libs/Makefile.in b/Build/source/libs/Makefile.in
index f8f3f4bcdab..857dfecf289 100644
--- a/Build/source/libs/Makefile.in
+++ b/Build/source/libs/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 = libs/
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/libs/cairo/ChangeLog b/Build/source/libs/cairo/ChangeLog
index 1fa7b8e2bde..c74dc0e3a95 100644
--- a/Build/source/libs/cairo/ChangeLog
+++ b/Build/source/libs/cairo/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-12-02 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Added KPSE_COMPILER_VISIBILITY.
diff --git a/Build/source/libs/cairo/Makefile.am b/Build/source/libs/cairo/Makefile.am
index 64fd506021f..ca74078b94c 100644
--- a/Build/source/libs/cairo/Makefile.am
+++ b/Build/source/libs/cairo/Makefile.am
@@ -1,7 +1,7 @@
## Proxy Makefile.am to build cairo for TeX Live.
##
## Copyright (C) 2012 Taco Hoekwater <taco@metatex.org>
-## Copyright (C) 2013, 2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2013-2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -17,9 +17,9 @@ EXTRA_DIST += $(CAIRO_TREE)-PATCHES
CAIRO_SRC = $(CAIRO_TREE)/src
-# in case of an SVN repository
-dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.lo' -o -name '*.$(OBJEXT)'`
+# Files not to be distributed
+include $(srcdir)/../../am/dist_hook.am
+NEVER_NAMES += $(NEVER_NAMES_SUB)
SUBDIRS = . cairo
diff --git a/Build/source/libs/cairo/Makefile.in b/Build/source/libs/cairo/Makefile.in
index d7913edc4ed..293a412efba 100644
--- a/Build/source/libs/cairo/Makefile.in
+++ b/Build/source/libs/cairo/Makefile.in
@@ -751,10 +751,10 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
- $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
- $(srcdir)/cairo-features.h.in $(srcdir)/config.h.in \
- $(top_srcdir)/../../build-aux/compile \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/../../am/reconfig.am \
+ $(srcdir)/Makefile.in $(srcdir)/cairo-features.h.in \
+ $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/config.guess \
$(top_srcdir)/../../build-aux/config.sub \
$(top_srcdir)/../../build-aux/depcomp \
@@ -916,6 +916,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(CAIRO_TREE) $(CAIRO_TREE)-PATCHES
CAIRO_SRC = $(CAIRO_TREE)/src
+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'
SUBDIRS = . cairo
AM_CPPFLAGS = -I$(top_srcdir)/$(CAIRO_SRC) $(PIXMAN_INCLUDES) -DCAIRO_NO_MUTEX
AM_CFLAGS = $(CAIRO_ATTRIBUTE_FLAG) $(VISIBILITY_CFLAGS) # $(WARNING_CFLAGS)
@@ -1040,7 +1046,7 @@ all: config.h cairo-features.h
.SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -1062,7 +1068,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/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -2324,10 +2330,8 @@ uninstall-am:
.PRECIOUS: Makefile
-
-# in case of an SVN repository
dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.lo' -o -name '*.$(OBJEXT)'`
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
$(libcairo_a_OBJECTS): config.force
diff --git a/Build/source/libs/freetype2/ChangeLog b/Build/source/libs/freetype2/ChangeLog
index 0defc4f9906..5fc0277cd08 100644
--- a/Build/source/libs/freetype2/ChangeLog
+++ b/Build/source/libs/freetype2/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2015-01-07 Peter Breitenlohner <peb@mppmu.mpg.de>
Import freetype-2.5.5.
diff --git a/Build/source/libs/freetype2/Makefile.am b/Build/source/libs/freetype2/Makefile.am
index 624752f28fa..16637fa9d53 100644
--- a/Build/source/libs/freetype2/Makefile.am
+++ b/Build/source/libs/freetype2/Makefile.am
@@ -1,6 +1,6 @@
## Wrapper Makefile.am to build FreeType for TeX Live.
##
-## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -14,9 +14,8 @@ EXTRA_DIST = $(FREETYPE_TREE)
##
EXTRA_DIST += $(FREETYPE_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
noinst_DATA = libfreetype.a
diff --git a/Build/source/libs/freetype2/Makefile.in b/Build/source/libs/freetype2/Makefile.in
index f87836d8e6b..fc421cfe5f2 100644
--- a/Build/source/libs/freetype2/Makefile.in
+++ b/Build/source/libs/freetype2/Makefile.in
@@ -121,7 +121,8 @@ am__can_run_installinfo = \
esac
DATA = $(noinst_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
$(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/install-sh \
$(top_srcdir)/../../build-aux/missing ../../build-aux/compile \
@@ -235,6 +236,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(FREETYPE_TREE) $(FREETYPE_TREE)-PATCHES
+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
noinst_DATA = libfreetype.a
# Rebuild
@@ -246,7 +253,7 @@ all: all-am
.SUFFIXES:
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -268,7 +275,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/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -573,10 +580,8 @@ uninstall-am:
.PRECIOUS: Makefile
-
-# in case of an SVN repository
dist-hook:
- rm -rf `find $(distdir) -name .svn`
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
# On MacOSX, using our zlib from TL results in a .a that is unusable; ld
# warns "file is not of required architecture", and does not read it.
diff --git a/Build/source/libs/gd/ChangeLog b/Build/source/libs/gd/ChangeLog
index 71da43c53f3..84b3b758256 100644
--- a/Build/source/libs/gd/ChangeLog
+++ b/Build/source/libs/gd/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2015-01-14 Peter Breitenlohner <peb@mppmu.mpg.de>
Import libgd-2.1.1.
diff --git a/Build/source/libs/gd/Makefile.am b/Build/source/libs/gd/Makefile.am
index e977b3bffa7..de8c8c7245e 100644
--- a/Build/source/libs/gd/Makefile.am
+++ b/Build/source/libs/gd/Makefile.am
@@ -14,9 +14,9 @@ EXTRA_DIST = $(GD_TREE)
##
EXTRA_DIST += $(GD_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)
SUBDIRS = . include
diff --git a/Build/source/libs/gd/Makefile.in b/Build/source/libs/gd/Makefile.in
index cde93275358..e0c07bac14f 100644
--- a/Build/source/libs/gd/Makefile.in
+++ b/Build/source/libs/gd/Makefile.in
@@ -442,9 +442,10 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
- $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/../../am/reconfig.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/config.guess \
$(top_srcdir)/../../build-aux/config.sub \
$(top_srcdir)/../../build-aux/depcomp \
@@ -610,6 +611,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(GD_TREE) $(GD_TREE)-PATCHES
+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'
SUBDIRS = . include
AM_CPPFLAGS = -I$(top_srcdir)/$(GD_TREE)/src $(am__append_1) \
$(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(FREETYPE2_INCLUDES)
@@ -684,7 +691,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 $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -706,7 +713,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/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1524,10 +1531,8 @@ uninstall-am:
.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)
$(libgd_a_OBJECTS): config.force
diff --git a/Build/source/libs/gmp/ChangeLog b/Build/source/libs/gmp/ChangeLog
index eb95ce6f802..b3d2839f68f 100644
--- a/Build/source/libs/gmp/ChangeLog
+++ b/Build/source/libs/gmp/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-12-22 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Added GMP_H_EXTERN_INLINE.
diff --git a/Build/source/libs/gmp/Makefile.am b/Build/source/libs/gmp/Makefile.am
index fcc5ebd969e..5cc6530748a 100644
--- a/Build/source/libs/gmp/Makefile.am
+++ b/Build/source/libs/gmp/Makefile.am
@@ -1,7 +1,7 @@
## Proxy Makefile.am to build GNU MP for TeX Live.
##
## Copyright (C) 2014 Taco Hoekwater <taco@metatex.org>
-## Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2014, 2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -15,9 +15,9 @@ EXTRA_DIST = $(GMP_TREE)
##
EXTRA_DIST += $(GMP_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)
SUBDIRS = native . include
diff --git a/Build/source/libs/gmp/Makefile.in b/Build/source/libs/gmp/Makefile.in
index f7639eeca34..70c0a4dfb68 100644
--- a/Build/source/libs/gmp/Makefile.in
+++ b/Build/source/libs/gmp/Makefile.in
@@ -551,9 +551,10 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
- $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/../../am/reconfig.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/config.guess \
$(top_srcdir)/../../build-aux/config.sub \
$(top_srcdir)/../../build-aux/depcomp \
@@ -717,6 +718,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(GMP_TREE) $(GMP_TREE)-PATCHES
+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'
SUBDIRS = native . include
AM_CPPFLAGS = -I$(srcdir)/$(GMP_TREE) -I$(srcdir)/$(GMP_TREE)/mpn/generic -DNO_ASM
AM_CFLAGS = $(VISIBILITY_CFLAGS) # $(WARNING_CFLAGS)
@@ -1118,7 +1125,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 $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -1140,7 +1147,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/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -2428,10 +2435,8 @@ uninstall-am:
.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)
$(libgmp_a_OBJECTS): mp_bases.h fac_table.h fib_table.h
$(logops_n_sources):
diff --git a/Build/source/libs/graphite2/ChangeLog b/Build/source/libs/graphite2/ChangeLog
index 457912fb838..b8a97b0960c 100644
--- a/Build/source/libs/graphite2/ChangeLog
+++ b/Build/source/libs/graphite2/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/libs/graphite2/Makefile.am b/Build/source/libs/graphite2/Makefile.am
index 14c9bfdef96..bae00cbad9d 100644
--- a/Build/source/libs/graphite2/Makefile.am
+++ b/Build/source/libs/graphite2/Makefile.am
@@ -1,6 +1,6 @@
## Proxy Makefile.am to build graphite2 for TeX Live.
##
-## Copyright (C) 2012-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2012-2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -17,9 +17,9 @@ EXTRA_DIST += $(GRAPHITE2_TREE)-PATCHES
GRAPHITE2_SRC = $(GRAPHITE2_TREE)/src
GRAPHITE2_INC = $(GRAPHITE2_TREE)/include
-# 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)
SUBDIRS = . include/graphite2
diff --git a/Build/source/libs/graphite2/Makefile.in b/Build/source/libs/graphite2/Makefile.in
index ec897d7c59b..eb12bcc48ed 100644
--- a/Build/source/libs/graphite2/Makefile.in
+++ b/Build/source/libs/graphite2/Makefile.in
@@ -525,7 +525,8 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/depcomp \
$(top_srcdir)/../../build-aux/install-sh \
@@ -675,6 +676,12 @@ top_srcdir = @top_srcdir@
EXTRA_DIST = $(GRAPHITE2_TREE) $(GRAPHITE2_TREE)-PATCHES
GRAPHITE2_SRC = $(GRAPHITE2_TREE)/src
GRAPHITE2_INC = $(GRAPHITE2_TREE)/include
+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'
SUBDIRS = . include/graphite2
noinst_LIBRARIES = libgraphite2.a
AM_CPPFLAGS = -I$(top_srcdir)/$(GRAPHITE2_SRC) \
@@ -760,7 +767,7 @@ all: config.h
.SUFFIXES: .c .cpp .cxx .log .o .obj .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -782,7 +789,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/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1639,10 +1646,8 @@ uninstall-am:
.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)
rebuild.stamp: $(rebuild_target)
echo timestamp >$@
diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog
index 1c262190793..ce16ee9ea59 100644
--- a/Build/source/libs/harfbuzz/ChangeLog
+++ b/Build/source/libs/harfbuzz/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2015-01-26 Peter Breitenlohner <peb@mppmu.mpg.de>
Import harfbuzz-0.9.38.
diff --git a/Build/source/libs/harfbuzz/Makefile.am b/Build/source/libs/harfbuzz/Makefile.am
index 672ba111948..1ce64d57153 100644
--- a/Build/source/libs/harfbuzz/Makefile.am
+++ b/Build/source/libs/harfbuzz/Makefile.am
@@ -1,6 +1,6 @@
## Proxy Makefile.am to build harfbuzz for TeX Live.
##
-## Copyright (C) 2012-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2012-2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -16,10 +16,9 @@ EXTRA_DIST += $(HARFBUZZ_TREE)-PATCHES
HARFBUZZ_SRC = $(HARFBUZZ_TREE)/src
-# in case of an SVN repository
-dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
- rm -f $(distdir)/$(HARFBUZZ_SRC)/harfbuzz-version.h
+# Files not to be distributed
+include $(srcdir)/../../am/dist_hook.am
+NEVER_NAMES += $(NEVER_NAMES_SUB)
SUBDIRS = . include
diff --git a/Build/source/libs/harfbuzz/Makefile.in b/Build/source/libs/harfbuzz/Makefile.in
index 22235c2c973..cad28b6c1bf 100644
--- a/Build/source/libs/harfbuzz/Makefile.in
+++ b/Build/source/libs/harfbuzz/Makefile.in
@@ -452,9 +452,10 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
- $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/../../am/reconfig.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/config.guess \
$(top_srcdir)/../../build-aux/config.sub \
$(top_srcdir)/../../build-aux/depcomp \
@@ -636,6 +637,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(HARFBUZZ_TREE) $(HARFBUZZ_TREE)-PATCHES
HARFBUZZ_SRC = $(HARFBUZZ_TREE)/src
+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'
SUBDIRS = . include
noinst_LIBRARIES = libharfbuzz.a
AM_CPPFLAGS = -DHB_NO_MT -DHB_NO_UNICODE_FUNCS \
@@ -740,7 +747,7 @@ all: config.h
.SUFFIXES: .c .cc .cxx .log .o .obj .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -762,7 +769,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/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1618,11 +1625,8 @@ uninstall-am:
.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)'`
- rm -f $(distdir)/$(HARFBUZZ_SRC)/harfbuzz-version.h
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
$(libharfbuzz_a_OBJECTS): config.force
diff --git a/Build/source/libs/icu/ChangeLog b/Build/source/libs/icu/ChangeLog
index db8f897c75e..fa022fcfbc8 100644
--- a/Build/source/libs/icu/ChangeLog
+++ b/Build/source/libs/icu/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-10-02 Peter Breitenlohner <peb@mppmu.mpg.de>
Update icu-54.1 (release).
diff --git a/Build/source/libs/icu/Makefile.am b/Build/source/libs/icu/Makefile.am
index 8809a72c996..3765faf9b72 100644
--- a/Build/source/libs/icu/Makefile.am
+++ b/Build/source/libs/icu/Makefile.am
@@ -1,6 +1,6 @@
## Wrapper Makefile.am to build ICU for TeX Live.
##
-## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -13,9 +13,8 @@ EXTRA_DIST = $(ICU_TREE)
##
EXTRA_DIST += $(ICU_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
SUBDIRS = .
diff --git a/Build/source/libs/icu/Makefile.in b/Build/source/libs/icu/Makefile.in
index 173910364d2..fb42382ac82 100644
--- a/Build/source/libs/icu/Makefile.in
+++ b/Build/source/libs/icu/Makefile.in
@@ -400,7 +400,8 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = . include/unicode
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
$(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/config.guess \
$(top_srcdir)/../../build-aux/config.sub \
@@ -560,6 +561,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(ICU_TREE) $(ICU_TREE)-PATCHES
+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
SUBDIRS = . $(am__append_1)
@cross_TRUE@ICU_NATIVE = icu-native/config/icucross.mk
@build_TRUE@dist_check_SCRIPTS = icu.test
@@ -581,7 +588,7 @@ all: all-recursive
.SUFFIXES: .c .cxx .log .o .obj .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -603,7 +610,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/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1279,10 +1286,8 @@ uninstall-am:
.PRECIOUS: Makefile
-
-# in case of an SVN repository
dist-hook:
- rm -rf `find $(distdir) -name .svn`
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
@build_TRUE@all-local: icubuild
@build_FALSE@all-local: icu-build/Makefile
diff --git a/Build/source/libs/libpaper/ChangeLog b/Build/source/libs/libpaper/ChangeLog
index 1e8eb698905..e7014b49145 100644
--- a/Build/source/libs/libpaper/ChangeLog
+++ b/Build/source/libs/libpaper/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-04-17 Karl Berry <karl@tug.org>
* Makefile.am (noinst_PROGRAMS): installing a program named
diff --git a/Build/source/libs/libpaper/Makefile.am b/Build/source/libs/libpaper/Makefile.am
index f374bad35dc..3e42bf66651 100644
--- a/Build/source/libs/libpaper/Makefile.am
+++ b/Build/source/libs/libpaper/Makefile.am
@@ -1,6 +1,6 @@
## Proxy Makefile.am to build libpaper for TeX Live.
##
-## Copyright 2013, 2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright 2013-2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -14,9 +14,9 @@ EXTRA_DIST = $(LIBPAPER_TREE)
##
EXTRA_DIST += $(LIBPAPER_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)/$(LIBPAPER_TREE)/lib $(WARNING_CFLAGS)
diff --git a/Build/source/libs/libpaper/Makefile.in b/Build/source/libs/libpaper/Makefile.in
index c16238bbef0..64b7a56e294 100644
--- a/Build/source/libs/libpaper/Makefile.in
+++ b/Build/source/libs/libpaper/Makefile.in
@@ -397,7 +397,8 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/depcomp \
$(top_srcdir)/../../build-aux/install-sh \
@@ -546,6 +547,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(LIBPAPER_TREE) $(LIBPAPER_TREE)-PATCHES
+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)/$(LIBPAPER_TREE)/lib $(WARNING_CFLAGS)
SUBDIRS = . include
noinst_LIBRARIES = libpaper.a
@@ -574,7 +581,7 @@ all: $(BUILT_SOURCES) config.h
.SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -596,7 +603,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/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1285,10 +1292,8 @@ uninstall-am:
.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)
rebuild.stamp: $(rebuild_target)
echo timestamp >$@
diff --git a/Build/source/libs/libpng/ChangeLog b/Build/source/libs/libpng/ChangeLog
index 9d76540a336..7afce797f91 100644
--- a/Build/source/libs/libpng/ChangeLog
+++ b/Build/source/libs/libpng/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-12-22 Peter Breitenlohner <peb@mppmu.mpg.de>
Import libpng-1.6.16.
diff --git a/Build/source/libs/libpng/Makefile.am b/Build/source/libs/libpng/Makefile.am
index 35b76dc7006..a8f73190e33 100644
--- a/Build/source/libs/libpng/Makefile.am
+++ b/Build/source/libs/libpng/Makefile.am
@@ -1,6 +1,6 @@
## Proxy Makefile.am to build libpng for TeX Live.
##
-## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -14,16 +14,9 @@ EXTRA_DIST = $(LIBPNG_TREE)
##
EXTRA_DIST += $(LIBPNG_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)'`
- rm -f $(distdir)/$(LIBPNG_TREE)/config.sub \
- $(distdir)/$(LIBPNG_TREE)/config.guess \
- $(distdir)/$(LIBPNG_TREE)/depcomp \
- $(distdir)/$(LIBPNG_TREE)/install-sh \
- $(distdir)/$(LIBPNG_TREE)/ltmain.sh \
- $(distdir)/$(LIBPNG_TREE)/missing \
- $(distdir)/$(LIBPNG_TREE)/mkinstalldirs
+# Files not to be distributed
+include $(srcdir)/../../am/dist_hook.am
+NEVER_NAMES += $(NEVER_NAMES_SUB)
SUBDIRS = . include
diff --git a/Build/source/libs/libpng/Makefile.in b/Build/source/libs/libpng/Makefile.in
index 6bd236659b3..a5250fbb502 100644
--- a/Build/source/libs/libpng/Makefile.in
+++ b/Build/source/libs/libpng/Makefile.in
@@ -408,9 +408,10 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
- $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/../../am/reconfig.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 \
@@ -561,6 +562,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(LIBPNG_TREE) $(LIBPNG_TREE)-PATCHES
+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'
SUBDIRS = . include
AM_CPPFLAGS = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) $(LIBPNG_DEFINES)
AM_CFLAGS = $(VISIBILITY_CFLAGS) $(WARNING_CFLAGS)
@@ -603,7 +610,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 $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -625,7 +632,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/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1337,17 +1344,8 @@ uninstall-am:
.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)'`
- rm -f $(distdir)/$(LIBPNG_TREE)/config.sub \
- $(distdir)/$(LIBPNG_TREE)/config.guess \
- $(distdir)/$(LIBPNG_TREE)/depcomp \
- $(distdir)/$(LIBPNG_TREE)/install-sh \
- $(distdir)/$(LIBPNG_TREE)/ltmain.sh \
- $(distdir)/$(LIBPNG_TREE)/missing \
- $(distdir)/$(LIBPNG_TREE)/mkinstalldirs
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
$(libpng_a_OBJECTS): config.force
diff --git a/Build/source/libs/lua52/ChangeLog b/Build/source/libs/lua52/ChangeLog
index 1b38e4bd6cc..3e99db59a29 100644
--- a/Build/source/libs/lua52/ChangeLog
+++ b/Build/source/libs/lua52/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-10-22 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am, configure.ac: Build lua52 as (possibly shared)
diff --git a/Build/source/libs/lua52/Makefile.am b/Build/source/libs/lua52/Makefile.am
index 3858a41f1a3..c10a3bfbcff 100644
--- a/Build/source/libs/lua52/Makefile.am
+++ b/Build/source/libs/lua52/Makefile.am
@@ -1,6 +1,6 @@
## Proxy Makefile.am to build Lua52 for TeX Live.
##
-## Copyright (C) 2013, 2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2013-2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -14,9 +14,9 @@ EXTRA_DIST = $(LUA52_TREE)
##
EXTRA_DIST += $(LUA52_TREE)-PATCHES
-# in case of an SVN repository
-dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name .libs -o -name '*.o' -o -name '*.lo'`
+# Files not to be distributed
+include $(srcdir)/../../am/dist_hook.am
+NEVER_NAMES += $(NEVER_NAMES_SUB) $(NEVER_NAMES_LT)
SUBDIRS = . include
diff --git a/Build/source/libs/lua52/Makefile.in b/Build/source/libs/lua52/Makefile.in
index 52e4d20209a..f16b1598f66 100644
--- a/Build/source/libs/lua52/Makefile.in
+++ b/Build/source/libs/lua52/Makefile.in
@@ -440,7 +440,8 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(srcdir)/texlua52.pc.in \
$(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/config.guess \
@@ -620,6 +621,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(LUA52_TREE) $(LUA52_TREE)-PATCHES error.exp
+NEVER_DIST = `find . $(NEVER_NAMES)`
+
+# Files not to be distributed
+NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB) $(NEVER_NAMES_LT)
+NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'
+NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
SUBDIRS = . include
AM_CPPFLAGS = -I$(top_srcdir)/$(LUA52_TREE)/src $(LUA52_DEFINES)
AM_CFLAGS = $(WARNING_CFLAGS)
@@ -689,7 +696,7 @@ all: config.h
.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -711,7 +718,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/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1615,10 +1622,8 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-lua52includeHEADERS \
.PRECIOUS: Makefile
-
-# in case of an SVN repository
dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name .libs -o -name '*.o' -o -name '*.lo'`
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
rebuild.stamp: $(rebuild_target)
echo timestamp >$@
diff --git a/Build/source/libs/luajit/ChangeLog b/Build/source/libs/luajit/ChangeLog
index ef6d06a0bf2..9f7a72e821f 100644
--- a/Build/source/libs/luajit/ChangeLog
+++ b/Build/source/libs/luajit/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-12-04 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am, configure.ac: Build luajit as (possibly shared)
diff --git a/Build/source/libs/luajit/Makefile.am b/Build/source/libs/luajit/Makefile.am
index 393989fdbb4..c9ce9140986 100644
--- a/Build/source/libs/luajit/Makefile.am
+++ b/Build/source/libs/luajit/Makefile.am
@@ -1,7 +1,7 @@
## Proxy Makefile.am to build LuaJIT for TeX Live.
##
## Copyright (C) 2014 Luigi Scarso <luigi.scarso@gmail.com>
-## Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2014, 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 LuaJIT source tree.
@@ -12,9 +12,9 @@ EXTRA_DIST = $(LUAJIT_TREE)
##
EXTRA_DIST += $(LUAJIT_TREE)-PATCHES
-# in case of an SVN repository
-dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name .libs -o -name '*.o' -o -name '*.lo'`
+# Files not to be distributed
+include $(srcdir)/../../am/dist_hook.am
+NEVER_NAMES += $(NEVER_NAMES_SUB) $(NEVER_NAMES_LT)
AM_CPPFLAGS = -I$(srcdir)/$(LUAJIT_TREE)/src $(LUAJIT_DEFINES)
AM_CFLAGS = -Wall
diff --git a/Build/source/libs/luajit/Makefile.in b/Build/source/libs/luajit/Makefile.in
index 0e938d031fe..a0c96569f5f 100644
--- a/Build/source/libs/luajit/Makefile.in
+++ b/Build/source/libs/luajit/Makefile.in
@@ -470,9 +470,10 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
- $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(srcdir)/texluajit.pc.in \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/../../am/reconfig.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(srcdir)/texluajit.pc.in \
$(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/config.guess \
$(top_srcdir)/../../build-aux/config.sub \
@@ -660,6 +661,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(LUAJIT_TREE) $(LUAJIT_TREE)-PATCHES jiterr.exp
+NEVER_DIST = `find . $(NEVER_NAMES)`
+
+# Files not to be distributed
+NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB) $(NEVER_NAMES_LT)
+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)/$(LUAJIT_TREE)/src $(LUAJIT_DEFINES)
AM_CFLAGS = -Wall
SUBDIRS = . native include
@@ -746,7 +753,7 @@ all: config.h
.SUFFIXES: .c .lo .log .o .obj .s .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -768,7 +775,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/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1750,10 +1757,8 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-luajitincludeHEADERS \
.PRECIOUS: Makefile
-
-# in case of an SVN repository
dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name .libs -o -name '*.o' -o -name '*.lo'`
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
$(libtexluajit_la_OBJECTS): $(HDRGEN)
diff --git a/Build/source/libs/mpfr/ChangeLog b/Build/source/libs/mpfr/ChangeLog
index e421e281854..deb9dbeccbb 100644
--- a/Build/source/libs/mpfr/ChangeLog
+++ b/Build/source/libs/mpfr/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-12-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am [Sparc Solaris, armel]:
diff --git a/Build/source/libs/mpfr/Makefile.am b/Build/source/libs/mpfr/Makefile.am
index 45c08f82198..25ea8c40684 100644
--- a/Build/source/libs/mpfr/Makefile.am
+++ b/Build/source/libs/mpfr/Makefile.am
@@ -1,7 +1,7 @@
## Proxy Makefile.am to build MPFR for TeX Live.
##
## Copyright (C) 2014 Taco Hoekwater <taco@metatex.org>
-## Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2014, 2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -15,9 +15,9 @@ EXTRA_DIST = $(MPFR_TREE)
##
EXTRA_DIST += $(MPFR_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)
SUBDIRS = . include
diff --git a/Build/source/libs/mpfr/Makefile.in b/Build/source/libs/mpfr/Makefile.in
index e19a86afdec..1a0e6b5f933 100644
--- a/Build/source/libs/mpfr/Makefile.in
+++ b/Build/source/libs/mpfr/Makefile.in
@@ -489,9 +489,10 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
- $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/../../am/reconfig.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/config.guess \
$(top_srcdir)/../../build-aux/config.sub \
$(top_srcdir)/../../build-aux/depcomp \
@@ -653,6 +654,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(MPFR_TREE) $(MPFR_TREE)-PATCHES
+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'
SUBDIRS = . include
AM_CPPFLAGS = -I$(srcdir)/$(MPFR_TREE)/src $(GMP_INCLUDES)
AM_CFLAGS = $(VISIBILITY_CFLAGS) # $(WARNING_CFLAGS)
@@ -901,7 +908,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 $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -923,7 +930,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/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1901,10 +1908,8 @@ uninstall-am:
.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)
$(libmpfr_a_OBJECTS): $(GMP_DEPEND)
@GMP_RULE@
diff --git a/Build/source/libs/pixman/ChangeLog b/Build/source/libs/pixman/ChangeLog
index eb2e493282c..497762f68b4 100644
--- a/Build/source/libs/pixman/ChangeLog
+++ b/Build/source/libs/pixman/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-12-03 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Added KPSE_COMPILER_VISIBILITY.
diff --git a/Build/source/libs/pixman/Makefile.am b/Build/source/libs/pixman/Makefile.am
index 31b89f47550..c7ecf7b3f7f 100644
--- a/Build/source/libs/pixman/Makefile.am
+++ b/Build/source/libs/pixman/Makefile.am
@@ -1,7 +1,7 @@
## Proxy Makefile.am to build pixman for TeX Live.
##
## Copyright (C) 2012 Taco Hoekwater <taco@metatex.org>
-## Copyright (C) 2012-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2012-2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -17,10 +17,9 @@ EXTRA_DIST += $(PIXMAN_TREE)-PATCHES
PIXMAN_SRC = $(PIXMAN_TREE)/pixman
-# in case of an SVN repository
-dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
- rm -f $(distdir)/$(PIXMAN_SRC)/pixman-version.h
+# Files not to be distributed
+include $(srcdir)/../../am/dist_hook.am
+NEVER_NAMES += $(NEVER_NAMES_SUB)
SUBDIRS = . include
diff --git a/Build/source/libs/pixman/Makefile.in b/Build/source/libs/pixman/Makefile.in
index 03318995aa6..50bc7424d82 100644
--- a/Build/source/libs/pixman/Makefile.in
+++ b/Build/source/libs/pixman/Makefile.in
@@ -432,7 +432,8 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(srcdir)/sources.am \
$(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/depcomp \
@@ -585,6 +586,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(PIXMAN_TREE) $(PIXMAN_TREE)-PATCHES
PIXMAN_SRC = $(PIXMAN_TREE)/pixman
+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'
SUBDIRS = . include
AM_CPPFLAGS = -I$(top_srcdir)/$(PIXMAN_SRC)
AM_CFLAGS = $(VISIBILITY_CFLAGS) # $(WARNING_CFLAGS)
@@ -648,7 +655,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 $(srcdir)/sources.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/sources.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -670,7 +677,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)/sources.am $(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/sources.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1470,11 +1477,8 @@ uninstall-am:
.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)'`
- rm -f $(distdir)/$(PIXMAN_SRC)/pixman-version.h
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
rebuild.stamp: $(rebuild_target)
echo timestamp >$@
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index 03b510eea0d..f895799bfb8 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/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-06 Peter Breitenlohner <peb@mppmu.mpg.de>
Import poppler-0.31.0.
diff --git a/Build/source/libs/poppler/Makefile.am b/Build/source/libs/poppler/Makefile.am
index 3951d2a00a7..08659d33dfe 100644
--- a/Build/source/libs/poppler/Makefile.am
+++ b/Build/source/libs/poppler/Makefile.am
@@ -1,6 +1,6 @@
## Proxy Makefile.am to build poppler for TeX Live.
##
-## Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2011-2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -14,9 +14,9 @@ EXTRA_DIST = $(POPPLER_TREE)
##
EXTRA_DIST += $(POPPLER_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)
SUBDIRS = . include
diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in
index 8b90b0d22e1..b9f5254e561 100644
--- a/Build/source/libs/poppler/Makefile.in
+++ b/Build/source/libs/poppler/Makefile.in
@@ -269,9 +269,10 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
- $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/../../am/reconfig.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 \
@@ -427,6 +428,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(POPPLER_TREE) $(POPPLER_TREE)-PATCHES
+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'
SUBDIRS = . include
GOO_SRC = $(top_srcdir)/$(POPPLER_TREE)/goo
FOFI_SRC = $(top_srcdir)/$(POPPLER_TREE)/fofi
@@ -541,7 +548,7 @@ all: config.h poppler-config.h
.SUFFIXES: .cc .cpp .o .obj
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -563,7 +570,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/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1409,10 +1416,8 @@ uninstall-am:
.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)
$(libpoppler_a_OBJECTS): $(ZLIB_DEPEND)
diff --git a/Build/source/libs/potrace/ChangeLog b/Build/source/libs/potrace/ChangeLog
index f2d5e29386f..a0e57db8e71 100644
--- a/Build/source/libs/potrace/ChangeLog
+++ b/Build/source/libs/potrace/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/libs/potrace/Makefile.am b/Build/source/libs/potrace/Makefile.am
index 46024282648..1b985783626 100644
--- a/Build/source/libs/potrace/Makefile.am
+++ b/Build/source/libs/potrace/Makefile.am
@@ -1,6 +1,6 @@
## Proxy Makefile.am to build potrace for TeX Live.
##
-## Copyright (C) 2013, 2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2013-2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -14,9 +14,9 @@ EXTRA_DIST = $(POTRACE_TREE)
##
EXTRA_DIST += $(POTRACE_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)
SUBDIRS = . include
diff --git a/Build/source/libs/potrace/Makefile.in b/Build/source/libs/potrace/Makefile.in
index c6a458257fe..5627334f1e5 100644
--- a/Build/source/libs/potrace/Makefile.in
+++ b/Build/source/libs/potrace/Makefile.in
@@ -401,7 +401,8 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/depcomp \
$(top_srcdir)/../../build-aux/install-sh \
@@ -547,6 +548,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(POTRACE_TREE) $(POTRACE_TREE)-PATCHES
+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'
SUBDIRS = . include
AM_CPPFLAGS = -I$(top_srcdir)/$(POTRACE_TREE)/src
noinst_LIBRARIES = libpotrace.a
@@ -581,7 +588,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 $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -603,7 +610,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/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1297,10 +1304,8 @@ uninstall-am:
.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)
rebuild.stamp: $(rebuild_target)
echo timestamp >$@
diff --git a/Build/source/libs/teckit/ChangeLog b/Build/source/libs/teckit/ChangeLog
index e39c16751ab..47b5e8e4b57 100644
--- a/Build/source/libs/teckit/ChangeLog
+++ b/Build/source/libs/teckit/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-07-18 Peter Breitenlohner <peb@mppmu.mpg.de>
Import TECkit-2.5.4
diff --git a/Build/source/libs/teckit/Makefile.am b/Build/source/libs/teckit/Makefile.am
index 9a42f8eb755..fbf349ce130 100644
--- a/Build/source/libs/teckit/Makefile.am
+++ b/Build/source/libs/teckit/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory libs/teckit/
##
-## 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 TECkit source tree.
@@ -11,9 +11,9 @@ EXTRA_DIST = $(TECKIT_TREE)
##
EXTRA_DIST += $(TECKIT_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)
SUBDIRS = . include/teckit
diff --git a/Build/source/libs/teckit/Makefile.in b/Build/source/libs/teckit/Makefile.in
index e133ab79c9d..30cf6def097 100644
--- a/Build/source/libs/teckit/Makefile.in
+++ b/Build/source/libs/teckit/Makefile.in
@@ -409,9 +409,10 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
- $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/../../am/reconfig.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/config.guess \
$(top_srcdir)/../../build-aux/config.sub \
$(top_srcdir)/../../build-aux/depcomp \
@@ -577,6 +578,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(TECKIT_TREE) $(TECKIT_TREE)-PATCHES teckit.test \
tex-text.map tex-text.tec
+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'
SUBDIRS = . include/teckit
AM_CPPFLAGS = -I$(top_srcdir)/$(TECKIT_TREE)/source/Public-headers \
$(ZLIB_INCLUDES) -DNDEBUG
@@ -617,7 +624,7 @@ all: config.h
.SUFFIXES: .cpp .log .o .obj .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -639,7 +646,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/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1373,10 +1380,8 @@ uninstall-am: uninstall-binPROGRAMS
.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)
$(teckit_compile_OBJECTS): libTECkit_Compiler.a
diff --git a/Build/source/libs/xpdf/ChangeLog b/Build/source/libs/xpdf/ChangeLog
index cf9bb085e93..6c86c2f424a 100644
--- a/Build/source/libs/xpdf/ChangeLog
+++ b/Build/source/libs/xpdf/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-10-26 Karl Berry <karl@tug.org>
* Makefile.am (xpdf_libxpdf_a_sources): add Annot.cc.
diff --git a/Build/source/libs/xpdf/Makefile.am b/Build/source/libs/xpdf/Makefile.am
index 92c08ab2086..997d3a25eae 100644
--- a/Build/source/libs/xpdf/Makefile.am
+++ b/Build/source/libs/xpdf/Makefile.am
@@ -1,6 +1,6 @@
## Proxy Makefile.am to build xpdf for TeX Live.
##
-## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,9 @@ EXTRA_DIST += $(XPDF_TREE)-foolabs
##
EXTRA_DIST += $(XPDF_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)'`
- rm -f $(distdir)/$(XPDF_TREE)/install-sh
+# Files not to be distributed
+include $(srcdir)/../../am/dist_hook.am
+NEVER_NAMES += $(NEVER_NAMES_SUB)
SUBDIRS = . goo fofi splash xpdf
diff --git a/Build/source/libs/xpdf/Makefile.in b/Build/source/libs/xpdf/Makefile.in
index d79961607b4..2131ab1b241 100644
--- a/Build/source/libs/xpdf/Makefile.in
+++ b/Build/source/libs/xpdf/Makefile.in
@@ -240,7 +240,8 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
$(srcdir)/aconf.h.in $(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/depcomp \
$(top_srcdir)/../../build-aux/install-sh \
@@ -394,6 +395,12 @@ top_srcdir = @top_srcdir@
#========================================================================
ACLOCAL_AMFLAGS = -I ../../m4
EXTRA_DIST = $(XPDF_TREE) $(XPDF_TREE)-foolabs $(XPDF_TREE)-PATCHES
+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'
SUBDIRS = . goo fofi splash xpdf
GOO_SRC = $(top_srcdir)/$(XPDF_TREE)/goo
FOFI_SRC = $(top_srcdir)/$(XPDF_TREE)/fofi
@@ -480,7 +487,7 @@ all: aconf.h
.SUFFIXES: .cc .o .obj
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -502,7 +509,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/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1192,11 +1199,8 @@ uninstall-am:
.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)'`
- rm -f $(distdir)/$(XPDF_TREE)/install-sh
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
rebuild.stamp: $(rebuild_target)
echo timestamp >$@
diff --git a/Build/source/libs/zlib/ChangeLog b/Build/source/libs/zlib/ChangeLog
index 74cdaa57d3e..3bd03b955ec 100644
--- a/Build/source/libs/zlib/ChangeLog
+++ b/Build/source/libs/zlib/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-12-03 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Added KPSE_COMPILER_VISIBILITY.
diff --git a/Build/source/libs/zlib/Makefile.am b/Build/source/libs/zlib/Makefile.am
index 4456426c7d4..6ce5fefe0bf 100644
--- a/Build/source/libs/zlib/Makefile.am
+++ b/Build/source/libs/zlib/Makefile.am
@@ -1,6 +1,6 @@
## Proxy Makefile.am to build zlib for TeX Live.
##
-## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -14,10 +14,9 @@ EXTRA_DIST = $(ZLIB_TREE)
##
EXTRA_DIST += $(ZLIB_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)'`
- rm -f $(distdir)/$(ZLIB_TREE)/zconf.h
+# Files not to be distributed
+include $(srcdir)/../../am/dist_hook.am
+NEVER_NAMES += $(NEVER_NAMES_SUB)
SUBDIRS = . include
diff --git a/Build/source/libs/zlib/Makefile.in b/Build/source/libs/zlib/Makefile.in
index d612feceb2e..ee83c26bdd5 100644
--- a/Build/source/libs/zlib/Makefile.in
+++ b/Build/source/libs/zlib/Makefile.in
@@ -409,7 +409,8 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/depcomp \
$(top_srcdir)/../../build-aux/install-sh \
@@ -557,6 +558,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(ZLIB_TREE) $(ZLIB_TREE)-PATCHES
+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'
SUBDIRS = . include
AM_CPPFLAGS = -I$(top_srcdir)/$(ZLIB_TREE) $(ZLIB_DEFINES)
AM_CFLAGS = $(VISIBILITY_CFLAGS) # $(WARNING_CFLAGS)
@@ -605,7 +612,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 $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -627,7 +634,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/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1355,11 +1362,8 @@ uninstall-am:
.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)'`
- rm -f $(distdir)/$(ZLIB_TREE)/zconf.h
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
$(libz_a_OBJECTS): zconf.h
diff --git a/Build/source/libs/zziplib/ChangeLog b/Build/source/libs/zziplib/ChangeLog
index 1a40ce7ff9f..9687547684a 100644
--- a/Build/source/libs/zziplib/ChangeLog
+++ b/Build/source/libs/zziplib/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-12-03 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Added KPSE_COMPILER_VISIBILITY.
diff --git a/Build/source/libs/zziplib/Makefile.am b/Build/source/libs/zziplib/Makefile.am
index 0a15a6ecb84..84ca3d8d3cd 100644
--- a/Build/source/libs/zziplib/Makefile.am
+++ b/Build/source/libs/zziplib/Makefile.am
@@ -1,6 +1,6 @@
## Proxy Makefile.am to build zziplib for TeX Live.
##
-## Copyright (C) 2010-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2010-2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -14,13 +14,9 @@ EXTRA_DIST = $(ZZIPLIB_TREE)
##
EXTRA_DIST += $(ZZIPLIB_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)'` \
- $(distdir)/$(ZZIPLIB_TREE)/uses
- rm -f $(distdir)/$(ZZIPLIB_TREE)/aclocal.m4 \
- $(distdir)/$(ZZIPLIB_TREE)/zzip/_config.h \
- $(distdir)/$(ZZIPLIB_TREE)/zzip/_msvc.h
+# Files not to be distributed
+include $(srcdir)/../../am/dist_hook.am
+NEVER_NAMES += $(NEVER_NAMES_SUB)
SUBDIRS = . include/zzip
diff --git a/Build/source/libs/zziplib/Makefile.in b/Build/source/libs/zziplib/Makefile.in
index afc93b6b05c..ae18a555940 100644
--- a/Build/source/libs/zziplib/Makefile.in
+++ b/Build/source/libs/zziplib/Makefile.in
@@ -409,9 +409,10 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
- $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/../../am/reconfig.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/config.guess \
$(top_srcdir)/../../build-aux/config.sub \
$(top_srcdir)/../../build-aux/depcomp \
@@ -571,6 +572,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(ZZIPLIB_TREE) $(ZZIPLIB_TREE)-PATCHES
+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'
SUBDIRS = . include/zzip
AM_CPPFLAGS = -Iinclude -I$(top_srcdir)/$(ZZIPLIB_TREE) \
$(ZLIB_INCLUDES) $(ZZIPLIB_DEFINES)
@@ -608,7 +615,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 $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -630,7 +637,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/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1343,14 +1350,8 @@ uninstall-am:
.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)'` \
- $(distdir)/$(ZZIPLIB_TREE)/uses
- rm -f $(distdir)/$(ZZIPLIB_TREE)/aclocal.m4 \
- $(distdir)/$(ZZIPLIB_TREE)/zzip/_config.h \
- $(distdir)/$(ZZIPLIB_TREE)/zzip/_msvc.h
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
$(libzzip_a_OBJECTS): config.force