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/tex4htk/ChangeLog | 4 ++++ Build/source/texk/tex4htk/Makefile.am | 7 +++---- Build/source/texk/tex4htk/Makefile.in | 20 ++++++++++++-------- 3 files changed, 19 insertions(+), 12 deletions(-) (limited to 'Build/source/texk/tex4htk') diff --git a/Build/source/texk/tex4htk/ChangeLog b/Build/source/texk/tex4htk/ChangeLog index a5149f95d1e..d1c7abaf26e 100644 --- a/Build/source/texk/tex4htk/ChangeLog +++ b/Build/source/texk/tex4htk/ChangeLog @@ -1,3 +1,7 @@ +2015-02-16 Peter Breitenlohner + + * Makefile.am: Use the fragment ../../am/dist_hook.am. + 2014-09-23 Peter Breitenlohner * tex4ht.c: Avoid compiler warning [-Wunused-value]. diff --git a/Build/source/texk/tex4htk/Makefile.am b/Build/source/texk/tex4htk/Makefile.am index 23bf73e4498..4a1aa2dd9ce 100644 --- a/Build/source/texk/tex4htk/Makefile.am +++ b/Build/source/texk/tex4htk/Makefile.am @@ -1,14 +1,13 @@ ## Makefile.am for the TeX Live subdirectory texk/tex4htk/ ## -## Copyright (C) 2009-2014 Peter Breitenlohner +## Copyright (C) 2009-2015 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## ## We distribute the whole java tree. EXTRA_DIST = java -# 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 AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DANSI -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in index c484fc619fe..b5db71c684b 100644 --- a/Build/source/texk/tex4htk/Makefile.in +++ b/Build/source/texk/tex4htk/Makefile.in @@ -224,9 +224,9 @@ ETAGS = etags CTAGS = ctags CSCOPE = cscope AM_RECURSIVE_TARGETS = cscope -am__DIST_COMMON = $(srcdir)/../../am/script_links.am \ - $(srcdir)/Makefile.in $(srcdir)/c-auto.in \ - $(top_srcdir)/../../build-aux/compile \ +am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \ + $(srcdir)/../../am/script_links.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 \ @@ -393,6 +393,12 @@ EXTRA_DIST = java $(top_builddir)/../../build-aux/relpath dbcontext \ wcontext wlatex wmex wtex wtexi wxelatex wxetex xhcontext \ xhlatex xhmcontext xhmex xhmlatex xhmmex xhmtex xhmtexi \ xhmxelatex xhmxetex xhtex xhtexi xhxelatex xhxetex xv4ht.java +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' + +# Files not to be distributed AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DANSI -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) t4ht_SOURCES = t4ht.c @@ -416,7 +422,7 @@ all: c-auto.h .SUFFIXES: .c .lo .o .obj 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*) \ @@ -438,7 +444,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 @@ -1034,10 +1040,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS \ .PRECIOUS: Makefile - -# in case of an SVN repository dist-hook: - rm -rf `find $(distdir) -name .svn` + cd "$(distdir)" && rm -rf $(NEVER_DIST) $(t4ht_OBJECTS) $(tex4ht_OBJECTS): $(KPATHSEA_DEPEND) -- cgit v1.2.3