diff options
Diffstat (limited to 'Build/source/libs/xpdf')
| -rw-r--r-- | Build/source/libs/xpdf/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/libs/xpdf/Makefile.am | 9 | ||||
| -rw-r--r-- | Build/source/libs/xpdf/Makefile.in | 18 |
3 files changed, 19 insertions, 12 deletions
diff --git a/Build/source/libs/xpdf/ChangeLog b/Build/source/libs/xpdf/ChangeLog index cf9bb085e93..6c86c2f424a 100644 --- a/Build/source/libs/xpdf/ChangeLog +++ b/Build/source/libs/xpdf/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-26 Karl Berry <karl@tug.org> * Makefile.am (xpdf_libxpdf_a_sources): add Annot.cc. diff --git a/Build/source/libs/xpdf/Makefile.am b/Build/source/libs/xpdf/Makefile.am index 92c08ab2086..997d3a25eae 100644 --- a/Build/source/libs/xpdf/Makefile.am +++ b/Build/source/libs/xpdf/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to build xpdf for TeX Live. ## -## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,9 @@ EXTRA_DIST += $(XPDF_TREE)-foolabs ## EXTRA_DIST += $(XPDF_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)'` - rm -f $(distdir)/$(XPDF_TREE)/install-sh +# Files not to be distributed +include $(srcdir)/../../am/dist_hook.am +NEVER_NAMES += $(NEVER_NAMES_SUB) SUBDIRS = . goo fofi splash xpdf diff --git a/Build/source/libs/xpdf/Makefile.in b/Build/source/libs/xpdf/Makefile.in index d79961607b4..2131ab1b241 100644 --- a/Build/source/libs/xpdf/Makefile.in +++ b/Build/source/libs/xpdf/Makefile.in @@ -240,7 +240,8 @@ ETAGS = etags CTAGS = ctags CSCOPE = cscope 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)/aconf.h.in $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/depcomp \ $(top_srcdir)/../../build-aux/install-sh \ @@ -394,6 +395,12 @@ top_srcdir = @top_srcdir@ #======================================================================== ACLOCAL_AMFLAGS = -I ../../m4 EXTRA_DIST = $(XPDF_TREE) $(XPDF_TREE)-foolabs $(XPDF_TREE)-PATCHES +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 = . goo fofi splash xpdf GOO_SRC = $(top_srcdir)/$(XPDF_TREE)/goo FOFI_SRC = $(top_srcdir)/$(XPDF_TREE)/fofi @@ -480,7 +487,7 @@ all: aconf.h .SUFFIXES: .cc .o .obj 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*) \ @@ -502,7 +509,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 @@ -1192,11 +1199,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)'` - rm -f $(distdir)/$(XPDF_TREE)/install-sh + cd "$(distdir)" && rm -rf $(NEVER_DIST) rebuild.stamp: $(rebuild_target) echo timestamp >$@ |