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/gd | |
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/gd')
-rw-r--r-- | Build/source/libs/gd/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/libs/gd/Makefile.am | 7 | ||||
-rw-r--r-- | Build/source/libs/gd/Makefile.in | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/Build/source/libs/gd/ChangeLog b/Build/source/libs/gd/ChangeLog index 7a55aeaa5ce..192f7533b02 100644 --- a/Build/source/libs/gd/ChangeLog +++ b/Build/source/libs/gd/ChangeLog @@ -1,3 +1,7 @@ +2012-11-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Avoid use of deprecated INCLUDES. + 2012-02-24 Peter Breitenlohner <peb@mppmu.mpg.de> * include/Makefile.am: Use ../am/hdr_links.am. diff --git a/Build/source/libs/gd/Makefile.am b/Build/source/libs/gd/Makefile.am index 4b0c419dca8..2cfc5e4bc81 100644 --- a/Build/source/libs/gd/Makefile.am +++ b/Build/source/libs/gd/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to build libpng for TeX Live. ## -## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -41,9 +41,8 @@ dist-hook: SUBDIRS = include -INCLUDES = -I$(top_srcdir)/$(GD_TREE) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(FREETYPE2_INCLUDES) - -AM_CPPFLAGS = -DNONDLL +AM_CPPFLAGS = -I$(top_srcdir)/$(GD_TREE) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(FREETYPE2_INCLUDES) +AM_CPPFLAGS += -DNONDLL noinst_LIBRARIES=libgd.a diff --git a/Build/source/libs/gd/Makefile.in b/Build/source/libs/gd/Makefile.in index 8c70adb3f4e..bd463069b58 100644 --- a/Build/source/libs/gd/Makefile.in +++ b/Build/source/libs/gd/Makefile.in @@ -304,8 +304,8 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 EXTRA_DIST = $(GD_TREE) $(GD_TREE)-PATCHES SUBDIRS = include -INCLUDES = -I$(top_srcdir)/$(GD_TREE) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(FREETYPE2_INCLUDES) -AM_CPPFLAGS = -DNONDLL +AM_CPPFLAGS = -I$(top_srcdir)/$(GD_TREE) $(ZLIB_INCLUDES) \ + $(LIBPNG_INCLUDES) $(FREETYPE2_INCLUDES) -DNONDLL noinst_LIBRARIES = libgd.a nodist_libgd_a_SOURCES = \ $(GD_TREE)/gd.c \ |