[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 05/73: lib/Makefile.m32: allow customizing dll suff
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 05/73: lib/Makefile.m32: allow customizing dll suffixes |
Date: |
Tue, 24 Oct 2017 18:53:46 +0200 |
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
- [GNUnet-SVN] [gnurl] branch master updated (dc0683b64 -> 8252aa305), gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 02/73: ftp: UBsan fixup 'pointer index expression overflowed', gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 10/73: openssl: fix build without HAVE_OPAQUE_EVP_PKEY, gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 09/73: lib/config-win32.h: let SMB/SMBS be enabled with OpenSSL/NSS, gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 08/73: build: fix --disable-crypto-auth, gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 05/73: lib/Makefile.m32: allow customizing dll suffixes,
gnunet <=
- [GNUnet-SVN] [gnurl] 07/73: darwinssl: add support for TLSv1.3, gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 03/73: failf: skip the sprintf() if there are no consumers, gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 26/73: test643: verify curl_mime_subparts() rejects cyclic additions., gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 35/73: test298: verify --ftp-method nowcwd with URL encoded path, gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 20/73: mime: be tolerant about setting twice the same header list in a part., gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 12/73: multi_cleanup: call DONE on handles that never got that, gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 01/73: RELEASE-PROCEDURE: update the release schedule, gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 14/73: tests: added flaky keyword to tests 587 and 644, gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 33/73: CURLOPT_NOPROGRESS.3: also refer to xferinfofunction, gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 24/73: mime: avoid resetting a part's encoder when part's contents change., gnunet, 2017/10/24