summaryrefslogtreecommitdiff
path: root/Build/source/libs/poppler
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/poppler
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/poppler')
-rw-r--r--Build/source/libs/poppler/ChangeLog4
-rw-r--r--Build/source/libs/poppler/Makefile.am8
-rw-r--r--Build/source/libs/poppler/Makefile.in21
3 files changed, 21 insertions, 12 deletions
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index 03b510eea0d..f895799bfb8 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use the fragment ../../am/dist_hook.am.
+
2015-02-06 Peter Breitenlohner <peb@mppmu.mpg.de>
Import poppler-0.31.0.
diff --git a/Build/source/libs/poppler/Makefile.am b/Build/source/libs/poppler/Makefile.am
index 3951d2a00a7..08659d33dfe 100644
--- a/Build/source/libs/poppler/Makefile.am
+++ b/Build/source/libs/poppler/Makefile.am
@@ -1,6 +1,6 @@
## Proxy Makefile.am to build poppler for TeX Live.
##
-## Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2011-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 = $(POPPLER_TREE)
##
EXTRA_DIST += $(POPPLER_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)
SUBDIRS = . include
diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in
index 8b90b0d22e1..b9f5254e561 100644
--- a/Build/source/libs/poppler/Makefile.in
+++ b/Build/source/libs/poppler/Makefile.in
@@ -269,9 +269,10 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
- $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
+am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
+ $(srcdir)/../../am/rebuild.am $(srcdir)/../../am/reconfig.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/depcomp \
$(top_srcdir)/../../build-aux/install-sh \
$(top_srcdir)/../../build-aux/missing \
@@ -427,6 +428,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = $(POPPLER_TREE) $(POPPLER_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 = . include
GOO_SRC = $(top_srcdir)/$(POPPLER_TREE)/goo
FOFI_SRC = $(top_srcdir)/$(POPPLER_TREE)/fofi
@@ -541,7 +548,7 @@ all: config.h poppler-config.h
.SUFFIXES: .cc .cpp .o .obj
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -563,7 +570,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/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1409,10 +1416,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)
$(libpoppler_a_OBJECTS): $(ZLIB_DEPEND)