From 216c6246b73645ac093de15b87aedc9abc6ebc80 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Sat, 20 Sep 2014 06:49:01 +0200 Subject: [PATCH] Move collectd daemon files to the src/daemon/ directory. --- configure.ac | 4 +- src/Makefile.am | 400 +++++----------------------------- src/daemon/Makefile.am | 85 ++++++++ src/{ => daemon}/collectd.c | 0 src/{ => daemon}/collectd.h | 0 src/{ => daemon}/common.c | 0 src/{ => daemon}/common.h | 0 src/{ => daemon}/configfile.c | 0 src/{ => daemon}/configfile.h | 0 src/{ => daemon}/filter_chain.c | 0 src/{ => daemon}/filter_chain.h | 0 src/{ => daemon}/meta_data.c | 0 src/{ => daemon}/meta_data.h | 0 src/{ => daemon}/plugin.c | 0 src/{ => daemon}/plugin.h | 0 src/{ => daemon}/types_list.c | 0 src/{ => daemon}/types_list.h | 0 src/{ => daemon}/utils_avltree.c | 0 src/{ => daemon}/utils_avltree.h | 0 src/{ => daemon}/utils_cache.c | 0 src/{ => daemon}/utils_cache.h | 0 src/{ => daemon}/utils_complain.c | 0 src/{ => daemon}/utils_complain.h | 0 src/{ => daemon}/utils_heap.c | 0 src/{ => daemon}/utils_heap.h | 0 src/{ => daemon}/utils_llist.c | 0 src/{ => daemon}/utils_llist.h | 0 src/{ => daemon}/utils_match.c | 0 src/{ => daemon}/utils_match.h | 0 src/{ => daemon}/utils_parse_option.c | 0 src/{ => daemon}/utils_parse_option.h | 0 src/{ => daemon}/utils_random.c | 0 src/{ => daemon}/utils_random.h | 0 src/{ => daemon}/utils_subst.c | 0 src/{ => daemon}/utils_subst.h | 0 src/{ => daemon}/utils_tail.c | 0 src/{ => daemon}/utils_tail.h | 0 src/{ => daemon}/utils_tail_match.c | 0 src/{ => daemon}/utils_tail_match.h | 0 src/{ => daemon}/utils_threshold.c | 0 src/{ => daemon}/utils_threshold.h | 0 src/{ => daemon}/utils_time.c | 0 src/{ => daemon}/utils_time.h | 0 src/libcollectdclient/Makefile.am | 2 +- 44 files changed, 138 insertions(+), 353 deletions(-) create mode 100644 src/daemon/Makefile.am rename src/{ => daemon}/collectd.c (100%) rename src/{ => daemon}/collectd.h (100%) rename src/{ => daemon}/common.c (100%) rename src/{ => daemon}/common.h (100%) rename src/{ => daemon}/configfile.c (100%) rename src/{ => daemon}/configfile.h (100%) rename src/{ => daemon}/filter_chain.c (100%) rename src/{ => daemon}/filter_chain.h (100%) rename src/{ => daemon}/meta_data.c (100%) rename src/{ => daemon}/meta_data.h (100%) rename src/{ => daemon}/plugin.c (100%) rename src/{ => daemon}/plugin.h (100%) rename src/{ => daemon}/types_list.c (100%) rename src/{ => daemon}/types_list.h (100%) rename src/{ => daemon}/utils_avltree.c (100%) rename src/{ => daemon}/utils_avltree.h (100%) rename src/{ => daemon}/utils_cache.c (100%) rename src/{ => daemon}/utils_cache.h (100%) rename src/{ => daemon}/utils_complain.c (100%) rename src/{ => daemon}/utils_complain.h (100%) rename src/{ => daemon}/utils_heap.c (100%) rename src/{ => daemon}/utils_heap.h (100%) rename src/{ => daemon}/utils_llist.c (100%) rename src/{ => daemon}/utils_llist.h (100%) rename src/{ => daemon}/utils_match.c (100%) rename src/{ => daemon}/utils_match.h (100%) rename src/{ => daemon}/utils_parse_option.c (100%) rename src/{ => daemon}/utils_parse_option.h (100%) rename src/{ => daemon}/utils_random.c (100%) rename src/{ => daemon}/utils_random.h (100%) rename src/{ => daemon}/utils_subst.c (100%) rename src/{ => daemon}/utils_subst.h (100%) rename src/{ => daemon}/utils_tail.c (100%) rename src/{ => daemon}/utils_tail.h (100%) rename src/{ => daemon}/utils_tail_match.c (100%) rename src/{ => daemon}/utils_tail_match.h (100%) rename src/{ => daemon}/utils_threshold.c (100%) rename src/{ => daemon}/utils_threshold.h (100%) rename src/{ => daemon}/utils_time.c (100%) rename src/{ => daemon}/utils_time.h (100%) diff --git a/configure.ac b/configure.ac index 65e535a6..9dd30c78 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)]) -AC_CONFIG_SRCDIR(src/collectd.c) +AC_CONFIG_SRCDIR(src/) AC_CONFIG_HEADERS(src/config.h) AC_CONFIG_AUX_DIR([libltdl/config]) @@ -5580,7 +5580,7 @@ AC_SUBST(LCC_VERSION_STRING) AC_CONFIG_FILES(src/libcollectdclient/collectd/lcc_features.h) -AC_CONFIG_FILES([Makefile src/Makefile src/collectd.conf src/libcollectdclient/Makefile src/libcollectdclient/libcollectdclient.pc src/liboconfig/Makefile bindings/Makefile bindings/java/Makefile]) +AC_CONFIG_FILES([Makefile src/Makefile src/daemon/Makefile src/collectd.conf src/libcollectdclient/Makefile src/libcollectdclient/libcollectdclient.pc src/liboconfig/Makefile bindings/Makefile bindings/java/Makefile]) AC_OUTPUT if test "x$with_librrd" = "xyes" \ diff --git a/src/Makefile.am b/src/Makefile.am index 340c7928..b3bd26ed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,12 +2,14 @@ SUBDIRS = libcollectdclient if BUILD_WITH_OWN_LIBOCONFIG SUBDIRS += liboconfig endif +SUBDIRS += daemon if COMPILER_IS_GCC AM_CFLAGS = -Wall -Werror endif -AM_CPPFLAGS = -DPREFIX='"${prefix}"' +AM_CPPFLAGS = -I$(srcdir)/daemon +AM_CPPFLAGS += -DPREFIX='"${prefix}"' AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"' AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' @@ -19,78 +21,9 @@ AM_CPPFLAGS += -DPKGDATADIR='"${pkgdatadir}"' AUTOMAKE_OPTIONS = subdir-objects -sbin_PROGRAMS = collectd collectdmon +sbin_PROGRAMS = collectdmon bin_PROGRAMS = collectd-nagios collectdctl collectd-tg -collectd_SOURCES = collectd.c collectd.h \ - common.c common.h \ - configfile.c configfile.h \ - filter_chain.c filter_chain.h \ - meta_data.c meta_data.h \ - plugin.c plugin.h \ - utils_avltree.c utils_avltree.h \ - utils_cache.c utils_cache.h \ - utils_complain.c utils_complain.h \ - utils_heap.c utils_heap.h \ - utils_ignorelist.c utils_ignorelist.h \ - utils_llist.c utils_llist.h \ - utils_parse_option.c utils_parse_option.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 = -lm -collectd_DEPENDENCIES = - -# Link to these libraries.. -if BUILD_WITH_LIBRT -collectd_LDADD += -lrt -endif -if BUILD_WITH_LIBPOSIX4 -collectd_LDADD += -lposix4 -endif -if BUILD_WITH_LIBSOCKET -collectd_LDADD += -lsocket -endif -if BUILD_WITH_LIBRESOLV -collectd_LDADD += -lresolv -endif -if BUILD_WITH_LIBPTHREAD -collectd_LDADD += -lpthread -endif -if BUILD_WITH_LIBKSTAT -collectd_LDADD += -lkstat -endif -if BUILD_WITH_LIBDEVINFO -collectd_LDADD += -ldevinfo -endif -if BUILD_AIX -collectd_LDFLAGS += -Wl,-bexpall,-brtllib -endif - -# The daemon needs to call sg_init, so we need to link it against libstatgrab, -# too. -octo -if BUILD_WITH_LIBSTATGRAB -collectd_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS) -collectd_LDADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) -endif - -if BUILD_WITH_OWN_LIBOCONFIG -collectd_LDADD += $(LIBLTDL) liboconfig/liboconfig.la -collectd_DEPENDENCIES += liboconfig/liboconfig.la -else -collectd_LDADD += -loconfig -endif - collectdmon_SOURCES = collectdmon.c collectdmon_CPPFLAGS = $(AM_CPPFLAGS) @@ -121,7 +54,7 @@ collectdctl_LDADD += libcollectdclient/libcollectdclient.la collectdctl_DEPENDENCIES = libcollectdclient/libcollectdclient.la collectd_tg_SOURCES = collectd-tg.c \ - utils_heap.c utils_heap.h + daemon/utils_heap.c daemon/utils_heap.h collectd_tg_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/src/libcollectdclient/collectd collectd_tg_LDADD = if BUILD_WITH_LIBSOCKET @@ -148,8 +81,6 @@ aggregation_la_SOURCES = aggregation.c \ utils_vl_lookup.c utils_vl_lookup.h aggregation_la_LDFLAGS = -module -avoid-version aggregation_la_LIBADD = -collectd_LDADD += "-dlopen" aggregation.la -collectd_DEPENDENCIES += aggregation.la endif if BUILD_PLUGIN_AMQP @@ -161,8 +92,6 @@ amqp_la_SOURCES = amqp.c \ amqp_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBRABBITMQ_LDFLAGS) amqp_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBRABBITMQ_CPPFLAGS) amqp_la_LIBADD = $(BUILD_WITH_LIBRABBITMQ_LIBS) -collectd_LDADD += "-dlopen" amqp.la -collectd_DEPENDENCIES += amqp.la endif if BUILD_PLUGIN_APACHE @@ -171,12 +100,10 @@ apache_la_SOURCES = apache.c apache_la_LDFLAGS = -module -avoid-version apache_la_CFLAGS = $(AM_CFLAGS) apache_la_LIBADD = -collectd_LDADD += "-dlopen" apache.la if BUILD_WITH_LIBCURL apache_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS) apache_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS) endif -collectd_DEPENDENCIES += apache.la endif if BUILD_PLUGIN_APCUPS @@ -187,8 +114,6 @@ apcups_la_LIBADD = if BUILD_WITH_LIBSOCKET apcups_la_LIBADD += -lsocket endif -collectd_LDADD += "-dlopen" apcups.la -collectd_DEPENDENCIES += apcups.la endif if BUILD_PLUGIN_APPLE_SENSORS @@ -196,8 +121,6 @@ pkglib_LTLIBRARIES += apple_sensors.la apple_sensors_la_SOURCES = apple_sensors.c apple_sensors_la_LDFLAGS = -module -avoid-version apple_sensors_la_LDFLAGS += -framework IOKit -collectd_LDADD += "-dlopen" apple_sensors.la -collectd_DEPENDENCIES += apple_sensors.la endif if BUILD_PLUGIN_AQUAERO @@ -206,8 +129,6 @@ aquaero_la_SOURCES = aquaero.c aquaero_la_LDFLAGS = -module -avoid-version aquaero_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBAQUAERO5_CFLAGS) aquaero_la_LIBADD = $(BUILD_WITH_LIBAQUAERO5_LDFLAGS) -laquaero5 -collectd_LDADD += "-dlopen" aquaero.la -collectd_DEPENDENCIES += aquaero.la endif if BUILD_PLUGIN_ASCENT @@ -217,8 +138,6 @@ ascent_la_LDFLAGS = -module -avoid-version ascent_la_CFLAGS = $(AM_CFLAGS) \ $(BUILD_WITH_LIBCURL_CFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS) ascent_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS) $(BUILD_WITH_LIBXML2_LIBS) -collectd_LDADD += "-dlopen" ascent.la -collectd_DEPENDENCIES += ascent.la endif if BUILD_PLUGIN_BAROMETER @@ -226,8 +145,6 @@ 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 @@ -238,8 +155,6 @@ battery_la_LIBADD = if BUILD_WITH_LIBIOKIT battery_la_LDFLAGS += -framework IOKit endif -collectd_LDADD += "-dlopen" battery.la -collectd_DEPENDENCIES += battery.la endif if BUILD_PLUGIN_BIND @@ -247,26 +162,22 @@ pkglib_LTLIBRARIES += bind.la bind_la_SOURCES = bind.c bind_la_LDFLAGS = -module -avoid-version bind_la_CFLAGS = $(AM_CFLAGS) \ - $(BUILD_WITH_LIBCURL_CFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS) + $(BUILD_WITH_LIBCURL_CFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS) bind_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS) $(BUILD_WITH_LIBXML2_LIBS) -collectd_LDADD += "-dlopen" bind.la -collectd_DEPENDENCIES += bind.la endif if BUILD_PLUGIN_CGROUPS pkglib_LTLIBRARIES += cgroups.la -cgroups_la_SOURCES = cgroups.c utils_mount.c utils_mount.h +cgroups_la_SOURCES = cgroups.c \ + utils_ignorelist.c utils_ignorelist.h \ + utils_mount.c utils_mount.h cgroups_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" cgroups.la -collectd_DEPENDENCIES += cgroups.la endif if BUILD_PLUGIN_CONNTRACK pkglib_LTLIBRARIES += conntrack.la conntrack_la_SOURCES = conntrack.c conntrack_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" conntrack.la -collectd_DEPENDENCIES += conntrack.la endif if BUILD_PLUGIN_CONTEXTSWITCH @@ -277,8 +188,6 @@ contextswitch_la_LIBADD = if BUILD_WITH_PERFSTAT contextswitch_la_LIBADD += -lperfstat endif -collectd_LDADD += "-dlopen" contextswitch.la -collectd_DEPENDENCIES += contextswitch.la endif if BUILD_PLUGIN_CPU @@ -300,24 +209,18 @@ endif if BUILD_WITH_PERFSTAT cpu_la_LIBADD += -lperfstat endif -collectd_LDADD += "-dlopen" cpu.la -collectd_DEPENDENCIES += cpu.la endif if BUILD_PLUGIN_CPUFREQ pkglib_LTLIBRARIES += cpufreq.la cpufreq_la_SOURCES = cpufreq.c cpufreq_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" cpufreq.la -collectd_DEPENDENCIES += cpufreq.la endif if BUILD_PLUGIN_CSV pkglib_LTLIBRARIES += csv.la csv_la_SOURCES = csv.c csv_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" csv.la -collectd_DEPENDENCIES += csv.la endif if BUILD_PLUGIN_CURL @@ -326,12 +229,10 @@ curl_la_SOURCES = curl.c curl_la_LDFLAGS = -module -avoid-version curl_la_CFLAGS = $(AM_CFLAGS) curl_la_LIBADD = -collectd_LDADD += "-dlopen" curl.la if BUILD_WITH_LIBCURL curl_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS) curl_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS) endif -collectd_DEPENDENCIES += curl.la endif if BUILD_PLUGIN_CURL_JSON @@ -339,14 +240,12 @@ pkglib_LTLIBRARIES += curl_json.la curl_json_la_SOURCES = curl_json.c curl_json_la_CFLAGS = $(AM_CFLAGS) curl_json_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBYAJL_LDFLAGS) -curl_json_la_CPPFLAGS = $(BUILD_WITH_LIBYAJL_CPPFLAGS) +curl_json_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS) curl_json_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS) if BUILD_WITH_LIBCURL curl_json_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS) curl_json_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS) endif -collectd_LDADD += "-dlopen" curl_json.la -collectd_DEPENDENCIES += curl_json.la endif if BUILD_PLUGIN_CURL_XML @@ -356,8 +255,6 @@ curl_xml_la_LDFLAGS = -module -avoid-version curl_xml_la_CFLAGS = $(AM_CFLAGS) \ $(BUILD_WITH_LIBCURL_CFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS) curl_xml_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS) $(BUILD_WITH_LIBXML2_LIBS) -collectd_LDADD += "-dlopen" curl_xml.la -collectd_DEPENDENCIES += curl_xml.la endif if BUILD_PLUGIN_DBI @@ -367,21 +264,20 @@ dbi_la_SOURCES = dbi.c \ dbi_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBDBI_CPPFLAGS) dbi_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBDBI_LDFLAGS) dbi_la_LIBADD = $(BUILD_WITH_LIBDBI_LIBS) -collectd_LDADD += "-dlopen" dbi.la -collectd_DEPENDENCIES += dbi.la endif if BUILD_PLUGIN_DF pkglib_LTLIBRARIES += df.la -df_la_SOURCES = df.c utils_mount.c utils_mount.h +df_la_SOURCES = df.c \ + utils_ignorelist.c utils_ignorelist.h \ + utils_mount.c utils_mount.h df_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" df.la -collectd_DEPENDENCIES += df.la endif if BUILD_PLUGIN_DISK pkglib_LTLIBRARIES += disk.la -disk_la_SOURCES = disk.c +disk_la_SOURCES = disk.c \ + utils_ignorelist.c utils_ignorelist.h disk_la_CFLAGS = $(AM_CFLAGS) disk_la_LDFLAGS = -module -avoid-version disk_la_LIBADD = @@ -404,8 +300,6 @@ endif if BUILD_WITH_PERFSTAT disk_la_LIBADD += -lperfstat endif -collectd_LDADD += "-dlopen" disk.la -collectd_DEPENDENCIES += disk.la endif if BUILD_PLUGIN_DNS @@ -413,8 +307,6 @@ pkglib_LTLIBRARIES += dns.la dns_la_SOURCES = dns.c utils_dns.c utils_dns.h dns_la_LDFLAGS = -module -avoid-version dns_la_LIBADD = -lpcap -lpthread -collectd_LDADD += "-dlopen" dns.la -collectd_DEPENDENCIES += dns.la endif if BUILD_PLUGIN_DRBD @@ -422,8 +314,6 @@ pkglib_LTLIBRARIES += drbd.la drbd_la_SOURCES = drbd.c drbd_la_LDFLAGS = -module -avoid-version drbd_la_LIBADD = -lpthread -collectd_LDADD += "-dlopen" drbd.la -collectd_DEPENDENCIES += drbd.la endif if BUILD_PLUGIN_EMAIL @@ -431,16 +321,12 @@ pkglib_LTLIBRARIES += email.la email_la_SOURCES = email.c email_la_LDFLAGS = -module -avoid-version email_la_LIBADD = -lpthread -collectd_LDADD += "-dlopen" email.la -collectd_DEPENDENCIES += email.la endif if BUILD_PLUGIN_ENTROPY pkglib_LTLIBRARIES += entropy.la entropy_la_SOURCES = entropy.c entropy_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" entropy.la -collectd_DEPENDENCIES += entropy.la endif if BUILD_PLUGIN_EXEC @@ -450,24 +336,18 @@ exec_la_SOURCES = exec.c \ utils_cmd_putval.c utils_cmd_putval.h exec_la_LDFLAGS = -module -avoid-version exec_la_LIBADD = -lpthread -collectd_LDADD += "-dlopen" exec.la -collectd_DEPENDENCIES += exec.la endif if BUILD_PLUGIN_ETHSTAT pkglib_LTLIBRARIES += ethstat.la ethstat_la_SOURCES = ethstat.c ethstat_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" ethstat.la -collectd_DEPENDENCIES += ethstat.la endif if BUILD_PLUGIN_FILECOUNT pkglib_LTLIBRARIES += filecount.la filecount_la_SOURCES = filecount.c filecount_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" filecount.la -collectd_DEPENDENCIES += filecount.la endif if BUILD_PLUGIN_GMOND @@ -476,8 +356,6 @@ gmond_la_SOURCES = gmond.c gmond_la_CPPFLAGS = $(AM_CPPFLAGS) $(GANGLIA_CPPFLAGS) gmond_la_LDFLAGS = -module -avoid-version $(GANGLIA_LDFLAGS) gmond_la_LIBADD = $(GANGLIA_LIBS) -collectd_LDADD += "-dlopen" gmond.la -collectd_DEPENDENCIES += gmond.la endif if BUILD_PLUGIN_HDDTEMP @@ -488,18 +366,15 @@ hddtemp_la_LIBADD = if BUILD_WITH_LIBSOCKET hddtemp_la_LIBADD += -lsocket endif -collectd_LDADD += "-dlopen" hddtemp.la -collectd_DEPENDENCIES += hddtemp.la endif if BUILD_PLUGIN_INTERFACE pkglib_LTLIBRARIES += interface.la -interface_la_SOURCES = interface.c +interface_la_SOURCES = interface.c \ + utils_ignorelist.c utils_ignorelist.h interface_la_CFLAGS = $(AM_CFLAGS) interface_la_LDFLAGS = -module -avoid-version interface_la_LIBADD = -collectd_LDADD += "-dlopen" interface.la -collectd_DEPENDENCIES += interface.la if BUILD_WITH_LIBSTATGRAB interface_la_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS) interface_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) @@ -522,18 +397,15 @@ iptables_la_SOURCES = iptables.c iptables_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBIPTC_CPPFLAGS) iptables_la_LDFLAGS = -module -avoid-version iptables_la_LIBADD = $(BUILD_WITH_LIBIPTC_LDFLAGS) -collectd_LDADD += "-dlopen" iptables.la -collectd_DEPENDENCIES += iptables.la endif if BUILD_PLUGIN_IPMI pkglib_LTLIBRARIES += ipmi.la -ipmi_la_SOURCES = ipmi.c +ipmi_la_SOURCES = ipmi.c \ + utils_ignorelist.c utils_ignorelist.h ipmi_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_OPENIPMI_CFLAGS) ipmi_la_LDFLAGS = -module -avoid-version ipmi_la_LIBADD = $(BUILD_WITH_OPENIPMI_LIBS) -collectd_LDADD += "-dlopen" ipmi.la -collectd_DEPENDENCIES += ipmi.la endif if BUILD_PLUGIN_IPVS @@ -543,16 +415,13 @@ if IP_VS_H_NEEDS_KERNEL_CFLAGS ipvs_la_CFLAGS = $(AM_CFLAGS) $(KERNEL_CFLAGS) endif ipvs_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" ipvs.la -collectd_DEPENDENCIES += ipvs.la endif if BUILD_PLUGIN_IRQ pkglib_LTLIBRARIES += irq.la -irq_la_SOURCES = irq.c +irq_la_SOURCES = irq.c \ + utils_ignorelist.c utils_ignorelist.h irq_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" irq.la -collectd_DEPENDENCIES += irq.la endif if BUILD_PLUGIN_JAVA @@ -562,8 +431,6 @@ java_la_CPPFLAGS = $(AM_CPPFLAGS) $(JAVA_CPPFLAGS) java_la_CFLAGS = $(AM_CFLAGS) $(JAVA_CFLAGS) java_la_LDFLAGS = -module -avoid-version $(JAVA_LDFLAGS) java_la_LIBADD = $(JAVA_LIBS) -collectd_LDADD += "-dlopen" java.la -collectd_DEPENDENCIES += java.la endif if BUILD_PLUGIN_LOAD @@ -572,8 +439,6 @@ load_la_SOURCES = load.c load_la_CFLAGS = $(AM_CFLAGS) load_la_LDFLAGS = -module -avoid-version load_la_LIBADD = -collectd_LDADD += "-dlopen" load.la -collectd_DEPENDENCIES += load.la if BUILD_WITH_LIBSTATGRAB load_la_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS) load_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) @@ -587,8 +452,6 @@ if BUILD_PLUGIN_LOGFILE pkglib_LTLIBRARIES += logfile.la logfile_la_SOURCES = logfile.c logfile_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" logfile.la -collectd_DEPENDENCIES += logfile.la endif if BUILD_PLUGIN_LOG_LOGSTASH @@ -598,16 +461,12 @@ log_logstash_la_CFLAGS = $(AM_CFLAGS) log_logstash_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBYAJL_LDFLAGS) log_logstash_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS) log_logstash_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS) -collectd_LDADD += "-dlopen" log_logstash.la -collectd_DEPENDENCIES += log_logstash.la endif if BUILD_PLUGIN_LPAR pkglib_LTLIBRARIES += lpar.la lpar_la_SOURCES = lpar.c lpar_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" lpar.la -collectd_DEPENDENCIES += lpar.la lpar_la_LIBADD = -lperfstat endif @@ -616,56 +475,43 @@ pkglib_LTLIBRARIES += lvm.la lvm_la_SOURCES = lvm.c lvm_la_LDFLAGS = -module -avoid-version lvm_la_LIBADD = $(BUILD_WITH_LIBLVM2APP_LIBS) -collectd_LDADD += "-dlopen" lvm.la -collectd_DEPENDENCIES += lvm.la endif if BUILD_PLUGIN_MADWIFI pkglib_LTLIBRARIES += madwifi.la -madwifi_la_SOURCES = madwifi.c madwifi.h +madwifi_la_SOURCES = madwifi.c madwifi.h \ + utils_ignorelist.c utils_ignorelist.h madwifi_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" madwifi.la -collectd_DEPENDENCIES += madwifi.la endif if BUILD_PLUGIN_MATCH_EMPTY_COUNTER pkglib_LTLIBRARIES += match_empty_counter.la match_empty_counter_la_SOURCES = match_empty_counter.c match_empty_counter_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" match_empty_counter.la -collectd_DEPENDENCIES += match_empty_counter.la endif if BUILD_PLUGIN_MATCH_HASHED pkglib_LTLIBRARIES += match_hashed.la match_hashed_la_SOURCES = match_hashed.c match_hashed_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" match_hashed.la -collectd_DEPENDENCIES += match_hashed.la endif if BUILD_PLUGIN_MATCH_REGEX pkglib_LTLIBRARIES += match_regex.la match_regex_la_SOURCES = match_regex.c match_regex_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" match_regex.la -collectd_DEPENDENCIES += match_regex.la endif if BUILD_PLUGIN_MATCH_TIMEDIFF pkglib_LTLIBRARIES += match_timediff.la match_timediff_la_SOURCES = match_timediff.c match_timediff_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" match_timediff.la -collectd_DEPENDENCIES += match_timediff.la endif if BUILD_PLUGIN_MATCH_VALUE pkglib_LTLIBRARIES += match_value.la match_value_la_SOURCES = match_value.c match_value_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" match_value.la -collectd_DEPENDENCIES += match_value.la endif if BUILD_PLUGIN_MBMON @@ -676,26 +522,21 @@ mbmon_la_LIBADD = if BUILD_WITH_LIBSOCKET mbmon_la_LIBADD += -lsocket endif -collectd_LDADD += "-dlopen" mbmon.la -collectd_DEPENDENCIES += mbmon.la endif if BUILD_PLUGIN_MD pkglib_LTLIBRARIES += md.la -md_la_SOURCES = md.c +md_la_SOURCES = md.c \ + utils_ignorelist.c utils_ignorelist.h md_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" md.la -collectd_DEPENDENCIES += md.la endif if BUILD_PLUGIN_MEMCACHEC pkglib_LTLIBRARIES += memcachec.la memcachec_la_SOURCES = memcachec.c memcachec_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBMEMCACHED_LDFLAGS) -memcachec_la_CPPFLAGS = $(BUILD_WITH_LIBMEMCACHED_CPPFLAGS) +memcachec_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBMEMCACHED_CPPFLAGS) memcachec_la_LIBADD = $(BUILD_WITH_LIBMEMCACHED_LIBS) -collectd_LDADD += "-dlopen" memcachec.la -collectd_DEPENDENCIES += memcachec.la endif if BUILD_PLUGIN_MEMCACHED @@ -706,8 +547,6 @@ memcached_la_LIBADD = if BUILD_WITH_LIBSOCKET memcached_la_LIBADD += -lsocket endif -collectd_LDADD += "-dlopen" memcached.la -collectd_DEPENDENCIES += memcached.la endif if BUILD_PLUGIN_MEMORY @@ -716,8 +555,6 @@ memory_la_SOURCES = memory.c memory_la_CFLAGS = $(AM_CFLAGS) memory_la_LDFLAGS = -module -avoid-version memory_la_LIBADD = -collectd_LDADD += "-dlopen" memory.la -collectd_DEPENDENCIES += memory.la if BUILD_WITH_LIBKSTAT memory_la_LIBADD += -lkstat endif @@ -733,22 +570,27 @@ memory_la_LIBADD += -lperfstat endif endif +if BUILD_PLUGIN_MIC +pkglib_LTLIBRARIES += mic.la +mic_la_SOURCES = mic.c \ + utils_ignorelist.c utils_ignorelist.h +mic_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_MIC_LIBPATH) +mic_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_MIC_CPPFLAGS) +mic_la_LIBADD = $(BUILD_WITH_MIC_LDADD) +endif + if BUILD_PLUGIN_MODBUS pkglib_LTLIBRARIES += modbus.la modbus_la_SOURCES = modbus.c modbus_la_LDFLAGS = -module -avoid-version modbus_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBMODBUS_CFLAGS) modbus_la_LIBADD = $(BUILD_WITH_LIBMODBUS_LIBS) -collectd_LDADD += "-dlopen" modbus.la -collectd_DEPENDENCIES += modbus.la endif if BUILD_PLUGIN_MULTIMETER pkglib_LTLIBRARIES += multimeter.la multimeter_la_SOURCES = multimeter.c multimeter_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" multimeter.la -collectd_DEPENDENCIES += multimeter.la endif if BUILD_PLUGIN_MYSQL @@ -757,22 +599,19 @@ mysql_la_SOURCES = mysql.c mysql_la_LDFLAGS = -module -avoid-version mysql_la_CFLAGS = $(AM_CFLAGS) mysql_la_LIBADD = -collectd_LDADD += "-dlopen" mysql.la if BUILD_WITH_LIBMYSQL mysql_la_CFLAGS += $(BUILD_WITH_LIBMYSQL_CFLAGS) mysql_la_LIBADD += $(BUILD_WITH_LIBMYSQL_LIBS) endif -collectd_DEPENDENCIES += mysql.la endif if BUILD_PLUGIN_NETAPP pkglib_LTLIBRARIES += netapp.la -netapp_la_SOURCES = netapp.c +netapp_la_SOURCES = netapp.c \ + utils_ignorelist.c utils_ignorelist.h netapp_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBNETAPP_CPPFLAGS) netapp_la_LDFLAGS = -module -avoid-version $(LIBNETAPP_LDFLAGS) netapp_la_LIBADD = $(LIBNETAPP_LIBS) -collectd_LDADD += "-dlopen" netapp.la -collectd_DEPENDENCIES += netapp.la endif if BUILD_PLUGIN_NETLINK @@ -781,8 +620,6 @@ netlink_la_SOURCES = netlink.c netlink_la_LDFLAGS = -module -avoid-version netlink_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBMNL_CFLAGS) netlink_la_LIBADD = $(BUILD_WITH_LIBMNL_LIBS) -collectd_LDADD += "-dlopen" netlink.la -collectd_DEPENDENCIES += netlink.la endif if BUILD_PLUGIN_NETWORK @@ -800,24 +637,18 @@ network_la_CPPFLAGS += $(GCRYPT_CPPFLAGS) network_la_LDFLAGS += $(GCRYPT_LDFLAGS) network_la_LIBADD += $(GCRYPT_LIBS) endif -collectd_LDADD += "-dlopen" network.la -collectd_DEPENDENCIES += network.la endif if BUILD_PLUGIN_NFS pkglib_LTLIBRARIES += nfs.la nfs_la_SOURCES = nfs.c nfs_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" nfs.la -collectd_DEPENDENCIES += nfs.la endif if BUILD_PLUGIN_FSCACHE pkglib_LTLIBRARIES += fscache.la fscache_la_SOURCES = fscache.c fscache_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" fscache.la -collectd_DEPENDENCIES += fscache.la endif if BUILD_PLUGIN_NGINX @@ -830,8 +661,6 @@ if BUILD_WITH_LIBCURL nginx_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS) nginx_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS) endif -collectd_LDADD += "-dlopen" nginx.la -collectd_DEPENDENCIES += nginx.la endif if BUILD_PLUGIN_NOTIFY_DESKTOP @@ -840,8 +669,6 @@ notify_desktop_la_SOURCES = notify_desktop.c notify_desktop_la_CFLAGS = $(AM_CFLAGS) $(LIBNOTIFY_CFLAGS) notify_desktop_la_LDFLAGS = -module -avoid-version notify_desktop_la_LIBADD = $(LIBNOTIFY_LIBS) -collectd_LDADD += "-dlopen" notify_desktop.la -collectd_DEPENDENCIES += notify_desktop.la endif if BUILD_PLUGIN_NOTIFY_EMAIL @@ -849,8 +676,6 @@ pkglib_LTLIBRARIES += notify_email.la notify_email_la_SOURCES = notify_email.c notify_email_la_LDFLAGS = -module -avoid-version notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread -ldl -collectd_LDADD += "-dlopen" notify_email.la -collectd_DEPENDENCIES += notify_email.la endif if BUILD_PLUGIN_NTPD @@ -861,16 +686,12 @@ ntpd_la_LIBADD = if BUILD_WITH_LIBSOCKET ntpd_la_LIBADD += -lsocket endif -collectd_LDADD += "-dlopen" ntpd.la -collectd_DEPENDENCIES += ntpd.la endif if BUILD_PLUGIN_NUMA pkglib_LTLIBRARIES += numa.la numa_la_SOURCES = numa.c numa_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" numa.la -collectd_DEPENDENCIES += numa.la endif if BUILD_PLUGIN_NUT @@ -879,8 +700,6 @@ nut_la_SOURCES = nut.c nut_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBUPSCLIENT_CFLAGS) nut_la_LDFLAGS = -module -avoid-version nut_la_LIBADD = -lpthread $(BUILD_WITH_LIBUPSCLIENT_LIBS) -collectd_LDADD += "-dlopen" nut.la -collectd_DEPENDENCIES += nut.la endif if BUILD_PLUGIN_OLSRD @@ -891,19 +710,16 @@ olsrd_la_LIBADD = if BUILD_WITH_LIBSOCKET olsrd_la_LIBADD += -lsocket endif -collectd_LDADD += "-dlopen" olsrd.la -collectd_DEPENDENCIES += olsrd.la endif if BUILD_PLUGIN_ONEWIRE pkglib_LTLIBRARIES += onewire.la -onewire_la_SOURCES = onewire.c +onewire_la_SOURCES = onewire.c \ + utils_ignorelist.c utils_ignorelist.h onewire_la_CFLAGS = $(AM_CFLAGS) -onewire_la_CPPFLAGS = $(BUILD_WITH_LIBOWCAPI_CPPFLAGS) +onewire_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBOWCAPI_CPPFLAGS) onewire_la_LIBADD = $(BUILD_WITH_LIBOWCAPI_LIBS) onewire_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" onewire.la -collectd_DEPENDENCIES += onewire.la endif if BUILD_PLUGIN_OPENVPN @@ -911,8 +727,6 @@ pkglib_LTLIBRARIES += openvpn.la openvpn_la_SOURCES = openvpn.c openvpn_la_CFLAGS = $(AM_CFLAGS) openvpn_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" openvpn.la -collectd_DEPENDENCIES += openvpn.la endif if BUILD_PLUGIN_ORACLE @@ -920,11 +734,9 @@ pkglib_LTLIBRARIES += oracle.la oracle_la_SOURCES = oracle.c \ utils_db_query.c utils_db_query.h oracle_la_CFLAGS = $(AM_CFLAGS) -oracle_la_CPPFLAGS = $(BUILD_WITH_ORACLE_CFLAGS) +oracle_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_ORACLE_CFLAGS) oracle_la_LIBADD = $(BUILD_WITH_ORACLE_LIBS) oracle_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" oracle.la -collectd_DEPENDENCIES += oracle.la endif if BUILD_PLUGIN_PERL @@ -943,16 +755,12 @@ perl_la_CFLAGS += -Wno-nonnull endif perl_la_LDFLAGS = -module -avoid-version \ $(PERL_LDFLAGS) -collectd_LDADD += "-dlopen" perl.la -collectd_DEPENDENCIES += perl.la endif if BUILD_PLUGIN_PF pkglib_LTLIBRARIES += pf.la pf_la_SOURCES = pf.c pf_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" pf.la -collectd_DEPENDENCIES += pf.la endif if BUILD_PLUGIN_PINBA @@ -961,8 +769,6 @@ pinba_la_SOURCES = pinba.c nodist_pinba_la_SOURCES = pinba.pb-c.c pinba.pb-c.h pinba_la_LDFLAGS = -module -avoid-version pinba_la_LIBADD = -lprotobuf-c -collectd_LDADD += "-dlopen" pinba.la -collectd_DEPENDENCIES += pinba.la endif if BUILD_PLUGIN_PING @@ -971,8 +777,6 @@ ping_la_SOURCES = ping.c ping_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBOPING_CPPFLAGS) ping_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBOPING_LDFLAGS) ping_la_LIBADD = -loping -lm -collectd_LDADD += "-dlopen" ping.la -collectd_DEPENDENCIES += ping.la endif if BUILD_PLUGIN_POSTGRESQL @@ -983,16 +787,12 @@ postgresql_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBPQ_CPPFLAGS) postgresql_la_LDFLAGS = -module -avoid-version \ $(BUILD_WITH_LIBPQ_LDFLAGS) postgresql_la_LIBADD = -lpq -collectd_LDADD += "-dlopen" postgresql.la -collectd_DEPENDENCIES += postgresql.la endif if BUILD_PLUGIN_POWERDNS pkglib_LTLIBRARIES += powerdns.la powerdns_la_SOURCES = powerdns.c powerdns_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" powerdns.la -collectd_DEPENDENCIES += powerdns.la endif if BUILD_PLUGIN_PYTHON @@ -1005,8 +805,6 @@ python_la_CFLAGS += -fno-strict-aliasing -Wno-strict-aliasing endif python_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_PYTHON_LDFLAGS) python_la_LIBADD = $(BUILD_WITH_PYTHON_LIBS) -collectd_LDADD += "-dlopen" python.la -collectd_DEPENDENCIES += python.la endif if BUILD_PLUGIN_PROCESSES @@ -1014,8 +812,6 @@ pkglib_LTLIBRARIES += processes.la processes_la_SOURCES = processes.c processes_la_LDFLAGS = -module -avoid-version processes_la_LIBADD = -collectd_LDADD += "-dlopen" processes.la -collectd_DEPENDENCIES += processes.la if BUILD_WITH_LIBKVM_GETPROCS processes_la_LIBADD += -lkvm endif @@ -1023,10 +819,9 @@ endif if BUILD_PLUGIN_PROTOCOLS pkglib_LTLIBRARIES += protocols.la -protocols_la_SOURCES = protocols.c +protocols_la_SOURCES = protocols.c \ + utils_ignorelist.c utils_ignorelist.h protocols_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" protocols.la -collectd_DEPENDENCIES += protocols.la endif if BUILD_PLUGIN_REDIS @@ -1035,18 +830,14 @@ redis_la_SOURCES = redis.c redis_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBCREDIS_LDFLAGS) redis_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCREDIS_CPPFLAGS) redis_la_LIBADD = -lcredis -collectd_LDADD += "-dlopen" redis.la -collectd_DEPENDENCIES += redis.la endif if BUILD_PLUGIN_ROUTEROS pkglib_LTLIBRARIES += routeros.la routeros_la_SOURCES = routeros.c -routeros_la_CPPFLAGS = $(BUILD_WITH_LIBROUTEROS_CPPFLAGS) +routeros_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBROUTEROS_CPPFLAGS) routeros_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBROUTEROS_LDFLAGS) routeros_la_LIBADD = -lrouteros -collectd_LDADD += "-dlopen" routeros.la -collectd_DEPENDENCIES += routeros.la endif if BUILD_PLUGIN_RRDCACHED @@ -1055,8 +846,6 @@ rrdcached_la_SOURCES = rrdcached.c utils_rrdcreate.c utils_rrdcreate.h rrdcached_la_LDFLAGS = -module -avoid-version rrdcached_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBRRD_CFLAGS) rrdcached_la_LIBADD = $(BUILD_WITH_LIBRRD_LDFLAGS) -collectd_LDADD += "-dlopen" rrdcached.la -collectd_DEPENDENCIES += rrdcached.la endif if BUILD_PLUGIN_RRDTOOL @@ -1065,26 +854,21 @@ rrdtool_la_SOURCES = rrdtool.c utils_rrdcreate.c utils_rrdcreate.h rrdtool_la_LDFLAGS = -module -avoid-version rrdtool_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBRRD_CFLAGS) rrdtool_la_LIBADD = $(BUILD_WITH_LIBRRD_LDFLAGS) -collectd_LDADD += "-dlopen" rrdtool.la -collectd_DEPENDENCIES += rrdtool.la endif if BUILD_PLUGIN_SENSORS pkglib_LTLIBRARIES += sensors.la -sensors_la_SOURCES = sensors.c +sensors_la_SOURCES = sensors.c \ + utils_ignorelist.c utils_ignorelist.h sensors_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBSENSORS_CFLAGS) sensors_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBSENSORS_LDFLAGS) sensors_la_LIBADD = -lsensors -collectd_LDADD += "-dlopen" sensors.la -collectd_DEPENDENCIES += sensors.la endif if BUILD_PLUGIN_SERIAL pkglib_LTLIBRARIES += serial.la serial_la_SOURCES = serial.c serial_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" serial.la -collectd_DEPENDENCIES += serial.la endif if BUILD_PLUGIN_SIGROK @@ -1093,8 +877,6 @@ sigrok_la_SOURCES = sigrok.c sigrok_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBSIGROK_CFLAGS) sigrok_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBSIGROK_LDFLAGS) sigrok_la_LIBADD = -lsigrok -collectd_LDADD += "-dlopen" sigrok.la -collectd_DEPENDENCIES += sigrok.la endif if BUILD_PLUGIN_SNMP @@ -1110,8 +892,6 @@ endif if BUILD_WITH_LIBPTHREAD snmp_la_LIBADD += -lpthread endif -collectd_LDADD += "-dlopen" snmp.la -collectd_DEPENDENCIES += snmp.la endif if BUILD_PLUGIN_STATSD @@ -1120,8 +900,6 @@ statsd_la_SOURCES = statsd.c \ utils_latency.h utils_latency.c statsd_la_LDFLAGS = -module -avoid-version statsd_la_LIBADD = -lpthread -collectd_LDADD += "-dlopen" statsd.la -collectd_DEPENDENCIES += statsd.la endif if BUILD_PLUGIN_SWAP @@ -1130,8 +908,6 @@ swap_la_SOURCES = swap.c swap_la_CFLAGS = $(AM_CFLAGS) swap_la_LDFLAGS = -module -avoid-version swap_la_LIBADD = -collectd_LDADD += "-dlopen" swap.la -collectd_DEPENDENCIES += swap.la if BUILD_WITH_LIBKSTAT swap_la_LIBADD += -lkstat endif @@ -1155,32 +931,24 @@ if BUILD_PLUGIN_SYSLOG pkglib_LTLIBRARIES += syslog.la syslog_la_SOURCES = syslog.c syslog_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" syslog.la -collectd_DEPENDENCIES += syslog.la endif if BUILD_PLUGIN_TABLE pkglib_LTLIBRARIES += table.la table_la_SOURCES = table.c table_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" table.la -collectd_DEPENDENCIES += table.la endif if BUILD_PLUGIN_TAIL pkglib_LTLIBRARIES += tail.la tail_la_SOURCES = tail.c tail_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" tail.la -collectd_DEPENDENCIES += tail.la endif if BUILD_PLUGIN_TAIL_CSV pkglib_LTLIBRARIES += tail_csv.la tail_csv_la_SOURCES = tail_csv.c tail_csv_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" tail_csv.la -collectd_DEPENDENCIES += tail_csv.la endif if BUILD_PLUGIN_TAPE @@ -1188,48 +956,36 @@ pkglib_LTLIBRARIES += tape.la tape_la_SOURCES = tape.c tape_la_LDFLAGS = -module -avoid-version tape_la_LIBADD = -lkstat -ldevinfo -collectd_LDADD += "-dlopen" tape.la -collectd_DEPENDENCIES += tape.la endif if BUILD_PLUGIN_TARGET_NOTIFICATION pkglib_LTLIBRARIES += target_notification.la target_notification_la_SOURCES = target_notification.c target_notification_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" target_notification.la -collectd_DEPENDENCIES += target_notification.la endif if BUILD_PLUGIN_TARGET_REPLACE pkglib_LTLIBRARIES += target_replace.la target_replace_la_SOURCES = target_replace.c target_replace_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" target_replace.la -collectd_DEPENDENCIES += target_replace.la endif if BUILD_PLUGIN_TARGET_SCALE pkglib_LTLIBRARIES += target_scale.la target_scale_la_SOURCES = target_scale.c target_scale_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" target_scale.la -collectd_DEPENDENCIES += target_scale.la endif if BUILD_PLUGIN_TARGET_SET pkglib_LTLIBRARIES += target_set.la target_set_la_SOURCES = target_set.c target_set_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" target_set.la -collectd_DEPENDENCIES += target_set.la endif if BUILD_PLUGIN_TARGET_V5UPGRADE pkglib_LTLIBRARIES += target_v5upgrade.la target_v5upgrade_la_SOURCES = target_v5upgrade.c target_v5upgrade_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" target_v5upgrade.la -collectd_DEPENDENCIES += target_v5upgrade.la endif if BUILD_PLUGIN_TCPCONNS @@ -1237,8 +993,6 @@ pkglib_LTLIBRARIES += tcpconns.la tcpconns_la_SOURCES = tcpconns.c tcpconns_la_LDFLAGS = -module -avoid-version tcpconns_la_LIBADD = -collectd_LDADD += "-dlopen" tcpconns.la -collectd_DEPENDENCIES += tcpconns.la if BUILD_WITH_LIBKVM_NLIST tcpconns_la_LIBADD += -lkvm endif @@ -1248,32 +1002,25 @@ if BUILD_PLUGIN_TEAMSPEAK2 pkglib_LTLIBRARIES += teamspeak2.la teamspeak2_la_SOURCES = teamspeak2.c teamspeak2_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" teamspeak2.la -collectd_DEPENDENCIES += teamspeak2.la endif if BUILD_PLUGIN_TED pkglib_LTLIBRARIES += ted.la ted_la_SOURCES = ted.c ted_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" ted.la -collectd_DEPENDENCIES += ted.la endif if BUILD_PLUGIN_THERMAL pkglib_LTLIBRARIES += thermal.la -thermal_la_SOURCES = thermal.c +thermal_la_SOURCES = thermal.c \ + utils_ignorelist.c utils_ignorelist.h thermal_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" thermal.la -collectd_DEPENDENCIES += thermal.la endif if BUILD_PLUGIN_THRESHOLD pkglib_LTLIBRARIES += threshold.la threshold_la_SOURCES = threshold.c threshold_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" threshold.la -collectd_DEPENDENCIES += threshold.la endif if BUILD_PLUGIN_TOKYOTYRANT @@ -1285,8 +1032,6 @@ tokyotyrant_la_LIBADD = $(BUILD_WITH_LIBTOKYOTYRANT_LIBS) if BUILD_WITH_LIBSOCKET tokyotyrant_la_LIBADD += -lsocket endif -collectd_LDADD += "-dlopen" tokyotyrant.la -collectd_DEPENDENCIES += tokyotyrant.la endif if BUILD_PLUGIN_UNIXSOCK @@ -1300,8 +1045,6 @@ unixsock_la_SOURCES = unixsock.c \ utils_cmd_putnotif.h utils_cmd_putnotif.c unixsock_la_LDFLAGS = -module -avoid-version unixsock_la_LIBADD = -lpthread -collectd_LDADD += "-dlopen" unixsock.la -collectd_DEPENDENCIES += unixsock.la endif if BUILD_PLUGIN_UPTIME @@ -1316,8 +1059,6 @@ endif if BUILD_WITH_PERFSTAT uptime_la_LIBADD += -lperfstat endif -collectd_LDADD += "-dlopen" uptime.la -collectd_DEPENDENCIES += uptime.la endif if BUILD_PLUGIN_USERS @@ -1330,8 +1071,6 @@ if BUILD_WITH_LIBSTATGRAB users_la_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS) users_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) endif -collectd_LDADD += "-dlopen" users.la -collectd_DEPENDENCIES += users.la endif if BUILD_PLUGIN_UUID @@ -1340,18 +1079,6 @@ uuid_la_SOURCES = uuid.c uuid_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBHAL_CFLAGS) uuid_la_LIBADD = $(BUILD_WITH_LIBHAL_LIBS) uuid_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" uuid.la -collectd_DEPENDENCIES += uuid.la -endif - -if BUILD_PLUGIN_MIC -pkglib_LTLIBRARIES += mic.la -mic_la_SOURCES = mic.c -mic_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_MIC_LIBPATH) -mic_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_MIC_CPPFLAGS) -mic_la_LIBADD = $(BUILD_WITH_MIC_LDADD) -collectd_LDADD += "-dlopen" mic.la -collectd_DEPENDENCIES += mic.la endif if BUILD_PLUGIN_VARNISH @@ -1360,43 +1087,34 @@ varnish_la_SOURCES = varnish.c varnish_la_LDFLAGS = -module -avoid-version varnish_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBVARNISH_CFLAGS) varnish_la_LIBADD = $(BUILD_WITH_LIBVARNISH_LIBS) -collectd_LDADD += "-dlopen" varnish.la -collectd_DEPENDENCIES += varnish.la endif if BUILD_PLUGIN_VIRT pkglib_LTLIBRARIES += virt.la -virt_la_SOURCES = virt.c +virt_la_SOURCES = virt.c \ + utils_ignorelist.c utils_ignorelist.h virt_la_CFLAGS = $(AM_CFLAGS) \ $(BUILD_WITH_LIBVIRT_CFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS) virt_la_LIBADD = $(BUILD_WITH_LIBVIRT_LIBS) $(BUILD_WITH_LIBXML2_LIBS) virt_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" virt.la -collectd_DEPENDENCIES += virt.la endif if BUILD_PLUGIN_VMEM pkglib_LTLIBRARIES += vmem.la vmem_la_SOURCES = vmem.c vmem_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" vmem.la -collectd_DEPENDENCIES += vmem.la endif if BUILD_PLUGIN_VSERVER pkglib_LTLIBRARIES += vserver.la vserver_la_SOURCES = vserver.c vserver_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" vserver.la -collectd_DEPENDENCIES += vserver.la endif if BUILD_PLUGIN_WIRELESS pkglib_LTLIBRARIES += wireless.la wireless_la_SOURCES = wireless.c wireless_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" wireless.la -collectd_DEPENDENCIES += wireless.la endif if BUILD_PLUGIN_WRITE_GRAPHITE @@ -1405,8 +1123,6 @@ write_graphite_la_SOURCES = write_graphite.c \ utils_format_graphite.c utils_format_graphite.h \ utils_format_json.c utils_format_json.h write_graphite_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" write_graphite.la -collectd_DEPENDENCIES += write_graphite.la endif if BUILD_PLUGIN_WRITE_HTTP @@ -1416,12 +1132,10 @@ write_http_la_SOURCES = write_http.c \ write_http_la_LDFLAGS = -module -avoid-version write_http_la_CFLAGS = $(AM_CFLAGS) write_http_la_LIBADD = -collectd_LDADD += "-dlopen" write_http.la if BUILD_WITH_LIBCURL write_http_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS) write_http_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS) endif -collectd_DEPENDENCIES += write_http.la endif if BUILD_PLUGIN_WRITE_KAFKA @@ -1433,8 +1147,6 @@ write_kafka_la_SOURCES = write_kafka.c \ utils_crc32.c utils_crc32.h write_kafka_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBRDKAFKA_LDFLAGS) write_kafka_la_LIBADD = $(BUILD_WITH_LIBRDKAFKA_LIBS) -collectd_LDADD += "-dlopen" write_kafka.la -collectd_DEPENDENCIES += write_kafka.la endif if BUILD_PLUGIN_WRITE_MONGODB @@ -1443,8 +1155,6 @@ write_mongodb_la_SOURCES = write_mongodb.c write_mongodb_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBMONGOC_CPPFLAGS) write_mongodb_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBMONGOC_LDFLAGS) write_mongodb_la_LIBADD = -lmongoc -collectd_LDADD += "-dlopen" write_mongodb.la -collectd_DEPENDENCIES += write_mongodb.la endif if BUILD_PLUGIN_WRITE_REDIS @@ -1453,8 +1163,6 @@ write_redis_la_SOURCES = write_redis.c write_redis_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBCREDIS_LDFLAGS) write_redis_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCREDIS_CPPFLAGS) write_redis_la_LIBADD = -lcredis -collectd_LDADD += "-dlopen" write_redis.la -collectd_DEPENDENCIES += write_redis.la endif if BUILD_PLUGIN_WRITE_RIEMANN @@ -1463,16 +1171,12 @@ write_riemann_la_SOURCES = write_riemann.c write_riemann_threshold.c nodist_write_riemann_la_SOURCES = riemann.pb-c.c riemann.pb-c.h write_riemann_la_LDFLAGS = -module -avoid-version write_riemann_la_LIBADD = -lprotobuf-c -collectd_LDADD += "-dlopen" write_riemann.la -collectd_DEPENDENCIES += write_riemann.la endif if BUILD_PLUGIN_WRITE_TSDB pkglib_LTLIBRARIES += write_tsdb.la write_tsdb_la_SOURCES = write_tsdb.c write_tsdb_la_LDFLAGS = -module -avoid-version -collectd_LDADD += "-dlopen" write_tsdb.la -collectd_DEPENDENCIES += write_tsdb.la endif if BUILD_PLUGIN_XMMS @@ -1481,8 +1185,6 @@ xmms_la_SOURCES = xmms.c xmms_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBXMMS_CFLAGS) xmms_la_LDFLAGS = -module -avoid-version xmms_la_LIBADD = $(BUILD_WITH_LIBXMMS_LIBS) -collectd_LDADD += "-dlopen" xmms.la -collectd_DEPENDENCIES += xmms.la endif if BUILD_PLUGIN_ZFS_ARC @@ -1500,8 +1202,6 @@ else zfs_arc_la_LIBADD = -lkstat endif endif -collectd_LDADD += "-dlopen" zfs_arc.la -collectd_DEPENDENCIES += zfs_arc.la endif BUILT_SOURCES += $(dist_man_MANS) diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am new file mode 100644 index 00000000..c4010779 --- /dev/null +++ b/src/daemon/Makefile.am @@ -0,0 +1,85 @@ +if COMPILER_IS_GCC +AM_CFLAGS = -Wall -Werror +endif + +AM_CPPFLAGS = -DPREFIX='"${prefix}"' +AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' +AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"' +AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' +if BUILD_FEATURE_DAEMON +AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"' +endif +AM_CPPFLAGS += -DPLUGINDIR='"${pkglibdir}"' +AM_CPPFLAGS += -DPKGDATADIR='"${pkgdatadir}"' + +AUTOMAKE_OPTIONS = subdir-objects + +sbin_PROGRAMS = collectd + +collectd_SOURCES = collectd.c collectd.h \ + common.c common.h \ + configfile.c configfile.h \ + filter_chain.c filter_chain.h \ + meta_data.c meta_data.h \ + plugin.c plugin.h \ + utils_avltree.c utils_avltree.h \ + utils_cache.c utils_cache.h \ + utils_complain.c utils_complain.h \ + utils_heap.c utils_heap.h \ + utils_llist.c utils_llist.h \ + utils_parse_option.c utils_parse_option.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 = -lm +collectd_DEPENDENCIES = + +# Link to these libraries.. +if BUILD_WITH_LIBRT +collectd_LDADD += -lrt +endif +if BUILD_WITH_LIBPOSIX4 +collectd_LDADD += -lposix4 +endif +if BUILD_WITH_LIBSOCKET +collectd_LDADD += -lsocket +endif +if BUILD_WITH_LIBRESOLV +collectd_LDADD += -lresolv +endif +if BUILD_WITH_LIBPTHREAD +collectd_LDADD += -lpthread +endif +if BUILD_WITH_LIBKSTAT +collectd_LDADD += -lkstat +endif +if BUILD_WITH_LIBDEVINFO +collectd_LDADD += -ldevinfo +endif +if BUILD_AIX +collectd_LDFLAGS += -Wl,-bexpall,-brtllib +endif + +# The daemon needs to call sg_init, so we need to link it against libstatgrab, +# too. -octo +if BUILD_WITH_LIBSTATGRAB +collectd_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS) +collectd_LDADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) +endif + +if BUILD_WITH_OWN_LIBOCONFIG +collectd_LDADD += $(LIBLTDL) $(top_builddir)/src/liboconfig/liboconfig.la +collectd_DEPENDENCIES += $(top_builddir)/src/liboconfig/liboconfig.la +else +collectd_LDADD += -loconfig +endif diff --git a/src/collectd.c b/src/daemon/collectd.c similarity index 100% rename from src/collectd.c rename to src/daemon/collectd.c diff --git a/src/collectd.h b/src/daemon/collectd.h similarity index 100% rename from src/collectd.h rename to src/daemon/collectd.h diff --git a/src/common.c b/src/daemon/common.c similarity index 100% rename from src/common.c rename to src/daemon/common.c diff --git a/src/common.h b/src/daemon/common.h similarity index 100% rename from src/common.h rename to src/daemon/common.h diff --git a/src/configfile.c b/src/daemon/configfile.c similarity index 100% rename from src/configfile.c rename to src/daemon/configfile.c diff --git a/src/configfile.h b/src/daemon/configfile.h similarity index 100% rename from src/configfile.h rename to src/daemon/configfile.h diff --git a/src/filter_chain.c b/src/daemon/filter_chain.c similarity index 100% rename from src/filter_chain.c rename to src/daemon/filter_chain.c diff --git a/src/filter_chain.h b/src/daemon/filter_chain.h similarity index 100% rename from src/filter_chain.h rename to src/daemon/filter_chain.h diff --git a/src/meta_data.c b/src/daemon/meta_data.c similarity index 100% rename from src/meta_data.c rename to src/daemon/meta_data.c diff --git a/src/meta_data.h b/src/daemon/meta_data.h similarity index 100% rename from src/meta_data.h rename to src/daemon/meta_data.h diff --git a/src/plugin.c b/src/daemon/plugin.c similarity index 100% rename from src/plugin.c rename to src/daemon/plugin.c diff --git a/src/plugin.h b/src/daemon/plugin.h similarity index 100% rename from src/plugin.h rename to src/daemon/plugin.h diff --git a/src/types_list.c b/src/daemon/types_list.c similarity index 100% rename from src/types_list.c rename to src/daemon/types_list.c diff --git a/src/types_list.h b/src/daemon/types_list.h similarity index 100% rename from src/types_list.h rename to src/daemon/types_list.h diff --git a/src/utils_avltree.c b/src/daemon/utils_avltree.c similarity index 100% rename from src/utils_avltree.c rename to src/daemon/utils_avltree.c diff --git a/src/utils_avltree.h b/src/daemon/utils_avltree.h similarity index 100% rename from src/utils_avltree.h rename to src/daemon/utils_avltree.h diff --git a/src/utils_cache.c b/src/daemon/utils_cache.c similarity index 100% rename from src/utils_cache.c rename to src/daemon/utils_cache.c diff --git a/src/utils_cache.h b/src/daemon/utils_cache.h similarity index 100% rename from src/utils_cache.h rename to src/daemon/utils_cache.h diff --git a/src/utils_complain.c b/src/daemon/utils_complain.c similarity index 100% rename from src/utils_complain.c rename to src/daemon/utils_complain.c diff --git a/src/utils_complain.h b/src/daemon/utils_complain.h similarity index 100% rename from src/utils_complain.h rename to src/daemon/utils_complain.h diff --git a/src/utils_heap.c b/src/daemon/utils_heap.c similarity index 100% rename from src/utils_heap.c rename to src/daemon/utils_heap.c diff --git a/src/utils_heap.h b/src/daemon/utils_heap.h similarity index 100% rename from src/utils_heap.h rename to src/daemon/utils_heap.h diff --git a/src/utils_llist.c b/src/daemon/utils_llist.c similarity index 100% rename from src/utils_llist.c rename to src/daemon/utils_llist.c diff --git a/src/utils_llist.h b/src/daemon/utils_llist.h similarity index 100% rename from src/utils_llist.h rename to src/daemon/utils_llist.h diff --git a/src/utils_match.c b/src/daemon/utils_match.c similarity index 100% rename from src/utils_match.c rename to src/daemon/utils_match.c diff --git a/src/utils_match.h b/src/daemon/utils_match.h similarity index 100% rename from src/utils_match.h rename to src/daemon/utils_match.h diff --git a/src/utils_parse_option.c b/src/daemon/utils_parse_option.c similarity index 100% rename from src/utils_parse_option.c rename to src/daemon/utils_parse_option.c diff --git a/src/utils_parse_option.h b/src/daemon/utils_parse_option.h similarity index 100% rename from src/utils_parse_option.h rename to src/daemon/utils_parse_option.h diff --git a/src/utils_random.c b/src/daemon/utils_random.c similarity index 100% rename from src/utils_random.c rename to src/daemon/utils_random.c diff --git a/src/utils_random.h b/src/daemon/utils_random.h similarity index 100% rename from src/utils_random.h rename to src/daemon/utils_random.h diff --git a/src/utils_subst.c b/src/daemon/utils_subst.c similarity index 100% rename from src/utils_subst.c rename to src/daemon/utils_subst.c diff --git a/src/utils_subst.h b/src/daemon/utils_subst.h similarity index 100% rename from src/utils_subst.h rename to src/daemon/utils_subst.h diff --git a/src/utils_tail.c b/src/daemon/utils_tail.c similarity index 100% rename from src/utils_tail.c rename to src/daemon/utils_tail.c diff --git a/src/utils_tail.h b/src/daemon/utils_tail.h similarity index 100% rename from src/utils_tail.h rename to src/daemon/utils_tail.h diff --git a/src/utils_tail_match.c b/src/daemon/utils_tail_match.c similarity index 100% rename from src/utils_tail_match.c rename to src/daemon/utils_tail_match.c diff --git a/src/utils_tail_match.h b/src/daemon/utils_tail_match.h similarity index 100% rename from src/utils_tail_match.h rename to src/daemon/utils_tail_match.h diff --git a/src/utils_threshold.c b/src/daemon/utils_threshold.c similarity index 100% rename from src/utils_threshold.c rename to src/daemon/utils_threshold.c diff --git a/src/utils_threshold.h b/src/daemon/utils_threshold.h similarity index 100% rename from src/utils_threshold.h rename to src/daemon/utils_threshold.h diff --git a/src/utils_time.c b/src/daemon/utils_time.c similarity index 100% rename from src/utils_time.c rename to src/daemon/utils_time.c diff --git a/src/utils_time.h b/src/daemon/utils_time.h similarity index 100% rename from src/utils_time.h rename to src/daemon/utils_time.h diff --git a/src/libcollectdclient/Makefile.am b/src/libcollectdclient/Makefile.am index 1d4dff59..2fc3152d 100644 --- a/src/libcollectdclient/Makefile.am +++ b/src/libcollectdclient/Makefile.am @@ -11,7 +11,7 @@ nodist_pkgconfig_DATA = libcollectdclient.pc BUILT_SOURCES = collectd/lcc_features.h libcollectdclient_la_SOURCES = client.c network.c network_buffer.c -libcollectdclient_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/src/libcollectdclient/collectd -I$(top_srcdir)/src +libcollectdclient_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/src/libcollectdclient/collectd -I$(top_srcdir)/src/daemon libcollectdclient_la_LDFLAGS = -version-info 1:0:0 libcollectdclient_la_LIBADD = if BUILD_WITH_LIBGCRYPT -- 2.11.0