From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 31 Mar 2016 13:09:48 +0000 (+0200)
Subject: recursor: Protobuf auto* cleanup
X-Git-Tag: dnsdist-1.0.0-beta1~14^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48a44e8ba65a93b56b33d66168d50951d459e0d0;p=thirdparty%2Fpdns.git

recursor: Protobuf auto* cleanup
---

diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index 55df2b560e..61e3eb8eb2 100644
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -20,6 +20,9 @@ AM_LDFLAGS = \
 ACLOCAL_AMFLAGS = -I m4
 
 BUILT_SOURCES=htmlfiles.h
+CLEANFILES = htmlfiles.h \
+	dnsmessage.pb.cc \
+	dnsmessage.pb.h
 
 htmlfiles.h: html/*
 	./incfiles > $@
@@ -169,13 +172,16 @@ pdns_recursor_SOURCES += \
 	portsmplexer.cc
 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
 pdns_recursor_LDADD += $(PROTOBUF_LIBS)
 nodist_pdns_recursor_SOURCES = dnsmessage.pb.cc dnsmessage.pb.h
+pdns_recursor.$(OBJEXT): dnsmessage.pb.cc
+endif
 endif
 
 rec_control_SOURCES = \
diff --git a/pdns/recursordist/configure.ac b/pdns/recursordist/configure.ac
index 4210807e75..f67b816f64 100644
--- a/pdns/recursordist/configure.ac
+++ b/pdns/recursordist/configure.ac
@@ -115,7 +115,7 @@ AS_IF([test "x$enable_hardening" != "xno"], [
 
 PDNS_ENABLE_SANITIZERS
 PDNS_ENABLE_MALLOC_TRACE
-PDNS_ENABLE_PROTOBUF
+PDNS_WITH_PROTOBUF
 PDNS_CHECK_PANDOC
 
 AC_SUBST(LIBS)
diff --git a/pdns/recursordist/m4/pdns_enable_protobuf.m4 b/pdns/recursordist/m4/pdns_enable_protobuf.m4
deleted file mode 120000
index 31d73d8732..0000000000
--- a/pdns/recursordist/m4/pdns_enable_protobuf.m4
+++ /dev/null
@@ -1 +0,0 @@
-../../../m4/pdns_enable_protobuf.m4
\ No newline at end of file
diff --git a/pdns/recursordist/m4/pdns_with_protobuf.m4 b/pdns/recursordist/m4/pdns_with_protobuf.m4
new file mode 120000
index 0000000000..bdfe381da6
--- /dev/null
+++ b/pdns/recursordist/m4/pdns_with_protobuf.m4
@@ -0,0 +1 @@
+../../../m4/pdns_with_protobuf.m4
\ No newline at end of file