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/cjkutils/ChangeLog | 4 ++++ Build/source/texk/cjkutils/Makefile.am | 8 ++++---- Build/source/texk/cjkutils/Makefile.in | 18 +++++++++++------- 3 files changed, 19 insertions(+), 11 deletions(-) (limited to 'Build/source/texk/cjkutils') diff --git a/Build/source/texk/cjkutils/ChangeLog b/Build/source/texk/cjkutils/ChangeLog index 6876b25452a..66f85dffa9b 100644 --- a/Build/source/texk/cjkutils/ChangeLog +++ b/Build/source/texk/cjkutils/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/texk/cjkutils/Makefile.am b/Build/source/texk/cjkutils/Makefile.am index 444633ad907..dd2a83d9055 100644 --- a/Build/source/texk/cjkutils/Makefile.am +++ b/Build/source/texk/cjkutils/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/cjkutils/ ## -## Copyright (C) 2009-2014 Peter Breitenlohner +## Copyright (C) 2009-2015 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## ## We want to re-distribute the whole original cjk/utils source tree. @@ -8,9 +8,9 @@ EXTRA_DIST = $(CJKUTILS_TREE) ## Patches applied to the original source tree EXTRA_DIST += $(CJKUTILS_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) if do_cweb all-local: config.force hbf2gf.dvi diff --git a/Build/source/texk/cjkutils/Makefile.in b/Build/source/texk/cjkutils/Makefile.in index 5b3c05aa077..04439e97529 100644 --- a/Build/source/texk/cjkutils/Makefile.in +++ b/Build/source/texk/cjkutils/Makefile.in @@ -431,8 +431,8 @@ am__set_b = \ b='$*';; \ esac am__DIST_COMMON = $(srcdir)/../../am/bin_links.am \ - $(srcdir)/Makefile.in $(srcdir)/c-auto.in \ - $(top_srcdir)/../../build-aux/compile \ + $(srcdir)/../../am/dist_hook.am $(srcdir)/Makefile.in \ + $(srcdir)/c-auto.in $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/config.guess \ $(top_srcdir)/../../build-aux/config.sub \ $(top_srcdir)/../../build-aux/depcomp \ @@ -595,6 +595,12 @@ EXTRA_DIST = $(CJKUTILS_TREE) $(CJKUTILS_TREE)-PATCHES $(CWEB_TEX) \ tests/cef5conv.cjk tests/cefsconv.tex tests/cefsconv.cjk \ tests/extconv.tex tests/extconv.cjk tests/sjisconv.tex \ tests/sjisconv.cjk +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' DISTCLEANFILES = config.force bg5conv.cjk cefconv.cjk cef5conv.cjk \ cefsconv.cjk extconv.cjk sjisconv.cjk AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(XX_CPPFLAGS) @@ -673,7 +679,7 @@ all: c-auto.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/bin_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/bin_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -695,7 +701,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/bin_links.am $(am__empty): +$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/bin_links.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -1552,10 +1558,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) @do_cweb_TRUE@all-local: config.force hbf2gf.dvi @do_cweb_FALSE@all-local: config.force -- cgit v1.2.3