- I renamed everything in the windows builds files that used the name 'curllib'

  to the proper 'libcurl' as clearly this caused confusion.

diff --git a/CHANGES b/CHANGES
index 780a3f139ec9dec72f3ab87f6c0e391e24d4b261..8bf300b79d9b057fabe86e151e902a31a0f8a518 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
 
                                   Changelog
 
+Daniel Stenberg (23 Feb 2009)
+- I renamed everything in the windows builds files that used the name 'curllib'
+  to the proper 'libcurl' as clearly this caused confusion.
+
 Yang Tse (20 Feb 2009)
 - Do not halt compilation when using VS2008 to build a Windows 2000 target.
 

diff --git a/docs/INSTALL b/docs/INSTALL
index 093ab6f5bb2a7c77e49c411555a0e3cd650a5e0a..d79b315481e22206ba16a6a405ddb0dde98ada22 100644 (file)
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -383,7 +383,7 @@ Win32
    - Modify lib/setup.h
    - Modify lib/Makefile.vc6
    - Add defines to Project/Settings/C/C++/General/Preprocessor Definitions
-     in the curllib.dsw/curllib.dsp Visual C++ 6 IDE project.
+     in the libcurl.dsw/libcurl.dsp Visual C++ 6 IDE project.
 
 
    Important static libcurl usage note

diff --git a/lib/.cvsignore b/lib/.cvsignore
index 9d2daa0a5f29cbda174e4a9536a608f3be22b94e..623a9fbb88a26027d220b1c248674f0a6907ec37 100644 (file)
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -7,6 +7,6 @@ Makefile
 config.h
 stamp-*
 getdate.c
-curllib.dsp
-curllib.vcproj
+libcurl.dsp
+libcurl.vcproj
 *.dist

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9266ecd9b30f0e9358c632d96c5cdf4de41af407..09c7de4b8956967d80faf5d84d53549a670e8f8b 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -22,15 +22,15 @@
 ###########################################################################
 AUTOMAKE_OPTIONS = foreign nostdinc
 
-DSP = curllib.dsp
-VCPROJ = curllib.vcproj
+DSP = libcurl.dsp
+VCPROJ = libcurl.vcproj
 
 DOCS = README.encoding README.memoryleak README.ares README.curlx      \
  README.hostip README.multi_socket README.httpauth README.pipelining    \
  README.NSS README.curl_off_t
 
 EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 Makefile.riscos $(DSP) \
- curllib.dsw config-win32.h config-win32ce.h config-riscos.h config-mac.h  \
+ libcurl.dsw config-win32.h config-win32ce.h config-riscos.h config-mac.h  \
  config.h.in makefile.dj config.dos libcurl.framework.make libcurl.plist   \
  libcurl.rc config-amigaos.h amigaos.c amigaos.h makefile.amiga                   \
  Makefile.netware nwlib.c nwos.c libcurl.imp msvcproj.head msvcproj.foot   \

diff --git a/lib/curllib.dsw b/lib/libcurl.dsw
similarity index 84%
rename from lib/curllib.dsw
rename to lib/libcurl.dsw
index 4d59ca318bb0740f092b35064925c5771bda2147..e07624def483de67703153d34be1b493d1787e98 100644 (file)
--- a/lib/curllib.dsw
+++ b/lib/libcurl.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 \r
 ###############################################################################\r
 \r
-Project: "curllib"=".\curllib.dsp" - Package Owner=<4>\r
+Project: "libcurl"=".\libcurl.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r

diff --git a/lib/msvcproj.head b/lib/msvcproj.head
index 839801d1ab6e917cf9c623e64675b71b3a9d1676..5714ef74520c74914e207ad61a468efa3f46b1c4 100644 (file)
--- a/lib/msvcproj.head
+++ b/lib/msvcproj.head
@@ -1,27 +1,27 @@
-# Microsoft Developer Studio Project File - Name="curllib" - Package Owner=<4>\r
+# Microsoft Developer Studio Project File - Name="libcurl" - Package Owner=<4>\r
 # Microsoft Developer Studio Generated Build File, Format Version 6.00\r
 # ** DO NOT EDIT **\r
 \r
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
 # TARGTYPE "Win32 (x86) Static Library" 0x0104\r
 \r
-CFG=curllib - Win32 LIB Debug\r
+CFG=libcurl - Win32 LIB Debug\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
 !MESSAGE use the Export Makefile command and run\r
 !MESSAGE \r
-!MESSAGE NMAKE /f "curllib.mak".\r
+!MESSAGE NMAKE /f "libcurl.mak".\r
 !MESSAGE \r
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
 !MESSAGE \r
-!MESSAGE NMAKE /f "curllib.mak" CFG="curllib - Win32 LIB Debug"\r
+!MESSAGE NMAKE /f "libcurl.mak" CFG="libcurl - Win32 LIB Debug"\r
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "curllib - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "curllib - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "curllib - Win32 LIB Debug" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "curllib - Win32 LIB Release" (based on "Win32 (x86) Static Library")\r
+!MESSAGE "libcurl - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "libcurl - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "libcurl - Win32 LIB Debug" (based on "Win32 (x86) Static Library")\r
+!MESSAGE "libcurl - Win32 LIB Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -29,7 +29,7 @@ CFG=curllib - Win32 LIB Debug
 # PROP Scc_ProjName ""\r
 # PROP Scc_LocalPath ""\r
 \r
-!IF  "$(CFG)" == "curllib - Win32 DLL Debug"\r
+!IF  "$(CFG)" == "libcurl - Win32 DLL Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -58,7 +58,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib ws2_32.lib wldap32.lib /nologo /dll /incremental:no /map /debug /machine:I386 /out:"DLL-Debug/libcurld.dll" /implib:"DLL-Debug/libcurld_imp.lib" /pdbtype:sept\r
 # ADD LINK32 kernel32.lib ws2_32.lib wldap32.lib /nologo /dll /incremental:no /map /debug /machine:I386 /out:"DLL-Debug/libcurld.dll" /implib:"DLL-Debug/libcurld_imp.lib" /pdbtype:sept\r
 \r
-!ELSEIF  "$(CFG)" == "curllib - Win32 DLL Release"\r
+!ELSEIF  "$(CFG)" == "libcurl - Win32 DLL Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
@@ -87,7 +87,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib ws2_32.lib wldap32.lib /nologo /dll /pdb:none /machine:I386 /out:"DLL-Release/libcurl.dll" /implib:"DLL-Release/libcurl_imp.lib"\r
 # ADD LINK32 kernel32.lib ws2_32.lib wldap32.lib /nologo /dll /pdb:none /machine:I386 /out:"DLL-Release/libcurl.dll" /implib:"DLL-Release/libcurl_imp.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "curllib - Win32 LIB Debug"\r
+!ELSEIF  "$(CFG)" == "libcurl - Win32 LIB Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -112,7 +112,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"LIB-Debug/libcurld.lib" /machine:I386\r
 # ADD LIB32 /nologo /out:"LIB-Debug/libcurld.lib" /machine:I386\r
 \r
-!ELSEIF  "$(CFG)" == "curllib - Win32 LIB Release"\r
+!ELSEIF  "$(CFG)" == "libcurl - Win32 LIB Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
@@ -141,7 +141,7 @@ LIB32=link.exe -lib
 \r
 # Begin Target\r
 \r
-# Name "curllib - Win32 DLL Debug"\r
-# Name "curllib - Win32 DLL Release"\r
-# Name "curllib - Win32 LIB Debug"\r
-# Name "curllib - Win32 LIB Release"\r
+# Name "libcurl - Win32 DLL Debug"\r
+# Name "libcurl - Win32 DLL Release"\r
+# Name "libcurl - Win32 LIB Debug"\r
+# Name "libcurl - Win32 LIB Release"\r

diff --git a/lib/vc8proj.head b/lib/vc8proj.head
index 00488d4ad06856ecc44ecfe8feb62677497181a5..13326fa839dc953f2fc7d2c965a6786ab19a7295 100644 (file)
--- a/lib/vc8proj.head
+++ b/lib/vc8proj.head
@@ -2,7 +2,7 @@
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="8.00"
-       Name="curllib"
+       Name="libcurl"
        ProjectGUID="{87EE9DA4-DE1E-4448-8324-183C98DCA588}"
        >
        <Platforms>
@@ -31,9 +31,9 @@
                        />
                        <Tool Name="VCWebServiceProxyGeneratorTool"
                        />
-                       <Tool Name="VCMIDLTool" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="1" TypeLibraryName=".\Release/curllib.tlb" HeaderFileName=""
+                       <Tool Name="VCMIDLTool" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="1" TypeLibraryName=".\Release/libcurl.tlb" HeaderFileName=""
                        />
-                       <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories=".,..\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" PrecompiledHeaderFile=".\Release/curllib.pch" AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" BrowseInformation="1" WarningLevel="0" SuppressStartupBanner="true" DebugInformationFormat="3"
+                       <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories=".,..\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" PrecompiledHeaderFile=".\Release/libcurl.pch" AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" BrowseInformation="1" WarningLevel="0" SuppressStartupBanner="true" DebugInformationFormat="3"
                        />
                        <Tool Name="VCManagedResourceCompilerTool"
                        />
@@ -47,7 +47,7 @@
                        />
                        <Tool Name="VCXDCMakeTool"
                        />
-                       <Tool Name="VCBscMakeTool" SuppressStartupBanner="true" OutputFile=".\Release/curllib.bsc"
+                       <Tool Name="VCBscMakeTool" SuppressStartupBanner="true" OutputFile=".\Release/libcurl.bsc"
                        />
                        <Tool Name="VCFxCopTool"
                        />
@@ -72,9 +72,9 @@
                        />
                        <Tool Name="VCWebServiceProxyGeneratorTool"
                        />
-                       <Tool Name="VCMIDLTool" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="1" TypeLibraryName=".\Debug/curllib.tlb" HeaderFileName=""
+                       <Tool Name="VCMIDLTool" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="1" TypeLibraryName=".\Debug/libcurl.tlb" HeaderFileName=""
                        />
-                       <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".,..\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" PrecompiledHeaderFile=".\Debug/curllib.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" BrowseInformation="1" WarningLevel="0" SuppressStartupBanner="true" DebugInformationFormat="3"
+                       <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".,..\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" PrecompiledHeaderFile=".\Debug/libcurl.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" BrowseInformation="1" WarningLevel="0" SuppressStartupBanner="true" DebugInformationFormat="3"
                        />
                        <Tool Name="VCManagedResourceCompilerTool"
                        />
@@ -88,7 +88,7 @@
                        />
                        <Tool Name="VCXDCMakeTool"
                        />
-                       <Tool Name="VCBscMakeTool" SuppressStartupBanner="true" OutputFile=".\Debug/curllib.bsc"
+                       <Tool Name="VCBscMakeTool" SuppressStartupBanner="true" OutputFile=".\Debug/libcurl.bsc"
                        />
                        <Tool Name="VCFxCopTool"
                        />

diff --git a/vc6curl.dsw b/vc6curl.dsw
index 65174ba02a6801a5c105ddfee336bc34ccc289fe..0d368d61f44b8649385097ee18c42c058bd69363 100644 (file)
--- a/vc6curl.dsw
+++ b/vc6curl.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 \r
 ###############################################################################\r
 \r
-Project: "curllib"=".\lib\curllib.dsp" - Package Owner=<4>\r
+Project: "libcurl"=".\lib\libcurl.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -24,7 +24,7 @@ Package=<5>
 Package=<4>\r
 {{{\r
     Begin Project Dependency\r
-    Project_Dep_Name curllib\r
+    Project_Dep_Name libcurl\r
     End Project Dependency\r
 }}}\r
 \r