[GNUnet-SVN] [gnurl] 05/73: lib/Makefile.m32: allow customizing dll suffixes

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit aaa16f80256abc1463fd9374815130a165222257
Author: Viktor Szakats <address@hidden>
AuthorDate: Wed Oct 4 15:57:19 2017 +0000

    lib/Makefile.m32: allow customizing dll suffixes
    
    - New `CURL_DLL_SUFFIX` envvar will add a suffix to the generated
      libcurl dll name. Useful to add `-x64` to 64-bit builds so that
      it can live in the same directory as the 32-bit one. By default
      this is empty.
    
    - New `CURL_DLL_A_SUFFIX` envvar to customize the suffix of the
      generated import library (implib) for libcurl .dll. It defaults
      to `dll`, and it's useful to modify that to `.dll` to have the
      standard naming scheme for mingw-built .dlls, i.e. `libcurl.dll.a`.
    
    Closes https://github.com/curl/curl/pull/1942
---
 lib/Makefile.m32 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 22efbdee0..577785e62 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -313,8 +313,12 @@ DLL_LIBS += -lws2_32
 # Makefile.inc provides the CSOURCES and HHEADERS defines
 include Makefile.inc
 
-libcurl_dll_LIBRARY = libcurl.dll
-libcurl_dll_a_LIBRARY = libcurldll.a
+ifeq ($(CURL_DLL_A_SUFFIX),)
+CURL_DLL_A_SUFFIX := dll
+endif
+
+libcurl_dll_LIBRARY = libcurl$(CURL_DLL_SUFFIX).dll
+libcurl_dll_a_LIBRARY = libcurl$(CURL_DLL_A_SUFFIX).a
 libcurl_a_LIBRARY = libcurl.a
 
 libcurl_a_OBJECTS := $(patsubst %.c,%.o,$(strip $(CSOURCES)))

-- 
To stop receiving notification emails like this one, please contact
address@hidden