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/xindy/ChangeLog | 4 ++++ Build/source/utils/xindy/Makefile.am | 7 +++---- Build/source/utils/xindy/Makefile.in | 19 ++++++++++++------- 3 files changed, 19 insertions(+), 11 deletions(-) (limited to 'Build/source/utils/xindy') diff --git a/Build/source/utils/xindy/ChangeLog b/Build/source/utils/xindy/ChangeLog index 309881e92c3..ecfcdee55a9 100644 --- a/Build/source/utils/xindy/ChangeLog +++ b/Build/source/utils/xindy/ChangeLog @@ -1,3 +1,7 @@ +2015-02-16 Peter Breitenlohner + + * Makefile.am: Use the fragment ../../am/dist_hook.am. + 2014-09-15 Peter Breitenlohner Import xindy-2.5.1. diff --git a/Build/source/utils/xindy/Makefile.am b/Build/source/utils/xindy/Makefile.am index 01ce9ea2057..1fc80e8b319 100644 --- a/Build/source/utils/xindy/Makefile.am +++ b/Build/source/utils/xindy/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory utils/xindy/ ## -## Copyright (C) 2009-2014 Peter Breitenlohner +## Copyright (C) 2009-2015 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## EXTRA_DIST = README-clisp @@ -22,9 +22,8 @@ EXTRA_DIST += \ $(XINDY_TREE)/configure.ac \ $(XINDY_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/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in index ebf1d081bc3..d7f0420985c 100644 --- a/Build/source/utils/xindy/Makefile.in +++ b/Build/source/utils/xindy/Makefile.in @@ -188,8 +188,9 @@ am__define_uniq_tagged_files = \ ETAGS = etags CTAGS = ctags CSCOPE = cscope -am__DIST_COMMON = $(srcdir)/../../am/script_links.am \ - $(srcdir)/Makefile.in $(top_srcdir)/../../build-aux/compile \ +am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \ + $(srcdir)/../../am/script_links.am $(srcdir)/Makefile.in \ + $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/config.guess \ $(top_srcdir)/../../build-aux/config.sub \ $(top_srcdir)/../../build-aux/install-sh \ @@ -354,6 +355,10 @@ EXTRA_DIST = README-clisp $(XINDY_TREE)-PATCHES \ $(top_builddir)/../../build-aux/relpath SUBDIRS = . $(XINDY_TREE) DIST_SUBDIRS = $(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' DISTCLEANFILES = config.force perl_scripts = texindy xindy scriptsdir = texmf-dist/scripts/xindy @@ -369,7 +374,7 @@ all: all-recursive .SUFFIXES: am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/script_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/script_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -391,7 +396,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/script_links.am $(am__empty): +$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/script_links.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -905,10 +910,10 @@ uninstall-am: uninstall-nodist_binSCRIPTS \ .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