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/dvipng/ChangeLog | 4 ++++ Build/source/texk/dvipng/Makefile.am | 8 ++++---- Build/source/texk/dvipng/Makefile.in | 18 +++++++++++------- 3 files changed, 19 insertions(+), 11 deletions(-) (limited to 'Build/source/texk/dvipng') diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog index 6b16ab99351..e27b17eef95 100644 --- a/Build/source/texk/dvipng/ChangeLog +++ b/Build/source/texk/dvipng/ChangeLog @@ -1,3 +1,7 @@ +2015-02-16 Peter Breitenlohner + + * Makefile.am: Use the fragment ../../am/dist_hook.am. + 2014-08-22 Peter Breitenlohner * Makefile.am: Add explicit dependency on freetype2 and libpng. diff --git a/Build/source/texk/dvipng/Makefile.am b/Build/source/texk/dvipng/Makefile.am index 98c7fbbdcac..72e1d9c1cbb 100644 --- a/Build/source/texk/dvipng/Makefile.am +++ b/Build/source/texk/dvipng/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/dvipng/ ## -## Copyright (C) 2009-2014 Peter Breitenlohner +## Copyright (C) 2009-2015 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## #************************************************************************ @@ -21,9 +21,9 @@ EXTRA_DIST = $(DVIPNG_TREE) ## EXTRA_DIST += $(DVIPNG_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 = -I$(top_srcdir)/$(DVIPNG_TREE) AM_CPPFLAGS += $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(GD_INCLUDES) diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in index 2dfa3a2f07b..9d89dda0b85 100644 --- a/Build/source/texk/dvipng/Makefile.in +++ b/Build/source/texk/dvipng/Makefile.in @@ -435,8 +435,8 @@ am__set_b = \ esac DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/../../am/bin_links.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/../../build-aux/compile \ + $(srcdir)/../../am/dist_hook.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 \ @@ -641,6 +641,12 @@ top_srcdir = @top_srcdir@ #************************************************************************ EXTRA_DIST = $(DVIPNG_TREE) $(DVIPNG_TREE)-PATCHES dvipng.test \ dvipng-test.dvi +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 = -I$(top_srcdir)/$(DVIPNG_TREE) $(KPATHSEA_INCLUDES) \ $(FREETYPE2_INCLUDES) $(GD_INCLUDES) $(LIBPNG_INCLUDES) \ $(ZLIB_INCLUDES) @@ -675,7 +681,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/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*) \ @@ -697,7 +703,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 @@ -1495,10 +1501,8 @@ uninstall-am: uninstall-binPROGRAMS .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) $(dvipng_OBJECTS): config.force -- cgit v1.2.3