From 7970f59dff204401069cfc53f7c53f207a681428 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Mon, 3 May 2010 09:47:42 +0200 Subject: [PATCH] src/Makefile.am: Fix building / packaging without the Pinba plugin. Getting the dependency right on generated sources wasn't quite as easy as I hoped. --- src/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 2a32ece8..c6b0538d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -108,6 +108,7 @@ collectd_nagios_DEPENDENCIES = libcollectdclient/libcollectdclient.la pkglib_LTLIBRARIES = BUILT_SOURCES = +CLEANFILES = if BUILD_PLUGIN_APACHE pkglib_LTLIBRARIES += apache.la @@ -811,8 +812,9 @@ endif if BUILD_PLUGIN_PINBA BUILT_SOURCES += pinba.pb-c.c pinba.pb-c.h +CLEANFILES += pinba.pb-c.c pinba.pb-c.h pkglib_LTLIBRARIES += pinba.la -pinba_la_SOURCES = pinba.c pinba.pb-c.c pinba.pb-c.h +pinba_la_SOURCES = pinba.c pinba_la_LDFLAGS = -module -avoid-version pinba_la_LIBADD = -lprotobuf-c collectd_LDADD += "-dlopen" pinba.la @@ -1247,10 +1249,8 @@ EXTRA_DIST += collectd.conf.pod \ echo "$@ has some POD errors!"; false; \ fi -if HAVE_PROTOC_C pinba.pb-c.c pinba.pb-c.h: pinba.proto protoc-c --c_out $(builddir) pinba.proto -endif install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(sysconfdir) -- 2.11.0