From: Maria Matejka <mq@ucw.cz>
Date: Fri, 9 Sep 2022 11:15:50 +0000 (+0200)
Subject: Merge commit 'd2c1036a42881d413ec97203ede92a69f8cd218f' into thread-next
X-Git-Tag: v3.0-alpha1~143
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26bfd4cc0350ef3249b0283d7fa9977cb13a5e55;p=thirdparty%2Fbird.git

Merge commit 'd2c1036a42881d413ec97203ede92a69f8cd218f' into thread-next
---

26bfd4cc0350ef3249b0283d7fa9977cb13a5e55
diff --cc nest/Makefile
index 396173501,a2e30ee2c..5b27da0c1
--- a/nest/Makefile
+++ b/nest/Makefile
@@@ -2,16 -2,11 +2,15 @@@ src := cli.c cmds.c iface.c locks.c nei
  obj := $(src-o-files)
  $(all-daemon)
  $(cf-local)
- $(call proto-build,dev_build)
  
- $(proto-build-c): $(lastword $(MAKEFILE_LIST))
+ $(objdir)/nest/proto-build.c: $(lastword $(MAKEFILE_LIST))
  	$(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 %(void);' >> $@;,$(PROTO_BUILD))
++	$(Q)$(patsubst %,echo 'void %_build(void);' >> $@;,$(PROTO_BUILD))
 +	$(Q)echo "void protos_build_gen(void) {" >> $@
- 	$(Q)$(patsubst %,echo '  %();'>>$@;,$(PROTO_BUILD))
++	$(Q)$(patsubst %,echo '  %_build();'>>$@;,$(PROTO_BUILD))
 +	$(Q)echo "}" >> $@
  
 -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)