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/libpng | |
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/libpng')
-rw-r--r-- | Build/source/libs/libpng/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/libs/libpng/Makefile.am | 5 | ||||
-rw-r--r-- | Build/source/libs/libpng/Makefile.in | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/Build/source/libs/libpng/ChangeLog b/Build/source/libs/libpng/ChangeLog index 046ec980b1a..30c7a2c5cdf 100644 --- a/Build/source/libs/libpng/ChangeLog +++ b/Build/source/libs/libpng/ChangeLog @@ -1,3 +1,7 @@ +2012-11-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Avoid use of deprecated INCLUDES. + 2012-09-28 Peter Breitenlohner <peb@mppmu.mpg.de> Import libpng-1.5.13. diff --git a/Build/source/libs/libpng/Makefile.am b/Build/source/libs/libpng/Makefile.am index 4bd3685d5cb..b82faa95fa1 100644 --- a/Build/source/libs/libpng/Makefile.am +++ b/Build/source/libs/libpng/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to build libpng for TeX Live. ## -## Copyright (C) 2009-2011 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, @@ -36,8 +36,7 @@ dist-hook: SUBDIRS = include -INCLUDES = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) -AM_CPPFLAGS = $(LIBPNG_DEFINES) +AM_CPPFLAGS = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) $(LIBPNG_DEFINES) AM_CFLAGS = $(WARNING_CFLAGS) noinst_LIBRARIES=libpng.a diff --git a/Build/source/libs/libpng/Makefile.in b/Build/source/libs/libpng/Makefile.in index d11adcf08e3..a3864843daa 100644 --- a/Build/source/libs/libpng/Makefile.in +++ b/Build/source/libs/libpng/Makefile.in @@ -266,8 +266,7 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 EXTRA_DIST = $(LIBPNG_TREE) $(LIBPNG_TREE)-PATCHES SUBDIRS = include -INCLUDES = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) -AM_CPPFLAGS = $(LIBPNG_DEFINES) +AM_CPPFLAGS = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) $(LIBPNG_DEFINES) AM_CFLAGS = $(WARNING_CFLAGS) noinst_LIBRARIES = libpng.a nodist_libpng_a_SOURCES = \ |