summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2012-01-17 15:06:41 -0600
committerMark Adler <madler@alumni.caltech.edu>2012-01-21 12:56:57 -0800
commitf0cff24214d437ef28d0eb92f9bc45a36cf25530 (patch)
tree4323a46e2df12e47d09fd55f7b0e6b0c35cd3ac9 /contrib
parent81015585d27875e250bdb8f375f2dd999e31a73f (diff)
downloadzlib-f0cff24214d437ef28d0eb92f9bc45a36cf25530.tar.gz
zlib-f0cff24214d437ef28d0eb92f9bc45a36cf25530.tar.bz2
zlib-f0cff24214d437ef28d0eb92f9bc45a36cf25530.zip
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.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/minizip/Makefile.am9
1 files changed, 7 insertions, 2 deletions
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 @@
1lib_LTLIBRARIES = libminizip.la 1lib_LTLIBRARIES = libminizip.la
2 2
3zlib_top_srcdir = $(top_srcdir)/../..
4zlib_top_builddir = $(top_builddir)/../..
5
6AM_CPPFLAGS = -I$(zlib_top_srcdir)
7AM_LDFLAGS = -L$(zlib_top_builddir)
8
3libminizip_la_SOURCES = \ 9libminizip_la_SOURCES = \
4 ioapi.c \ 10 ioapi.c \
5 mztools.c \ 11 mztools.c \
6 unzip.c \ 12 unzip.c \
7 zip.c 13 zip.c
8 14
9AM_CFLAGS = -I../.. -L../.. 15libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz
10libminizip_la_LDFLAGS = -version-info 1:0:0 -lz
11 16
12minizip_includedir = $(includedir)/minizip 17minizip_includedir = $(includedir)/minizip
13minizip_include_HEADERS = \ 18minizip_include_HEADERS = \