X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=c24e73802257fac2406926ec2ebc26a15e9ab0a9;hb=82e27678f8972d2625b466e7e7ba9daaa6395c98;hp=6e84eafe9235f85c6c877b8fe82c6c3ab84c13cc;hpb=0f9c7ce19f32c64ae54f0132763d9f38cf57b5b1;p=collectd.git diff --git a/src/Makefile.am b/src/Makefile.am index 6e84eafe..c24e7380 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -136,15 +136,14 @@ collectd_tg_DEPENDENCIES = libcollectdclient/libcollectdclient.la pkglib_LTLIBRARIES = BUILT_SOURCES = -CLEANFILES = -DISTCLEANFILES = +CLEANFILES = if BUILD_PLUGIN_AGGREGATION pkglib_LTLIBRARIES += aggregation.la aggregation_la_SOURCES = aggregation.c \ utils_vl_lookup.c utils_vl_lookup.h aggregation_la_LDFLAGS = -module -avoid-version -aggregation_la_LIBADD = +aggregation_la_LIBADD = -lm collectd_LDADD += "-dlopen" aggregation.la collectd_DEPENDENCIES += aggregation.la endif @@ -192,7 +191,7 @@ if BUILD_PLUGIN_APPLE_SENSORS pkglib_LTLIBRARIES += apple_sensors.la apple_sensors_la_SOURCES = apple_sensors.c apple_sensors_la_LDFLAGS = -module -avoid-version -apple_sensors_la_LIBADD = -lIOKit +apple_sensors_la_LDFLAGS += -framework IOKit collectd_LDADD += "-dlopen" apple_sensors.la collectd_DEPENDENCIES += apple_sensors.la endif @@ -214,7 +213,7 @@ battery_la_SOURCES = battery.c battery_la_LDFLAGS = -module -avoid-version battery_la_LIBADD = if BUILD_WITH_LIBIOKIT -battery_la_LIBADD += -lIOKit +battery_la_LDFLAGS += -framework IOKit endif collectd_LDADD += "-dlopen" battery.la collectd_DEPENDENCIES += battery.la @@ -362,7 +361,7 @@ if BUILD_WITH_LIBDEVINFO disk_la_LIBADD += -ldevinfo endif if BUILD_WITH_LIBIOKIT -disk_la_LIBADD += -lIOKit +disk_la_LDFLAGS += -framework IOKit endif if BUILD_WITH_LIBSTATGRAB disk_la_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS) @@ -478,8 +477,8 @@ if BUILD_PLUGIN_IPTABLES pkglib_LTLIBRARIES += iptables.la iptables_la_SOURCES = iptables.c iptables_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBIPTC_CPPFLAGS) -iptables_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBIPTC_LDFLAGS) -iptables_la_LIBADD = -liptc +iptables_la_LDFLAGS = -module -avoid-version +iptables_la_LIBADD = $(BUILD_WITH_LIBIPTC_LDFLAGS) collectd_LDADD += "-dlopen" iptables.la collectd_DEPENDENCIES += iptables.la endif @@ -797,7 +796,7 @@ if BUILD_PLUGIN_NOTIFY_EMAIL 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 +notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread collectd_LDADD += "-dlopen" notify_email.la collectd_DEPENDENCIES += notify_email.la endif @@ -892,6 +891,7 @@ perl_la_CFLAGS += -Wno-nonnull endif perl_la_LDFLAGS = -module -avoid-version \ $(PERL_LDFLAGS) +perl_la_LIBADD = $(PERL_LIBS) collectd_LDADD += "-dlopen" perl.la collectd_DEPENDENCIES += perl.la endif @@ -904,11 +904,10 @@ collectd_LDADD += "-dlopen" pf.la collectd_DEPENDENCIES += pf.la endif -BUILT_SOURCES += pinba.pb-c.c pinba.pb-c.h -DISTCLEANFILES += pinba.pb-c.c pinba.pb-c.h if BUILD_PLUGIN_PINBA pkglib_LTLIBRARIES += pinba.la 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 @@ -1352,11 +1351,10 @@ collectd_LDADD += "-dlopen" write_redis.la collectd_DEPENDENCIES += write_redis.la endif -BUILT_SOURCES += riemann.pb-c.c riemann.pb-c.h -DISTCLEANFILES += riemann.pb-c.c riemann.pb-c.h if BUILD_PLUGIN_WRITE_RIEMANN pkglib_LTLIBRARIES += write_riemann.la -write_riemann_la_SOURCES = write_riemann.c riemann.pb-c.c +write_riemann_la_SOURCES = write_riemann.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 @@ -1405,9 +1403,6 @@ dist_man_MANS = collectd.1 \ EXTRA_DIST = types.db -EXTRA_DIST += pinba.proto pinba.pb-c.c pinba.pb-c.h -EXTRA_DIST += riemann.proto riemann.pb-c.c riemann.pb-c.h - EXTRA_DIST += collectd.conf.pod \ collectd-email.pod \ collectd-exec.pod \ @@ -1441,24 +1436,25 @@ EXTRA_DIST += collectd.conf.pod \ echo "$@ has some POD errors!"; false; \ fi -pinba.pb-c.c pinba.pb-c.h: pinba.proto +# Protocol buffer for the "pinba" plugin. +EXTRA_DIST += pinba.proto if HAVE_PROTOC_C +CLEANFILES += pinba.pb-c.c pinba.pb-c.h +BUILT_SOURCES += pinba.pb-c.c pinba.pb-c.h + +pinba.pb-c.c pinba.pb-c.h: pinba.proto protoc-c -I$(srcdir) --c_out . $(srcdir)/pinba.proto -else - @echo "INFO Could not find protoc-c. This tool is necessary to generate $@" - @echo "INFO Check http://code.google.com/p/protobuf-c for more information" - @echo "INFO Note : package for Debian (Ubuntu...) is protobuf-c-compiler and protobuf-c0-dev will also be needed" - @echo "INFO Note : package for Fedora (Redhat, Centos...) is protobuf-c and protobuf-c-devel will also be needed" endif -riemann.pb-c.c riemann.pb-c.h: riemann.proto +# Protocol buffer for the "write_riemann" plugin. +EXTRA_DIST += riemann.proto if HAVE_PROTOC_C +CLEANFILES += riemann.pb-c.c riemann.pb-c.h + +BUILT_SOURCES += riemann.pb-c.c riemann.pb-c.h + +riemann.pb-c.c riemann.pb-c.h: riemann.proto protoc-c -I$(srcdir) --c_out . $(srcdir)/riemann.proto -else - @echo "INFO Could not find protoc-c. This tool is necessary to generate $@" - @echo "INFO Check http://code.google.com/p/protobuf-c for more information" - @echo "INFO Note : package for Debian (Ubuntu...) is protobuf-c-compiler and protobuf-c0-dev will also be needed" - @echo "INFO Note : package for Fedora (Redhat, Centos...) is protobuf-c and protobuf-c-devel will also be needed" endif install-exec-hook: