summaryrefslogtreecommitdiff
path: root/Build/source/utils/vlna
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-02-16 14:32:53 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-02-16 14:32:53 +0000
commit8a76c4cf53b01a6a34e6c4fe8ac2c531e23503cc (patch)
treef83da7c83bd9925137f9793803e604f66d3cb637 /Build/source/utils/vlna
parentb99e22bb614c3ff22ace371cbd9cb0575f4df20b (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/vlna')
-rw-r--r--Build/source/utils/vlna/ChangeLog4
-rw-r--r--Build/source/utils/vlna/Makefile.am5
-rw-r--r--Build/source/utils/vlna/Makefile.in17
3 files changed, 17 insertions, 9 deletions
diff --git a/Build/source/utils/vlna/ChangeLog b/Build/source/utils/vlna/ChangeLog
index 8e1d22d1240..fb30024d342 100644
--- a/Build/source/utils/vlna/ChangeLog
+++ b/Build/source/utils/vlna/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS.
diff --git a/Build/source/utils/vlna/Makefile.am b/Build/source/utils/vlna/Makefile.am
index 40f548bd2ac..baf91053afa 100644
--- a/Build/source/utils/vlna/Makefile.am
+++ b/Build/source/utils/vlna/Makefile.am
@@ -8,9 +8,8 @@ EXTRA_DIST = $(VLNA_TREE)
## Patches applied to the original source tree
EXTRA_DIST += $(VLNA_TREE)-PATCHES
-# 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_CFLAGS = $(WARNING_CFLAGS)
diff --git a/Build/source/utils/vlna/Makefile.in b/Build/source/utils/vlna/Makefile.in
index e074c184dc0..2f42e498b58 100644
--- a/Build/source/utils/vlna/Makefile.in
+++ b/Build/source/utils/vlna/Makefile.in
@@ -192,8 +192,8 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
AM_RECURSIVE_TARGETS = cscope
-am__DIST_COMMON = $(srcdir)/Makefile.in \
- $(top_srcdir)/../../build-aux/compile \
+am__DIST_COMMON = $(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 ../../build-aux/compile \
@@ -310,6 +310,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(VLNA_TREE) $(VLNA_TREE)-PATCHES vlna.dvi vlna.tex \
vlna.idx vlna.scn
+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_CFLAGS = $(WARNING_CFLAGS)
man1_MANS = $(VLNA_TREE)/vlna.man
CLEANFILES = vlna.log vlna.toc
@@ -319,7 +325,7 @@ all: all-am
.SUFFIXES: .c .o .obj
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*) \
@@ -341,6 +347,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
@@ -821,10 +828,8 @@ uninstall-man: uninstall-man1
.PRECIOUS: Makefile
-
-# in case of an SVN repository
dist-hook:
- rm -rf `find $(distdir) -name .svn`
+ cd "$(distdir)" && rm -rf $(NEVER_DIST)
vlna.dvi: vlna.tex vlna.idx vlna.scn
TEXINPUTS=.:$(srcdir)/$(VLNA_TREE):$$TEXINPUTS $(CSPLAIN) vlna.tex