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/libs/lua52 | |
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/libs/lua52')
-rw-r--r-- | Build/source/libs/lua52/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/libs/lua52/Makefile.am | 8 | ||||
-rw-r--r-- | Build/source/libs/lua52/Makefile.in | 17 |
3 files changed, 19 insertions, 10 deletions
diff --git a/Build/source/libs/lua52/ChangeLog b/Build/source/libs/lua52/ChangeLog index 1b38e4bd6cc..3e99db59a29 100644 --- a/Build/source/libs/lua52/ChangeLog +++ b/Build/source/libs/lua52/ChangeLog @@ -1,3 +1,7 @@ +2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Use the fragment ../../am/dist_hook.am. + 2014-10-22 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am, configure.ac: Build lua52 as (possibly shared) diff --git a/Build/source/libs/lua52/Makefile.am b/Build/source/libs/lua52/Makefile.am index 3858a41f1a3..c10a3bfbcff 100644 --- a/Build/source/libs/lua52/Makefile.am +++ b/Build/source/libs/lua52/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to build Lua52 for TeX Live. ## -## Copyright (C) 2013, 2014 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2013-2015 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -14,9 +14,9 @@ EXTRA_DIST = $(LUA52_TREE) ## EXTRA_DIST += $(LUA52_TREE)-PATCHES -# in case of an SVN repository -dist-hook: - rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name .libs -o -name '*.o' -o -name '*.lo'` +# Files not to be distributed +include $(srcdir)/../../am/dist_hook.am +NEVER_NAMES += $(NEVER_NAMES_SUB) $(NEVER_NAMES_LT) SUBDIRS = . include diff --git a/Build/source/libs/lua52/Makefile.in b/Build/source/libs/lua52/Makefile.in index 52e4d20209a..f16b1598f66 100644 --- a/Build/source/libs/lua52/Makefile.in +++ b/Build/source/libs/lua52/Makefile.in @@ -440,7 +440,8 @@ am__set_b = \ b='$*';; \ esac DIST_SUBDIRS = $(SUBDIRS) -am__DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \ +am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \ + $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \ $(srcdir)/config.h.in $(srcdir)/texlua52.pc.in \ $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/config.guess \ @@ -620,6 +621,12 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = $(LUA52_TREE) $(LUA52_TREE)-PATCHES error.exp +NEVER_DIST = `find . $(NEVER_NAMES)` + +# Files not to be distributed +NEVER_NAMES = -name .svn $(NEVER_NAMES_SUB) $(NEVER_NAMES_LT) +NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)' +NEVER_NAMES_LT = -o -name .libs -o -name '*.lo' SUBDIRS = . include AM_CPPFLAGS = -I$(top_srcdir)/$(LUA52_TREE)/src $(LUA52_DEFINES) AM_CFLAGS = $(WARNING_CFLAGS) @@ -689,7 +696,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/rebuild.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -711,7 +718,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/rebuild.am $(am__empty): +$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -1615,10 +1622,8 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-lua52includeHEADERS \ .PRECIOUS: Makefile - -# in case of an SVN repository dist-hook: - rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name .libs -o -name '*.o' -o -name '*.lo'` + cd "$(distdir)" && rm -rf $(NEVER_DIST) rebuild.stamp: $(rebuild_target) echo timestamp >$@ |