Merge commit 'd2c1036a42881d413ec97203ede92a69f8cd218f' into thread-next

diff --cc nest/Makefile
index 39617350146084a2b00dbd3f4b2aa33c245e2ae9,a2e30ee2ca53138b525e5671ad89b3210b7f707b..5b27da0c1ad989b5531ac09087e57e6c2623c52d
--- 1/nest/Makefile
--- 2/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)

diff --cc proto/bfd/Makefile
Simple merge

diff --cc sysdep/unix/Makefile
Simple merge