From: Florian Forster <octo@google.com>
Date: Mon, 29 Jun 2020 08:43:29 +0000 (+0200)
Subject: Makefile.am: Fix some linking issues with the utility libraries.
X-Git-Tag: 6.0.0-rc0~144^2~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ef2f5ba9d3b02ec98654e27a340a642f60fa95e;p=thirdparty%2Fcollectd.git

Makefile.am: Fix some linking issues with the utility libraries.
---

diff --git a/Makefile.am b/Makefile.am
index 694de1677..546224ecf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -474,11 +474,12 @@ libplugin_mock_la_SOURCES = \
 
 libplugin_mock_la_CPPFLAGS = $(AM_CPPFLAGS) -DMOCK_TIME
 libplugin_mock_la_LIBADD = libcommon.la libignorelist.la libmetadata.la $(COMMON_LIBS)
+#libplugin_mock_la_LIBADD = libcommon.la libignorelist.la $(COMMON_LIBS)
 
 libformat_graphite_la_SOURCES = \
 	src/utils/format_graphite/format_graphite.c \
 	src/utils/format_graphite/format_graphite.h
-libformat_graphite_la_LIBADD = libstrbuf.la $(COMMON_LIBS)
+libformat_graphite_la_LIBADD = $(COMMON_LIBS)
 
 test_format_graphite_SOURCES = \
 	src/utils/format_graphite/format_graphite_test.c \
@@ -488,6 +489,7 @@ test_format_graphite_LDADD = \
 	libidentity.la \
 	libmetadata.la \
 	libplugin_mock.la \
+	libstrbuf.la \
 	-lm
 
 libformat_json_la_SOURCES = \
@@ -2246,7 +2248,7 @@ if BUILD_PLUGIN_WRITE_GRAPHITE
 pkglib_LTLIBRARIES += write_graphite.la
 write_graphite_la_SOURCES = src/write_graphite.c
 write_graphite_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-write_graphite_la_LIBADD = libformat_graphite.la
+write_graphite_la_LIBADD = libformat_graphite.la libstrbuf.la
 endif
 
 if BUILD_PLUGIN_WRITE_HTTP