diff options
Diffstat (limited to 'Build/source/texk/web2c/pdftexdir')
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/ChangeLog | 11 | ||||
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/am/pdftex.am | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/am/ttf2afm.am | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/pdftoepdf.cc | 4 |
4 files changed, 18 insertions, 7 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index 25f2aa8bae1..ac5b90bb222 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,14 @@ +2010-06-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/pdftex.am (pdftex_cppflags): Add $(AM_CPPFLAGS). + * am/ttf2afm.am (ttf2afm_CPPFLAGS): Add $(AM_CPPFLAGS). + +2010-06-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + Reorganize web2c headers. + * pdftoepdf.cc: #include <w2c/c-auto.h> instead of <c-auto.h> + and <w2c/config.h> instead of "../config.h". + 2010-06-07 Karl Berry <karl@tug.org> * pdftex.web: (pdftex_version_string): let's be optimistic and diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am index 6ebeb764cdf..446d4ff9d2b 100644 --- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am +++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am @@ -3,9 +3,9 @@ ## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. -pdftex_cppflags = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES) -pdftex_cppflags += $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 -pdftex_cppflags += -I$(srcdir)/pdftexdir +pdftex_cppflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) +pdftex_cppflags += $(XPDF_INCLUDES) $(OBSDCOMPAT_INCLUDES) +pdftex_cppflags += -I$(srcdir)/libmd5 -I$(srcdir)/pdftexdir # used for both pdftex and pdftosrc. pdftex_ldadd = $(LIBPNG_LIBS) $(ZLIB_LIBS) $(XPDF_LIBS) diff --git a/Build/source/texk/web2c/pdftexdir/am/ttf2afm.am b/Build/source/texk/web2c/pdftexdir/am/ttf2afm.am index 12e31675c41..964a07fe26b 100644 --- a/Build/source/texk/web2c/pdftexdir/am/ttf2afm.am +++ b/Build/source/texk/web2c/pdftexdir/am/ttf2afm.am @@ -1,6 +1,6 @@ ## texk/web2c/pdftexdir/am/ttf2afm.am: Makefile fragment for ttf2afm. ## -## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ttf2afm @@ -10,7 +10,7 @@ bin_PROGRAMS += ttf2afm endif PDFTEX EXTRA_PROGRAMS += ttf2afm -ttf2afm_CPPFLAGS = -I$(srcdir)/pdftexdir +ttf2afm_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/pdftexdir ttf2afm_CFLAGS = $(WARNING_CFLAGS) ttf2afm_SOURCES = pdftexdir/ttf2afm.c diff --git a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc index fca1ad4a08e..22f01978ab3 100644 --- a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc +++ b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc @@ -72,8 +72,8 @@ extern "C" { #include <kpathsea/c-proto.h> #include <kpathsea/lib.h> -#include <c-auto.h> /* define SIZEOF_LONG */ -#include "../config.h" /* define type integer */ +#include <w2c/c-auto.h> /* define SIZEOF_LONG */ +#include <w2c/config.h> /* define type integer */ #include <pdftexdir/ptexmac.h> #include <pdftexdir/pdftex-common.h> |