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/texk/lcdf-typetools/ChangeLog | 4 ++++ Build/source/texk/lcdf-typetools/Makefile.am | 7 +++---- Build/source/texk/lcdf-typetools/Makefile.in | 16 +++++++++++----- 3 files changed, 18 insertions(+), 9 deletions(-) (limited to 'Build/source/texk/lcdf-typetools') diff --git a/Build/source/texk/lcdf-typetools/ChangeLog b/Build/source/texk/lcdf-typetools/ChangeLog index 49b17e8fedd..e8ac7b5ffaa 100644 --- a/Build/source/texk/lcdf-typetools/ChangeLog +++ b/Build/source/texk/lcdf-typetools/ChangeLog @@ -1,3 +1,7 @@ +2015-02-16 Peter Breitenlohner + + * Makefile.am: Use the fragment ../../am/dist_hook.am. + 2014-07-08 Peter Breitenlohner Import lcdf-typetools-2.104. diff --git a/Build/source/texk/lcdf-typetools/Makefile.am b/Build/source/texk/lcdf-typetools/Makefile.am index fc3903844b3..8c8d0fb03b3 100644 --- a/Build/source/texk/lcdf-typetools/Makefile.am +++ b/Build/source/texk/lcdf-typetools/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/lcdf-typetools/ ## -## Copyright (C) 2009-2012 Peter Breitenlohner +## Copyright (C) 2009-2015 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## #************************************************************************ @@ -26,9 +26,8 @@ EXTRA_DIST += \ $(LCDF_TYPETOOLS_TREE)/configure.ac \ $(LCDF_TYPETOOLS_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/texk/lcdf-typetools/Makefile.in b/Build/source/texk/lcdf-typetools/Makefile.in index fc5c0bf166c..8c7182f7261 100644 --- a/Build/source/texk/lcdf-typetools/Makefile.in +++ b/Build/source/texk/lcdf-typetools/Makefile.in @@ -368,7 +368,8 @@ am__set_b = \ *) \ b='$*';; \ esac -am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/autoconf.h.in \ +am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \ + $(srcdir)/Makefile.in $(srcdir)/autoconf.h.in \ $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/config.guess \ $(top_srcdir)/../../build-aux/config.sub \ @@ -576,6 +577,10 @@ EXTRA_DIST = $(LCDF_TYPETOOLS_TREE)-PATCHES \ tests/FonetikaDaniaIwonaeBold.ttf tests/texmfhome.otf \ tests/Fon.post tests/Fon.t42 tests/tmf.info tests/tmf.pfa \ tests/tmf.pfb tests/tmf.tables +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 CXXLD.sh uhv* Ant* a_enhg3c.enc Fon* \ tmf.* TESTS = tests/t1.test tests/tfm.test tests/ttf.test @@ -587,7 +592,7 @@ all: autoconf.h .SUFFIXES: .log .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*) \ @@ -609,6 +614,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 @@ -1227,10 +1233,10 @@ uninstall-am: .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 -- cgit v1.2.3