From 24f1130f1cce3c23aef00279dd30516dc82a4669 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Wed, 10 Apr 2013 16:46:14 +0200 Subject: [PATCH] Build system: Don't ship the generated *.pb-c.[ch] files. They depend on specific versions of the protobuf-c.h header file, so shipping this will cause problems for people having a different version of protoc-c installed. This reverts some of the work done in #269, but distcheck should still work. Meh. --- configure.in | 4 ++-- src/Makefile.am | 14 +++++--------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/configure.in b/configure.in index 186b2438..a62d608b 100644 --- a/configure.in +++ b/configure.in @@ -4956,7 +4956,7 @@ AC_PLUGIN([oracle], [$with_oracle], [Oracle plugin]) AC_PLUGIN([perl], [$plugin_perl], [Embed a Perl interpreter]) AC_PLUGIN([pf], [$have_net_pfvar_h], [BSD packet filter (PF) statistics]) # FIXME: Check for libevent, too. -AC_PLUGIN([pinba], [$have_protobuf_c_h], [Pinba statistics]) +AC_PLUGIN([pinba], [$have_protoc_c], [Pinba statistics]) AC_PLUGIN([ping], [$with_liboping], [Network latency statistics]) AC_PLUGIN([postgresql], [$with_libpq], [PostgreSQL database statistics]) AC_PLUGIN([powerdns], [yes], [PowerDNS statistics]) @@ -4999,7 +4999,7 @@ AC_PLUGIN([write_graphite], [yes], [Graphite / Carbon output plugin] AC_PLUGIN([write_http], [$with_libcurl], [HTTP output plugin]) AC_PLUGIN([write_mongodb], [$with_libmongoc], [MongoDB output plugin]) AC_PLUGIN([write_redis], [$with_libcredis], [Redis output plugin]) -AC_PLUGIN([write_riemann], [$have_protobuf_c_h], [Riemann output plugin]) +AC_PLUGIN([write_riemann], [$have_protoc_c], [Riemann output plugin]) AC_PLUGIN([xmms], [$with_libxmms], [XMMS statistics]) AC_PLUGIN([zfs_arc], [$plugin_zfs_arc], [ZFS ARC statistics]) diff --git a/src/Makefile.am b/src/Makefile.am index f0064ff6..59915225 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -136,8 +136,7 @@ collectd_tg_DEPENDENCIES = libcollectdclient/libcollectdclient.la pkglib_LTLIBRARIES = BUILT_SOURCES = -CLEANFILES = -MAINTAINERCLEANFILES = +CLEANFILES = if BUILD_PLUGIN_AGGREGATION pkglib_LTLIBRARIES += aggregation.la @@ -1434,22 +1433,19 @@ EXTRA_DIST += collectd.conf.pod \ echo "$@ has some POD errors!"; false; \ fi -# Protocol buffer for the "pinba" plugin. -EXTRA_DIST += pinba.proto pinba.pb-c.c pinba.pb-c.h -MAINTAINERCLEANFILES += pinba.pb-c.c pinba.pb-c.h - if HAVE_PROTOC_C +# Protocol buffer for the "pinba" plugin. +CLEANFILES += pinba.pb-c.c pinba.pb-c.h BUILT_SOURCES += pinba.pb-c.c pinba.pb-c.h pinba.pb-c.c pinba.pb-c.h: pinba.proto protoc-c -I$(srcdir) --c_out . $(srcdir)/pinba.proto endif +if HAVE_PROTOC_C # Protocol buffer for the "write_riemann" plugin. -EXTRA_DIST += riemann.proto riemann.pb-c.c riemann.pb-c.h -MAINTAINERCLEANFILES += riemann.pb-c.c riemann.pb-c.h +CLEANFILES += riemann.pb-c.c riemann.pb-c.h -if HAVE_PROTOC_C BUILT_SOURCES += riemann.pb-c.c riemann.pb-c.h riemann.pb-c.c riemann.pb-c.h: riemann.proto -- 2.11.0