From: Florian Forster Date: Tue, 29 Apr 2008 15:44:26 +0000 (+0200) Subject: Merge branch 'collectd-4.3' into collectd-4.4 X-Git-Tag: collectd-4.4.0~29 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0aad516f24e861109627f4b1dc5bfea3b1f621c1;p=collectd.git Merge branch 'collectd-4.3' into collectd-4.4 --- 0aad516f24e861109627f4b1dc5bfea3b1f621c1 diff --cc src/Makefile.am index e094c8f3,02b85fcd..fe4af774 --- a/src/Makefile.am +++ b/src/Makefile.am @@@ -30,49 -30,43 +30,46 @@@ collectd_SOURCES = collectd.c collectd. utils_cache.c utils_cache.h \ utils_ignorelist.c utils_ignorelist.h \ utils_llist.c utils_llist.h \ + utils_tail_match.c utils_tail_match.h \ + utils_match.c utils_match.h \ utils_mount.c utils_mount.h \ + utils_tail.c utils_tail.h \ utils_threshold.c utils_threshold.h \ types_list.c types_list.h - collectd_CPPFLAGS = $(LTDLINCL) - collectd_CPPFLAGS += $(AM_CPPFLAGS) - # Link to these libraries.. + collectd_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) + collectd_CFLAGS = collectd_LDFLAGS = -export-dynamic + collectd_LDADD = + collectd_DEPENDENCIES = + + # Link to these libraries.. if BUILD_WITH_LIBRT - collectd_LDFLAGS += -lrt + collectd_LDADD += -lrt endif if BUILD_WITH_LIBSOCKET - collectd_LDFLAGS += -lsocket + collectd_LDADD += -lsocket endif if BUILD_WITH_LIBRESOLV - collectd_LDFLAGS += -lresolv + collectd_LDADD += -lresolv endif if BUILD_WITH_LIBPTHREAD - collectd_LDFLAGS += -lpthread + collectd_LDADD += -lpthread endif if BUILD_WITH_LIBKSTAT - collectd_LDFLAGS += -lkstat + collectd_LDADD += -lkstat endif if BUILD_WITH_LIBDEVINFO - collectd_LDFLAGS += -ldevinfo + collectd_LDADD += -ldevinfo endif + # The daemon needs to call sg_init, so we need to link it against libstatgrab, + # too. -octo if BUILD_WITH_LIBSTATGRAB - if BUILD_WITH_LIBKVM - collectd_LDFLAGS += -lkvm - endif - if BUILD_WITH_LIBDEVSTAT - collectd_LDFLAGS += -ldevstat - endif - collectd_LDFLAGS += -lstatgrab + collectd_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS) + collectd_LDADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) endif - - collectd_LDADD = - collectd_DEPENDENCIES = if BUILD_WITH_OWN_LIBOCONFIG collectd_LDADD += $(LIBLTDL) liboconfig/liboconfig.la collectd_DEPENDENCIES += $(LIBLTDL) liboconfig/liboconfig.la