From: Yang Tse <yangsita@gmail.com>
Date: Fri, 30 Nov 2012 18:12:18 +0000 (+0100)
Subject: build: prevent global LIBS from influencing examples build targets
X-Git-Tag: curl-7_29_0~237
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6bd6b3a8a17e2f2004e276c7568feaa01acebfe7;p=thirdparty%2Fcurl.git

build: prevent global LIBS from influencing examples build targets
---

diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am
index eb4e7c7674..49c20361f5 100644
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -36,18 +36,27 @@ EXTRA_DIST = README Makefile.example Makefile.inc Makefile.m32 \
 
 AM_CPPFLAGS = -I$(top_builddir)/include/curl \
               -I$(top_builddir)/include      \
-              -I$(top_srcdir)/include \
-              -DCURL_NO_OLDIES
+              -I$(top_srcdir)/include
 
 LIBDIR = $(top_builddir)/lib
 
+# Avoid libcurl obsolete stuff
+AM_CPPFLAGS += -DCURL_NO_OLDIES
+
 # Mostly for Windows build targets, when using static libcurl
 if USE_CPPFLAG_CURL_STATICLIB
 AM_CPPFLAGS += -DCURL_STATICLIB
 endif
 
+# Prevent global LIBS from influencing examples build targets
+LIBS = $(BLANK_AT_MAKETIME)
+
 # Dependencies
+if USE_EXPLICIT_LIB_DEPS
+LDADD = $(LIBDIR)/libcurl.la @LIBCURL_LIBS@
+else
 LDADD = $(LIBDIR)/libcurl.la
+endif
 
 # Makefile.inc provides the check_PROGRAMS and COMPLICATED_EXAMPLES defines
 include Makefile.inc