From: Florian Forster <octo@huhu.verplant.org>
Date: Mon, 3 May 2010 07:47:42 +0000 (+0200)
Subject: src/Makefile.am: Fix building / packaging without the Pinba plugin.
X-Git-Tag: collectd-4.10.1~12
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=7970f59dff204401069cfc53f7c53f207a681428;p=collectd.git

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.
---

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)