msvc: move Makefile.msvc.names into winbuild/

In an attempt to clear up misc files from the root dir

diff --git a/Makefile.am b/Makefile.am
index 3ea73a480a62406149bc2c0da7a05a04da8fb19f..edbc805dd7716830bffe8362419806037dd06950 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,11 +31,12 @@ CMake/OtherTests.cmake CMake/Platforms/WindowsCache.cmake           \
 CMake/Utilities.cmake include/curl/curlbuild.h.cmake
 
 WINBUILD_DIST = winbuild/BUILD.WINDOWS.txt winbuild/gen_resp_file.bat  \
-winbuild/MakefileBuild.vc winbuild/Makefile.vc
+ winbuild/MakefileBuild.vc winbuild/Makefile.vc                                \
+ winbuild/Makefile.msvc.names
 
 EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in      \
  RELEASE-NOTES buildconf libcurl.pc.in vc6curl.dsw MacOSX-Framework    \
- $(CMAKE_DIST) Makefile.msvc.names $(WINBUILD_DIST) lib/libcurl.vers.in
+ $(CMAKE_DIST) $(WINBUILD_DIST) lib/libcurl.vers.in
 
 bin_SCRIPTS = curl-config
 

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 443a114fb0091a1d71091aeca85e7387ec5b8406..34fb30c7f3e0beee81cbd64650162b807c7c4ced 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___\r
 #                             \___|\___/|_| \_\_____|\r
 #\r
-# Copyright (C) 1999 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.\r
+# Copyright (C) 1999 - 2013, 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
@@ -62,7 +62,7 @@
 # Makefile.msvc.names provides libcurl file names\r
 # ------------------------------------------------\r
 \r
-!INCLUDE ..\Makefile.msvc.names\r
+!INCLUDE ..\winbuild\Makefile.msvc.names\r
 \r
 !IFNDEF OPENSSL_PATH\r
 OPENSSL_PATH   = ../../openssl-0.9.8x\r

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index 073b20d6ae66c1deac21005b4b137b0d9f894196..4a23c98cc008e539072bb27fa60d928d5e91b760 100644 (file)
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___\r
 #                             \___|\___/|_| \_\_____|\r
 #\r
-# Copyright (C) 1999 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.\r
+# Copyright (C) 1999 - 2013, 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
@@ -52,8 +52,7 @@ PROGRAM_NAME = curl.exe
 # Makefile.msvc.names provides libcurl file names\r
 # ------------------------------------------------\r
 \r
-!INCLUDE ..\Makefile.msvc.names\r
-\r
+!INCLUDE ..\winbuild\Makefile.msvc.names\r
 \r
 \r
 !IFNDEF OPENSSL_PATH\r

diff --git a/Makefile.msvc.names b/winbuild/Makefile.msvc.names
similarity index 100%
rename from Makefile.msvc.names
rename to winbuild/Makefile.msvc.names