From 0d240b7cd1b937c17ef3b95446f7342c211a2483 Mon Sep 17 00:00:00 2001 From: Martin Schröder Date: Mon, 14 Jul 2008 21:44:01 +0000 Subject: Merge pdftex up to r494 git-svn-id: svn://tug.org/texlive/trunk@9556 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/xpdf/goo/Makefile.in | 9 +++++++-- Build/source/libs/xpdf/xpdf/Makefile.in | 11 ++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Build/source/libs/xpdf/goo/Makefile.in b/Build/source/libs/xpdf/goo/Makefile.in index fdfc82b9a9c..4de9c5d7fda 100644 --- a/Build/source/libs/xpdf/goo/Makefile.in +++ b/Build/source/libs/xpdf/goo/Makefile.in @@ -10,9 +10,14 @@ # ------------------------------------------------------------------------ # Changed by Martin Schröder -# $Id: Makefile.in 421 2008-04-26 21:59:55Z oneiros $ +# $Id: Makefile.in 494 2008-07-14 21:35:09Z oneiros $ # Changelog: # ------------------------------------------------------------------------ +# r493 | oneiros | 2008-07-14 23:32:04 +0200 (Mo, 14 Jul 2008) | 2 lines +# +# Also set -DDISABLE_OUTLINE (pdftoepdf.cc had conflicting options) +# +# ------------------------------------------------------------------------ # r390 | oneiros | 2008-03-23 16:51:58 +0100 (So, 23 Mär 2008) | 2 lines # # Merge changes since r357 to everything but pdftexdir from trunk into stable @@ -73,7 +78,7 @@ kpathsea_include_dir = -I../../../texk -I$(srcdir)/../../../texk ALLCFLAGS = $(CFLAGS) @DEFS@ -I.. -I$(srcdir)/.. -I. -I$(srcdir) $(kpathsea_include_dir) ALLCXXFLAGS = $(CXXFLAGS) @DEFS@ \ -I.. -I$(srcdir)/.. -I. -I$(srcdir) $(kpathsea_include_dir) \ - -DPDF_PARSER_ONLY + -DPDF_PARSER_ONLY -DDISABLE_OUTLINE CXXFLAGS = @CXXFLAGS@ CC = @CC@ CXX = @CXX@ diff --git a/Build/source/libs/xpdf/xpdf/Makefile.in b/Build/source/libs/xpdf/xpdf/Makefile.in index 52da94bb852..27fe1538cae 100644 --- a/Build/source/libs/xpdf/xpdf/Makefile.in +++ b/Build/source/libs/xpdf/xpdf/Makefile.in @@ -8,14 +8,19 @@ # # Heavily modified for pdftex by Thomas Esser, 1998, 1999 # -# $Id: Makefile.in 421 2008-04-26 21:59:55Z oneiros $ +# $Id: Makefile.in 494 2008-07-14 21:35:09Z oneiros $ #======================================================================== # ------------------------------------------------------------------------ # Changed by Martin Schröder -# $Id: Makefile.in 421 2008-04-26 21:59:55Z oneiros $ +# $Id: Makefile.in 494 2008-07-14 21:35:09Z oneiros $ # Changelog: # ------------------------------------------------------------------------ +# r493 | oneiros | 2008-07-14 23:32:04 +0200 (Mo, 14 Jul 2008) | 2 lines +# +# Also set -DDISABLE_OUTLINE (pdftoepdf.cc had conflicting options) +# +# ------------------------------------------------------------------------ # r390 | oneiros | 2008-03-23 16:51:58 +0100 (So, 23 Mär 2008) | 2 lines # # Merge changes since r357 to everything but pdftexdir from trunk into stable @@ -72,7 +77,7 @@ CXXFLAGS = @CXXFLAGS@ CXX = @CXX@ ALLCXXFLAGS = $(CXXFLAGS) -DHAVE_CONFIG_H $(XCFLAGS) \ -I.. -I$(srcdirparent) -I$(goodir) -I$(fofidir) -I. -I$(srcdir) \ - -DPDF_PARSER_ONLY + -DPDF_PARSER_ONLY -DDISABLE_OUTLINE kpse_include ../../texk/make/library.mk -- cgit v1.2.3