diff options
Diffstat (limited to 'Build/source/libs/zlib')
-rw-r--r-- | Build/source/libs/zlib/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/libs/zlib/Makefile.am | 3 | ||||
-rw-r--r-- | Build/source/libs/zlib/Makefile.in | 3 |
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 \ |