X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=3c5c87b295d0e3cfb650731eccd97bddf284e5d9;hb=5e700757575fa6606cf201947cb0efb57ce12e6d;hp=37bf6fcb29a06951495c0411baa4ec246f4fff7a;hpb=b58af48a482b30999bd0b71c470c5dbab8fd5abd;p=collectd.git diff --git a/src/Makefile.am b/src/Makefile.am index 37bf6fcb..3c5c87b2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,7 @@ SUBDIRS = +if BUILD_WITH_OWN_LIBIPTC +SUBDIRS += libiptc +endif if BUILD_WITH_OWN_LIBOCONFIG SUBDIRS += liboconfig endif @@ -18,6 +21,7 @@ if BUILD_FEATURE_DAEMON AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"' endif AM_CPPFLAGS += -DPLUGINDIR='"${pkglibdir}"' +AM_CPPFLAGS += -DPKGDATADIR='"${pkgdatadir}"' sbin_PROGRAMS = collectd collectdmon bin_PROGRAMS = collectd-nagios @@ -28,6 +32,7 @@ collectd_SOURCES = collectd.c collectd.h \ plugin.c plugin.h \ utils_avltree.c utils_avltree.h \ utils_cache.c utils_cache.h \ + utils_complain.c utils_complain.h \ utils_ignorelist.c utils_ignorelist.h \ utils_llist.c utils_llist.h \ utils_tail_match.c utils_tail_match.h \ @@ -36,48 +41,45 @@ collectd_SOURCES = collectd.c collectd.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 = $(AM_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 +collectd_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS) +collectd_LDADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) endif -if BUILD_WITH_LIBDEVSTAT -collectd_LDFLAGS += -ldevstat -endif -collectd_LDFLAGS += -lstatgrab -endif - -collectd_LDADD = -collectd_DEPENDENCIES = if BUILD_WITH_OWN_LIBOCONFIG collectd_LDADD += $(LIBLTDL) liboconfig/liboconfig.la collectd_DEPENDENCIES += $(LIBLTDL) liboconfig/liboconfig.la else -collectd_LDFLAGS += -loconfig +collectd_LDADD += -loconfig endif collectdmon_SOURCES = collectdmon.c @@ -95,7 +97,7 @@ if BUILD_PLUGIN_APACHE pkglib_LTLIBRARIES += apache.la apache_la_SOURCES = apache.c apache_la_LDFLAGS = -module -avoid-version -apache_la_CFLAGS = +apache_la_CFLAGS = $(AM_CFLAGS) apache_la_LIBADD = collectd_LDADD += "-dlopen" apache.la if BUILD_WITH_LIBCURL @@ -128,7 +130,8 @@ if BUILD_PLUGIN_ASCENT pkglib_LTLIBRARIES += ascent.la ascent_la_SOURCES = ascent.c ascent_la_LDFLAGS = -module -avoid-version -ascent_la_CFLAGS = $(BUILD_WITH_LIBCURL_CFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS) +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" apache.la collectd_DEPENDENCIES += ascent.la @@ -148,13 +151,19 @@ endif if BUILD_PLUGIN_CPU pkglib_LTLIBRARIES += cpu.la cpu_la_SOURCES = cpu.c +cpu_la_CFLAGS = $(AM_CFLAGS) cpu_la_LDFLAGS = -module -avoid-version +cpu_la_LIBADD = if BUILD_WITH_LIBKSTAT cpu_la_LDFLAGS += -lkstat endif if BUILD_WITH_LIBDEVINFO cpu_la_LDFLAGS += -ldevinfo endif +if BUILD_WITH_LIBSTATGRAB +cpu_la_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS) +cpu_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) +endif collectd_LDADD += "-dlopen" cpu.la collectd_DEPENDENCIES += cpu.la endif @@ -186,7 +195,9 @@ endif if BUILD_PLUGIN_DISK pkglib_LTLIBRARIES += disk.la disk_la_SOURCES = disk.c +disk_la_CFLAGS = $(AM_CFLAGS) disk_la_LDFLAGS = -module -avoid-version +disk_la_LIBADD = if BUILD_WITH_LIBKSTAT disk_la_LDFLAGS += -lkstat endif @@ -196,6 +207,10 @@ endif if BUILD_WITH_LIBIOKIT disk_la_LDFLAGS += -lIOKit endif +if BUILD_WITH_LIBSTATGRAB +disk_la_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS) +disk_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) +endif collectd_LDADD += "-dlopen" disk.la collectd_DEPENDENCIES += disk.la endif @@ -254,30 +269,34 @@ endif if BUILD_PLUGIN_INTERFACE pkglib_LTLIBRARIES += interface.la interface_la_SOURCES = interface.c +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) +else if BUILD_WITH_LIBKSTAT interface_la_LDFLAGS += -lkstat endif if BUILD_WITH_LIBDEVINFO interface_la_LDFLAGS += -ldevinfo -endif -if BUILD_WITH_LIBSTATGRAB -if BUILD_WITH_LIBKVM -interface_la_LDFLAGS += -lkvm -endif -if BUILD_WITH_LIBDEVSTAT -interface_la_LDFLAGS += -ldevstat -endif -interface_la_LDFLAGS += -lstatgrab -endif -endif +endif # BUILD_WITH_LIBDEVINFO +endif # !BUILD_WITH_LIBSTATGRAB +endif # BUILD_PLUGIN_INTERFACE if BUILD_PLUGIN_IPTABLES pkglib_LTLIBRARIES += iptables.la iptables_la_SOURCES = iptables.c -iptables_la_LDFLAGS = -module -avoid-version -liptc +iptables_la_LDFLAGS = -module -avoid-version +if BUILD_WITH_OWN_LIBIPTC +iptables_la_LIBADD = libiptc/libiptc.la +iptables_la_DEPENDENCIES = libiptc/libiptc.la +else +iptables_la_LDFLAGS += -liptc +endif collectd_LDADD += "-dlopen" iptables.la collectd_DEPENDENCIES += iptables.la endif @@ -285,7 +304,7 @@ endif if BUILD_PLUGIN_IPMI pkglib_LTLIBRARIES += ipmi.la ipmi_la_SOURCES = ipmi.c -ipmi_la_CFLAGS = $(BUILD_WITH_OPENIPMI_CFLAGS) +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 @@ -295,6 +314,7 @@ endif if BUILD_PLUGIN_IPVS pkglib_LTLIBRARIES += ipvs.la ipvs_la_SOURCES = ipvs.c +ipvs_la_CFLAGS = $(KERNEL_CFLAGS) ipvs_la_LDFLAGS = -module -avoid-version collectd_LDADD += "-dlopen" ipvs.la collectd_DEPENDENCIES += ipvs.la @@ -311,7 +331,8 @@ endif if BUILD_PLUGIN_LIBVIRT pkglib_LTLIBRARIES += libvirt.la libvirt_la_SOURCES = libvirt.c -libvirt_la_CFLAGS = $(BUILD_WITH_LIBVIRT_CFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS) +libvirt_la_CFLAGS = $(AM_CFLAGS) \ + $(BUILD_WITH_LIBVIRT_CFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS) libvirt_la_LIBADD = $(BUILD_WITH_LIBVIRT_LIBS) $(BUILD_WITH_LIBXML2_LIBS) libvirt_la_LDFLAGS = -module -avoid-version collectd_LDADD += "-dlopen" libvirt.la @@ -321,19 +342,16 @@ endif if BUILD_PLUGIN_LOAD pkglib_LTLIBRARIES += load.la 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 -if BUILD_WITH_LIBKVM -load_la_LDFLAGS += -lkvm -endif -if BUILD_WITH_LIBDEVSTAT -load_la_LDFLAGS += -ldevstat -endif -load_la_LDFLAGS += -lstatgrab -endif -endif +load_la_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS) +load_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) +endif # BUILD_WITH_LIBSTATGRAB +endif # BUILD_PLUGIN_LOAD if BUILD_PLUGIN_LOGFILE pkglib_LTLIBRARIES += logfile.la @@ -358,7 +376,6 @@ if BUILD_PLUGIN_MEMCACHED pkglib_LTLIBRARIES += memcached.la memcached_la_SOURCES = memcached.c memcached_la_LDFLAGS = -module -avoid-version -memcached_la_CFLAGS = memcached_la_LIBADD = if BUILD_WITH_LIBSOCKET memcached_la_LDFLAGS += -lsocket @@ -370,23 +387,20 @@ endif if BUILD_PLUGIN_MEMORY pkglib_LTLIBRARIES += memory.la 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_LDFLAGS += -lkstat +memory_la_LIBADD += -lkstat endif if BUILD_WITH_LIBDEVINFO -memory_la_LDFLAGS += -ldevinfo +memory_la_LIBADD += -ldevinfo endif if BUILD_WITH_LIBSTATGRAB -if BUILD_WITH_LIBKVM -memory_la_LDFLAGS += -lkvm -endif -if BUILD_WITH_LIBDEVSTAT -memory_la_LDFLAGS += -ldevstat -endif -memory_la_LDFLAGS += -lstatgrab +memory_la_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS) +memory_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) endif endif @@ -402,7 +416,7 @@ if BUILD_PLUGIN_MYSQL pkglib_LTLIBRARIES += mysql.la mysql_la_SOURCES = mysql.c mysql_la_LDFLAGS = -module -avoid-version -mysql_la_CFLAGS = +mysql_la_CFLAGS = $(AM_CFLAGS) mysql_la_LIBADD = collectd_LDADD += "-dlopen" mysql.la if BUILD_WITH_LIBMYSQL @@ -416,7 +430,7 @@ if BUILD_PLUGIN_NETLINK pkglib_LTLIBRARIES += netlink.la netlink_la_SOURCES = netlink.c netlink_la_LDFLAGS = -module -avoid-version -netlink_la_CFLAGS = $(BUILD_WITH_LIBNETLINK_CFLAGS) +netlink_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBNETLINK_CFLAGS) netlink_la_LIBADD = $(BUILD_WITH_LIBNETLINK_LIBS) collectd_LDADD += "-dlopen" netlink.la collectd_DEPENDENCIES += netlink.la @@ -458,6 +472,23 @@ collectd_LDADD += "-dlopen" nginx.la collectd_DEPENDENCIES += nginx.la endif +if BUILD_PLUGIN_NOTIFY_DESKTOP +pkglib_LTLIBRARIES += notify_desktop.la +notify_desktop_la_SOURCES = notify_desktop.c +notify_desktop_la_CFLAGS = $(AM_CFLAGS) $(LIBNOTIFY_CFLAGS) +notify_desktop_la_LDFLAGS = -module -avoid-version $(LIBNOTIFY_LIBS) +collectd_LDADD += "-dlopen" notify_desktop.la +collectd_DEPENDENCIES += notify_desktop.la +endif + +if BUILD_PLUGIN_NOTIFY_EMAIL +pkglib_LTLIBRARIES += notify_email.la +notify_email_la_SOURCES = notify_email.c +notify_email_la_LDFLAGS = -L/usr/local/lib -lesmtp -lssl -lcrypto -pthread -module -avoid-version +collectd_LDADD += "-dlopen" notify_email.la +collectd_DEPENDENCIES += notify_email.la +endif + if BUILD_PLUGIN_NTPD pkglib_LTLIBRARIES += ntpd.la ntpd_la_SOURCES = ntpd.c @@ -478,14 +509,28 @@ collectd_LDADD += "-dlopen" nut.la collectd_DEPENDENCIES += nut.la endif +if BUILD_PLUGIN_ONEWIRE +pkglib_LTLIBRARIES += onewire.la +onewire_la_SOURCES = onewire.c +onewire_la_CFLAGS = $(AM_CFLAGS) +onewire_la_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_PERL pkglib_LTLIBRARIES += perl.la perl_la_SOURCES = perl.c +# Despite C99 providing the "bool" type thru stdbool.h, Perl defines its own +# version of that type if HAS_BOOL is not defined... *sigh* +perl_la_CPPFLAGS = $(AM_CPPFLAGS) -DHAS_BOOL=1 perl_la_CFLAGS = $(AM_CFLAGS) \ - $(PERL_CFLAGS) \ - -DXS_VERSION=\"$(VERSION)\" -DVERSION=\"$(VERSION)\" + $(PERL_CFLAGS) \ + -DXS_VERSION=\"$(VERSION)\" -DVERSION=\"$(VERSION)\" perl_la_LDFLAGS = -module -avoid-version \ - $(PERL_LDFLAGS) + $(PERL_LDFLAGS) collectd_LDADD += "-dlopen" perl.la collectd_DEPENDENCIES += perl.la endif @@ -504,6 +549,16 @@ collectd_LDADD += "-dlopen" ping.la collectd_DEPENDENCIES += ping.la endif +if BUILD_PLUGIN_POSTGRESQL +pkglib_LTLIBRARIES += postgresql.la +postgresql_la_SOURCES = postgresql.c +postgresql_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBPQ_CPPFLAGS) +postgresql_la_LDFLAGS = -module -avoid-version \ + $(BUILD_WITH_LIBPQ_LDFLAGS) -lpq +collectd_LDADD += "-dlopen" postgresql.la +collectd_DEPENDENCIES += postgresql.la +endif + if BUILD_PLUGIN_POWERDNS pkglib_LTLIBRARIES += powerdns.la powerdns_la_SOURCES = powerdns.c @@ -520,11 +575,19 @@ collectd_LDADD += "-dlopen" processes.la collectd_DEPENDENCIES += processes.la endif +if BUILD_PLUGIN_QMAIL +pkglib_LTLIBRARIES += qmail.la +qmail_la_SOURCES = qmail.c +qmail_la_LDFLAGS = -module -avoid-version +collectd_LDADD += "-dlopen" qmail.la +collectd_DEPENDENCIES += qmail.la +endif + if BUILD_PLUGIN_RRDTOOL pkglib_LTLIBRARIES += rrdtool.la rrdtool_la_SOURCES = rrdtool.c rrdtool_la_LDFLAGS = -module -avoid-version -rrdtool_la_CFLAGS = $(BUILD_WITH_LIBRRD_CFLAGS) +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 @@ -533,7 +596,7 @@ endif if BUILD_PLUGIN_SENSORS pkglib_LTLIBRARIES += sensors.la sensors_la_SOURCES = sensors.c -sensors_la_CFLAGS = $(BUILD_WITH_LIBSENSORS_CFLAGS) +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 @@ -552,7 +615,7 @@ if BUILD_PLUGIN_SNMP pkglib_LTLIBRARIES += snmp.la snmp_la_SOURCES = snmp.c snmp_la_LDFLAGS = -module -avoid-version -snmp_la_CFLAGS = +snmp_la_CFLAGS = $(AM_CFLAGS) snmp_la_LIBADD = if BUILD_WITH_LIBNETSNMP snmp_la_CFLAGS += $(BUILD_WITH_LIBSNMP_CFLAGS) @@ -568,23 +631,23 @@ endif if BUILD_PLUGIN_SWAP pkglib_LTLIBRARIES += swap.la 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_LDFLAGS += -lkstat +swap_la_LIBADD += -lkstat endif if BUILD_WITH_LIBDEVINFO -swap_la_LDFLAGS += -ldevinfo +swap_la_LIBADD += -ldevinfo endif if BUILD_WITH_LIBKVM -swap_la_LDFLAGS += -lkvm +swap_la_LIBADD += -lkvm endif if BUILD_WITH_LIBSTATGRAB -if BUILD_WITH_LIBDEVSTAT -swap_la_LDFLAGS += -ldevstat -endif -swap_la_LDFLAGS += -lstatgrab +swap_la_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS) +swap_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) endif endif @@ -620,6 +683,22 @@ collectd_LDADD += "-dlopen" tcpconns.la collectd_DEPENDENCIES += tcpconns.la endif +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_THERMAL +pkglib_LTLIBRARIES += thermal.la +thermal_la_SOURCES = thermal.c +thermal_la_LDFLAGS = -module -avoid-version +collectd_LDADD += "-dlopen" thermal.la +collectd_DEPENDENCIES += thermal.la +endif + if BUILD_PLUGIN_UNIXSOCK pkglib_LTLIBRARIES += unixsock.la unixsock_la_SOURCES = unixsock.c \ @@ -636,7 +715,13 @@ endif if BUILD_PLUGIN_USERS pkglib_LTLIBRARIES += users.la users_la_SOURCES = users.c +users_la_CFLAGS = $(AM_CFLAGS) users_la_LDFLAGS = -module -avoid-version +users_la_LIBADD = +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 @@ -696,7 +781,8 @@ EXTRA_DIST = types.db EXTRA_DIST += collectd-email.pod collectd-exec.pod collectd-nagios.pod \ collectd-perl.pod collectd-snmp.pod collectd-unixsock.pod \ - collectd.conf.pod collectd.pod collectdmon.pod types.db.pod + collectd.conf.pod collectd.pod collectdmon.pod types.db.pod \ + postgresql_default.conf .pod.1: pod2man --release=$(VERSION) --center=$(PACKAGE) $< >.pod2man.tmp 2>/dev/null && mv -f .pod2man.tmp $@ || true @@ -713,3 +799,5 @@ install-exec-hook: $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \ fi; \ cp -f $(srcdir)/types.db $(DESTDIR)$(pkglibdir)/; + $(INSTALL) -D -m 0644 $(srcdir)/postgresql_default.conf \ + $(DESTDIR)$(pkgdatadir)/postgresql_default.conf;