From f0cff24214d437ef28d0eb92f9bc45a36cf25530 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Tue, 17 Jan 2012 15:06:41 -0600 Subject: Add support for VPATH builds in contrib/minizip. Instead of using relative paths directly, use paths relative to top_srcdir and top_builddir to refer to source files and built files, respectively. Note that the toplevel zlib configure script still does not have any special support for out-of-tree builds. But now you can do (cd contrib/minizip && autoreconf -fis) mkdir -p BUILD/test cp *.c *.h *.in zlib.map configure zlib.3 BUILD cp test/*.c BUILD/test (cd BUILD && ./configure --shared) (cd BUILD && make) mkdir -p BUILD/contrib/minizip cd BUILD/contrib/minizip ../../../contrib/minizip/configure make While at it, move the include path and library path settings to CPPFLAGS and LDFLAGS respectively instead of setting both in CFLAGS. Thanks to Mike Frysinger for advice. --- contrib/minizip/Makefile.am | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'contrib') diff --git a/contrib/minizip/Makefile.am b/contrib/minizip/Makefile.am index 91258db..b0f39b6 100644 --- a/contrib/minizip/Makefile.am +++ b/contrib/minizip/Makefile.am @@ -1,13 +1,18 @@ lib_LTLIBRARIES = libminizip.la +zlib_top_srcdir = $(top_srcdir)/../.. +zlib_top_builddir = $(top_builddir)/../.. + +AM_CPPFLAGS = -I$(zlib_top_srcdir) +AM_LDFLAGS = -L$(zlib_top_builddir) + libminizip_la_SOURCES = \ ioapi.c \ mztools.c \ unzip.c \ zip.c -AM_CFLAGS = -I../.. -L../.. -libminizip_la_LDFLAGS = -version-info 1:0:0 -lz +libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz minizip_includedir = $(includedir)/minizip minizip_include_HEADERS = \ -- cgit v1.2.3-55-g6feb