projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build system: Add the PF plugin.
[collectd.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
f8c1f79
..
fb94c76
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-43,7
+43,7
@@
collectd_SOURCES = collectd.c collectd.h \
collectd_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
collectd_CFLAGS = $(AM_CFLAGS)
collectd_LDFLAGS = -export-dynamic
collectd_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
collectd_CFLAGS = $(AM_CFLAGS)
collectd_LDFLAGS = -export-dynamic
-collectd_LDADD =
+collectd_LDADD =
-lm
collectd_DEPENDENCIES =
# Link to these libraries..
collectd_DEPENDENCIES =
# Link to these libraries..
@@
-70,7
+70,6
@@
collectd_LDADD += -ldevinfo
endif
if BUILD_AIX
collectd_LDFLAGS += -Wl,-bexpall,-brtllib
endif
if BUILD_AIX
collectd_LDFLAGS += -Wl,-bexpall,-brtllib
-collectd_LDADD += -lm
endif
# The daemon needs to call sg_init, so we need to link it against libstatgrab,
endif
# The daemon needs to call sg_init, so we need to link it against libstatgrab,
@@
-124,8
+123,8
@@
if BUILD_PLUGIN_AMQP
pkglib_LTLIBRARIES += amqp.la
amqp_la_SOURCES = amqp.c \
utils_cmd_putval.c utils_cmd_putval.h \
pkglib_LTLIBRARIES += amqp.la
amqp_la_SOURCES = amqp.c \
utils_cmd_putval.c utils_cmd_putval.h \
- utils_format_
json.c utils_format_json
.h \
- utils_format_
graphite.c utils_format_graphite
.h
+ utils_format_
graphite.c utils_format_graphite
.h \
+ utils_format_
json.c utils_format_json
.h
amqp_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBRABBITMQ_LDFLAGS)
amqp_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBRABBITMQ_CPPFLAGS)
amqp_la_LIBADD = $(BUILD_WITH_LIBRABBITMQ_LIBS)
amqp_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBRABBITMQ_LDFLAGS)
amqp_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBRABBITMQ_CPPFLAGS)
amqp_la_LIBADD = $(BUILD_WITH_LIBRABBITMQ_LIBS)
@@
-863,6
+862,14
@@
collectd_LDADD += "-dlopen" perl.la
collectd_DEPENDENCIES += perl.la
endif
collectd_DEPENDENCIES += perl.la
endif
+if BUILD_PLUGIN_PF
+pkglib_LTLIBRARIES += pf.la
+pf_la_SOURCES = pf.c
+pf_la_LDFLAGS = -module -avoid-version
+collectd_LDADD += "-dlopen" pf.la
+collectd_DEPENDENCIES += pf.la
+endif
+
if BUILD_PLUGIN_PINBA
BUILT_SOURCES += pinba.pb-c.c pinba.pb-c.h
CLEANFILES += pinba.pb-c.c pinba.pb-c.h
if BUILD_PLUGIN_PINBA
BUILT_SOURCES += pinba.pb-c.c pinba.pb-c.h
CLEANFILES += pinba.pb-c.c pinba.pb-c.h
@@
-1258,7
+1265,8
@@
endif
if BUILD_PLUGIN_WRITE_GRAPHITE
pkglib_LTLIBRARIES += write_graphite.la
write_graphite_la_SOURCES = write_graphite.c \
if BUILD_PLUGIN_WRITE_GRAPHITE
pkglib_LTLIBRARIES += write_graphite.la
write_graphite_la_SOURCES = write_graphite.c \
- utils_format_json.c utils_format_json.h
+ utils_format_graphite.c utils_format_graphite.h \
+ utils_format_json.c utils_format_json.h
write_graphite_la_LDFLAGS = -module -avoid-version
collectd_LDADD += "-dlopen" write_graphite.la
collectd_DEPENDENCIES += write_graphite.la
write_graphite_la_LDFLAGS = -module -avoid-version
collectd_LDADD += "-dlopen" write_graphite.la
collectd_DEPENDENCIES += write_graphite.la
@@
-1371,7
+1379,7
@@
EXTRA_DIST += collectd.conf.pod \
fi
pinba.pb-c.c pinba.pb-c.h: pinba.proto
fi
pinba.pb-c.c pinba.pb-c.h: pinba.proto
- protoc-c --c_out
$(builddir)
pinba.proto
+ protoc-c --c_out
.
pinba.proto
install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)