From: Yang Tse Date: Fri, 8 May 2009 18:55:42 +0000 (+0000) Subject: Renamed vc6 workspace and project files to avoid filename clash when used for convers... X-Git-Tag: upstream/7.37.1~6272 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=838ddf8f554456d87c1eccda72818864e706748c;p=platform%2Fupstream%2Fcurl.git Renamed vc6 workspace and project files to avoid filename clash when used for conversion to later VS versions. --- diff --git a/docs/INSTALL b/docs/INSTALL index f17aa85..7d13aa5 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -386,7 +386,7 @@ Win32 - Modify lib/setup.h - Modify lib/Makefile.vc6 - Add defines to Project/Settings/C/C++/General/Preprocessor Definitions - in the libcurl.dsw/libcurl.dsp Visual C++ 6 IDE project. + in the vc6libcurl.dsw/vc6libcurl.dsp Visual C++ 6 IDE project. Important static libcurl usage note diff --git a/lib/Makefile.am b/lib/Makefile.am index 049edf3..f7bfadd 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -32,8 +32,8 @@ DOCS = README.encoding README.memoryleak README.ares README.curlx \ CMAKE_DIST = CMakeLists.txt config.h.cmake EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 Makefile.riscos $(DSP) \ - libcurl.dsw config-win32.h config-win32ce.h config-riscos.h config-mac.h \ - config.h.in makefile.dj config.dos libcurl.plist \ + vc6libcurl.dsw config-win32.h config-win32ce.h config-riscos.h \ + config-mac.h config.h.in makefile.dj config.dos 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 \ config-win32ce.h config-os400.h setup-os400.h config-symbian.h \ diff --git a/src/Makefile.am b/src/Makefile.am index 2db575c..a008dcb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -55,9 +55,9 @@ NROFF=env LC_ALL=C @NROFF@ @MANOPT@ # figured out by the configure script EXTRA_DIST = mkhelp.pl makefile.dj Makefile.vc6 Makefile.b32 Makefile.m32 \ Makefile.riscos config.h.in macos/curl.mcp.xml.sit.hqx \ - macos/MACINSTALL.TXT macos/src/curl_GUSIConfig.cpp curlsrc.dsp \ + macos/MACINSTALL.TXT macos/src/curl_GUSIConfig.cpp vc6curlsrc.dsp \ macos/src/macos_main.cpp config-amigaos.h makefile.amiga curl.rc \ - Makefile.netware Makefile.inc Makefile.Watcom curlsrc.dsw \ + Makefile.netware Makefile.inc Makefile.Watcom vc6curlsrc.dsw \ CMakeLists.txt MANPAGE=$(top_srcdir)/docs/curl.1