X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=1b46b9ba9e3fa12fae3d8f6d5990af931a7819ab;hb=7c8fb05fcb919fb2d9fc68757c198916396600ce;hp=4e157fa9de7b28f9e6e4d775d7423af8deab39d6;hpb=43b3f7d1ce3195c93c5357bcafb60421699aab7d;p=collectd.git diff --git a/src/Makefile.am b/src/Makefile.am index 4e157fa9..1b46b9ba 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,6 +21,7 @@ if BUILD_FEATURE_DAEMON AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"' endif AM_CPPFLAGS += -DPLUGINDIR='"${pkglibdir}"' +AM_CPPFLAGS += -DPKGDATADIR='"${pkgdatadir}"' sbin_PROGRAMS = collectd collectdmon bin_PROGRAMS = collectd-nagios @@ -132,7 +133,7 @@ ascent_la_LDFLAGS = -module -avoid-version ascent_la_CFLAGS = $(AM_CFLAGS) \ $(BUILD_WITH_LIBCURL_CFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS) ascent_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS) $(BUILD_WITH_LIBXML2_LIBS) -collectd_LDADD += "-dlopen" apache.la +collectd_LDADD += "-dlopen" ascent.la collectd_DEPENDENCIES += ascent.la endif @@ -244,6 +245,7 @@ endif if BUILD_PLUGIN_EXEC pkglib_LTLIBRARIES += exec.la exec_la_SOURCES = exec.c \ + utils_parse_option.h utils_parse_option.c \ utils_cmd_putnotif.c utils_cmd_putnotif.h \ utils_cmd_putval.c utils_cmd_putval.h exec_la_LDFLAGS = -module -avoid-version @@ -254,6 +256,14 @@ collectd_LDADD += "-dlopen" exec.la collectd_DEPENDENCIES += exec.la endif +if BUILD_PLUGIN_FILECOUNT +pkglib_LTLIBRARIES += filecount.la +filecount_la_SOURCES = filecount.c +filecount_la_LDFLAGS = -module -avoid-version +collectd_LDADD += "-dlopen" filecount.la +collectd_DEPENDENCIES += filecount.la +endif + if BUILD_PLUGIN_HDDTEMP pkglib_LTLIBRARIES += hddtemp.la hddtemp_la_SOURCES = hddtemp.c @@ -313,6 +323,7 @@ endif if BUILD_PLUGIN_IPVS pkglib_LTLIBRARIES += ipvs.la ipvs_la_SOURCES = ipvs.c +ipvs_la_CFLAGS = $(AM_CFLAGS) $(KERNEL_CFLAGS) ipvs_la_LDFLAGS = -module -avoid-version collectd_LDADD += "-dlopen" ipvs.la collectd_DEPENDENCIES += ipvs.la @@ -507,9 +518,23 @@ collectd_LDADD += "-dlopen" nut.la collectd_DEPENDENCIES += nut.la endif +if BUILD_PLUGIN_ONEWIRE +pkglib_LTLIBRARIES += onewire.la +onewire_la_SOURCES = onewire.c +onewire_la_CFLAGS = $(AM_CFLAGS) +onewire_la_CPPFLAGS = $(BUILD_WITH_LIBOWCAPI_CPPFLAGS) +onewire_la_LIBADD = $(BUILD_WITH_LIBOWCAPI_LIBS) +onewire_la_LDFLAGS = -module -avoid-version +collectd_LDADD += "-dlopen" onewire.la +collectd_DEPENDENCIES += onewire.la +endif + if BUILD_PLUGIN_PERL pkglib_LTLIBRARIES += perl.la perl_la_SOURCES = perl.c +# Despite C99 providing the "bool" type thru stdbool.h, Perl defines its own +# version of that type if HAS_BOOL is not defined... *sigh* +perl_la_CPPFLAGS = $(AM_CPPFLAGS) -DHAS_BOOL=1 perl_la_CFLAGS = $(AM_CFLAGS) \ $(PERL_CFLAGS) \ -DXS_VERSION=\"$(VERSION)\" -DVERSION=\"$(VERSION)\" @@ -533,6 +558,16 @@ 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_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBPQ_CPPFLAGS) +postgresql_la_LDFLAGS = -module -avoid-version \ + $(BUILD_WITH_LIBPQ_LDFLAGS) -lpq +collectd_LDADD += "-dlopen" postgresql.la +collectd_DEPENDENCIES += postgresql.la +endif + if BUILD_PLUGIN_POWERDNS pkglib_LTLIBRARIES += powerdns.la powerdns_la_SOURCES = powerdns.c @@ -545,8 +580,12 @@ if BUILD_PLUGIN_PROCESSES pkglib_LTLIBRARIES += processes.la processes_la_SOURCES = processes.c processes_la_LDFLAGS = -module -avoid-version +processes_la_LIBADD = collectd_LDADD += "-dlopen" processes.la collectd_DEPENDENCIES += processes.la +if BUILD_WITH_LIBKVM_GETPROCS +processes_la_LIBADD += -lkvm +endif endif if BUILD_PLUGIN_RRDTOOL @@ -608,7 +647,7 @@ endif if BUILD_WITH_LIBDEVINFO swap_la_LIBADD += -ldevinfo endif -if BUILD_WITH_LIBKVM +if BUILD_WITH_LIBKVM_GETSWAPINFO swap_la_LIBADD += -lkvm endif if BUILD_WITH_LIBSTATGRAB @@ -645,8 +684,12 @@ if BUILD_PLUGIN_TCPCONNS pkglib_LTLIBRARIES += tcpconns.la tcpconns_la_SOURCES = tcpconns.c tcpconns_la_LDFLAGS = -module -avoid-version +tcpconns_la_LIBADD = collectd_LDADD += "-dlopen" tcpconns.la collectd_DEPENDENCIES += tcpconns.la +if BUILD_WITH_LIBKVM_NLIST +tcpconns_la_LIBADD += -lkvm +endif endif if BUILD_PLUGIN_TEAMSPEAK2 @@ -668,6 +711,7 @@ endif if BUILD_PLUGIN_UNIXSOCK pkglib_LTLIBRARIES += unixsock.la unixsock_la_SOURCES = unixsock.c \ + utils_parse_option.h utils_parse_option.c \ utils_cmd_flush.h utils_cmd_flush.c \ utils_cmd_getval.h utils_cmd_getval.c \ utils_cmd_listval.h utils_cmd_listval.c \ @@ -695,7 +739,7 @@ endif if BUILD_PLUGIN_UUID pkglib_LTLIBRARIES += uuid.la uuid_la_SOURCES = uuid.c -uuid_la_CFLAGS = $(BUILD_WITH_LIBHAL_CFLAGS) +uuid_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBHAL_CFLAGS) uuid_la_LIBADD = $(BUILD_WITH_LIBHAL_LIBS) uuid_la_LDFLAGS = -module -avoid-version collectd_LDADD += "-dlopen" uuid.la @@ -747,13 +791,24 @@ 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 + collectd.conf.pod collectd.pod collectdmon.pod types.db.pod \ + postgresql_default.conf .pod.1: - pod2man --release=$(VERSION) --center=$(PACKAGE) $< >.pod2man.tmp 2>/dev/null && mv -f .pod2man.tmp $@ || true + pod2man --release=$(VERSION) --center=$(PACKAGE) $< \ + >.pod2man.tmp 2>/dev/null && mv -f .pod2man.tmp $@ || true + @if grep '\' $@ >/dev/null 2>&1; \ + then \ + echo "$@ has some POD errors!"; false; \ + fi .pod.5: - pod2man --section=5 --release=$(VERSION) --center=$(PACKAGE) $< >.pod2man.tmp 2>/dev/null && mv -f .pod2man.tmp $@ || true + pod2man --section=5 --release=$(VERSION) --center=$(PACKAGE) $< \ + >.pod2man.tmp 2>/dev/null && mv -f .pod2man.tmp $@ || true + @if grep '\' $@ >/dev/null 2>&1; \ + then \ + echo "$@ has some POD errors!"; false; \ + fi install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(sysconfdir) @@ -764,3 +819,6 @@ install-exec-hook: $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \ fi; \ cp -f $(srcdir)/types.db $(DESTDIR)$(pkglibdir)/; + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) + $(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \ + $(DESTDIR)$(pkgdatadir)/postgresql_default.conf;