summaryrefslogtreecommitdiff
path: root/Makefile.dist
diff options
context:
space:
mode:
authorGunter Knauf <gk@gknw.de>2007-08-03 11:24:22 +0000
committerGunter Knauf <gk@gknw.de>2007-08-03 11:24:22 +0000
commitefaab37698d2a8677556a3eb22ca2ce37fa84300 (patch)
tree4f4210d463f4f9e47b5d9745286515147c9101f5 /Makefile.dist
parent869319ce4a6aa235dfacb6753f367a62732906f9 (diff)
downloadcurl-efaab37698d2a8677556a3eb22ca2ce37fa84300.tar.gz
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.
Diffstat (limited to 'Makefile.dist')
-rw-r--r--Makefile.dist10
1 files changed, 7 insertions, 3 deletions
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