X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdaemon%2FMakefile.am;h=9a0ba8f92ffcda84e01b0d5aaa06a761797cfeab;hb=865f2eb31e8264edd9337bc63ac59f6c2fa3b5a7;hp=74af5196a25f07ca0811201b191ec488cd962e43;hpb=c7fa732db30f2886e64829047e8912bd84afb65f;p=collectd.git diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index 74af5196..9a0ba8f9 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -23,9 +23,6 @@ endif if BUILD_WITH_LIBSOCKET COMMON_LIBS += -lsocket endif -if BUILD_WITH_LIBRESOLV -COMMON_LIBS += -lresolv -endif if BUILD_WITH_LIBKSTAT COMMON_LIBS += -lkstat endif @@ -47,6 +44,8 @@ libheap_la_SOURCES = utils_heap.c utils_heap.h libmetadata_la_SOURCES = meta_data.c meta_data.h libplugin_mock_la_SOURCES = plugin_mock.c utils_cache_mock.c \ + utils_complain.c utils_complain.h \ + utils_ignorelist.c utils_ignorelist.h \ utils_time.c utils_time.h libplugin_mock_la_CPPFLAGS = $(AM_CPPFLAGS) -DMOCK_TIME libplugin_mock_la_LIBADD = $(COMMON_LIBS) libcommon.la @@ -79,12 +78,8 @@ collectd_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS) collectd_LDADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) endif -if BUILD_WITH_OWN_LIBOCONFIG collectd_LDADD += $(top_builddir)/src/liboconfig/liboconfig.la collectd_DEPENDENCIES += $(top_builddir)/src/liboconfig/liboconfig.la -else -collectd_LDADD += -loconfig -endif LOG_COMPILER = env VALGRIND="@VALGRIND@" $(abs_top_srcdir)/testwrapper.sh