aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am5
-rw-r--r--lib/Makefile.vc64
-rw-r--r--src/Makefile.vc65
-rw-r--r--winbuild/Makefile.msvc.names (renamed from Makefile.msvc.names)0
4 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index 3ea73a480..edbc805dd 100644
--- 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 443a114fb..34fb30c7f 100644
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1999 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1999 - 2013, 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
@@ -62,7 +62,7 @@
# Makefile.msvc.names provides libcurl file names
# ------------------------------------------------
-!INCLUDE ..\Makefile.msvc.names
+!INCLUDE ..\winbuild\Makefile.msvc.names
!IFNDEF OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8x
diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index 073b20d6a..4a23c98cc 100644
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1999 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1999 - 2013, 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
@@ -52,8 +52,7 @@ PROGRAM_NAME = curl.exe
# Makefile.msvc.names provides libcurl file names
# ------------------------------------------------
-!INCLUDE ..\Makefile.msvc.names
-
+!INCLUDE ..\winbuild\Makefile.msvc.names
!IFNDEF OPENSSL_PATH
diff --git a/Makefile.msvc.names b/winbuild/Makefile.msvc.names
index 56c81ad72..56c81ad72 100644
--- a/Makefile.msvc.names
+++ b/winbuild/Makefile.msvc.names