From 632e50ca8d71a309ea3863acac5f1a7f88633e69 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 6 Feb 2013 23:14:11 +0100 Subject: msvc: move Makefile.msvc.names into winbuild/ In an attempt to clear up misc files from the root dir --- Makefile.am | 5 +-- Makefile.msvc.names | 81 -------------------------------------------- lib/Makefile.vc6 | 4 +-- src/Makefile.vc6 | 5 ++- winbuild/Makefile.msvc.names | 81 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 88 insertions(+), 88 deletions(-) delete mode 100644 Makefile.msvc.names create mode 100644 winbuild/Makefile.msvc.names 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/Makefile.msvc.names b/Makefile.msvc.names deleted file mode 100644 index 56c81ad72..000000000 --- a/Makefile.msvc.names +++ /dev/null @@ -1,81 +0,0 @@ -#*************************************************************************** -# _ _ ____ _ -# Project ___| | | | _ \| | -# / __| | | | |_) | | -# | (__| |_| | _ <| |___ -# \___|\___/|_| \_\_____| -# -# Copyright (C) 1999 - 2010, Daniel Stenberg, , et al. -# -# This software is licensed as described in the file COPYING, which -# you should have received as part of this distribution. The terms -# are also available at http://curl.haxx.se/docs/copyright.html. -# -# You may opt to use, copy, modify, merge, publish, distribute and/or sell -# copies of the Software, and permit persons to whom the Software is -# furnished to do so, under the terms of the COPYING file. -# -# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# KIND, either express or implied. -# -#*************************************************************************** - -# -# This file is included from MSVC makefiles located in lib and src, -# providing libcurl common file names required by these makefiles. -# - -# ------------------ -# libcurl base name -# ------------------ - -!IF !DEFINED(LIB_NAME) || "$(LIB_NAME)" == "" -LIB_NAME = libcurl -!ENDIF - -# ------------------------------------------------- -# libcurl static and dynamic libraries common base -# file names for release and debug configurations -# ------------------------------------------------- - -!IF !DEFINED(LIB_NAME_STA_REL) || "$(LIB_NAME_STA_REL)" == "" -LIB_NAME_STA_REL = $(LIB_NAME) -!ENDIF - -!IF !DEFINED(LIB_NAME_STA_DBG) || "$(LIB_NAME_STA_DBG)" == "" -LIB_NAME_STA_DBG = $(LIB_NAME_STA_REL)d -!ENDIF - -!IF !DEFINED(LIB_NAME_DYN_REL) || "$(LIB_NAME_DYN_REL)" == "" -LIB_NAME_DYN_REL = $(LIB_NAME) -!ENDIF - -!IF !DEFINED(LIB_NAME_DYN_DBG) || "$(LIB_NAME_DYN_DBG)" == "" -LIB_NAME_DYN_DBG = $(LIB_NAME_DYN_REL)d -!ENDIF - -# -------------------------------------------- -# Base names for libcurl DLL import libraries -# -------------------------------------------- - -!IF !DEFINED(LIB_NAME_IMP_REL) || "$(LIB_NAME_IMP_REL)" == "" -LIB_NAME_IMP_REL = $(LIB_NAME_DYN_REL)_imp -!ENDIF - -!IF !DEFINED(LIB_NAME_IMP_DBG) || "$(LIB_NAME_IMP_DBG)" == "" -LIB_NAME_IMP_DBG = $(LIB_NAME_DYN_DBG)_imp -!ENDIF - -# -------------------------------------- -# File names with extension and no path -# -------------------------------------- - -LIBCURL_STA_LIB_REL = $(LIB_NAME_STA_REL).lib -LIBCURL_STA_LIB_DBG = $(LIB_NAME_STA_DBG).lib -LIBCURL_DYN_LIB_REL = $(LIB_NAME_DYN_REL).dll -LIBCURL_DYN_LIB_DBG = $(LIB_NAME_DYN_DBG).dll -LIBCURL_IMP_LIB_REL = $(LIB_NAME_IMP_REL).lib -LIBCURL_IMP_LIB_DBG = $(LIB_NAME_IMP_DBG).lib -LIBCURL_DYN_LIB_PDB = $(LIB_NAME_IMP_DBG).pdb - -# End of Makefile.msvc.names 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, , et al. +# Copyright (C) 1999 - 2013, Daniel Stenberg, , 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, , et al. +# Copyright (C) 1999 - 2013, Daniel Stenberg, , 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/winbuild/Makefile.msvc.names b/winbuild/Makefile.msvc.names new file mode 100644 index 000000000..56c81ad72 --- /dev/null +++ b/winbuild/Makefile.msvc.names @@ -0,0 +1,81 @@ +#*************************************************************************** +# _ _ ____ _ +# Project ___| | | | _ \| | +# / __| | | | |_) | | +# | (__| |_| | _ <| |___ +# \___|\___/|_| \_\_____| +# +# Copyright (C) 1999 - 2010, Daniel Stenberg, , et al. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://curl.haxx.se/docs/copyright.html. +# +# You may opt to use, copy, modify, merge, publish, distribute and/or sell +# copies of the Software, and permit persons to whom the Software is +# furnished to do so, under the terms of the COPYING file. +# +# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY +# KIND, either express or implied. +# +#*************************************************************************** + +# +# This file is included from MSVC makefiles located in lib and src, +# providing libcurl common file names required by these makefiles. +# + +# ------------------ +# libcurl base name +# ------------------ + +!IF !DEFINED(LIB_NAME) || "$(LIB_NAME)" == "" +LIB_NAME = libcurl +!ENDIF + +# ------------------------------------------------- +# libcurl static and dynamic libraries common base +# file names for release and debug configurations +# ------------------------------------------------- + +!IF !DEFINED(LIB_NAME_STA_REL) || "$(LIB_NAME_STA_REL)" == "" +LIB_NAME_STA_REL = $(LIB_NAME) +!ENDIF + +!IF !DEFINED(LIB_NAME_STA_DBG) || "$(LIB_NAME_STA_DBG)" == "" +LIB_NAME_STA_DBG = $(LIB_NAME_STA_REL)d +!ENDIF + +!IF !DEFINED(LIB_NAME_DYN_REL) || "$(LIB_NAME_DYN_REL)" == "" +LIB_NAME_DYN_REL = $(LIB_NAME) +!ENDIF + +!IF !DEFINED(LIB_NAME_DYN_DBG) || "$(LIB_NAME_DYN_DBG)" == "" +LIB_NAME_DYN_DBG = $(LIB_NAME_DYN_REL)d +!ENDIF + +# -------------------------------------------- +# Base names for libcurl DLL import libraries +# -------------------------------------------- + +!IF !DEFINED(LIB_NAME_IMP_REL) || "$(LIB_NAME_IMP_REL)" == "" +LIB_NAME_IMP_REL = $(LIB_NAME_DYN_REL)_imp +!ENDIF + +!IF !DEFINED(LIB_NAME_IMP_DBG) || "$(LIB_NAME_IMP_DBG)" == "" +LIB_NAME_IMP_DBG = $(LIB_NAME_DYN_DBG)_imp +!ENDIF + +# -------------------------------------- +# File names with extension and no path +# -------------------------------------- + +LIBCURL_STA_LIB_REL = $(LIB_NAME_STA_REL).lib +LIBCURL_STA_LIB_DBG = $(LIB_NAME_STA_DBG).lib +LIBCURL_DYN_LIB_REL = $(LIB_NAME_DYN_REL).dll +LIBCURL_DYN_LIB_DBG = $(LIB_NAME_DYN_DBG).dll +LIBCURL_IMP_LIB_REL = $(LIB_NAME_IMP_REL).lib +LIBCURL_IMP_LIB_DBG = $(LIB_NAME_IMP_DBG).lib +LIBCURL_DYN_LIB_PDB = $(LIB_NAME_IMP_DBG).pdb + +# End of Makefile.msvc.names -- cgit v1.2.3