From 3c572afe1d0eff59d48db45afbfc5686173ce1a4 Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Fri, 3 Jun 2016 19:20:50 +0200 Subject: [PATCH] Simplify Makefile.am for curl plugins They can't be build without libcurl support, ./configure will take care of that. --- src/Makefile.am | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 9cdb38e9..d12e0fae 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -261,25 +261,17 @@ if BUILD_PLUGIN_CURL pkglib_LTLIBRARIES += curl.la curl_la_SOURCES = curl.c curl_la_LDFLAGS = $(PLUGIN_LDFLAGS) -curl_la_CFLAGS = $(AM_CFLAGS) -curl_la_LIBADD = -if BUILD_WITH_LIBCURL -curl_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS) -curl_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS) -endif +curl_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS) +curl_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS) endif if BUILD_PLUGIN_CURL_JSON pkglib_LTLIBRARIES += curl_json.la curl_json_la_SOURCES = curl_json.c -curl_json_la_CFLAGS = $(AM_CFLAGS) -curl_json_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS) +curl_json_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS) curl_json_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS) -curl_json_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS) -if BUILD_WITH_LIBCURL -curl_json_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS) -curl_json_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS) -endif +curl_json_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS) +curl_json_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS) $(BUILD_WITH_LIBYAJL_LIBS) endif if BUILD_PLUGIN_CURL_XML -- 2.11.0