On Mon, 9 Jan 2017, Daniel Stenberg wrote:
I'd like to once again propose that we remove these makefiles in order to
simplify and confuse our users less.
I'm attaching a patch showing what I'd like to do:
Makefile.dist| 449 +--
lib/Makefile.am | 4 +-
lib/Makefile.vc6 | 691
maketgz | 10 +-
src/Makefile.am | 4 +-
src/Makefile.vc6 | 550
-
6 files changed, 12 insertions(+), 1696 deletions(-)
--
/ daniel.haxx.seFrom 8d98083b9f98b6788dbbea7b6b62bec4fc1d02c6 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg
Date: Tue, 10 Jan 2017 00:29:14 +0100
Subject: [PATCH] VC: remove the makefile.vc6 build infra
All hail winbuild/
---
Makefile.dist| 449 +---
lib/Makefile.am | 4 +-
lib/Makefile.vc6 | 691 ---
maketgz | 10 +-
src/Makefile.am | 4 +-
src/Makefile.vc6 | 550 ---
6 files changed, 12 insertions(+), 1696 deletions(-)
delete mode 100644 lib/Makefile.vc6
delete mode 100644 src/Makefile.vc6
diff --git a/Makefile.dist b/Makefile.dist
index 329e4f3a8..8577c8a14 100644
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -3,11 +3,11 @@
# Project ___| | | | _ \| |
# / __| | | | |_) | |
#| (__| |_| | _ <| |___
# \___|\___/|_| \_\_|
#
-# Copyright (C) 1998 - 2015, Daniel Stenberg, , et al.
+# Copyright (C) 1998 - 2017, Daniel Stenberg, , et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
# are also available at https://curl.haxx.se/docs/copyright.html.
#
@@ -18,12 +18,10 @@
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
# KIND, either express or implied.
#
###
-VC=vc6
-
all:
./configure
make
ssl:
@@ -85,370 +83,17 @@ mingw32-examples%:
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
- cd ..\src
- nmake -f Makefile.$(VC) clean
-
-vc-all: $(VC)
- cd lib
- nmake -f Makefile.$(VC) cfg=release
- nmake -f Makefile.$(VC) cfg=release-ssl
- nmake -f Makefile.$(VC) cfg=release-zlib
- nmake -f Makefile.$(VC) cfg=release-ssl-zlib
- nmake -f Makefile.$(VC) cfg=release-ssl-dll
- nmake -f Makefile.$(VC) cfg=release-zlib-dll
- nmake -f Makefile.$(VC) cfg=release-ssl-dll-zlib-dll
- nmake -f Makefile.$(VC) cfg=release-dll
- nmake -f Makefile.$(VC) cfg=release-dll-ssl-dll
- nmake -f Makefile.$(VC) cfg=release-dll-zlib-dll
- nmake -f Makefile.$(VC) cfg=release-dll-ssl-dll-zlib-dll
- nmake -f Makefile.$(VC) cfg=debug
- nmake -f Makefile.$(VC) cfg=debug-ssl
- nmake -f Makefile.$(VC) cfg=debug-zlib
- nmake -f Makefile.$(VC) cfg=debug-ssl-zlib
- nmake -f Makefile.$(VC) cfg=debug-ssl-dll
- nmake -f Makefile.$(VC) cfg=debug-zlib-dll
- nmake -f Makefile.$(VC) cfg=debug-ssl-dll-zlib-dll
- nmake -f Makefile.$(VC) cfg=debug-dll
- nmake -f Makefile.$(VC) cfg=debug-dll-ssl-dll
- nmake -f Makefile.$(VC) cfg=debug-dll-zlib-dll
- nmake -f Makefile.$(VC) cfg=debug-dll-ssl-dll-zlib-dll
-
-vc: $(VC)
- cd lib
- nmake /f Makefile.$(VC) cfg=release
- cd ..\src
- nmake /f Makefile.$(VC)
-
-vc-x64: $(VC)
- cd lib
- nmake /f Makefile.$(VC) MACHINE=x64 cfg=release
- cd ..\src
- nmake /f Makefile.$(VC) MACHINE=x64 cfg=release
-
-vc-sspi: $(VC)
- cd lib
- nmake /f Makefile.$(VC) cfg=release WINDOWS_SSPI=1
- cd ..\src
- nmake /f Makefile.$(VC) cfg=release WINDOWS_SSPI=1
-
-vc-x64-sspi: $(VC)
- cd lib
- nmake /f Makefile.$(VC) MACHINE=x64 cfg=release WINDOWS_SSPI=1
- cd ..\src
- nmake /f Makefile.$(VC) MACHINE=x64 cfg=release WINDOWS_SSPI=1
-
-vc-idn: $(VC)
- cd lib
- nmake /f Makefile.$(VC) cfg=release USE_IDN=1
- cd ..\src
- nmake /f Makefile.$(VC) cfg=release USE_IDN=1
-
-vc-x64-idn: $(VC)
- cd lib
- nmake /f Makefile.$(VC) MACHINE=x64 cfg=release USE_IDN=1
- cd ..\src
- nmake /f Makefile.$(VC) MACHINE=x64 cfg=release USE_IDN=1
-
-vc-idn-sspi: $(VC)
- cd lib
- nmake /f Makefile.$(VC) cfg=release USE_IDN=1 WINDOWS_SSPI=1
- cd ..\src
- nmake /f Makefile.$(VC) cfg=release USE_IDN=1 WINDOWS_SSPI=1
-
-vc-x64-idn-sspi: $(VC)
- cd lib
- nmake /f Makefile.$(VC) MACHINE=x64 cfg=release USE_IDN=1 WINDOWS_SSPI=1
- cd ..\src
- nmake /f Makefile.$(VC) MACHINE=x64 cfg=release USE_IDN=1 WINDOWS_SSPI=1
-
-vc-zlib: $(VC)
- cd lib
- nmake /f Makefile.$(VC) cfg=release-zlib
- cd ..\src
- nmake /f Makefile.$(VC) cfg=release-zlib
-
-vc-x64-zlib: $(VC)
- cd lib
- nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-zlib
- cd ..\src
- nmake /f Makefile.$(VC) MACHINE=x64