From 8a76c4cf53b01a6a34e6c4fe8ac2c531e23503cc Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 16 Feb 2015 14:32:53 +0000 Subject: 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 --- Build/source/utils/t1utils/ChangeLog | 4 ++++ Build/source/utils/t1utils/Makefile.am | 8 ++++---- Build/source/utils/t1utils/Makefile.in | 18 ++++++++++++------ 3 files changed, 20 insertions(+), 10 deletions(-) (limited to 'Build/source/utils/t1utils') 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 + + * Makefile.am: Use the fragment ../../am/dist_hook.am. + 2014-06-16 Peter Breitenlohner * 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 +## Copyright (C) 2008-2015 Peter Breitenlohner ## 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. -- cgit v1.2.3