From 351b5fe3106e281bf9269440e6270dc1b56635f5 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 16 Nov 2012 11:52:12 +0000 Subject: 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 --- Build/source/libs/zziplib/ChangeLog | 4 ++++ Build/source/libs/zziplib/Makefile.am | 6 +++--- Build/source/libs/zziplib/Makefile.in | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) (limited to 'Build/source/libs/zziplib') diff --git a/Build/source/libs/zziplib/ChangeLog b/Build/source/libs/zziplib/ChangeLog index a29f3ed653e..3a3991d2895 100644 --- a/Build/source/libs/zziplib/ChangeLog +++ b/Build/source/libs/zziplib/ChangeLog @@ -1,3 +1,7 @@ +2012-11-16 Peter Breitenlohner + + * Makefile.am: Avoid use of deprecated INCLUDES. + 2012-03-12 Peter Breitenlohner Import zziplib-0.13.62. diff --git a/Build/source/libs/zziplib/Makefile.am b/Build/source/libs/zziplib/Makefile.am index 6bc182eb000..1ec5cfea3a5 100644 --- a/Build/source/libs/zziplib/Makefile.am +++ b/Build/source/libs/zziplib/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to build zziplib for TeX Live. ## -## Copyright (C) 2010, 2011 Peter Breitenlohner +## Copyright (C) 2010-2012 Peter Breitenlohner ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -33,8 +33,8 @@ dist-hook: SUBDIRS = include/zzip -INCLUDES = -Iinclude -I$(top_srcdir)/$(ZZIPLIB_TREE) $(ZLIB_INCLUDES) -AM_CPPFLAGS = $(ZZIPLIB_DEFINES) +AM_CPPFLAGS = -Iinclude -I$(top_srcdir)/$(ZZIPLIB_TREE) $(ZLIB_INCLUDES) +AM_CPPFLAGS += $(ZZIPLIB_DEFINES) AM_CFLAGS = $(WARNING_CFLAGS) noinst_LIBRARIES=libzzip.a diff --git a/Build/source/libs/zziplib/Makefile.in b/Build/source/libs/zziplib/Makefile.in index 53dcca2d8d2..9395522665b 100644 --- a/Build/source/libs/zziplib/Makefile.in +++ b/Build/source/libs/zziplib/Makefile.in @@ -277,8 +277,8 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -I m4 EXTRA_DIST = $(ZZIPLIB_TREE) $(ZZIPLIB_TREE)-PATCHES SUBDIRS = include/zzip -INCLUDES = -Iinclude -I$(top_srcdir)/$(ZZIPLIB_TREE) $(ZLIB_INCLUDES) -AM_CPPFLAGS = $(ZZIPLIB_DEFINES) +AM_CPPFLAGS = -Iinclude -I$(top_srcdir)/$(ZZIPLIB_TREE) \ + $(ZLIB_INCLUDES) $(ZZIPLIB_DEFINES) AM_CFLAGS = $(WARNING_CFLAGS) noinst_LIBRARIES = libzzip.a nodist_libzzip_a_SOURCES = \ -- cgit v1.2.3