From efaab37698d2a8677556a3eb22ca2ce37fa84300 Mon Sep 17 00:00:00 2001 From: Gunter Knauf Date: Fri, 3 Aug 2007 11:24:22 +0000 Subject: Peteris Krumins pointed out that the standard MingW32 build depends on zlib; removed that, and added another option for zlib build, and renamed all other targets to reflect zlib dependency. --- Makefile.dist | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'Makefile.dist') diff --git a/Makefile.dist b/Makefile.dist index c5f4e8076..f01b361d3 100644 --- a/Makefile.dist +++ b/Makefile.dist @@ -68,18 +68,22 @@ watcom-clean: wmake -f Makefile.Watcom clean mingw32: + $(MAKE) -C lib -f Makefile.m32 + $(MAKE) -C src -f Makefile.m32 + +mingw32-zlib: $(MAKE) -C lib -f Makefile.m32 ZLIB=1 $(MAKE) -C src -f Makefile.m32 ZLIB=1 -mingw32-ssl: +mingw32-ssl-zlib: $(MAKE) -C lib -f Makefile.m32 SSL=1 ZLIB=1 $(MAKE) -C src -f Makefile.m32 SSL=1 ZLIB=1 -mingw32-ssh2-ssl: +mingw32-ssh2-ssl-zlib: $(MAKE) -C lib -f Makefile.m32 SSH2=1 SSL=1 ZLIB=1 $(MAKE) -C src -f Makefile.m32 SSH2=1 SSL=1 ZLIB=1 -mingw32-ssh2-ssl-sspi: +mingw32-ssh2-ssl-sspi-zlib: $(MAKE) -C lib -f Makefile.m32 SSH2=1 SSL=1 SSPI=1 ZLIB=1 $(MAKE) -C src -f Makefile.m32 SSH2=1 SSL=1 SSPI=1 ZLIB=1 -- cgit v1.2.3