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

diff --cc nest/Makefile
index 5b27da0c1ad989b5531ac09087e57e6c2623c52d,163a1199462e6772aeec5c52f1abd7bd11317134..1a71c2fbdaa2bd93d60ddaa13458dee3ec5dbb62
--- 1/nest/Makefile
--- 2/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 "}" >> $@
  
 -tests_src := a-set_test.c a-path_test.c
+ prepare: $(o)proto-build.c
+ 
 +tests_src :=
  tests_targets := $(tests_targets) $(tests-target-files)
  tests_objs := $(tests_objs) $(src-o-files)