X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=88041b9913e5819d14981e951c1b0097a387fee3;hb=ebdc9011b75c4c1478fbe02eb1cb9c69795288f9;hp=79b3438b48778e4bea69a45ba9e03ef177fd1005;hpb=69e5d982e7adf27a0eca6e6431f748f4913d80ac;p=collectd.git diff --git a/src/Makefile.am b/src/Makefile.am index 79b3438b..88041b99 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,51 +30,51 @@ collectd_SOURCES = collectd.c collectd.h \ 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 +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 @@ -121,6 +121,16 @@ collectd_LDADD += "-dlopen" apple_sensors.la collectd_DEPENDENCIES += apple_sensors.la endif +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_LIBADD = $(BUILD_WITH_LIBCURL_LIBS) $(BUILD_WITH_LIBXML2_LIBS) +collectd_LDADD += "-dlopen" apache.la +collectd_DEPENDENCIES += ascent.la +endif + if BUILD_PLUGIN_BATTERY pkglib_LTLIBRARIES += battery.la battery_la_SOURCES = battery.c @@ -142,6 +152,10 @@ 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 @@ -183,6 +197,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 @@ -216,7 +234,9 @@ endif if BUILD_PLUGIN_EXEC pkglib_LTLIBRARIES += exec.la -exec_la_SOURCES = exec.c utils_cmd_putval.c utils_cmd_putval.h +exec_la_SOURCES = exec.c \ + utils_cmd_putnotif.c utils_cmd_putnotif.h \ + utils_cmd_putval.c utils_cmd_putval.h exec_la_LDFLAGS = -module -avoid-version if BUILD_WITH_LIBPTHREAD exec_la_LDFLAGS += -lpthread @@ -239,25 +259,23 @@ endif if BUILD_PLUGIN_INTERFACE pkglib_LTLIBRARIES += interface.la interface_la_SOURCES = interface.c +interface_la_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 @@ -267,6 +285,16 @@ 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_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 pkglib_LTLIBRARIES += ipvs.la ipvs_la_SOURCES = ipvs.c @@ -296,19 +324,16 @@ endif if BUILD_PLUGIN_LOAD pkglib_LTLIBRARIES += load.la load_la_SOURCES = load.c +load_la_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 @@ -345,23 +370,20 @@ endif if BUILD_PLUGIN_MEMORY pkglib_LTLIBRARIES += memory.la memory_la_SOURCES = memory.c +memory_la_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 @@ -422,9 +444,12 @@ endif if BUILD_PLUGIN_NGINX pkglib_LTLIBRARIES += nginx.la nginx_la_SOURCES = nginx.c +nginx_la_CFLAGS = $(AM_CFLAGS) +nginx_la_LIBADD = nginx_la_LDFLAGS = -module -avoid-version if BUILD_WITH_LIBCURL -nginx_la_LDFLAGS += $(BUILD_WITH_LIBCURL_LIBS) +nginx_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS) +nginx_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS) endif collectd_LDADD += "-dlopen" nginx.la collectd_DEPENDENCIES += nginx.la @@ -476,6 +501,14 @@ collectd_LDADD += "-dlopen" ping.la collectd_DEPENDENCIES += ping.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_PROCESSES pkglib_LTLIBRARIES += processes.la processes_la_SOURCES = processes.c @@ -532,23 +565,23 @@ endif if BUILD_PLUGIN_SWAP pkglib_LTLIBRARIES += swap.la swap_la_SOURCES = swap.c +swap_la_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 @@ -560,6 +593,14 @@ collectd_LDADD += "-dlopen" syslog.la collectd_DEPENDENCIES += syslog.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_TAPE pkglib_LTLIBRARIES += tape.la tape_la_SOURCES = tape.c @@ -576,9 +617,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_UNIXSOCK pkglib_LTLIBRARIES += unixsock.la -unixsock_la_SOURCES = unixsock.c utils_cmd_putval.h utils_cmd_putval.c +unixsock_la_SOURCES = unixsock.c \ + utils_cmd_flush.h utils_cmd_flush.c \ + utils_cmd_getval.h utils_cmd_getval.c \ + utils_cmd_listval.h utils_cmd_listval.c \ + utils_cmd_putval.h utils_cmd_putval.c \ + utils_cmd_putnotif.h utils_cmd_putnotif.c unixsock_la_LDFLAGS = -module -avoid-version -lpthread collectd_LDADD += "-dlopen" unixsock.la collectd_DEPENDENCIES += unixsock.la @@ -602,6 +656,14 @@ collectd_LDADD += "-dlopen" uuid.la collectd_DEPENDENCIES += uuid.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 @@ -630,7 +692,8 @@ endif dist_man_MANS = collectd.1 collectd-nagios.1 collectd.conf.5 \ collectd-email.5 collectd-exec.5 collectd-perl.5 \ - collectd-snmp.5 collectd-unixsock.5 + collectd-snmp.5 collectd-unixsock.5 collectdmon.1 \ + types.db.5 #collectd_1_SOURCES = collectd.pod @@ -638,7 +701,7 @@ 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 + collectd.conf.pod collectd.pod collectdmon.pod types.db.pod .pod.1: pod2man --release=$(VERSION) --center=$(PACKAGE) $< >.pod2man.tmp 2>/dev/null && mv -f .pod2man.tmp $@ || true