]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
dnsdist: Protobuf automake fixes
authorPieter Lexis <pieter.lexis@powerdns.com>
Thu, 31 Mar 2016 09:17:33 +0000 (11:17 +0200)
committerPieter Lexis <pieter.lexis@powerdns.com>
Thu, 7 Apr 2016 15:11:17 +0000 (17:11 +0200)
pdns/dnsdistdist/Makefile.am

index 54d74f30907cfb771225106f50bf4aa7f0c2d8fd..33937c9dfb5b88984ec670ae408d8a5664bd38f8 100644 (file)
@@ -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 = \