summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/libs/poppler/ChangeLog5
-rw-r--r--Build/source/libs/poppler/Makefile.am1
-rw-r--r--Build/source/libs/poppler/Makefile.in28
-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.in20
6 files changed, 19 insertions, 43 deletions
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index 317b04339cf..b6c654e6291 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (poppler_libpoppler_a_sources): Drop PSOutputDev.cc,
+ not used by {lua,Xe}TeX.
+
2012-07-11 Peter Breitenlohner <peb@mppmu.mpg.de>
Import poppler-0.20.2.
diff --git a/Build/source/libs/poppler/Makefile.am b/Build/source/libs/poppler/Makefile.am
index 69bd04738a4..7888ef913cb 100644
--- a/Build/source/libs/poppler/Makefile.am
+++ b/Build/source/libs/poppler/Makefile.am
@@ -99,7 +99,6 @@ poppler_libpoppler_a_sources = \
$(POPPLER_SRC)/OutputDev.cc \
$(POPPLER_SRC)/PDFDoc.cc \
$(POPPLER_SRC)/PDFDocEncoding.cc \
- $(POPPLER_SRC)/PSOutputDev.cc \
$(POPPLER_SRC)/PSTokenizer.cc \
$(POPPLER_SRC)/Page.cc \
$(POPPLER_SRC)/PageLabelInfo.cc \
diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in
index 28f181c8c1f..6b058330114 100644
--- a/Build/source/libs/poppler/Makefile.in
+++ b/Build/source/libs/poppler/Makefile.in
@@ -96,12 +96,12 @@ am__objects_3 = Annot.$(OBJEXT) Array.$(OBJEXT) BuiltinFont.$(OBJEXT) \
Link.$(OBJEXT) Movie.$(OBJEXT) NameToCharCode.$(OBJEXT) \
Object.$(OBJEXT) OptionalContent.$(OBJEXT) Outline.$(OBJEXT) \
OutputDev.$(OBJEXT) PDFDoc.$(OBJEXT) PDFDocEncoding.$(OBJEXT) \
- PSOutputDev.$(OBJEXT) PSTokenizer.$(OBJEXT) Page.$(OBJEXT) \
- PageLabelInfo.$(OBJEXT) PageTransition.$(OBJEXT) \
- Parser.$(OBJEXT) PopplerCache.$(OBJEXT) \
- PreScanOutputDev.$(OBJEXT) ProfileData.$(OBJEXT) \
- Rendition.$(OBJEXT) SecurityHandler.$(OBJEXT) Sound.$(OBJEXT) \
- Stream.$(OBJEXT) strtok_r.$(OBJEXT) UnicodeMap.$(OBJEXT) \
+ PSTokenizer.$(OBJEXT) Page.$(OBJEXT) PageLabelInfo.$(OBJEXT) \
+ PageTransition.$(OBJEXT) Parser.$(OBJEXT) \
+ PopplerCache.$(OBJEXT) PreScanOutputDev.$(OBJEXT) \
+ ProfileData.$(OBJEXT) Rendition.$(OBJEXT) \
+ SecurityHandler.$(OBJEXT) Sound.$(OBJEXT) Stream.$(OBJEXT) \
+ strtok_r.$(OBJEXT) UnicodeMap.$(OBJEXT) \
UnicodeTypeTable.$(OBJEXT) ViewerPreferences.$(OBJEXT) \
XRef.$(OBJEXT) XpdfPluginAPI.$(OBJEXT)
nodist_libpoppler_a_OBJECTS = $(am__objects_1) $(am__objects_2) \
@@ -354,7 +354,6 @@ poppler_libpoppler_a_sources = \
$(POPPLER_SRC)/OutputDev.cc \
$(POPPLER_SRC)/PDFDoc.cc \
$(POPPLER_SRC)/PDFDocEncoding.cc \
- $(POPPLER_SRC)/PSOutputDev.cc \
$(POPPLER_SRC)/PSTokenizer.cc \
$(POPPLER_SRC)/Page.cc \
$(POPPLER_SRC)/PageLabelInfo.cc \
@@ -491,7 +490,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OutputDev.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PDFDoc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PDFDocEncoding.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PSOutputDev.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PSTokenizer.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Page.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PageLabelInfo.Po@am__quote@
@@ -1257,20 +1255,6 @@ PDFDocEncoding.obj: $(POPPLER_SRC)/PDFDocEncoding.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PDFDocEncoding.obj `if test -f '$(POPPLER_SRC)/PDFDocEncoding.cc'; then $(CYGPATH_W) '$(POPPLER_SRC)/PDFDocEncoding.cc'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/PDFDocEncoding.cc'; fi`
-PSOutputDev.o: $(POPPLER_SRC)/PSOutputDev.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PSOutputDev.o -MD -MP -MF $(DEPDIR)/PSOutputDev.Tpo -c -o PSOutputDev.o `test -f '$(POPPLER_SRC)/PSOutputDev.cc' || echo '$(srcdir)/'`$(POPPLER_SRC)/PSOutputDev.cc
-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/PSOutputDev.Tpo $(DEPDIR)/PSOutputDev.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(POPPLER_SRC)/PSOutputDev.cc' object='PSOutputDev.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PSOutputDev.o `test -f '$(POPPLER_SRC)/PSOutputDev.cc' || echo '$(srcdir)/'`$(POPPLER_SRC)/PSOutputDev.cc
-
-PSOutputDev.obj: $(POPPLER_SRC)/PSOutputDev.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PSOutputDev.obj -MD -MP -MF $(DEPDIR)/PSOutputDev.Tpo -c -o PSOutputDev.obj `if test -f '$(POPPLER_SRC)/PSOutputDev.cc'; then $(CYGPATH_W) '$(POPPLER_SRC)/PSOutputDev.cc'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/PSOutputDev.cc'; fi`
-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/PSOutputDev.Tpo $(DEPDIR)/PSOutputDev.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(POPPLER_SRC)/PSOutputDev.cc' object='PSOutputDev.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PSOutputDev.obj `if test -f '$(POPPLER_SRC)/PSOutputDev.cc'; then $(CYGPATH_W) '$(POPPLER_SRC)/PSOutputDev.cc'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/PSOutputDev.cc'; fi`
-
PSTokenizer.o: $(POPPLER_SRC)/PSTokenizer.cc
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PSTokenizer.o -MD -MP -MF $(DEPDIR)/PSTokenizer.Tpo -c -o PSTokenizer.o `test -f '$(POPPLER_SRC)/PSTokenizer.cc' || echo '$(srcdir)/'`$(POPPLER_SRC)/PSTokenizer.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/PSTokenizer.Tpo $(DEPDIR)/PSTokenizer.Po
diff --git a/Build/source/libs/xpdf/ChangeLog b/Build/source/libs/xpdf/ChangeLog
index 072a81ed973..a8018ae06d2 100644
--- a/Build/source/libs/xpdf/ChangeLog
+++ b/Build/source/libs/xpdf/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (xpdf_libxpdf_a_sources): Drop PSOutputDev.cc,
+ not used by pdfTeX.
+
2012-02-24 Peter Breitenlohner <peb@mppmu.mpg.de>
* {fofi,goo,splash,xpdf}/Makefile.am: Use ../am/hdr_links.am.
diff --git a/Build/source/libs/xpdf/Makefile.am b/Build/source/libs/xpdf/Makefile.am
index 103ec6e05f9..c4c3cedaee9 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-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -107,7 +107,6 @@ xpdf_libxpdf_a_sources = \
$(XPDF_SRC)/OutputDev.cc \
$(XPDF_SRC)/PDFDoc.cc \
$(XPDF_SRC)/PDFDocEncoding.cc \
- $(XPDF_SRC)/PSOutputDev.cc \
$(XPDF_SRC)/PSTokenizer.cc \
$(XPDF_SRC)/Page.cc \
$(XPDF_SRC)/Parser.cc \
diff --git a/Build/source/libs/xpdf/Makefile.in b/Build/source/libs/xpdf/Makefile.in
index 9e910441f6a..da50a6fdcde 100644
--- a/Build/source/libs/xpdf/Makefile.in
+++ b/Build/source/libs/xpdf/Makefile.in
@@ -90,8 +90,8 @@ am__objects_3 = Array.$(OBJEXT) BuiltinFont.$(OBJEXT) \
Link.$(OBJEXT) NameToCharCode.$(OBJEXT) Object.$(OBJEXT) \
OptionalContent.$(OBJEXT) Outline.$(OBJEXT) \
OutputDev.$(OBJEXT) PDFDoc.$(OBJEXT) PDFDocEncoding.$(OBJEXT) \
- PSOutputDev.$(OBJEXT) PSTokenizer.$(OBJEXT) Page.$(OBJEXT) \
- Parser.$(OBJEXT) SecurityHandler.$(OBJEXT) Stream.$(OBJEXT) \
+ PSTokenizer.$(OBJEXT) Page.$(OBJEXT) Parser.$(OBJEXT) \
+ SecurityHandler.$(OBJEXT) Stream.$(OBJEXT) \
UnicodeMap.$(OBJEXT) XRef.$(OBJEXT)
nodist_libxpdf_a_OBJECTS = $(am__objects_1) $(am__objects_2) \
$(am__objects_3)
@@ -331,7 +331,6 @@ xpdf_libxpdf_a_sources = \
$(XPDF_SRC)/OutputDev.cc \
$(XPDF_SRC)/PDFDoc.cc \
$(XPDF_SRC)/PDFDocEncoding.cc \
- $(XPDF_SRC)/PSOutputDev.cc \
$(XPDF_SRC)/PSTokenizer.cc \
$(XPDF_SRC)/Page.cc \
$(XPDF_SRC)/Parser.cc \
@@ -444,7 +443,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OutputDev.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PDFDoc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PDFDocEncoding.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PSOutputDev.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PSTokenizer.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Page.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Parser.Po@am__quote@
@@ -1016,20 +1014,6 @@ PDFDocEncoding.obj: $(XPDF_SRC)/PDFDocEncoding.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PDFDocEncoding.obj `if test -f '$(XPDF_SRC)/PDFDocEncoding.cc'; then $(CYGPATH_W) '$(XPDF_SRC)/PDFDocEncoding.cc'; else $(CYGPATH_W) '$(srcdir)/$(XPDF_SRC)/PDFDocEncoding.cc'; fi`
-PSOutputDev.o: $(XPDF_SRC)/PSOutputDev.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PSOutputDev.o -MD -MP -MF $(DEPDIR)/PSOutputDev.Tpo -c -o PSOutputDev.o `test -f '$(XPDF_SRC)/PSOutputDev.cc' || echo '$(srcdir)/'`$(XPDF_SRC)/PSOutputDev.cc
-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/PSOutputDev.Tpo $(DEPDIR)/PSOutputDev.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(XPDF_SRC)/PSOutputDev.cc' object='PSOutputDev.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PSOutputDev.o `test -f '$(XPDF_SRC)/PSOutputDev.cc' || echo '$(srcdir)/'`$(XPDF_SRC)/PSOutputDev.cc
-
-PSOutputDev.obj: $(XPDF_SRC)/PSOutputDev.cc
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PSOutputDev.obj -MD -MP -MF $(DEPDIR)/PSOutputDev.Tpo -c -o PSOutputDev.obj `if test -f '$(XPDF_SRC)/PSOutputDev.cc'; then $(CYGPATH_W) '$(XPDF_SRC)/PSOutputDev.cc'; else $(CYGPATH_W) '$(srcdir)/$(XPDF_SRC)/PSOutputDev.cc'; fi`
-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/PSOutputDev.Tpo $(DEPDIR)/PSOutputDev.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(XPDF_SRC)/PSOutputDev.cc' object='PSOutputDev.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PSOutputDev.obj `if test -f '$(XPDF_SRC)/PSOutputDev.cc'; then $(CYGPATH_W) '$(XPDF_SRC)/PSOutputDev.cc'; else $(CYGPATH_W) '$(srcdir)/$(XPDF_SRC)/PSOutputDev.cc'; fi`
-
PSTokenizer.o: $(XPDF_SRC)/PSTokenizer.cc
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PSTokenizer.o -MD -MP -MF $(DEPDIR)/PSTokenizer.Tpo -c -o PSTokenizer.o `test -f '$(XPDF_SRC)/PSTokenizer.cc' || echo '$(srcdir)/'`$(XPDF_SRC)/PSTokenizer.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/PSTokenizer.Tpo $(DEPDIR)/PSTokenizer.Po