From: Maria Matejka <mq@ucw.cz>
Date: Fri, 14 Apr 2023 09:37:23 +0000 (+0200)
Subject: Merge commit '0851fcde' into thread-next-iface
X-Git-Tag: v3.0-alpha1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb978f3a8357e53fcfeede1caf355e80d782ca6a;p=thirdparty%2Fbird.git

Merge commit '0851fcde' into thread-next-iface
---

eb978f3a8357e53fcfeede1caf355e80d782ca6a
diff --cc nest/Makefile
index 5b27da0c1,163a11994..1a71c2fbd
--- a/nest/Makefile
+++ b/nest/Makefile
@@@ -3,14 -3,12 +3,16 @@@ obj := $(src-o-files
  $(all-daemon)
  $(cf-local)
  
- $(objdir)/nest/proto-build.c: $(lastword $(MAKEFILE_LIST))
+ $(o)proto-build.c: Makefile $(lastword $(MAKEFILE_LIST)) $(objdir)/.dir-stamp
  	$(E)echo GEN $@
 -	$(Q)echo "$(patsubst %,void %_build(void); ,$(PROTO_BUILD)) void protos_build_gen(void) { $(patsubst %,  %_build(); ,$(PROTO_BUILD))}" > $@
 +	$(Q)echo "#include \"lib/birdlib.h\"" > $@
 +	$(Q)$(patsubst %,echo 'void %_build(void);' >> $@;,$(PROTO_BUILD))
 +	$(Q)echo "void protos_build_gen(void) {" >> $@
 +	$(Q)$(patsubst %,echo '  %_build();'>>$@;,$(PROTO_BUILD))
 +	$(Q)echo "}" >> $@
  
+ prepare: $(o)proto-build.c
+ 
 -tests_src := a-set_test.c a-path_test.c
 +tests_src :=
  tests_targets := $(tests_targets) $(tests-target-files)
  tests_objs := $(tests_objs) $(src-o-files)