summaryrefslogtreecommitdiff
path: root/Build/source/libs/graphite2
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/libs/graphite2
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/libs/graphite2')
-rw-r--r--Build/source/libs/graphite2/ChangeLog4
-rw-r--r--Build/source/libs/graphite2/Makefile.am8
-rw-r--r--Build/source/libs/graphite2/Makefile.in17
3 files changed, 19 insertions, 10 deletions
diff --git a/Build/source/libs/graphite2/ChangeLog b/Build/source/libs/graphite2/ChangeLog
index 457912fb838..b8a97b0960c 100644
--- a/Build/source/libs/graphite2/ChangeLog
+++ b/Build/source/libs/graphite2/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/libs/graphite2/Makefile.am b/Build/source/libs/graphite2/Makefile.am
index 14c9bfdef96..bae00cbad9d 100644
--- a/Build/source/libs/graphite2/Makefile.am
+++ b/Build/source/libs/graphite2/Makefile.am
@@ -1,6 +1,6 @@
## Proxy Makefile.am to build graphite2 for TeX Live.
##
-## Copyright (C) 2012-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2012-2015 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -17,9 +17,9 @@ EXTRA_DIST += $(GRAPHITE2_TREE)-PATCHES
GRAPHITE2_SRC = $(GRAPHITE2_TREE)/src
GRAPHITE2_INC = $(GRAPHITE2_TREE)/include
-# 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)
SUBDIRS = . include/graphite2
diff --git a/Build/source/libs/graphite2/Makefile.in b/Build/source/libs/graphite2/Makefile.in
index ec897d7c59b..eb12bcc48ed 100644
--- a/Build/source/libs/graphite2/Makefile.in
+++ b/Build/source/libs/graphite2/Makefile.in
@@ -525,7 +525,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 $(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/depcomp \
$(top_srcdir)/../../build-aux/install-sh \
@@ -675,6 +676,12 @@ top_srcdir = @top_srcdir@
EXTRA_DIST = $(GRAPHITE2_TREE) $(GRAPHITE2_TREE)-PATCHES
GRAPHITE2_SRC = $(GRAPHITE2_TREE)/src
GRAPHITE2_INC = $(GRAPHITE2_TREE)/include
+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'
SUBDIRS = . include/graphite2
noinst_LIBRARIES = libgraphite2.a
AM_CPPFLAGS = -I$(top_srcdir)/$(GRAPHITE2_SRC) \
@@ -760,7 +767,7 @@ all: config.h
.SUFFIXES: .c .cpp .cxx .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*) \
@@ -782,7 +789,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
@@ -1639,10 +1646,8 @@ uninstall-am:
.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)
rebuild.stamp: $(rebuild_target)
echo timestamp >$@