Renamed import lib to "libcurl_imp.lib".

Some cleanup and making it more readable.

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 45e679dc357e4ed32a75e09695791848aaf25b05..7093a8182338d4a48db71d3648ad1c6b592ba0db 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -22,8 +22,18 @@
 # $Id: Makefile.vc6,v 1.17 2004/01/13 08:57:01 bagder Exp $\r
 ##############################################################\r
 \r
+#\r
+# Stem for static libs and DLLs\r
+#\r
 LIB_NAME       = libcurl\r
 LIB_NAME_DEBUG = libcurld\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.7d\r
 !ENDIF\r
@@ -43,7 +53,7 @@ CCNODBG    = cl.exe /MD /O2 /DNDEBUG
 CCDEBUG    = cl.exe /MDd /Od /Gm /Zi /D_DEBUG /GZ\r
 CFLAGSSSL  = /DUSE_SSLEAY /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"\r
 CFLAGSZLIB = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"\r
-CFLAGS     = /I. /I../include /nologo /W3 /GX /DWIN32 /DVC6 /D_MBCS /D_LIB /YX /FD /c /DBUILDING_LIBCURL\r
+CFLAGS     = /I. /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL\r
 LNKDLL     = link.exe /DLL\r
 LNKLIB     = link.exe /lib\r
 LFLAGS     = /nologo\r
@@ -61,8 +71,8 @@ CFGSET     = FALSE
 # release\r
 \r
 !IF "$(CFG)" == "release"\r
-TARGET =$(LIB_NAME).lib\r
-DIROBJ =.\$(CFG)\r
+TARGET = $(LIB_NAME).lib\r
+DIROBJ = .\$(CFG)\r
 LNK    = $(LNKLIB) /out:$(TARGET)\r
 CC     = $(CCNODBG)\r
 CFGSET = TRUE\r
@@ -72,8 +82,8 @@ CFGSET = TRUE
 # release-zlib\r
 \r
 !IF "$(CFG)" == "release-zlib"\r
-TARGET   =$(LIB_NAME).lib\r
-DIROBJ   =.\$(CFG)\r
+TARGET   = $(LIB_NAME).lib\r
+DIROBJ   = .\$(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LNK      = $(LNKLIB) $(LFLAGSZLIB) /out:$(TARGET)\r
 CC       = $(CCNODBG) $(CFLAGSZLIB)\r
@@ -84,9 +94,9 @@ CFGSET   = TRUE
 # release-dll\r
 \r
 !IF "$(CFG)" == "release-dll"\r
-TARGET =$(LIB_NAME).dll\r
-DIROBJ =.\$(CFG)\r
-LNK    = $(LNKDLL) $(WINLIBS) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"\r
+TARGET = $(LIB_NAME).dll\r
+DIROBJ = .\$(CFG)\r
+LNK    = $(LNKDLL) $(WINLIBS) /out:$(TARGET) /IMPLIB:$(IMPLIB_NAME).lib\r
 CC     = $(CCNODBG)\r
 CFGSET = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
@@ -96,8 +106,8 @@ RESOURCE = $(DIROBJ)\libcurl.res
 # release-ssl\r
 \r
 !IF "$(CFG)" == "release-ssl"\r
-TARGET   =$(LIB_NAME).lib\r
-DIROBJ   =.\$(CFG)\r
+TARGET   = $(LIB_NAME).lib\r
+DIROBJ   = .\$(CFG)\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32"\r
 LNK      = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)\r
 CC       = $(CCNODBG) $(CFLAGSSSL)\r
@@ -108,10 +118,10 @@ CFGSET   = TRUE
 # release-ssl-dll\r
 \r
 !IF "$(CFG)" == "release-ssl-dll"\r
-TARGET   =$(LIB_NAME).dll\r
-DIROBJ   =.\$(CFG)\r
+TARGET   = $(LIB_NAME).dll\r
+DIROBJ   = .\$(CFG)\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"\r
-LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(WINLIBS) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"\r
+LNK      = $(LNKDLL) $(SSLLIBS) $(WINLIBS) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:$(IMPLIB_NAME).lib\r
 CC       = $(CCNODBG) $(CFLAGSSSL)\r
 CFGSET   = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
@@ -120,8 +130,8 @@ RESOURCE = $(DIROBJ)\libcurl.res
 ######################\r
 # release-ssl-zlib\r
 !IF "$(CFG)" == "release-ssl-zlib"\r
-TARGET   =$(LIB_NAME).lib\r
-DIROBJ   =.\$(CFG)\r
+TARGET   = $(LIB_NAME).lib\r
+DIROBJ   = .\$(CFG)\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32"\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LNK      = $(LNKLIB) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(TARGET)\r
@@ -132,8 +142,8 @@ CFGSET   = TRUE
 ######################\r
 # release-libcurl-ssl-dll\r
 !IF "$(CFG)" == "release-libcurl-ssl-dll"\r
-TARGET   =$(LIB_NAME).lib\r
-DIROBJ   =.\$(CFG)\r
+TARGET   = $(LIB_NAME).lib\r
+DIROBJ   = .\$(CFG)\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"\r
 LNK      = $(LNKLIB) $(SSLLIBS) $(LFLAGSSSL) /out:$(TARGET)\r
 CC       = $(CCNODBG) $(CFLAGSSSL)\r
@@ -146,8 +156,8 @@ RESOURCE = $(DIROBJ)\libcurl.res
 # debug\r
 \r
 !IF "$(CFG)" == "debug"\r
-TARGET =$(LIB_NAME_DEBUG).lib\r
-DIROBJ =.\$(CFG)\r
+TARGET = $(LIB_NAME_DEBUG).lib\r
+DIROBJ = .\$(CFG)\r
 LNK    = $(LNKLIB) /out:$(TARGET)\r
 CC     = $(CCDEBUG)\r
 CFGSET = TRUE\r
@@ -157,9 +167,9 @@ CFGSET = TRUE
 # debug-dll\r
 \r
 !IF "$(CFG)" == "debug-dll"\r
-TARGET =$(LIB_NAME_DEBUG).dll\r
-DIROBJ =.\$(CFG)\r
-LNK    = $(LNKDLL) $(WINLIBS) /DEBUG /out:$(TARGET) /IMPLIB:"$(LIB_NAME_DEBUG).lib" /PDB:"$(LIB_NAME_DEBUG).pdb"\r
+TARGET = $(LIB_NAME_DEBUG).dll\r
+DIROBJ = .\$(CFG)\r
+LNK    = $(LNKDLL) $(WINLIBS) /DEBUG /out:$(TARGET) /IMPLIB:$(IMPLIB_NAME_DEBUG).lib /PDB:$(IMPLIB_NAME_DEBUG).pdb\r
 CC     = $(CCDEBUG)\r
 CFGSET = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
@@ -170,7 +180,7 @@ RESOURCE = $(DIROBJ)\libcurl.res
 #todo\r
 !IF "$(CFG)" == "debug-ssl"\r
 TARGET   = $(LIB_NAME_DEBUG).lib\r
-DIROBJ   =.\$(CFG)\r
+DIROBJ   = .\$(CFG)\r
 LNK      = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)\r
 CC       = $(CCDEBUG) $(CFLAGSSSL)\r
 CFGSET   = TRUE\r
@@ -180,7 +190,7 @@ CFGSET   = TRUE
 # debug-zlib\r
 !IF "$(CFG)" == "debug-zlib"\r
 TARGET   = $(LIB_NAME_DEBUG).lib\r
-DIROBJ   =.\$(CFG)\r
+DIROBJ   = .\$(CFG)\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 LNK      = $(LNKLIB) $(LFLAGSZLIB) /out:$(TARGET)\r
 CC       = $(CCDEBUG) $(CFLAGSZLIB)\r
@@ -191,10 +201,10 @@ CFGSET   = TRUE
 # debug-ssl-dll\r
 \r
 !IF "$(CFG)" == "debug-ssl-dll"\r
-TARGET   =$(LIB_NAME_DEBUG).dll\r
-DIROBJ   =.\$(CFG)\r
+TARGET   = $(LIB_NAME_DEBUG).dll\r
+DIROBJ   = .\$(CFG)\r
 LFLAGSSSL = /LIBPATH:$(OPENSSL_PATH)/out32dll\r
-LNK      = $(LNKDLL) $(WINLIBS) $(LFLAGSSSL) /DEBUG /out:$(TARGET) /IMPLIB:"$(LIB_NAME_DEBUG).lib" /PDB:"$(LIB_NAME_DEBUG).pdb"\r
+LNK      = $(LNKDLL) $(WINLIBS) $(LFLAGSSSL) /DEBUG /out:$(TARGET) /IMPLIB:$(IMPLIB_NAME_DEBUG).lib /PDB:$(IMPLIB_NAME_DEBUG).pdb\r
 CC       = $(CCDEBUG) $(CFLAGSSSL)\r
 CFGSET   = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
@@ -308,3 +318,4 @@ clean:
        -@erase $(DIROBJ)\*.res\r
        -@erase vc60.idb\r
        -@erase vc60.pch\r
+\r