|
@@ -96,13 +96,13 @@ mingw32-clean:
|
|
|
$(MAKE) -C lib -f Makefile.m32 clean
|
|
|
$(MAKE) -C src -f Makefile.m32 clean
|
|
|
|
|
|
-vc-clean:
|
|
|
+vc-clean: $(VC)
|
|
|
cd lib
|
|
|
nmake -f Makefile.$(VC) clean
|
|
|
cd ..\src
|
|
|
nmake -f Makefile.$(VC) clean
|
|
|
|
|
|
-vc-all:
|
|
|
+vc-all: $(VC)
|
|
|
cd lib
|
|
|
nmake -f Makefile.$(VC) cfg=release
|
|
|
nmake -f Makefile.$(VC) cfg=release-ssl
|
|
@@ -127,85 +127,85 @@ vc-all:
|
|
|
nmake -f Makefile.$(VC) cfg=debug-dll-zlib-dll
|
|
|
nmake -f Makefile.$(VC) cfg=debug-dll-ssl-dll-zlib-dll
|
|
|
|
|
|
-vc:
|
|
|
+vc: $(VC)
|
|
|
cd lib
|
|
|
nmake /f Makefile.$(VC) cfg=release
|
|
|
cd ..\src
|
|
|
nmake /f Makefile.$(VC)
|
|
|
|
|
|
-vc-x64:
|
|
|
+vc-x64: $(VC)
|
|
|
cd lib
|
|
|
nmake /f Makefile.$(VC) MACHINE=x64 cfg=release
|
|
|
cd ..\src
|
|
|
nmake /f Makefile.$(VC) MACHINE=x64 cfg=release
|
|
|
|
|
|
-vc-zlib:
|
|
|
+vc-zlib: $(VC)
|
|
|
cd lib
|
|
|
nmake /f Makefile.$(VC) cfg=release-zlib
|
|
|
cd ..\src
|
|
|
nmake /f Makefile.$(VC) cfg=release-zlib
|
|
|
|
|
|
-vc-ssl:
|
|
|
+vc-ssl: $(VC)
|
|
|
cd lib
|
|
|
nmake /f Makefile.$(VC) cfg=release-ssl
|
|
|
cd ..\src
|
|
|
nmake /f Makefile.$(VC) cfg=release-ssl
|
|
|
|
|
|
-vc-ssl-zlib:
|
|
|
+vc-ssl-zlib: $(VC)
|
|
|
cd lib
|
|
|
nmake /f Makefile.$(VC) cfg=release-ssl-zlib
|
|
|
cd ..\src
|
|
|
nmake /f Makefile.$(VC) cfg=release-ssl-zlib
|
|
|
|
|
|
-vc-x64-ssl-zlib:
|
|
|
+vc-x64-ssl-zlib: $(VC)
|
|
|
cd lib
|
|
|
nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl-zlib
|
|
|
cd ..\src
|
|
|
nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl-zlib
|
|
|
|
|
|
-vc-ssl-dll:
|
|
|
+vc-ssl-dll: $(VC)
|
|
|
cd lib
|
|
|
nmake /f Makefile.$(VC) cfg=release-ssl-dll
|
|
|
cd ..\src
|
|
|
nmake /f Makefile.$(VC) cfg=release-ssl-dll
|
|
|
|
|
|
-vc-dll-ssl-dll:
|
|
|
+vc-dll-ssl-dll: $(VC)
|
|
|
cd lib
|
|
|
nmake /f Makefile.$(VC) cfg=release-dll-ssl-dll
|
|
|
cd ..\src
|
|
|
nmake /f Makefile.$(VC) cfg=release-dll-ssl-dll
|
|
|
|
|
|
-vc-dll:
|
|
|
+vc-dll: $(VC)
|
|
|
cd lib
|
|
|
nmake /f Makefile.$(VC) cfg=release-dll
|
|
|
cd ..\src
|
|
|
nmake /f Makefile.$(VC) cfg=release-dll
|
|
|
|
|
|
-vc-dll-zlib-dll:
|
|
|
+vc-dll-zlib-dll: $(VC)
|
|
|
cd lib
|
|
|
nmake /f Makefile.$(VC) cfg=release-dll-zlib-dll
|
|
|
cd ..\src
|
|
|
nmake /f Makefile.$(VC) cfg=release-dll-zlib-dll
|
|
|
|
|
|
-vc-dll-ssl-dll-zlib-dll:
|
|
|
+vc-dll-ssl-dll-zlib-dll: $(VC)
|
|
|
cd lib
|
|
|
nmake /f Makefile.$(VC) cfg=release-dll-ssl-dll-zlib-dll
|
|
|
cd ..\src
|
|
|
nmake /f Makefile.$(VC) cfg=release-dll-ssl-dll-zlib-dll
|
|
|
|
|
|
-vc-ssl-dll-zlib-dll:
|
|
|
+vc-ssl-dll-zlib-dll: $(VC)
|
|
|
cd lib
|
|
|
nmake /f Makefile.$(VC) cfg=release-ssl-dll-zlib-dll
|
|
|
cd ..\src
|
|
|
nmake /f Makefile.$(VC) cfg=release-ssl-dll-zlib-dll
|
|
|
|
|
|
-vc-zlib-dll:
|
|
|
+vc-zlib-dll: $(VC)
|
|
|
cd lib
|
|
|
nmake /f Makefile.$(VC) cfg=release-zlib-dll
|
|
|
cd ..\src
|
|
|
nmake /f Makefile.$(VC) cfg=release-zlib-dll
|
|
|
|
|
|
-vc-sspi:
|
|
|
+vc-sspi: $(VC)
|
|
|
cd lib
|
|
|
nmake /f Makefile.$(VC) cfg=release WINDOWS_SSPI=1
|
|
|
cd ..\src
|
|
@@ -267,6 +267,8 @@ linux: all
|
|
|
|
|
|
linux-ssl: ssl
|
|
|
|
|
|
+# We don't need to do anything for vc6.
|
|
|
+vc6:
|
|
|
|
|
|
vc8: lib/Makefile.vc8 src/Makefile.vc8
|
|
|
|
|
@@ -289,6 +291,17 @@ src/Makefile.vc9: src/Makefile.vc6
|
|
|
@echo "generate $@"
|
|
|
@sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/ws2_32.lib/ws2_32.lib/g" -e "s/vc6/vc9/g" -e "s/VC6/VC9/g" src/Makefile.vc6 > src/Makefile.vc9
|
|
|
|
|
|
+# VC10 makefiles are for use with VS2010
|
|
|
+vc10: lib/Makefile.vc10 src/Makefile.vc10
|
|
|
+
|
|
|
+lib/Makefile.vc10: lib/Makefile.vc6
|
|
|
+ @echo "generate $@"
|
|
|
+ @sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/ws2_32.lib/ws2_32.lib/g" -e "s/vc6/vc10/g" -e "s/VC6/VC10/g" lib/Makefile.vc6 > lib/Makefile.vc10
|
|
|
+
|
|
|
+src/Makefile.vc10: src/Makefile.vc6
|
|
|
+ @echo "generate $@"
|
|
|
+ @sed -e "s#/GX /DWIN32 /YX#/EHsc /DWIN32#" -e "s#/GZ#/RTC1#" -e "s/ws2_32.lib/ws2_32.lib/g" -e "s/vc6/vc10/g" -e "s/VC6/VC10/g" src/Makefile.vc6 > src/Makefile.vc10
|
|
|
+
|
|
|
ca-bundle: lib/mk-ca-bundle.pl
|
|
|
@echo "generate a fresh ca-bundle.crt"
|
|
|
@perl $< -b -l -u lib/ca-bundle.crt
|