summaryrefslogtreecommitdiff
path: root/Build/source/libs/xpdf/goo/Makefile.in
diff options
context:
space:
mode:
authorMartin Schröder <martin@oneiros.de>2008-07-14 21:44:01 +0000
committerMartin Schröder <martin@oneiros.de>2008-07-14 21:44:01 +0000
commit0d240b7cd1b937c17ef3b95446f7342c211a2483 (patch)
treeb2a5ab757059cd35ca5ecc49f34950f8aded4732 /Build/source/libs/xpdf/goo/Makefile.in
parentddf0c8ffbb8b64c0c02cd8a93fa62622fe9a157d (diff)
Merge pdftex up to r494
git-svn-id: svn://tug.org/texlive/trunk@9556 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/xpdf/goo/Makefile.in')
-rw-r--r--Build/source/libs/xpdf/goo/Makefile.in9
1 files changed, 7 insertions, 2 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 <martin@pdftex.org>
-# $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@