summaryrefslogtreecommitdiff
path: root/Build/source/libs/poppler
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-06-26 07:35:06 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-06-26 07:35:06 +0000
commitd0c3117e5c8cea5fe0d1a44f1e71e52238eda87e (patch)
tree037acf292d5408aa20359396e2c33cdc78c8ef15 /Build/source/libs/poppler
parenta9d413edd25d84283f1222cb1d2e1beba5ba1daa (diff)
build system: Fix dependencies for build `on demand'
git-svn-id: svn://tug.org/texlive/trunk@30950 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.am2
-rw-r--r--Build/source/libs/poppler/Makefile.in2
3 files changed, 8 insertions, 0 deletions
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index 534aba77bd6..8434c4dc21b 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-26 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Ensure existence of zlib headers.
+
2013-06-18 Peter Breitenlohner <peb@mppmu.mpg.de>
Import poppler-0.23.2.
diff --git a/Build/source/libs/poppler/Makefile.am b/Build/source/libs/poppler/Makefile.am
index db9615959b1..f5aae6c7bcd 100644
--- a/Build/source/libs/poppler/Makefile.am
+++ b/Build/source/libs/poppler/Makefile.am
@@ -37,6 +37,8 @@ AM_CXXFLAGS = $(NO_WARN_CXXFLAGS)
noinst_LIBRARIES = libpoppler.a
+$(libpoppler_a_OBJECTS): $(ZLIB_DEPEND)
+
nodist_libpoppler_a_SOURCES = \
$(goo_libGoo_a_sources) \
$(fofi_libfofi_a_sources) \
diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in
index c5b05c9aa17..6f62219de2d 100644
--- a/Build/source/libs/poppler/Makefile.in
+++ b/Build/source/libs/poppler/Makefile.in
@@ -1375,6 +1375,8 @@ rebuild: all
dist-hook:
rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
+$(libpoppler_a_OBJECTS): $(ZLIB_DEPEND)
+
$(libpoppler_a_OBJECTS): config.force
config.force: $(ZLIB_DEPEND)