From: W.C.A. Wijngaards Date: Tue, 29 Apr 2025 10:38:41 +0000 (+0200) Subject: - Fix for parallel build of dnstap protoc-c output. X-Git-Tag: release-1.24.0rc1~105 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c253c8367a627151aab5ebbe0bbe6722f0630af6;p=thirdparty%2Funbound.git - Fix for parallel build of dnstap protoc-c output. --- diff --git a/Makefile.in b/Makefile.in index 463cdac28..76ad6bcb9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -449,9 +449,13 @@ dnstap.lo dnstap.o: $(srcdir)/dnstap/dnstap.c config.h dnstap/dnstap_config.h \ $(srcdir)/util/netevent.h $(srcdir)/util/net_help.h \ $(srcdir)/util/locks.h -dnstap/dnstap.pb-c.c dnstap/dnstap.pb-c.h: $(srcdir)/dnstap/dnstap.proto +# Builds both dnstap/dnstap.pb-c.c and dnstap/dnstap.pb-c.h. +# To avoid double-building we split one target out. +dnstap/dnstap.pb-c.c: $(srcdir)/dnstap/dnstap.proto @-if test ! -d dnstap; then $(INSTALL) -d dnstap; fi $(PROTOC_C) --c_out=. --proto_path=$(srcdir) $(srcdir)/dnstap/dnstap.proto +dnstap/dnstap.pb-c.h: dnstap/dnstap.pb-c.c + touch $@ unbound-dnstap-socket$(EXEEXT): $(DNSTAP_SOCKET_OBJ_LINK) $(LINK) -o $@ $(DNSTAP_SOCKET_OBJ_LINK) $(SSLLIB) $(LIBS) diff --git a/doc/Changelog b/doc/Changelog index f92f2f645..68a10be60 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +29 April 2025: Wouter + - Fix for parallel build of dnstap protoc-c output. + 28 April 2025: Yorgos - Merge #1275: Use macros for the fr_check_changed* functions.