summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/pdftexdir/am
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-06-10 13:18:47 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-06-10 13:18:47 +0000
commit5af1aa3cd449e5a6abb4972dcd9090bbe61162de (patch)
treecb4e4668b85d773dbb9ed7019ea250488a760948 /Build/source/texk/web2c/pdftexdir/am
parent3afa3f06a4c3c3750742e7a6db8f20314c53183a (diff)
texk/web2c: reorganize headers and CPPFLAGS
git-svn-id: svn://tug.org/texlive/trunk@18865 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/pdftexdir/am')
-rw-r--r--Build/source/texk/web2c/pdftexdir/am/pdftex.am6
-rw-r--r--Build/source/texk/web2c/pdftexdir/am/ttf2afm.am4
2 files changed, 5 insertions, 5 deletions
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