Skip to content

Commit

Permalink
msvc: move Makefile.msvc.names into winbuild/
Browse files Browse the repository at this point in the history
In an attempt to clear up misc files from the root dir
  • Loading branch information
bagder committed Feb 6, 2013
1 parent 7be925a commit 632e50c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
5 changes: 3 additions & 2 deletions Makefile.am
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions lib/Makefile.vc6
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions src/Makefile.vc6
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
File renamed without changes.

0 comments on commit 632e50c

Please sign in to comment.