diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-02-16 14:32:53 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-02-16 14:32:53 +0000 |
commit | 8a76c4cf53b01a6a34e6c4fe8ac2c531e23503cc (patch) | |
tree | f83da7c83bd9925137f9793803e604f66d3cb637 /Build/source/texk/chktex | |
parent | b99e22bb614c3ff22ace371cbd9cb0575f4df20b (diff) |
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
Diffstat (limited to 'Build/source/texk/chktex')
-rw-r--r-- | Build/source/texk/chktex/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/chktex/Makefile.am | 8 | ||||
-rw-r--r-- | Build/source/texk/chktex/Makefile.in | 20 |
3 files changed, 20 insertions, 12 deletions
diff --git a/Build/source/texk/chktex/ChangeLog b/Build/source/texk/chktex/ChangeLog index feb2a3e370a..6670e780339 100644 --- a/Build/source/texk/chktex/ChangeLog +++ b/Build/source/texk/chktex/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-06 Peter Breitenlohner <peb@mppmu.mpg.de> * regex/regcomp.c [WIN64]: Use __int64 (not long) as intptr_t. diff --git a/Build/source/texk/chktex/Makefile.am b/Build/source/texk/chktex/Makefile.am index 7974930e702..ee5179f8e31 100644 --- a/Build/source/texk/chktex/Makefile.am +++ b/Build/source/texk/chktex/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/chktex/ ## -## Copyright (C) 2010-2014 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2010-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## #************************************************************************ @@ -20,9 +20,9 @@ EXTRA_DIST = $(CHKTEX_TREE) ## EXTRA_DIST += $(CHKTEX_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 = $(REGEX_INCLUDES) $(KPATHSEA_INCLUDES) -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/texk/chktex/Makefile.in b/Build/source/texk/chktex/Makefile.in index 0009b8993f4..1c857456bb6 100644 --- a/Build/source/texk/chktex/Makefile.in +++ b/Build/source/texk/chktex/Makefile.in @@ -414,9 +414,9 @@ am__set_b = \ *) \ b='$*';; \ esac -am__DIST_COMMON = $(srcdir)/../../am/script_links.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/../../build-aux/compile \ +am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \ + $(srcdir)/../../am/script_links.am $(srcdir)/Makefile.in \ + $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/config.guess \ $(top_srcdir)/../../build-aux/config.sub \ $(top_srcdir)/../../build-aux/depcomp \ @@ -578,6 +578,12 @@ top_srcdir = @top_srcdir@ #************************************************************************ EXTRA_DIST = $(CHKTEX_TREE) $(CHKTEX_TREE)-PATCHES regex/COPYING.LIB \ regex/README $(top_builddir)/../../build-aux/relpath $(TESTS) +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 = $(REGEX_INCLUDES) $(KPATHSEA_INCLUDES) -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) chktex_SOURCES = @CHKTEX_TREE@/ChkTeX.c @CHKTEX_TREE@/ChkTeX.h \ @@ -629,7 +635,7 @@ all: config.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/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*) \ @@ -651,7 +657,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 @@ -1541,10 +1547,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) $(chktex_OBJECTS): $(KPATHSEA_DEPEND) .PHONY: install-lua-links install-perl-links install-shell-links install-sh-links \ |