projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3 from collectd/master
[collectd.git]
/
src
/
daemon
/
Makefile.am
diff --git
a/src/daemon/Makefile.am
b/src/daemon/Makefile.am
index
8275eee
..
cd53a7b
100644
(file)
--- a/
src/daemon/Makefile.am
+++ b/
src/daemon/Makefile.am
@@
-41,15
+41,19
@@
AUTOMAKE_OPTIONS = subdir-objects
sbin_PROGRAMS = collectd
sbin_PROGRAMS = collectd
-noinst_LTLIBRARIES = libavltree.la libcommon.la libheap.la libplugin_mock.la
+noinst_LTLIBRARIES = libavltree.la libcommon.la libheap.la lib
metadata.la lib
plugin_mock.la
libavltree_la_SOURCES = utils_avltree.c utils_avltree.h
libcommon_la_SOURCES = common.c common.h
libavltree_la_SOURCES = utils_avltree.c utils_avltree.h
libcommon_la_SOURCES = common.c common.h
+libcommon_la_LIBADD = $(COMMON_LIBS)
libheap_la_SOURCES = utils_heap.c utils_heap.h
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_time_mock.c
libplugin_mock_la_SOURCES = plugin_mock.c utils_cache_mock.c utils_time_mock.c
+libplugin_mock_la_LIBADD = $(COMMON_LIBS)
collectd_SOURCES = collectd.c collectd.h \
configfile.c configfile.h \
collectd_SOURCES = collectd.c collectd.h \
configfile.c configfile.h \
@@
-73,7
+77,7
@@
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_CFLAGS = $(AM_CFLAGS)
collectd_LDFLAGS = -export-dynamic
collectd_LDADD = libavltree.la libcommon.la libheap.la -lm $(COMMON_LIBS)
-collectd_DEPENDENCIES =
+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,
# too. -octo
# The daemon needs to call sg_init, so we need to link it against libstatgrab,
# too. -octo
@@
-89,11
+93,14
@@
else
collectd_LDADD += -loconfig
endif
collectd_LDADD += -loconfig
endif
-check_PROGRAMS = test_common test_
utils_avltree test_utils_heap
test_utils_subst
-TESTS
= test_common test_utils_avltree test_utils_heap
test_utils_subst
+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
test_common_SOURCES = common_test.c ../testing.h
test_common_SOURCES = common_test.c ../testing.h
-test_common_LDADD = libcommon.la libplugin_mock.la $(COMMON_LIBS)
+test_common_LDADD = libcommon.la libplugin_mock.la
+
+test_meta_data_SOURCES = meta_data_test.c ../testing.h
+test_meta_data_LDADD = libmetadata.la libplugin_mock.la
test_utils_avltree_SOURCES = utils_avltree_test.c ../testing.h
test_utils_avltree_LDADD = libavltree.la $(COMMON_LIBS)
test_utils_avltree_SOURCES = utils_avltree_test.c ../testing.h
test_utils_avltree_LDADD = libavltree.la $(COMMON_LIBS)
@@
-101,6
+108,8
@@
test_utils_avltree_LDADD = libavltree.la $(COMMON_LIBS)
test_utils_heap_SOURCES = utils_heap_test.c ../testing.h
test_utils_heap_LDADD = libheap.la $(COMMON_LIBS)
test_utils_heap_SOURCES = utils_heap_test.c ../testing.h
test_utils_heap_LDADD = libheap.la $(COMMON_LIBS)
+test_utils_time_SOURCES = utils_time_test.c ../testing.h
+
test_utils_subst_SOURCES = utils_subst_test.c ../testing.h \
utils_subst.c utils_subst.h
test_utils_subst_SOURCES = utils_subst_test.c ../testing.h \
utils_subst.c utils_subst.h
-test_utils_subst_LDADD = libcommon.la libplugin_mock.la
$(COMMON_LIBS)
+test_utils_subst_LDADD = libcommon.la libplugin_mock.la