build: refactoring of msvc makefiles to allow overriding of library filenames.

Default libcurl's file names are kept equal to those used since Y2K.

diff --git a/Makefile.msvc.names b/Makefile.msvc.names
new file mode 100644 (file)
index 0000000..56c81ad
--- /dev/null
+++ b/Makefile.msvc.names
@@ -0,0 +1,81 @@
+#***************************************************************************\r
+#                                  _   _ ____  _\r
+#  Project                     ___| | | |  _ \| |\r
+#                             / __| | | | |_) | |\r
+#                            | (__| |_| |  _ <| |___\r
+#                             \___|\___/|_| \_\_____|\r
+#\r
+# Copyright (C) 1999 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.\r
+#\r
+# This software is licensed as described in the file COPYING, which\r
+# you should have received as part of this distribution. The terms\r
+# are also available at http://curl.haxx.se/docs/copyright.html.\r
+#\r
+# You may opt to use, copy, modify, merge, publish, distribute and/or sell\r
+# copies of the Software, and permit persons to whom the Software is\r
+# furnished to do so, under the terms of the COPYING file.\r
+#\r
+# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY\r
+# KIND, either express or implied.\r
+#\r
+#***************************************************************************\r
+\r
+#\r
+# This file is included from MSVC makefiles located in lib and src,\r
+# providing libcurl common file names required by these makefiles.\r
+#\r
+\r
+# ------------------\r
+# libcurl base name\r
+# ------------------\r
+\r
+!IF !DEFINED(LIB_NAME) || "$(LIB_NAME)" == ""\r
+LIB_NAME = libcurl\r
+!ENDIF\r
+\r
+# -------------------------------------------------\r
+# libcurl static and dynamic libraries common base\r
+# file names for release and debug configurations\r
+# -------------------------------------------------\r
+\r
+!IF !DEFINED(LIB_NAME_STA_REL) || "$(LIB_NAME_STA_REL)" == ""\r
+LIB_NAME_STA_REL = $(LIB_NAME)\r
+!ENDIF\r
+\r
+!IF !DEFINED(LIB_NAME_STA_DBG) || "$(LIB_NAME_STA_DBG)" == ""\r
+LIB_NAME_STA_DBG = $(LIB_NAME_STA_REL)d\r
+!ENDIF\r
+\r
+!IF !DEFINED(LIB_NAME_DYN_REL) || "$(LIB_NAME_DYN_REL)" == ""\r
+LIB_NAME_DYN_REL = $(LIB_NAME)\r
+!ENDIF\r
+\r
+!IF !DEFINED(LIB_NAME_DYN_DBG) || "$(LIB_NAME_DYN_DBG)" == ""\r
+LIB_NAME_DYN_DBG = $(LIB_NAME_DYN_REL)d\r
+!ENDIF\r
+\r
+# --------------------------------------------\r
+# Base names for libcurl DLL import libraries\r
+# --------------------------------------------\r
+\r
+!IF !DEFINED(LIB_NAME_IMP_REL) || "$(LIB_NAME_IMP_REL)" == ""\r
+LIB_NAME_IMP_REL = $(LIB_NAME_DYN_REL)_imp\r
+!ENDIF\r
+\r
+!IF !DEFINED(LIB_NAME_IMP_DBG) || "$(LIB_NAME_IMP_DBG)" == ""\r
+LIB_NAME_IMP_DBG = $(LIB_NAME_DYN_DBG)_imp\r
+!ENDIF\r
+\r
+# --------------------------------------\r
+# File names with extension and no path\r
+# --------------------------------------\r
+\r
+LIBCURL_STA_LIB_REL = $(LIB_NAME_STA_REL).lib\r
+LIBCURL_STA_LIB_DBG = $(LIB_NAME_STA_DBG).lib\r
+LIBCURL_DYN_LIB_REL = $(LIB_NAME_DYN_REL).dll\r
+LIBCURL_DYN_LIB_DBG = $(LIB_NAME_DYN_DBG).dll\r
+LIBCURL_IMP_LIB_REL = $(LIB_NAME_IMP_REL).lib\r
+LIBCURL_IMP_LIB_DBG = $(LIB_NAME_IMP_DBG).lib\r
+LIBCURL_DYN_LIB_PDB = $(LIB_NAME_IMP_DBG).pdb\r
+\r
+# End of Makefile.msvc.names\r

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 2e18e14..278af1d 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -18,6 +18,8 @@
 # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY\r
 # KIND, either express or implied.\r
 #\r
+#***************************************************************************\r
+\r
 ###########################################################################\r
 #\r
 # Makefile for building libcurl with MSVC6\r
@@ -41,17 +43,24 @@
 #\r
 ##############################################################\r
 \r
-#\r
-# Stem for static libs and DLLs\r
-#\r
-LIB_NAME       = libcurl\r
-LIB_NAME_DEBUG = libcurld\r
+# ----------------------------------------------\r
+# Verify that current subdir is libcurl's 'lib'\r
+# ----------------------------------------------\r
+\r
+!IF ! EXIST(.\curl_addrinfo.c)\r
+!  MESSAGE Can not process this makefile from outside of libcurl's 'lib' subdirectory.\r
+!  MESSAGE Change to libcurl's 'lib' subdirectory, and try again.\r
+!  ERROR   See previous message.\r
+!ENDIF\r
+\r
+# ------------------------------------------------\r
+# Makefile.msvc.names provides libcurl file names\r
+# ------------------------------------------------\r
+\r
+!INCLUDE ..\Makefile.msvc.names\r
+\r
+\r
 \r
-#\r
-# Stem for DLL import libs\r
-#\r
-IMPLIB_NAME       = libcurl_imp\r
-IMPLIB_NAME_DEBUG = libcurld_imp\r
 \r
 !IFNDEF OPENSSL_PATH\r
 OPENSSL_PATH   = ../../openssl-0.9.8o\r
@@ -129,7 +138,7 @@ RTLIBD = /MTd
 # release\r
 \r
 !IF "$(CFG)" == "release"\r
-TARGET = $(LIB_NAME).lib\r
+TARGET = $(LIBCURL_STA_LIB_REL)\r
 DIROBJ = $(CFG)\r
 LNK    = $(LNKLIB) /out:$(DIROBJ)\$(TARGET)\r
 CC     = $(CCNODBG) $(RTLIB) $(CFLAGSLIB)\r
@@ -140,7 +149,7 @@ CFGSET = TRUE
 # release-zlib\r
 \r
 !IF "$(CFG)" == "release-zlib"\r
-TARGET   = $(LIB_NAME).lib\r
+TARGET   = $(LIBCURL_STA_LIB_REL)\r
 DIROBJ   = $(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
@@ -152,9 +161,9 @@ CFGSET   = TRUE
 # release-dll\r
 \r
 !IF "$(CFG)" == "release-dll"\r
-TARGET = $(LIB_NAME).dll\r
+TARGET = $(LIBCURL_DYN_LIB_REL)\r
 DIROBJ = $(CFG)\r
-LNK    = $(LNKDLL) $(WINLIBS) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME).lib\r
+LNK    = $(LNKDLL) $(WINLIBS) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_REL)\r
 CC     = $(CCNODBG) $(RTLIB)\r
 CFGSET = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
@@ -164,7 +173,7 @@ RESOURCE = $(DIROBJ)\libcurl.res
 # release-ssl\r
 \r
 !IF "$(CFG)" == "release-ssl"\r
-TARGET   = $(LIB_NAME).lib\r
+TARGET   = $(LIBCURL_STA_LIB_REL)\r
 DIROBJ   = $(CFG)\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"\r
 LNK      = $(LNKLIB) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)\r
@@ -176,7 +185,7 @@ CFGSET   = TRUE
 # release-ssl-dll\r
 \r
 !IF "$(CFG)" == "release-ssl-dll"\r
-TARGET   = $(LIB_NAME).lib\r
+TARGET   = $(LIBCURL_STA_LIB_REL)\r
 DIROBJ   = $(CFG)\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"\r
 LNK      = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)\r
@@ -188,7 +197,7 @@ CFGSET   = TRUE
 # release-ssl-zlib\r
 \r
 !IF "$(CFG)" == "release-ssl-zlib"\r
-TARGET   = $(LIB_NAME).lib\r
+TARGET   = $(LIBCURL_STA_LIB_REL)\r
 DIROBJ   = $(CFG)\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
@@ -201,10 +210,10 @@ CFGSET   = TRUE
 # release-dll-ssl-dll\r
 \r
 !IF "$(CFG)" == "release-dll-ssl-dll"\r
-TARGET   = $(LIB_NAME).dll\r
+TARGET   = $(LIBCURL_DYN_LIB_REL)\r
 DIROBJ   = $(CFG)\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"\r
-LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME).lib\r
+LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_REL)\r
 CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL)\r
 CFGSET   = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
@@ -214,7 +223,7 @@ RESOURCE = $(DIROBJ)\libcurl.res
 # release-zlib-dll\r
 \r
 !IF "$(CFG)" == "release-zlib-dll"\r
-TARGET   = $(LIB_NAME).lib\r
+TARGET   = $(LIBCURL_STA_LIB_REL)\r
 DIROBJ   = $(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LNK      = $(LNKLIB) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
@@ -226,7 +235,7 @@ CFGSET   = TRUE
 # release-ssl-dll-zlib-dll\r
 \r
 !IF "$(CFG)" == "release-ssl-dll-zlib-dll"\r
-TARGET   = $(LIB_NAME).lib\r
+TARGET   = $(LIBCURL_STA_LIB_REL)\r
 DIROBJ   = $(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"\r
@@ -239,10 +248,10 @@ CFGSET   = TRUE
 # release-dll-zlib-dll\r
 \r
 !IF "$(CFG)" == "release-dll-zlib-dll"\r
-TARGET   = $(LIB_NAME).dll\r
+TARGET   = $(LIBCURL_DYN_LIB_REL)\r
 DIROBJ   = $(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
-LNK      = $(LNKDLL) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME).lib\r
+LNK      = $(LNKDLL) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_REL)\r
 CC       = $(CCNODBG) $(RTLIB) $(CFLAGSZLIB)\r
 CFGSET   = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
@@ -252,11 +261,11 @@ RESOURCE = $(DIROBJ)\libcurl.res
 # release-dll-ssl-dll-zlib-dll\r
 \r
 !IF "$(CFG)" == "release-dll-ssl-dll-zlib-dll"\r
-TARGET   = $(LIB_NAME).dll\r
+TARGET   = $(LIBCURL_DYN_LIB_REL)\r
 DIROBJ   = $(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"\r
-LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME).lib\r
+LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_REL)\r
 CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSZLIB)\r
 CFGSET   = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
@@ -266,7 +275,7 @@ RESOURCE = $(DIROBJ)\libcurl.res
 # debug\r
 \r
 !IF "$(CFG)" == "debug"\r
-TARGET = $(LIB_NAME_DEBUG).lib\r
+TARGET = $(LIBCURL_STA_LIB_DBG)\r
 DIROBJ = $(CFG)\r
 LNK    = $(LNKLIB) /out:$(DIROBJ)\$(TARGET)\r
 CC     = $(CCDEBUG) $(RTLIBD) $(CFLAGSLIB)\r
@@ -277,7 +286,7 @@ CFGSET = TRUE
 # debug-ssl\r
 \r
 !IF "$(CFG)" == "debug-ssl"\r
-TARGET   = $(LIB_NAME_DEBUG).lib\r
+TARGET   = $(LIBCURL_STA_LIB_DBG)\r
 DIROBJ   = $(CFG)\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"\r
 LNK      = $(LNKLIB) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)\r
@@ -289,7 +298,7 @@ CFGSET   = TRUE
 # debug-zlib\r
 \r
 !IF "$(CFG)" == "debug-zlib"\r
-TARGET   = $(LIB_NAME_DEBUG).lib\r
+TARGET   = $(LIBCURL_STA_LIB_DBG)\r
 DIROBJ   = $(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
@@ -301,7 +310,7 @@ CFGSET   = TRUE
 # debug-ssl-dll\r
 \r
 !IF "$(CFG)" == "debug-ssl-dll"\r
-TARGET   = $(LIB_NAME_DEBUG).lib\r
+TARGET   = $(LIBCURL_STA_LIB_DBG)\r
 DIROBJ   = $(CFG)\r
 LFLAGSSSL = /LIBPATH:$(OPENSSL_PATH)\out32dll\r
 LNK      = $(LNKLIB) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)\r
@@ -313,7 +322,7 @@ CFGSET   = TRUE
 # debug-ssl-zlib\r
 \r
 !IF "$(CFG)" == "debug-ssl-zlib"\r
-TARGET   = $(LIB_NAME_DEBUG).lib\r
+TARGET   = $(LIBCURL_STA_LIB_DBG)\r
 DIROBJ   = $(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"\r
@@ -326,7 +335,7 @@ CFGSET   = TRUE
 # debug-zlib-dll\r
 \r
 !IF "$(CFG)" == "debug-zlib-dll"\r
-TARGET   = $(LIB_NAME_DEBUG).lib\r
+TARGET   = $(LIBCURL_STA_LIB_DBG)\r
 DIROBJ   = $(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LNK      = $(LNKLIB) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
@@ -338,7 +347,7 @@ CFGSET   = TRUE
 # debug-ssl-dll-zlib-dll\r
 \r
 !IF "$(CFG)" == "debug-ssl-dll-zlib-dll"\r
-TARGET   = $(LIB_NAME_DEBUG).lib\r
+TARGET   = $(LIBCURL_STA_LIB_DBG)\r
 DIROBJ   = $(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"\r
@@ -351,9 +360,9 @@ CFGSET   = TRUE
 # debug-dll\r
 \r
 !IF "$(CFG)" == "debug-dll"\r
-TARGET = $(LIB_NAME_DEBUG).dll\r
+TARGET = $(LIBCURL_DYN_LIB_DBG)\r
 DIROBJ = $(CFG)\r
-LNK    = $(LNKDLL) $(WINLIBS) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).lib /PDB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).pdb\r
+LNK    = $(LNKDLL) $(WINLIBS) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_DBG) /PDB:$(DIROBJ)\$(LIBCURL_DYN_LIB_PDB)\r
 CC     = $(CCDEBUG) $(RTLIBD) \r
 CFGSET = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
@@ -363,10 +372,10 @@ RESOURCE = $(DIROBJ)\libcurl.res
 # debug-dll-ssl-dll\r
 \r
 !IF "$(CFG)" == "debug-dll-ssl-dll"\r
-TARGET   = $(LIB_NAME_DEBUG).dll\r
+TARGET   = $(LIBCURL_DYN_LIB_DBG)\r
 DIROBJ   = $(CFG)\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"\r
-LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).lib /PDB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).pdb\r
+LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_DBG) /PDB:$(DIROBJ)\$(LIBCURL_DYN_LIB_PDB)\r
 CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL)\r
 CFGSET   = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
@@ -376,10 +385,10 @@ RESOURCE = $(DIROBJ)\libcurl.res
 # debug-dll-zlib-dll\r
 \r
 !IF "$(CFG)" == "debug-dll-zlib-dll"\r
-TARGET   = $(LIB_NAME_DEBUG).dll\r
+TARGET   = $(LIBCURL_DYN_LIB_DBG)\r
 DIROBJ   = $(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
-LNK      = $(LNKDLL) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).lib /PDB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).pdb\r
+LNK      = $(LNKDLL) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_DBG) /PDB:$(DIROBJ)\$(LIBCURL_DYN_LIB_PDB)\r
 CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSZLIB)\r
 CFGSET   = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
@@ -389,11 +398,11 @@ RESOURCE = $(DIROBJ)\libcurl.res
 # debug-dll-ssl-dll-zlib-dll\r
 \r
 !IF "$(CFG)" == "debug-dll-ssl-dll-zlib-dll"\r
-TARGET   = $(LIB_NAME_DEBUG).dll\r
+TARGET   = $(LIBCURL_DYN_LIB_DBG)\r
 DIROBJ   = $(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32dll"\r
-LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).lib /PDB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).pdb\r
+LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_DBG) /PDB:$(DIROBJ)\$(LIBCURL_DYN_LIB_PDB)\r
 CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSZLIB)\r
 CFGSET   = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
@@ -498,7 +507,7 @@ X_OBJS= \
        $(DIROBJ)\mprintf.obj \\r
        $(DIROBJ)\multi.obj \\r
        $(DIROBJ)\netrc.obj \\r
-        $(DIROBJ)\nonblock.obj \\r
+       $(DIROBJ)\nonblock.obj \\r
        $(DIROBJ)\openldap.obj \\r
        $(DIROBJ)\parsedate.obj \\r
        $(DIROBJ)\pingpong.obj \\r
@@ -538,14 +547,14 @@ all : $(TARGET)
 \r
 $(TARGET): $(X_OBJS)\r
        $(LNK) $(LFLAGS) $(X_OBJS)\r
-       -xcopy $(DIROBJ)\$(LIB_NAME).dll       . /y\r
-       -xcopy $(DIROBJ)\$(LIB_NAME).lib       . /y\r
-       -xcopy $(DIROBJ)\$(LIB_NAME_DEBUG).dll . /y\r
-       -xcopy $(DIROBJ)\$(LIB_NAME_DEBUG).lib . /y\r
-       -xcopy $(DIROBJ)\$(IMPLIB_NAME).lib    . /y\r
-       -xcopy $(DIROBJ)\$(IMPLIB_NAME_DEBUG).lib . /y\r
-       -xcopy $(DIROBJ)\*.exp                 . /y\r
-       -xcopy $(DIROBJ)\*.pdb                 . /y\r
+       -xcopy $(DIROBJ)\$(LIBCURL_STA_LIB_REL) . /y\r
+       -xcopy $(DIROBJ)\$(LIBCURL_STA_LIB_DBG) . /y\r
+       -xcopy $(DIROBJ)\$(LIBCURL_DYN_LIB_REL) . /y\r
+       -xcopy $(DIROBJ)\$(LIBCURL_DYN_LIB_DBG) . /y\r
+       -xcopy $(DIROBJ)\$(LIBCURL_IMP_LIB_REL) . /y\r
+       -xcopy $(DIROBJ)\$(LIBCURL_IMP_LIB_DBG) . /y\r
+       -xcopy $(DIROBJ)\*.exp                  . /y\r
+       -xcopy $(DIROBJ)\*.pdb                  . /y\r
 \r
 $(X_OBJS): $(DIROBJ)\r
 \r

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index da7a2a3..042885a 100644 (file)
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -1,3 +1,25 @@
+#***************************************************************************\r
+#                                  _   _ ____  _\r
+#  Project                     ___| | | |  _ \| |\r
+#                             / __| | | | |_) | |\r
+#                            | (__| |_| |  _ <| |___\r
+#                             \___|\___/|_| \_\_____|\r
+#\r
+# Copyright (C) 1999 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.\r
+#\r
+# This software is licensed as described in the file COPYING, which\r
+# you should have received as part of this distribution. The terms\r
+# are also available at http://curl.haxx.se/docs/copyright.html.\r
+#\r
+# You may opt to use, copy, modify, merge, publish, distribute and/or sell\r
+# copies of the Software, and permit persons to whom the Software is\r
+# furnished to do so, under the terms of the COPYING file.\r
+#\r
+# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY\r
+# KIND, either express or implied.\r
+#\r
+#***************************************************************************\r
+\r
 #############################################################\r
 #\r
 ## Makefile for building curl.exe with MSVC6\r
@@ -6,14 +28,29 @@
 ## "nmake -f makefile.vc6 CFG=release-ssl" statically links OpenSSL\r
 ## into curl.exe producing a standalone SSL-enabled executable.\r
 ##\r
-## Comments to: Troy Engel <tengel@sonic.net>\r
-## Updated by: Craig Davison <cd@securityfocus.com>\r
-## release-ssl added by Miklos Nemeth <mnemeth@kfkisystems.com>\r
 #\r
 #############################################################\r
 \r
 PROGRAM_NAME = curl.exe\r
 \r
+# -------------------------------------------\r
+# Verify that current subdir is curl's 'src'\r
+# -------------------------------------------\r
+\r
+!IF ! EXIST(.\main.c)\r
+!  MESSAGE Can not process this makefile from outside of curl's 'src' subdirectory.\r
+!  MESSAGE Change to curl's 'src' subdirectory, and try again.\r
+!  ERROR   See previous message.\r
+!ENDIF\r
+\r
+# ------------------------------------------------\r
+# Makefile.msvc.names provides libcurl file names\r
+# ------------------------------------------------\r
+\r
+!INCLUDE ..\Makefile.msvc.names\r
+\r
+\r
+\r
 !IFNDEF OPENSSL_PATH\r
 OPENSSL_PATH = ../../openssl-0.9.8o\r
 !ENDIF\r
@@ -124,15 +161,15 @@ DEBUG_OBJS= \
 # If CFG not specified, use static libs\r
 \r
 CFLAGS         = $(CFLAGS) /DCURL_STATICLIB\r
-LINKLIBS       = libcurl.lib\r
-LINKLIBS_DEBUG = libcurld.lib\r
+LINKLIBS       = $(LIBCURL_STA_LIB_REL)\r
+LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG)\r
 \r
 #################################################\r
 # release dynamic library\r
 \r
 !IF "$(CFG)" == "release-dll"\r
-LINKLIBS       = libcurl_imp.lib\r
-LINKLIBS_DEBUG = libcurld_imp.lib\r
+LINKLIBS       = $(LIBCURL_IMP_LIB_REL)\r
+LINKLIBS_DEBUG = $(LIBCURL_IMP_LIB_DBG)\r
 !ENDIF\r
 \r
 #################################################\r
@@ -140,8 +177,8 @@ LINKLIBS_DEBUG = libcurld_imp.lib
 \r
 !IF "$(CFG)" == "release-zlib"\r
 CFLAGS         = $(CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB\r
-LINKLIBS       = libcurl.lib  $(ZLIB_LIBS)\r
-LINKLIBS_DEBUG = libcurld.lib $(ZLIB_LIBS)\r
+LINKLIBS       = $(LIBCURL_STA_LIB_REL) $(ZLIB_LIBS)\r
+LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG) $(ZLIB_LIBS)\r
 LFLAGS         = $(LFLAGS) $(ZLIB_LFLAGS)\r
 !ENDIF\r
 \r
@@ -150,8 +187,8 @@ LFLAGS         = $(LFLAGS) $(ZLIB_LFLAGS)
 \r
 !IF "$(CFG)" == "release-ssl"\r
 CFLAGS         = $(CFLAGS) $(SSL_CFLAGS) /DCURL_STATICLIB\r
-LINKLIBS       = libcurl.lib  $(SSL_LIBS)\r
-LINKLIBS_DEBUG = libcurld.lib $(SSL_LIBS)\r
+LINKLIBS       = $(LIBCURL_STA_LIB_REL) $(SSL_LIBS)\r
+LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG) $(SSL_LIBS)\r
 LFLAGS         = $(LFLAGS) $(SSL_LFLAGS)\r
 !ENDIF\r
 \r
@@ -160,8 +197,8 @@ LFLAGS         = $(LFLAGS) $(SSL_LFLAGS)
 \r
 !IF "$(CFG)" == "release-dll-ssl-dll"\r
 CFLAGS         = $(CFLAGS) $(SSL_CFLAGS)\r
-LINKLIBS       = libcurl_imp.lib  $(SSL_LIBS)\r
-LINKLIBS_DEBUG = libcurld_imp.lib $(SSL_LIBS)\r
+LINKLIBS       = $(LIBCURL_IMP_LIB_REL) $(SSL_LIBS)\r
+LINKLIBS_DEBUG = $(LIBCURL_IMP_LIB_DBG) $(SSL_LIBS)\r
 LFLAGS         = $(LFLAGS) $(SSL_IMP_LFLAGS)\r
 !ENDIF\r
 \r
@@ -170,8 +207,8 @@ LFLAGS         = $(LFLAGS) $(SSL_IMP_LFLAGS)
 \r
 !IF "$(CFG)" == "release-ssl-zlib"\r
 CFLAGS         = $(CFLAGS) $(SSL_CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB\r
-LINKLIBS       = libcurl.lib  $(SSL_LIBS) $(ZLIB_LIBS)\r
-LINKLIBS_DEBUG = libcurld.lib $(SSL_LIBS) $(ZLIB_LIBS)\r
+LINKLIBS       = $(LIBCURL_STA_LIB_REL) $(SSL_LIBS) $(ZLIB_LIBS)\r
+LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG) $(SSL_LIBS) $(ZLIB_LIBS)\r
 LFLAGS         = $(LFLAGS) $(SSL_LFLAGS) $(ZLIB_LFLAGS)\r
 !ENDIF\r
 \r
@@ -180,8 +217,8 @@ LFLAGS         = $(LFLAGS) $(SSL_LFLAGS) $(ZLIB_LFLAGS)
 \r
 !IF "$(CFG)" == "release-ssl-dll"\r
 CFLAGS         = $(CFLAGS) $(SSL_CFLAGS) /DCURL_STATICLIB\r
-LINKLIBS       = libcurl.lib  $(SSL_LIBS)\r
-LINKLIBS_DEBUG = libcurld.lib $(SSL_LIBS)\r
+LINKLIBS       = $(LIBCURL_STA_LIB_REL) $(SSL_LIBS)\r
+LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG) $(SSL_LIBS)\r
 LFLAGS         = $(LFLAGS) $(SSL_IMP_LFLAGS)\r
 !ENDIF\r
 \r
@@ -190,8 +227,8 @@ LFLAGS         = $(LFLAGS) $(SSL_IMP_LFLAGS)
 \r
 !IF "$(CFG)" == "release-zlib-dll"\r
 CFLAGS         = $(CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB\r
-LINKLIBS       = libcurl.lib  $(ZLIB_IMP_LIBS)\r
-LINKLIBS_DEBUG = libcurld.lib $(ZLIB_IMP_LIBS)\r
+LINKLIBS       = $(LIBCURL_STA_LIB_REL) $(ZLIB_IMP_LIBS)\r
+LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG) $(ZLIB_IMP_LIBS)\r
 LFLAGS         = $(LFLAGS) $(ZLIB_LFLAGS)\r
 !ENDIF\r
 \r
@@ -200,8 +237,8 @@ LFLAGS         = $(LFLAGS) $(ZLIB_LFLAGS)
 \r
 !IF "$(CFG)" == "release-dll-zlib-dll"\r
 CFLAGS         = $(CFLAGS) $(ZLIB_CFLAGS)\r
-LINKLIBS       = libcurl_imp.lib  $(ZLIB_IMP_LIBS)\r
-LINKLIBS_DEBUG = libcurld_imp.lib $(ZLIB_IMP_LIBS)\r
+LINKLIBS       = $(LIBCURL_IMP_LIB_REL) $(ZLIB_IMP_LIBS)\r
+LINKLIBS_DEBUG = $(LIBCURL_IMP_LIB_DBG) $(ZLIB_IMP_LIBS)\r
 LFLAGS         = $(LFLAGS) $(ZLIB_LFLAGS)\r
 !ENDIF\r
 \r
@@ -210,8 +247,8 @@ LFLAGS         = $(LFLAGS) $(ZLIB_LFLAGS)
 \r
 !IF "$(CFG)" == "release-ssl-dll-zlib-dll"\r
 CFLAGS         = $(CFLAGS) $(SSL_CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB\r
-LINKLIBS       = libcurl.lib  $(SSL_LIBS) $(ZLIB_IMP_LIBS)\r
-LINKLIBS_DEBUG = libcurld.lib $(SSL_LIBS) $(ZLIB_IMP_LIBS)\r
+LINKLIBS       = $(LIBCURL_STA_LIB_REL) $(SSL_LIBS) $(ZLIB_IMP_LIBS)\r
+LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG) $(SSL_LIBS) $(ZLIB_IMP_LIBS)\r
 LFLAGS         = $(LFLAGS) $(SSL_IMP_LFLAGS) $(ZLIB_LFLAGS)\r
 !ENDIF\r
 \r
@@ -220,8 +257,8 @@ LFLAGS         = $(LFLAGS) $(SSL_IMP_LFLAGS) $(ZLIB_LFLAGS)
 \r
 !IF "$(CFG)" == "release-dll-ssl-dll-zlib-dll"\r
 CFLAGS         = $(CFLAGS) $(SSL_CFLAGS) $(ZLIB_CFLAGS)\r
-LINKLIBS       = libcurl_imp.lib  $(SSL_LIBS) $(ZLIB_IMP_LIBS)\r
-LINKLIBS_DEBUG = libcurld_imp.lib $(SSL_LIBS) $(ZLIB_IMP_LIBS)\r
+LINKLIBS       = $(LIBCURL_IMP_LIB_REL) $(SSL_LIBS) $(ZLIB_IMP_LIBS)\r
+LINKLIBS_DEBUG = $(LIBCURL_IMP_LIB_DBG) $(SSL_LIBS) $(ZLIB_IMP_LIBS)\r
 LFLAGS         = $(LFLAGS) $(SSL_IMP_LFLAGS) $(ZLIB_LFLAGS)\r
 !ENDIF\r
 \r