X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=02b85fcd1d7f438c718826f0c1957e2af0a5dc81;hb=9d5a7847b03d78a94b6a0b153abeb630b4b94ddd;hp=d305d855073ad68cbdd85fe5e558102fa1f2e2f6;hpb=f71467d9c2097ddd9eb772a4fdb985663168ec71;p=collectd.git diff --git a/src/Makefile.am b/src/Makefile.am index d305d855..02b85fcd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,69 +10,73 @@ if COMPILER_IS_GCC AM_CFLAGS = -Wall -Werror endif -sbin_PROGRAMS = collectd +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}"' + +sbin_PROGRAMS = collectd collectdmon bin_PROGRAMS = collectd-nagios collectd_SOURCES = collectd.c collectd.h \ - utils_avltree.c utils_avltree.h \ - utils_mount.c utils_mount.h \ - utils_llist.c utils_llist.h \ - utils_ignorelist.c utils_ignorelist.h \ common.c common.h \ - plugin.c plugin.h \ configfile.c configfile.h \ + plugin.c plugin.h \ + utils_avltree.c utils_avltree.h \ + utils_cache.c utils_cache.h \ + utils_ignorelist.c utils_ignorelist.h \ + utils_llist.c utils_llist.h \ + utils_mount.c utils_mount.h \ + utils_threshold.c utils_threshold.h \ types_list.c types_list.h -collectd_CPPFLAGS = $(LTDLINCL) -collectd_CPPFLAGS += -DPREFIX='"${prefix}"' -collectd_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' -collectd_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"' -collectd_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' -if BUILD_FEATURE_DAEMON -collectd_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"' -endif -collectd_CPPFLAGS += -DPLUGINDIR='"${pkglibdir}"' -# Link to these libraries.. +collectd_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) +collectd_CFLAGS = collectd_LDFLAGS = -export-dynamic +collectd_LDADD = +collectd_DEPENDENCIES = + +# Link to these libraries.. if BUILD_WITH_LIBRT -collectd_LDFLAGS += -lrt +collectd_LDADD += -lrt endif if BUILD_WITH_LIBSOCKET -collectd_LDFLAGS += -lsocket +collectd_LDADD += -lsocket endif if BUILD_WITH_LIBRESOLV -collectd_LDFLAGS += -lresolv +collectd_LDADD += -lresolv endif if BUILD_WITH_LIBPTHREAD -collectd_LDFLAGS += -lpthread +collectd_LDADD += -lpthread endif if BUILD_WITH_LIBKSTAT -collectd_LDFLAGS += -lkstat +collectd_LDADD += -lkstat endif if BUILD_WITH_LIBDEVINFO -collectd_LDFLAGS += -ldevinfo +collectd_LDADD += -ldevinfo endif +# The daemon needs to call sg_init, so we need to link it against libstatgrab, +# too. -octo if BUILD_WITH_LIBSTATGRAB -if BUILD_WITH_LIBKVM -collectd_LDFLAGS += -lkvm -endif -if BUILD_WITH_LIBDEVSTAT -collectd_LDFLAGS += -ldevstat +collectd_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS) +collectd_LDADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) 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 +collectdmon_CPPFLAGS = $(AM_CPPFLAGS) + collectd_nagios_SOURCES = collectd-nagios.c collectd_nagios_LDFLAGS = if BUILD_WITH_LIBSOCKET @@ -209,7 +213,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 @@ -232,25 +238,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 @@ -276,22 +280,29 @@ collectd_LDADD += "-dlopen" irq.la collectd_DEPENDENCIES += irq.la 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_LIBADD = $(BUILD_WITH_LIBVIRT_LIBS) $(BUILD_WITH_LIBXML2_LIBS) +libvirt_la_LDFLAGS = -module -avoid-version +collectd_LDADD += "-dlopen" libvirt.la +collectd_DEPENDENCIES += libvirt.la +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 @@ -328,23 +339,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 @@ -518,23 +526,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 @@ -564,8 +572,7 @@ endif if BUILD_PLUGIN_UNIXSOCK pkglib_LTLIBRARIES += unixsock.la -unixsock_la_SOURCES = unixsock.c utils_cmd_putval.h utils_cmd_putval.c -unixsock_la_CPPFLAGS = -DLOCALSTATEDIR='"${localstatedir}"' +unixsock_la_SOURCES = unixsock.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 @@ -579,6 +586,16 @@ collectd_LDADD += "-dlopen" users.la collectd_DEPENDENCIES += users.la endif +if BUILD_PLUGIN_UUID +pkglib_LTLIBRARIES += uuid.la +uuid_la_SOURCES = uuid.c +uuid_la_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_VSERVER pkglib_LTLIBRARIES += vserver.la vserver_la_SOURCES = vserver.c @@ -607,7 +624,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 @@ -615,7 +633,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