diff options
author | Guenter Knauf <lists@gknw.net> | 2011-04-19 20:59:24 +0200 |
---|---|---|
committer | Guenter Knauf <lists@gknw.net> | 2011-04-19 20:59:24 +0200 |
commit | eb65a49befa040746b222e693bba19ee56814e85 (patch) | |
tree | 671766c2df7c719ea453ad9711949f0e44e646a4 /Makefile.dist | |
parent | b2140a09f8fdda5b36172012ba02a404413c996f (diff) | |
download | curl-eb65a49befa040746b222e693bba19ee56814e85.tar.gz |
Improve MinGW static makefile builds.
It is now possible to use any combination of features without
having to 1st add makefile targets to the main makefile. The
main makefile now passes the 'mingw32-feat1-feat2' as var CFG,
and the ./[lib|src]/Makefile.m32 parses the CFG var to determine
the features to be enabled.
Diffstat (limited to 'Makefile.dist')
-rw-r--r-- | Makefile.dist | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/Makefile.dist b/Makefile.dist index bc532ce9a..55bab370a 100644 --- a/Makefile.dist +++ b/Makefile.dist @@ -70,30 +70,18 @@ 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-zlib: - $(MAKE) -C lib -f Makefile.m32 SSL=1 ZLIB=1 - $(MAKE) -C src -f Makefile.m32 SSL=1 ZLIB=1 - -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-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 - -mingw32-rtmp-ssh2-ssl-sspi-zlib: - $(MAKE) -C lib -f Makefile.m32 RTMP=1 SSH2=1 SSL=1 SSPI=1 ZLIB=1 - $(MAKE) -C src -f Makefile.m32 RTMP=1 SSH2=1 SSL=1 SSPI=1 ZLIB=1 - mingw32-clean: $(MAKE) -C lib -f Makefile.m32 clean $(MAKE) -C src -f Makefile.m32 clean +mingw32-vclean mingw32-distclean: + $(MAKE) -C lib -f Makefile.m32 vclean + $(MAKE) -C src -f Makefile.m32 vclean + +mingw32%: + $(MAKE) -C lib -f Makefile.m32 CFG=$@ + $(MAKE) -C src -f Makefile.m32 CFG=$@ + vc-clean: $(VC) cd lib nmake -f Makefile.$(VC) clean |