summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/libs/xpdf/ChangeLog5
-rw-r--r--Build/source/libs/xpdf/Makefile.am3
-rw-r--r--Build/source/libs/xpdf/Makefile.in5
3 files changed, 12 insertions, 1 deletions
diff --git a/Build/source/libs/xpdf/ChangeLog b/Build/source/libs/xpdf/ChangeLog
index 093926711ca..cf9bb085e93 100644
--- a/Build/source/libs/xpdf/ChangeLog
+++ b/Build/source/libs/xpdf/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-26 Karl Berry <karl@tug.org>
+
+ * Makefile.am (xpdf_libxpdf_a_sources): add Annot.cc.
+ (else references from Gfx.cc do not resolve when linking pdftex)
+
2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de>
Import xpdf-3.04.
diff --git a/Build/source/libs/xpdf/Makefile.am b/Build/source/libs/xpdf/Makefile.am
index 291bf90cd16..92c08ab2086 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-2013 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -76,6 +76,7 @@ fofi_libfofi_a_sources = \
xpdf_libxpdf_a_sources = \
@XPDF_TREE@/xpdf/AcroForm.cc \
+ @XPDF_TREE@/xpdf/Annot.cc \
@XPDF_TREE@/xpdf/Array.cc \
@XPDF_TREE@/xpdf/BuiltinFont.cc \
@XPDF_TREE@/xpdf/BuiltinFontTables.cc \
diff --git a/Build/source/libs/xpdf/Makefile.in b/Build/source/libs/xpdf/Makefile.in
index 41ffa1999ca..5a90bc57429 100644
--- a/Build/source/libs/xpdf/Makefile.in
+++ b/Build/source/libs/xpdf/Makefile.in
@@ -124,6 +124,7 @@ am__objects_2 = @XPDF_TREE@/fofi/FoFiBase.$(OBJEXT) \
@XPDF_TREE@/fofi/FoFiType1.$(OBJEXT) \
@XPDF_TREE@/fofi/FoFiType1C.$(OBJEXT)
am__objects_3 = @XPDF_TREE@/xpdf/AcroForm.$(OBJEXT) \
+ @XPDF_TREE@/xpdf/Annot.$(OBJEXT) \
@XPDF_TREE@/xpdf/Array.$(OBJEXT) \
@XPDF_TREE@/xpdf/BuiltinFont.$(OBJEXT) \
@XPDF_TREE@/xpdf/BuiltinFontTables.$(OBJEXT) \
@@ -418,6 +419,7 @@ fofi_libfofi_a_sources = \
xpdf_libxpdf_a_sources = \
@XPDF_TREE@/xpdf/AcroForm.cc \
+ @XPDF_TREE@/xpdf/Annot.cc \
@XPDF_TREE@/xpdf/Array.cc \
@XPDF_TREE@/xpdf/BuiltinFont.cc \
@XPDF_TREE@/xpdf/BuiltinFontTables.cc \
@@ -571,6 +573,8 @@ clean-noinstLIBRARIES:
@: > @XPDF_TREE@/xpdf/$(DEPDIR)/$(am__dirstamp)
@XPDF_TREE@/xpdf/AcroForm.$(OBJEXT): @XPDF_TREE@/xpdf/$(am__dirstamp) \
@XPDF_TREE@/xpdf/$(DEPDIR)/$(am__dirstamp)
+@XPDF_TREE@/xpdf/Annot.$(OBJEXT): @XPDF_TREE@/xpdf/$(am__dirstamp) \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/$(am__dirstamp)
@XPDF_TREE@/xpdf/Array.$(OBJEXT): @XPDF_TREE@/xpdf/$(am__dirstamp) \
@XPDF_TREE@/xpdf/$(DEPDIR)/$(am__dirstamp)
@XPDF_TREE@/xpdf/BuiltinFont.$(OBJEXT): \
@@ -692,6 +696,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/goo/$(DEPDIR)/gmem.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/goo/$(DEPDIR)/gmempp.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/AcroForm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Annot.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Array.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/BuiltinFont.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/BuiltinFontTables.Po@am__quote@