Merge pull request #673 from deferraz/master

[collectd.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 9d3379d..b8a272a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -219,6 +219,15 @@ collectd_LDADD += "-dlopen" ascent.la
 collectd_DEPENDENCIES += ascent.la
 endif
 
+if BUILD_PLUGIN_BAROMETER
+pkglib_LTLIBRARIES += barometer.la
+barometer_la_SOURCES = barometer.c
+barometer_la_LDFLAGS = -module -avoid-version
+barometer_la_LIBADD = -lm
+collectd_LDADD += "-dlopen" barometer.la
+collectd_DEPENDENCIES += barometer.la
+endif
+
 if BUILD_PLUGIN_BATTERY
 pkglib_LTLIBRARIES += battery.la
 battery_la_SOURCES = battery.c
@@ -1565,39 +1574,48 @@ uninstall-hook:
        rm -f $(DESTDIR)$(sysconfdir)/collectd.conf
        rm -f $(DESTDIR)$(pkgdatadir)/postgresql_default.conf;
 
-check_PROGRAMS = common_test utils_avltree_test utils_heap_test utils_vl_lookup_test
+check_PROGRAMS = test_common test_utils_avltree test_utils_heap test_utils_mount test_utils_vl_lookup
 
-common_test_SOURCES = tests/common_test.c \
-                     common.h common.c \
-                     tests/mock/plugin.c \
-                     tests/mock/utils_cache.c \
-                     tests/mock/utils_time.c
-common_test_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
-common_test_LDFLAGS = -export-dynamic
-common_test_LDADD =
+test_common_SOURCES = tests/test_common.c \
+                      common.h common.c \
+                      tests/mock/plugin.c \
+                      tests/mock/utils_cache.c \
+                      tests/mock/utils_time.c
+test_common_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
+test_common_LDFLAGS = -export-dynamic
+test_common_LDADD =
 
-utils_avltree_test_SOURCES = tests/utils_avltree_test.c \
-                            utils_avltree.c utils_avltree.h
-utils_avltree_test_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
-utils_avltree_test_LDFLAGS = -export-dynamic
-utils_avltree_test_LDADD =
+test_utils_avltree_SOURCES = tests/test_utils_avltree.c \
+                             utils_avltree.c utils_avltree.h
+test_utils_avltree_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
+test_utils_avltree_LDFLAGS = -export-dynamic
+test_utils_avltree_LDADD =
 
-utils_heap_test_SOURCES = tests/utils_heap_test.c \
+test_utils_heap_SOURCES = tests/test_utils_heap.c \
                           utils_heap.c utils_heap.h
-utils_heap_test_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
-utils_heap_test_LDFLAGS = -export-dynamic
-utils_heap_test_LDADD =
-
-utils_vl_lookup_test_SOURCES = tests/utils_vl_lookup_test.c \
-                              utils_vl_lookup.h utils_vl_lookup.c \
-                              utils_avltree.c utils_avltree.h \
-                              common.c common.h \
-                              tests/mock/plugin.c \
-                              tests/mock/utils_cache.c \
-                              tests/mock/utils_time.c
-utils_vl_lookup_test_CPPFLAGS =  $(AM_CPPFLAGS) $(LTDLINCL)
-utils_vl_lookup_test_CFLAGS = $(AM_CFLAGS)
-utils_vl_lookup_test_LDFLAGS = -export-dynamic
-utils_vl_lookup_test_LDADD =
-
-TESTS = common_test utils_avltree_test utils_heap_test utils_vl_lookup_test
+test_utils_heap_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
+test_utils_heap_LDFLAGS = -export-dynamic
+test_utils_heap_LDADD =
+
+test_utils_mount_SOURCES = tests/test_utils_mount.c \
+                           utils_mount.c utils_mount.h \
+                           common.c common.h \
+                           tests/mock/plugin.c \
+                           tests/mock/utils_cache.c \
+                           tests/mock/utils_time.c
+test_utils_mount_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
+test_utils_mount_LDFLAGS = -export-dynamic
+test_utils_mount_LDADD =
+
+test_utils_vl_lookup_SOURCES = tests/test_utils_vl_lookup.c \
+                               utils_vl_lookup.h utils_vl_lookup.c \
+                               utils_avltree.c utils_avltree.h \
+                               common.c common.h \
+                               tests/mock/plugin.c \
+                               tests/mock/utils_cache.c \
+                               tests/mock/utils_time.c
+test_utils_vl_lookup_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
+test_utils_vl_lookup_LDFLAGS = -export-dynamic
+test_utils_vl_lookup_LDADD =
+
+TESTS = test_common test_utils_avltree test_utils_heap test_utils_mount test_utils_vl_lookup