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/xpdfopen | |
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/xpdfopen')
-rw-r--r-- | Build/source/utils/xpdfopen/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/utils/xpdfopen/Makefile.am | 8 | ||||
-rw-r--r-- | Build/source/utils/xpdfopen/Makefile.in | 18 |
3 files changed, 19 insertions, 11 deletions
diff --git a/Build/source/utils/xpdfopen/ChangeLog b/Build/source/utils/xpdfopen/ChangeLog index d8165653c14..2056e213307 100644 --- a/Build/source/utils/xpdfopen/ChangeLog +++ b/Build/source/utils/xpdfopen/ChangeLog @@ -1,3 +1,7 @@ +2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Use the fragment ../../am/dist_hook.am. + 2014-05-28 Peter Breitenlohner <peb@mppmu.mpg.de> Import xpdfopen-0.86 (into versioned subdirectory). diff --git a/Build/source/utils/xpdfopen/Makefile.am b/Build/source/utils/xpdfopen/Makefile.am index 676bdcd3556..1fd9213dd23 100644 --- a/Build/source/utils/xpdfopen/Makefile.am +++ b/Build/source/utils/xpdfopen/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory utils/xpdfopen/ ## -## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## EXTRA_DIST = $(XPDFOPEN_TREE) @@ -9,9 +9,9 @@ EXTRA_DIST = $(XPDFOPEN_TREE) ## EXTRA_DIST += $(XPDFOPEN_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 = $(X_CFLAGS) AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/utils/xpdfopen/Makefile.in b/Build/source/utils/xpdfopen/Makefile.in index f29f29f27bb..8970dac7814 100644 --- a/Build/source/utils/xpdfopen/Makefile.in +++ b/Build/source/utils/xpdfopen/Makefile.in @@ -203,8 +203,8 @@ ETAGS = etags CTAGS = ctags CSCOPE = cscope AM_RECURSIVE_TARGETS = cscope -am__DIST_COMMON = $(srcdir)/Makefile.in \ - $(top_srcdir)/../../am/man1_links.am \ +am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \ + $(srcdir)/Makefile.in $(top_srcdir)/../../am/man1_links.am \ $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/depcomp \ $(top_srcdir)/../../build-aux/install-sh \ @@ -325,6 +325,12 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = $(XPDFOPEN_TREE) $(XPDFOPEN_TREE)-PATCHES xpdfopen.pdf \ xpdfopen.tex +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 = $(X_CFLAGS) AM_CFLAGS = $(WARNING_CFLAGS) LDADD = $(X_LIBS) -lX11 -lXmu $(X_EXTRA_LIBS) @@ -350,7 +356,7 @@ all: all-am .SUFFIXES: .c .o .obj am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/man1_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(top_srcdir)/../../am/man1_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -372,7 +378,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; -$(top_srcdir)/../../am/man1_links.am $(am__empty): +$(srcdir)/../../am/dist_hook.am $(top_srcdir)/../../am/man1_links.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -878,10 +884,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) .PHONY: install-man1-links uninstall-man1-links install-man1-links: |