diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-11-16 11:52:12 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-11-16 11:52:12 +0000 |
| commit | 351b5fe3106e281bf9269440e6270dc1b56635f5 (patch) | |
| tree | 29d6be38592c9384cec27797b3ea3560730adfd6 /Build/source/libs/teckit | |
| parent | 361ad3a3d62671dd95699b6fc55d6cbb79424811 (diff) | |
icu: build fix for gcc-4.7
tardate 2012-11-16
libs/*: avoid use of deprecated 'INCLUDES'.
git-svn-id: svn://tug.org/texlive/trunk@28277 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/teckit')
| -rw-r--r-- | Build/source/libs/teckit/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/libs/teckit/Makefile.am | 6 | ||||
| -rw-r--r-- | Build/source/libs/teckit/Makefile.in | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/Build/source/libs/teckit/ChangeLog b/Build/source/libs/teckit/ChangeLog index f82d8ef9b41..6cc7731fdd1 100644 --- a/Build/source/libs/teckit/ChangeLog +++ b/Build/source/libs/teckit/ChangeLog @@ -1,3 +1,7 @@ +2012-11-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Avoid use of deprecated INCLUDES. + 2012-03-17 Peter Breitenlohner <peb@mppmu.mpg.de> Import TECkit-2.5.3 diff --git a/Build/source/libs/teckit/Makefile.am b/Build/source/libs/teckit/Makefile.am index 38828e11f65..36b750df6ac 100644 --- a/Build/source/libs/teckit/Makefile.am +++ b/Build/source/libs/teckit/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory libs/teckit/ ## -## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -26,8 +26,8 @@ dist-hook: SUBDIRS = include/teckit -INCLUDES = -I$(top_srcdir)/$(TECKIT_TREE)/source/Public-headers $(ZLIB_INCLUDES) -AM_CPPFLAGS = -DNDEBUG +AM_CPPFLAGS = -I$(top_srcdir)/$(TECKIT_TREE)/source/Public-headers $(ZLIB_INCLUDES) +AM_CPPFLAGS += -DNDEBUG AM_CFLAGS = $(WARNING_CFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) diff --git a/Build/source/libs/teckit/Makefile.in b/Build/source/libs/teckit/Makefile.in index 0706c3bc5af..2c6523a469f 100644 --- a/Build/source/libs/teckit/Makefile.in +++ b/Build/source/libs/teckit/Makefile.in @@ -289,8 +289,8 @@ ACLOCAL_AMFLAGS = -I ../../m4 EXTRA_DIST = $(TECKIT_TREE) $(TECKIT_TREE)-PATCHES teckit.test \ tex-text.map tex-text.tec SUBDIRS = include/teckit -INCLUDES = -I$(top_srcdir)/$(TECKIT_TREE)/source/Public-headers $(ZLIB_INCLUDES) -AM_CPPFLAGS = -DNDEBUG +AM_CPPFLAGS = -I$(top_srcdir)/$(TECKIT_TREE)/source/Public-headers \ + $(ZLIB_INCLUDES) -DNDEBUG AM_CFLAGS = $(WARNING_CFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) noinst_LIBRARIES = libTECkit_Compiler.a libTECkit.a |