diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/libtest/Makefile.am | 3 | ||||
-rw-r--r-- | tests/server/Makefile.am | 3 | ||||
-rw-r--r-- | tests/unit/Makefile.am | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am index a9d0b9031..df13df111 100644 --- a/tests/libtest/Makefile.am +++ b/tests/libtest/Makefile.am @@ -55,8 +55,7 @@ test1022.pl Makefile.inc notexists.pl CFLAG_CURL_SYMBOL_HIDING = @CFLAG_CURL_SYMBOL_HIDING@ -# Prevent global LIBS from influencing libtest build targets -BLANK_AT_MAKETIME = @BLANK_AT_MAKETIME@ +# Prevent LIBS from being used for all link targets LIBS = $(BLANK_AT_MAKETIME) if USE_EXPLICIT_LIB_DEPS diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am index 85e0c097c..d4ef252db 100644 --- a/tests/server/Makefile.am +++ b/tests/server/Makefile.am @@ -50,8 +50,7 @@ AM_CPPFLAGS = -I$(top_builddir)/include/curl \ -I$(top_srcdir)/lib endif -# Prevent global LIBS from influencing test server build targets -BLANK_AT_MAKETIME = @BLANK_AT_MAKETIME@ +# Prevent LIBS from being used for all link targets LIBS = $(BLANK_AT_MAKETIME) if DOING_NATIVE_WINDOWS diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index 058216814..eb29241ad 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -54,7 +54,10 @@ endif EXTRA_DIST = Makefile.inc -LDADD = $(top_builddir)/lib/libcurlu.la @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@ +# Prevent LIBS from being used for all link targets +LIBS = $(BLANK_AT_MAKETIME) + +LDADD = $(top_builddir)/lib/libcurlu.la @LDFLAGS@ @LIBCURL_LIBS@ DEPENDENCIES = $(top_builddir)/lib/libcurlu.la AM_CPPFLAGS += -DUNITTESTS |