From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 31 Mar 2016 09:17:33 +0000 (+0200)
Subject: dnsdist: Protobuf automake fixes
X-Git-Tag: dnsdist-1.0.0-beta1~14^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37a2da85065ac95300ec83e9125b76ef7f89940d;p=thirdparty%2Fpdns.git

dnsdist: Protobuf automake fixes
---

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index 54d74f3090..33937c9dfb 100644
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -4,6 +4,8 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS=ext/yahttp
 
+CLEANFILES = dnsmessage.pb.cc dnsmessage.pb.h
+
 dnslabeltext.cc: dnslabeltext.rl
 	$(AM_V_GEN)$(RAGEL) $< -o dnslabeltext.cc
 
@@ -103,13 +105,18 @@ dnsdist_LDADD += $(RE2_LIBS)
 endif
 
 
+if HAVE_PROTOBUF
+if HAVE_PROTOC
 dnsmessage.pb.cc: dnsmessage.proto
-	protoc --cpp_out=./ $<
+	$(AM_V_GEN)$(PROTOC) --cpp_out=./ $<
 
-if HAVE_PROTOBUF
 BUILT_SOURCES += dnsmessage.pb.cc
+
+nodist_dnsdist_SOURCES = dnsmessage.pb.cc dnsmessage.pb.h
 dnsdist_LDADD += $(PROTOBUF_LIBS)
-nodist_dnsdist_SOURCES = dnsmessage.pb.cc dnsmessage.pb.h 
+
+dnsdist.$(OBJEXT): dnsmessage.pb.cc
+endif
 endif
 
 testrunner_SOURCES = \