X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=098c07b098e2193f1cdc85ac012086d9fd5d45f8;hb=4027126a75439c7d2b1d5572092fd291ef19ead6;hp=0c3b476b0ed6aa56cbcae7dd6da4c6539d1957f5;hpb=a16e967161314d4b2047e36ba0af0d7efa616919;p=collectd.git diff --git a/src/Makefile.am b/src/Makefile.am index 0c3b476b..098c07b0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,9 +5,6 @@ endif if BUILD_WITH_OWN_LIBOCONFIG SUBDIRS += liboconfig endif -if BUILD_WITH_OWN_LIBOPING -SUBDIRS += liboping -endif if COMPILER_IS_GCC AM_CFLAGS = -Wall -Werror @@ -35,6 +32,7 @@ collectd_SOURCES = collectd.c collectd.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 \ @@ -90,11 +88,11 @@ collectdmon_SOURCES = collectdmon.c collectdmon_CPPFLAGS = $(AM_CPPFLAGS) collectd_nagios_SOURCES = collectd-nagios.c -collectd_nagios_LDFLAGS = +collectd_nagios_LDADD = if BUILD_WITH_LIBSOCKET -collectd_nagios_LDFLAGS += -lsocket +collectd_nagios_LDADD += -lsocket endif -collectd_nagios_LDADD = libcollectdclient/libcollectdclient.la +collectd_nagios_LDADD += libcollectdclient/libcollectdclient.la collectd_nagios_DEPENDENCIES = libcollectdclient/libcollectdclient.la pkglib_LTLIBRARIES = @@ -117,8 +115,9 @@ if BUILD_PLUGIN_APCUPS pkglib_LTLIBRARIES += apcups.la apcups_la_SOURCES = apcups.c apcups_la_LDFLAGS = -module -avoid-version +apcups_la_LIBADD = if BUILD_WITH_LIBSOCKET -apcups_la_LDFLAGS += -lsocket +apcups_la_LIBADD += -lsocket endif collectd_LDADD += "-dlopen" apcups.la collectd_DEPENDENCIES += apcups.la @@ -127,7 +126,8 @@ endif if BUILD_PLUGIN_APPLE_SENSORS pkglib_LTLIBRARIES += apple_sensors.la apple_sensors_la_SOURCES = apple_sensors.c -apple_sensors_la_LDFLAGS = -module -avoid-version -lIOKit +apple_sensors_la_LDFLAGS = -module -avoid-version +apple_sensors_la_LIBADD = -lIOKit collectd_LDADD += "-dlopen" apple_sensors.la collectd_DEPENDENCIES += apple_sensors.la endif @@ -147,8 +147,9 @@ if BUILD_PLUGIN_BATTERY pkglib_LTLIBRARIES += battery.la battery_la_SOURCES = battery.c battery_la_LDFLAGS = -module -avoid-version +battery_la_LIBADD = if BUILD_WITH_LIBIOKIT -battery_la_LDFLAGS += -lIOKit +battery_la_LIBADD += -lIOKit endif collectd_LDADD += "-dlopen" battery.la collectd_DEPENDENCIES += battery.la @@ -172,10 +173,10 @@ cpu_la_CFLAGS = $(AM_CFLAGS) cpu_la_LDFLAGS = -module -avoid-version cpu_la_LIBADD = if BUILD_WITH_LIBKSTAT -cpu_la_LDFLAGS += -lkstat +cpu_la_LIBADD += -lkstat endif if BUILD_WITH_LIBDEVINFO -cpu_la_LDFLAGS += -ldevinfo +cpu_la_LIBADD += -ldevinfo endif if BUILD_WITH_LIBSTATGRAB cpu_la_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS) @@ -241,13 +242,13 @@ disk_la_CFLAGS = $(AM_CFLAGS) disk_la_LDFLAGS = -module -avoid-version disk_la_LIBADD = if BUILD_WITH_LIBKSTAT -disk_la_LDFLAGS += -lkstat +disk_la_LIBADD += -lkstat endif if BUILD_WITH_LIBDEVINFO -disk_la_LDFLAGS += -ldevinfo +disk_la_LIBADD += -ldevinfo endif if BUILD_WITH_LIBIOKIT -disk_la_LDFLAGS += -lIOKit +disk_la_LIBADD += -lIOKit endif if BUILD_WITH_LIBSTATGRAB disk_la_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS) @@ -260,7 +261,8 @@ endif if BUILD_PLUGIN_DNS pkglib_LTLIBRARIES += dns.la dns_la_SOURCES = dns.c utils_dns.c utils_dns.h -dns_la_LDFLAGS = -module -avoid-version -lpcap -lpthread +dns_la_LDFLAGS = -module -avoid-version +dns_la_LIBADD = -lpcap -lpthread collectd_LDADD += "-dlopen" dns.la collectd_DEPENDENCIES += dns.la endif @@ -269,9 +271,7 @@ if BUILD_PLUGIN_EMAIL pkglib_LTLIBRARIES += email.la email_la_SOURCES = email.c email_la_LDFLAGS = -module -avoid-version -if BUILD_WITH_LIBPTHREAD -email_la_LDFLAGS += -lpthread -endif +email_la_LIBADD = -lpthread collectd_LDADD += "-dlopen" email.la collectd_DEPENDENCIES += email.la endif @@ -290,9 +290,7 @@ 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 -endif +exec_la_LIBADD = -lpthread collectd_LDADD += "-dlopen" exec.la collectd_DEPENDENCIES += exec.la endif @@ -305,12 +303,23 @@ collectd_LDADD += "-dlopen" filecount.la collectd_DEPENDENCIES += filecount.la endif +if BUILD_PLUGIN_GMOND +pkglib_LTLIBRARIES += gmond.la +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 pkglib_LTLIBRARIES += hddtemp.la hddtemp_la_SOURCES = hddtemp.c hddtemp_la_LDFLAGS = -module -avoid-version +hddtemp_la_LIBADD = if BUILD_WITH_LIBSOCKET -hddtemp_la_LDFLAGS += -lsocket +hddtemp_la_LIBADD += -lsocket endif collectd_LDADD += "-dlopen" hddtemp.la collectd_DEPENDENCIES += hddtemp.la @@ -329,10 +338,10 @@ interface_la_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS) interface_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) else if BUILD_WITH_LIBKSTAT -interface_la_LDFLAGS += -lkstat +interface_la_LIBADD += -lkstat endif if BUILD_WITH_LIBDEVINFO -interface_la_LDFLAGS += -ldevinfo +interface_la_LIBADD += -ldevinfo endif # BUILD_WITH_LIBDEVINFO endif # !BUILD_WITH_LIBSTATGRAB endif # BUILD_PLUGIN_INTERFACE @@ -345,7 +354,7 @@ if BUILD_WITH_OWN_LIBIPTC iptables_la_LIBADD = libiptc/libiptc.la iptables_la_DEPENDENCIES = libiptc/libiptc.la else -iptables_la_LDFLAGS += -liptc +iptables_la_LIBADD = -liptc endif collectd_LDADD += "-dlopen" iptables.la collectd_DEPENDENCIES += iptables.la @@ -378,6 +387,17 @@ collectd_LDADD += "-dlopen" irq.la collectd_DEPENDENCIES += irq.la endif +if BUILD_PLUGIN_JAVA +pkglib_LTLIBRARIES += java.la +java_la_SOURCES = java.c +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_LIBVIRT pkglib_LTLIBRARIES += libvirt.la libvirt_la_SOURCES = libvirt.c @@ -414,13 +434,19 @@ endif if BUILD_PLUGIN_MATCH_REGEX pkglib_LTLIBRARIES += match_regex.la match_regex_la_SOURCES = match_regex.c -match_regex_la_CPPFLAGS = $(BUILD_WITH_LIBPCRE_CFLAGS) -match_regex_la_LDFLAGS = -module -avoid-version \ - $(BUILD_WITH_LIBPCRE_LIBS) +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 @@ -433,20 +459,31 @@ if BUILD_PLUGIN_MBMON pkglib_LTLIBRARIES += mbmon.la mbmon_la_SOURCES = mbmon.c mbmon_la_LDFLAGS = -module -avoid-version +mbmon_la_LIBADD = if BUILD_WITH_LIBSOCKET -mbmon_la_LDFLAGS += -lsocket +mbmon_la_LIBADD += -lsocket endif collectd_LDADD += "-dlopen" mbmon.la collectd_DEPENDENCIES += mbmon.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_LIBADD = $(BUILD_WITH_LIBMEMCACHED_LIBS) +collectd_LDADD += "-dlopen" memcachec.la +collectd_DEPENDENCIES += memcachec.la +endif + if BUILD_PLUGIN_MEMCACHED pkglib_LTLIBRARIES += memcached.la memcached_la_SOURCES = memcached.c memcached_la_LDFLAGS = -module -avoid-version memcached_la_LIBADD = if BUILD_WITH_LIBSOCKET -memcached_la_LDFLAGS += -lsocket +memcached_la_LIBADD += -lsocket endif collectd_LDADD += "-dlopen" memcached.la collectd_DEPENDENCIES += memcached.la @@ -508,11 +545,9 @@ if BUILD_PLUGIN_NETWORK pkglib_LTLIBRARIES += network.la network_la_SOURCES = network.c network.h network_la_LDFLAGS = -module -avoid-version +network_la_LIBADD = -lpthread if BUILD_WITH_LIBSOCKET -network_la_LDFLAGS += -lsocket -endif -if BUILD_WITH_LIBPTHREAD -network_la_LDFLAGS += -lpthread +network_la_LIBADD += -lsocket endif collectd_LDADD += "-dlopen" network.la collectd_DEPENDENCIES += network.la @@ -544,7 +579,8 @@ 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) +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 @@ -552,7 +588,8 @@ 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 +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 @@ -561,8 +598,9 @@ if BUILD_PLUGIN_NTPD pkglib_LTLIBRARIES += ntpd.la ntpd_la_SOURCES = ntpd.c ntpd_la_LDFLAGS = -module -avoid-version +ntpd_la_LIBADD = if BUILD_WITH_LIBSOCKET -ntpd_la_LDFLAGS += -lsocket +ntpd_la_LIBADD += -lsocket endif collectd_LDADD += "-dlopen" ntpd.la collectd_DEPENDENCIES += ntpd.la @@ -572,7 +610,8 @@ if BUILD_PLUGIN_NUT pkglib_LTLIBRARIES += nut.la nut_la_SOURCES = nut.c nut_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBUPSCLIENT_CFLAGS) -nut_la_LDFLAGS = -module -avoid-version -lpthread $(BUILD_WITH_LIBUPSCLIENT_LIBS) +nut_la_LDFLAGS = -module -avoid-version +nut_la_LIBADD = -lpthread $(BUILD_WITH_LIBUPSCLIENT_LIBS) collectd_LDADD += "-dlopen" nut.la collectd_DEPENDENCIES += nut.la endif @@ -632,23 +671,21 @@ endif if BUILD_PLUGIN_PING pkglib_LTLIBRARIES += ping.la ping_la_SOURCES = ping.c -ping_la_LDFLAGS = -module -avoid-version -if BUILD_WITH_OWN_LIBOPING -ping_la_LIBADD = liboping/liboping.la -ping_la_DEPENDENCIES = liboping/liboping.la -else -ping_la_LDFLAGS += -loping -endif +ping_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBOPING_CPPFLAGS) +ping_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBOPING_LDFLAGS) +ping_la_LIBADD = -loping 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_SOURCES = postgresql.c \ + utils_db_query.c utils_db_query.h postgresql_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBPQ_CPPFLAGS) postgresql_la_LDFLAGS = -module -avoid-version \ - $(BUILD_WITH_LIBPQ_LDFLAGS) -lpq + $(BUILD_WITH_LIBPQ_LDFLAGS) +postgresql_la_LIBADD = -lpq collectd_LDADD += "-dlopen" postgresql.la collectd_DEPENDENCIES += postgresql.la endif @@ -673,6 +710,14 @@ processes_la_LIBADD += -lkvm endif endif +if BUILD_PLUGIN_PROTOCOLS +pkglib_LTLIBRARIES += protocols.la +protocols_la_SOURCES = protocols.c +protocols_la_LDFLAGS = -module -avoid-version +collectd_LDADD += "-dlopen" protocols.la +collectd_DEPENDENCIES += protocols.la +endif + if BUILD_PLUGIN_RRDCACHED pkglib_LTLIBRARIES += rrdcached.la rrdcached_la_SOURCES = rrdcached.c utils_rrdcreate.c utils_rrdcreate.h @@ -697,8 +742,8 @@ if BUILD_PLUGIN_SENSORS pkglib_LTLIBRARIES += sensors.la sensors_la_SOURCES = sensors.c sensors_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBSENSORS_CFLAGS) -sensors_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBSENSORS_LDFLAGS) -sensors_la_LIBADD = -lsensors +sensors_la_LDFLAGS = -module -avoid-version +sensors_la_LIBADD = $(BUILD_WITH_LIBSENSORS_LDFLAGS) collectd_LDADD += "-dlopen" sensors.la collectd_DEPENDENCIES += sensors.la endif @@ -759,6 +804,14 @@ 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 @@ -770,7 +823,8 @@ endif if BUILD_PLUGIN_TAPE pkglib_LTLIBRARIES += tape.la tape_la_SOURCES = tape.c -tape_la_LDFLAGS = -module -avoid-version -lkstat -ldevinfo +tape_la_LDFLAGS = -module -avoid-version +tape_la_LIBADD = -lkstat -ldevinfo collectd_LDADD += "-dlopen" tape.la collectd_DEPENDENCIES += tape.la endif @@ -819,6 +873,14 @@ 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 @@ -835,11 +897,25 @@ unixsock_la_SOURCES = unixsock.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 +unixsock_la_LDFLAGS = -module -avoid-version +unixsock_la_LIBADD = -lpthread collectd_LDADD += "-dlopen" unixsock.la collectd_DEPENDENCIES += unixsock.la endif +if BUILD_PLUGIN_UPTIME +pkglib_LTLIBRARIES += uptime.la +uptime_la_SOURCES = uptime.c +uptime_la_CFLAGS = $(AM_CFLAGS) +uptime_la_LDFLAGS = -module -avoid-version +uptime_la_LIBADD = +if BUILD_WITH_LIBKSTAT +uptime_la_LIBADD += -lkstat +endif +collectd_LDADD += "-dlopen" uptime.la +collectd_DEPENDENCIES += uptime.la +endif + if BUILD_PLUGIN_USERS pkglib_LTLIBRARIES += users.la users_la_SOURCES = users.c @@ -892,25 +968,41 @@ if BUILD_PLUGIN_XMMS pkglib_LTLIBRARIES += xmms.la xmms_la_SOURCES = xmms.c xmms_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBXMMS_CFLAGS) -xmms_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBXMMS_LIBS) +xmms_la_LDFLAGS = -module -avoid-version +xmms_la_LIBADD = $(BUILD_WITH_LIBXMMS_LIBS) collectd_LDADD += "-dlopen" xmms.la collectd_DEPENDENCIES += xmms.la 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 collectdmon.1 \ +dist_man_MANS = collectd.1 \ + collectd.conf.5 \ + collectd-email.5 \ + collectd-exec.5 \ + collectd-java.5 + collectdmon.1 \ + collectd-nagios.1 \ + collectd-perl.5 \ + collectd-snmp.5 \ + collectd-unixsock.5 \ types.db.5 #collectd_1_SOURCES = collectd.pod 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 \ - postgresql_default.conf +EXTRA_DIST += collectd.conf.pod \ + collectd-email.pod \ + collectd-exec.pod \ + collectd-java.pod \ + collectdmon.pod \ + collectd-nagios.pod \ + collectd-perl.pod \ + collectd.pod \ + collectd-snmp.pod \ + collectd-unixsock.pod \ + postgresql_default.conf \ + types.db.pod .pod.1: pod2man --release=$(VERSION) --center=$(PACKAGE) $< \