diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index cdd927bc7b859e037aeb5e1abf2c9596e4a5fae4..9a0ba8f92ffcda84e01b0d5aaa06a761797cfeab 100644 (file)
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
AM_CPPFLAGS += -DPKGDATADIR='"${pkgdatadir}"'
# Link to these libraries..
-COMMON_LIBS =
+COMMON_LIBS = $(PTHREAD_LIBS)
+if BUILD_WITH_CAPABILITY
+COMMON_LIBS += -lcap
+endif
if BUILD_WITH_LIBRT
COMMON_LIBS += -lrt
endif
if BUILD_WITH_LIBSOCKET
COMMON_LIBS += -lsocket
endif
-if BUILD_WITH_LIBRESOLV
-COMMON_LIBS += -lresolv
-endif
-if BUILD_WITH_LIBPTHREAD
-COMMON_LIBS += -lpthread
-endif
if BUILD_WITH_LIBKSTAT
COMMON_LIBS += -lkstat
endif
COMMON_LIBS += -ldevinfo
endif
-AUTOMAKE_OPTIONS = subdir-objects
-
sbin_PROGRAMS = collectd
noinst_LTLIBRARIES = libavltree.la libcommon.la libheap.la libmetadata.la libplugin_mock.la
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
utils_ignorelist.c utils_ignorelist.h \
utils_llist.c utils_llist.h \
utils_random.c utils_random.h \
- utils_tail_match.c utils_tail_match.h \
- utils_match.c utils_match.h \
utils_subst.c utils_subst.h \
- utils_tail.c utils_tail.h \
utils_time.c utils_time.h \
types_list.c types_list.h \
utils_threshold.c utils_threshold.h
-collectd_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
collectd_CFLAGS = $(AM_CFLAGS)
collectd_LDFLAGS = -export-dynamic
-collectd_LDADD = libavltree.la libcommon.la libheap.la -lm $(COMMON_LIBS)
+collectd_LDADD = libavltree.la libcommon.la libheap.la -lm $(COMMON_LIBS) $(DLOPEN_LIBS)
collectd_DEPENDENCIES = libavltree.la libcommon.la libheap.la libmetadata.la
# The daemon needs to call sg_init, so we need to link it against libstatgrab,
collectd_LDADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
endif
-if BUILD_WITH_OWN_LIBOCONFIG
-collectd_LDADD += $(LIBLTDL) $(top_builddir)/src/liboconfig/liboconfig.la
+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
check_PROGRAMS = test_common test_meta_data test_utils_avltree test_utils_heap test_utils_time test_utils_subst
TESTS = test_common test_meta_data test_utils_avltree test_utils_heap test_utils_time test_utils_subst