diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-06-10 13:18:47 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-06-10 13:18:47 +0000 |
commit | 5af1aa3cd449e5a6abb4972dcd9090bbe61162de (patch) | |
tree | cb4e4668b85d773dbb9ed7019ea250488a760948 /Build/source/texk/web2c/xetexdir | |
parent | 3afa3f06a4c3c3750742e7a6db8f20314c53183a (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/xetexdir')
-rw-r--r-- | Build/source/texk/web2c/xetexdir/ChangeLog | 10 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/am/xetex.am | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/bmpimage.h | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/pngimage.c | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/pngimage.h | 2 |
5 files changed, 15 insertions, 5 deletions
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog index 22f3bad4fa2..2fe4d64f90b 100644 --- a/Build/source/texk/web2c/xetexdir/ChangeLog +++ b/Build/source/texk/web2c/xetexdir/ChangeLog @@ -1,3 +1,13 @@ +2010-06-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/xetex.am (xetex_cppflags): Add $(AM_CPPFLAGS). + +2010-06-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + Reorganize web2c headers. + * bmpimage.h, pngimage.[ch]: #include <w2c/config.h> instead + of "config.h". + 2010-05-18 Karl Berry <karl@tug.org> * xetex.ch (XeTeX_version_string): incr to 0.9995.3. diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am index bd2cd0255e6..c61b7dcc8be 100644 --- a/Build/source/texk/web2c/xetexdir/am/xetex.am +++ b/Build/source/texk/web2c/xetexdir/am/xetex.am @@ -1,6 +1,6 @@ ## texk/web2c/xetexdir/am/xetex.am: Makefile fragment for XeTeX. ## -## 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. ## XeTeX @@ -15,7 +15,7 @@ nodist_EXTRA_xetex_SOURCES = dummy.cxx libxetex = libxetex.a -xetex_cppflags = -I$(srcdir)/xetexdir +xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir ## Must add icu first to avoid an installed version. xetex_cppflags += $(ICU_INCLUDES) ## Must add freetype2 includes early to avoid diff --git a/Build/source/texk/web2c/xetexdir/bmpimage.h b/Build/source/texk/web2c/xetexdir/bmpimage.h index 9c55b0c20f8..c2d248b001e 100644 --- a/Build/source/texk/web2c/xetexdir/bmpimage.h +++ b/Build/source/texk/web2c/xetexdir/bmpimage.h @@ -50,7 +50,7 @@ #define _BMPIMAGE_H_ #if HAVE_CONFIG_H -#include "config.h" +#include <w2c/config.h> #endif #include "mfileio.h" diff --git a/Build/source/texk/web2c/xetexdir/pngimage.c b/Build/source/texk/web2c/xetexdir/pngimage.c index 0701c4f46d0..25f7362562c 100644 --- a/Build/source/texk/web2c/xetexdir/pngimage.c +++ b/Build/source/texk/web2c/xetexdir/pngimage.c @@ -46,7 +46,7 @@ */ #if HAVE_CONFIG_H -#include "config.h" +#include <w2c/config.h> #endif /* diff --git a/Build/source/texk/web2c/xetexdir/pngimage.h b/Build/source/texk/web2c/xetexdir/pngimage.h index c00387ca4f0..c126986c5c7 100644 --- a/Build/source/texk/web2c/xetexdir/pngimage.h +++ b/Build/source/texk/web2c/xetexdir/pngimage.h @@ -50,7 +50,7 @@ #define _PNGIMAGE_H_ #if HAVE_CONFIG_H -#include "config.h" +#include <w2c/config.h> #endif #include "mfileio.h" |