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

3 files changed, 19 insertions, 13 deletions

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)