summaryrefslogtreecommitdiff
path: root/Build/source/libs/zziplib
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-11-16 11:52:12 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-11-16 11:52:12 +0000
commit351b5fe3106e281bf9269440e6270dc1b56635f5 (patch)
tree29d6be38592c9384cec27797b3ea3560730adfd6 /Build/source/libs/zziplib
parent361ad3a3d62671dd95699b6fc55d6cbb79424811 (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/zziplib')
-rw-r--r--Build/source/libs/zziplib/ChangeLog4
-rw-r--r--Build/source/libs/zziplib/Makefile.am6
-rw-r--r--Build/source/libs/zziplib/Makefile.in4
3 files changed, 9 insertions, 5 deletions
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 <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-03-12 Peter Breitenlohner <peb@mppmu.mpg.de>
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 <tex-live@tug.org>
+## Copyright (C) 2010-2012 Peter Breitenlohner <tex-live@tug.org>
##
## 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 = \