projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.10' into collectd-5.0
[collectd.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
14b4c83
..
45fd6f1
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-40,13
+40,13
@@
collectd_SOURCES = collectd.c collectd.h \
utils_match.c utils_match.h \
utils_subst.c utils_subst.h \
utils_tail.c utils_tail.h \
utils_match.c utils_match.h \
utils_subst.c utils_subst.h \
utils_tail.c utils_tail.h \
- utils_t
hreshold.c utils_threshold
.h \
+ utils_t
ime.c utils_time
.h \
types_list.c types_list.h
collectd_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
collectd_CFLAGS = $(AM_CFLAGS)
collectd_LDFLAGS = -export-dynamic
types_list.c types_list.h
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..
@@
-73,7
+73,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,
@@
-85,7
+84,7
@@
endif
if BUILD_WITH_OWN_LIBOCONFIG
collectd_LDADD += $(LIBLTDL) liboconfig/liboconfig.la
if BUILD_WITH_OWN_LIBOCONFIG
collectd_LDADD += $(LIBLTDL) liboconfig/liboconfig.la
-collectd_DEPENDENCIES +=
$(LIBLTDL)
liboconfig/liboconfig.la
+collectd_DEPENDENCIES += liboconfig/liboconfig.la
else
collectd_LDADD += -loconfig
endif
else
collectd_LDADD += -loconfig
endif
@@
-463,7
+462,9
@@
endif
if BUILD_PLUGIN_IPVS
pkglib_LTLIBRARIES += ipvs.la
ipvs_la_SOURCES = ipvs.c
if BUILD_PLUGIN_IPVS
pkglib_LTLIBRARIES += ipvs.la
ipvs_la_SOURCES = ipvs.c
+if IP_VS_H_NEEDS_KERNEL_CFLAGS
ipvs_la_CFLAGS = $(AM_CFLAGS) $(KERNEL_CFLAGS)
ipvs_la_CFLAGS = $(AM_CFLAGS) $(KERNEL_CFLAGS)
+endif
ipvs_la_LDFLAGS = -module -avoid-version
collectd_LDADD += "-dlopen" ipvs.la
collectd_DEPENDENCIES += ipvs.la
ipvs_la_LDFLAGS = -module -avoid-version
collectd_LDADD += "-dlopen" ipvs.la
collectd_DEPENDENCIES += ipvs.la
@@
-524,6
+525,15
@@
collectd_LDADD += "-dlopen" logfile.la
collectd_DEPENDENCIES += logfile.la
endif
collectd_DEPENDENCIES += logfile.la
endif
+if BUILD_PLUGIN_LPAR
+pkglib_LTLIBRARIES += lpar.la
+lpar_la_SOURCES = lpar.c
+lpar_la_LDFLAGS = -module -avoid-version
+collectd_LDADD += "-dlopen" lpar.la
+collectd_DEPENDENCIES += lpar.la
+lpar_la_LIBADD = -lperfstat
+endif
+
if BUILD_PLUGIN_MADWIFI
pkglib_LTLIBRARIES += madwifi.la
madwifi_la_SOURCES = madwifi.c madwifi.h
if BUILD_PLUGIN_MADWIFI
pkglib_LTLIBRARIES += madwifi.la
madwifi_la_SOURCES = madwifi.c madwifi.h
@@
-1121,6
+1131,14
@@
collectd_LDADD += "-dlopen" thermal.la
collectd_DEPENDENCIES += thermal.la
endif
collectd_DEPENDENCIES += thermal.la
endif
+if BUILD_PLUGIN_THRESHOLD
+pkglib_LTLIBRARIES += threshold.la
+threshold_la_SOURCES = threshold.c
+threshold_la_LDFLAGS = -module -avoid-version
+collectd_LDADD += "-dlopen" threshold.la
+collectd_DEPENDENCIES += threshold.la
+endif
+
if BUILD_PLUGIN_TOKYOTYRANT
pkglib_LTLIBRARIES += tokyotyrant.la
tokyotyrant_la_SOURCES = tokyotyrant.c
if BUILD_PLUGIN_TOKYOTYRANT
pkglib_LTLIBRARIES += tokyotyrant.la
tokyotyrant_la_SOURCES = tokyotyrant.c
@@
-1139,7
+1157,6
@@
pkglib_LTLIBRARIES += unixsock.la
unixsock_la_SOURCES = unixsock.c \
utils_cmd_flush.h utils_cmd_flush.c \
utils_cmd_getval.h utils_cmd_getval.c \
unixsock_la_SOURCES = unixsock.c \
utils_cmd_flush.h utils_cmd_flush.c \
utils_cmd_getval.h utils_cmd_getval.c \
- utils_cmd_getthreshold.h utils_cmd_getthreshold.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
utils_cmd_listval.h utils_cmd_listval.c \
utils_cmd_putval.h utils_cmd_putval.c \
utils_cmd_putnotif.h utils_cmd_putnotif.c
@@
-1265,6
+1282,8
@@
collectd_LDADD += "-dlopen" zfs_arc.la
collectd_DEPENDENCIES += zfs_arc.la
endif
collectd_DEPENDENCIES += zfs_arc.la
endif
+BUILT_SOURCES += $(dist_man_MANS)
+
dist_man_MANS = collectd.1 \
collectd.conf.5 \
collectd-email.5 \
dist_man_MANS = collectd.1 \
collectd.conf.5 \
collectd-email.5 \
@@
-1276,6
+1295,7
@@
dist_man_MANS = collectd.1 \
collectd-perl.5 \
collectd-python.5 \
collectd-snmp.5 \
collectd-perl.5 \
collectd-python.5 \
collectd-snmp.5 \
+ collectd-threshold.5 \
collectd-unixsock.5 \
types.db.5
collectd-unixsock.5 \
types.db.5
@@
-1294,6
+1314,7
@@
EXTRA_DIST += collectd.conf.pod \
collectd-python.pod \
collectd.pod \
collectd-snmp.pod \
collectd-python.pod \
collectd.pod \
collectd-snmp.pod \
+ collectd-threshold.pod \
collectd-unixsock.pod \
postgresql_default.conf \
types.db.pod
collectd-unixsock.pod \
postgresql_default.conf \
types.db.pod
@@
-1315,7
+1336,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)
@@
-1329,3
+1350,8
@@
install-exec-hook:
$(INSTALL) -m 0644 $(srcdir)/types.db $(DESTDIR)$(pkgdatadir)/types.db;
$(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \
$(DESTDIR)$(pkgdatadir)/postgresql_default.conf;
$(INSTALL) -m 0644 $(srcdir)/types.db $(DESTDIR)$(pkgdatadir)/types.db;
$(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \
$(DESTDIR)$(pkgdatadir)/postgresql_default.conf;
+
+uninstall-hook:
+ rm -f $(DESTDIR)$(pkgdatadir)/types.db;
+ rm -f $(DESTDIR)$(sysconfdir)/collectd.conf
+ rm -f $(DESTDIR)$(pkgdatadir)/postgresql_default.conf;