From 068f7ae2645844ce76b73702bd275f2073f3919c Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Mon, 3 Dec 2012 22:40:26 +0100 Subject: build: prevent global LIBS from influencing src and lib build targets Currently, LIBS is already used through other macros. --- src/Makefile.am | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index b53127d27..7839904d5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -54,7 +54,15 @@ include Makefile.inc # This might hold -Werror CFLAGS += @CURL_CFLAG_EXTRAS@ @LIBMETALINK_CFLAGS@ -curl_LDADD = $(top_builddir)/lib/libcurl.la @CURL_LIBS@ @LIBMETALINK_LIBS@ +# Prevent global LIBS from influencing src build targets +LIBS = $(BLANK_AT_MAKETIME) + +if USE_EXPLICIT_LIB_DEPS +curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBMETALINK_LIBS@ @LIBCURL_LIBS@ +else +curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBMETALINK_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@ +endif + curl_LDFLAGS = @LIBMETALINK_LDFLAGS@ curl_DEPENDENCIES = $(top_builddir)/lib/libcurl.la BUILT_SOURCES = hugehelp.c -- cgit v1.2.1