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/utils/m-tx | |
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/utils/m-tx')
-rw-r--r-- | Build/source/utils/m-tx/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/utils/m-tx/Makefile.am | 6 | ||||
-rw-r--r-- | Build/source/utils/m-tx/Makefile.in | 17 |
3 files changed, 18 insertions, 9 deletions
diff --git a/Build/source/utils/m-tx/ChangeLog b/Build/source/utils/m-tx/ChangeLog index 0762e5a1eef..fce745bd047 100644 --- a/Build/source/utils/m-tx/ChangeLog +++ b/Build/source/utils/m-tx/ChangeLog @@ -1,3 +1,7 @@ +2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Use the fragment ../../am/dist_hook.am. + 2015-02-03 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Drop AC_HEADER_STDBOOL, AC_FUNC_ERROR_AT_LINE, diff --git a/Build/source/utils/m-tx/Makefile.am b/Build/source/utils/m-tx/Makefile.am index 3186970e3b4..c3773911066 100644 --- a/Build/source/utils/m-tx/Makefile.am +++ b/Build/source/utils/m-tx/Makefile.am @@ -8,9 +8,9 @@ EXTRA_DIST = $(MTX_TREE) ## Patches applied to the original source tree EXTRA_DIST += $(MTX_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$(srcdir)/$(MTX_TREE)/libp2c -DNO_DECLARE_MALLOC AM_CFLAGS = #$(WARNING_CFLAGS) diff --git a/Build/source/utils/m-tx/Makefile.in b/Build/source/utils/m-tx/Makefile.in index cfbc77c62c5..ad56a54467e 100644 --- a/Build/source/utils/m-tx/Makefile.in +++ b/Build/source/utils/m-tx/Makefile.in @@ -374,8 +374,8 @@ am__set_b = \ *) \ b='$*';; \ esac -am__DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.in \ - $(top_srcdir)/../../build-aux/compile \ +am__DIST_COMMON = $(dist_man1_MANS) $(srcdir)/../../am/dist_hook.am \ + $(srcdir)/Makefile.in $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/depcomp \ $(top_srcdir)/../../build-aux/install-sh \ $(top_srcdir)/../../build-aux/missing \ @@ -496,6 +496,12 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = $(MTX_TREE) $(MTX_TREE)-PATCHES $(TESTS) tests/mozart.mtx \ tests/mozart.pmx +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$(srcdir)/$(MTX_TREE)/libp2c -DNO_DECLARE_MALLOC AM_CFLAGS = #$(WARNING_CFLAGS) prepmx_SOURCES = \ @@ -540,7 +546,7 @@ all: all-am .SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -562,6 +568,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/dist_hook.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -1255,10 +1262,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) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. |