summaryrefslogtreecommitdiff
path: root/Build/source/libs/zlib
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/zlib
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/zlib')
-rw-r--r--Build/source/libs/zlib/ChangeLog4
-rw-r--r--Build/source/libs/zlib/Makefile.am3
-rw-r--r--Build/source/libs/zlib/Makefile.in3
3 files changed, 6 insertions, 4 deletions
diff --git a/Build/source/libs/zlib/ChangeLog b/Build/source/libs/zlib/ChangeLog
index 4f5af92c3cd..5f7071001ea 100644
--- a/Build/source/libs/zlib/ChangeLog
+++ b/Build/source/libs/zlib/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-05-03 Peter Breitenlohner <peb@mppmu.mpg.de>
Import zlib-1.2.7.
diff --git a/Build/source/libs/zlib/Makefile.am b/Build/source/libs/zlib/Makefile.am
index 756b285fa0c..0584444885a 100644
--- a/Build/source/libs/zlib/Makefile.am
+++ b/Build/source/libs/zlib/Makefile.am
@@ -30,8 +30,7 @@ dist-hook:
SUBDIRS = . include
-INCLUDES = -I$(top_srcdir)/$(ZLIB_TREE)
-AM_CPPFLAGS = $(ZLIB_DEFINES)
+AM_CPPFLAGS = -I$(top_srcdir)/$(ZLIB_TREE) $(ZLIB_DEFINES)
noinst_LIBRARIES = libz.a
diff --git a/Build/source/libs/zlib/Makefile.in b/Build/source/libs/zlib/Makefile.in
index 19876ac8e9a..30935eb6921 100644
--- a/Build/source/libs/zlib/Makefile.in
+++ b/Build/source/libs/zlib/Makefile.in
@@ -264,8 +264,7 @@ top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
EXTRA_DIST = $(ZLIB_TREE) $(ZLIB_TREE)-PATCHES
SUBDIRS = . include
-INCLUDES = -I$(top_srcdir)/$(ZLIB_TREE)
-AM_CPPFLAGS = $(ZLIB_DEFINES)
+AM_CPPFLAGS = -I$(top_srcdir)/$(ZLIB_TREE) $(ZLIB_DEFINES)
noinst_LIBRARIES = libz.a
nodist_libz_a_SOURCES = \
$(ZLIB_TREE)/adler32.c \