Simplified the protocol hookup code in Makefiles

14 files changed, 3 insertions, 26 deletions

diff --git a/Makefile.in b/Makefile.in
index 0d55807b..fa534872 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,6 +26,7 @@ INSTALL_DATA=@INSTALL_DATA@
 client=$(addprefix $(exedir)/,@CLIENT@)
 daemon=$(exedir)/bird
 protocols=@protocols@
+PROTO_BUILD := $(protocols) dev kif krt
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -82,9 +83,6 @@ conf-lex-targets := $(addprefix $(objdir)/conf/,cf-lex.o)
 conf-y-targets := $(addprefix $(objdir)/conf/,cf-parse.y keywords.h commands.h)
 cf-local = $(conf-y-targets): $(s)config.Y
 
-# nest/Makefile declarations needed for all other modules
-proto-build-c := $(addprefix $(objdir)/nest/,proto-build.c)
-
 src-o-files = $(patsubst %.c,$(o)%.o,$(src))
 tests-target-files = $(patsubst %.c,$(o)%,$(tests_src))
 
@@ -98,13 +96,6 @@ else
   o = $(patsubst $(srcdir)%,$(objdir)%,$(s))
 endif
 
-define proto-build_in =
-PROTO_BUILD += $(1)
-$(proto-build-c): $(lastword $(MAKEFILE_LIST))
-endef
-
-proto-build = $(eval $(call proto-build_in,$(1)))
-
 define clean_in =
 clean::
 	rm -f $(addprefix $(o),$(1))
diff --git a/nest/Makefile b/nest/Makefile
index 7d451ba4..a2e30ee2 100644
--- a/nest/Makefile
+++ b/nest/Makefile
@@ -2,11 +2,10 @@ src := a-path.c a-set.c cli.c cmds.c iface.c locks.c neighbor.c password.c proto
 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 %(void); ,$(PROTO_BUILD)) void protos_build_gen(void) { $(patsubst %,  %(); ,$(PROTO_BUILD))}" > $@
+	$(Q)echo "$(patsubst %,void %_build(void); ,$(PROTO_BUILD)) void protos_build_gen(void) { $(patsubst %,  %_build(); ,$(PROTO_BUILD))}" > $@
 
 tests_src := a-set_test.c a-path_test.c
 tests_targets := $(tests_targets) $(tests-target-files)
diff --git a/proto/babel/Makefile b/proto/babel/Makefile
index ae6aeaf2..06b58e95 100644
--- a/proto/babel/Makefile
+++ b/proto/babel/Makefile
@@ -2,6 +2,5 @@ src := babel.c packets.c
 obj := $(src-o-files)
 $(all-daemon)
 $(cf-local)
-$(call proto-build,babel_build)
 
 tests_objs := $(tests_objs) $(src-o-files)
diff --git a/proto/bfd/Makefile b/proto/bfd/Makefile
index dbdc0a09..d9aecfa9 100644
--- a/proto/bfd/Makefile
+++ b/proto/bfd/Makefile
@@ -2,6 +2,5 @@ src := bfd.c io.c packets.c
 obj := $(src-o-files)
 $(all-daemon)
 $(cf-local)
-$(call proto-build,bfd_build)
 
 tests_objs := $(tests_objs) $(src-o-files)
diff --git a/proto/bgp/Makefile b/proto/bgp/Makefile
index 2a4cc99c..f6a38678 100644
--- a/proto/bgp/Makefile
+++ b/proto/bgp/Makefile
@@ -2,6 +2,5 @@ src := attrs.c bgp.c packets.c
 obj := $(src-o-files)
 $(all-daemon)
 $(cf-local)
-$(call proto-build,bgp_build)
 
 tests_objs := $(tests_objs) $(src-o-files)
diff --git a/proto/mrt/Makefile b/proto/mrt/Makefile
index 000e1c1c..8cd44ac1 100644
--- a/proto/mrt/Makefile
+++ b/proto/mrt/Makefile
@@ -2,6 +2,5 @@ src := mrt.c
 obj := $(src-o-files)
 $(all-daemon)
 $(cf-local)
-$(call proto-build,mrt_build)
 
 tests_objs := $(tests_objs) $(src-o-files)
diff --git a/proto/ospf/Makefile b/proto/ospf/Makefile
index 85664543..015f394a 100644
--- a/proto/ospf/Makefile
+++ b/proto/ospf/Makefile
@@ -2,6 +2,5 @@ src := dbdes.c hello.c iface.c lsack.c lsalib.c lsreq.c lsupd.c neighbor.c ospf.
 obj := $(src-o-files)
 $(all-daemon)
 $(cf-local)
-$(call proto-build,ospf_build)
 
 tests_objs := $(tests_objs) $(src-o-files)
diff --git a/proto/perf/Makefile b/proto/perf/Makefile
index 42051f43..7877fb19 100644
--- a/proto/perf/Makefile
+++ b/proto/perf/Makefile
@@ -2,6 +2,5 @@ src := perf.c
 obj := $(src-o-files)
 $(all-daemon)
 $(cf-local)
-$(call proto-build,perf_build)
 
 tests_objs := $(tests_objs) $(src-o-files)
diff --git a/proto/pipe/Makefile b/proto/pipe/Makefile
index ba66027f..0d68db4c 100644
--- a/proto/pipe/Makefile
+++ b/proto/pipe/Makefile
@@ -2,6 +2,5 @@ src := pipe.c
 obj := $(src-o-files)
 $(all-daemon)
 $(cf-local)
-$(call proto-build,pipe_build)
 
 tests_objs := $(tests_objs) $(src-o-files)
diff --git a/proto/radv/Makefile b/proto/radv/Makefile
index 4780bee3..5c56fbf3 100644
--- a/proto/radv/Makefile
+++ b/proto/radv/Makefile
@@ -2,6 +2,5 @@ src := packets.c radv.c
 obj := $(src-o-files)
 $(all-daemon)
 $(cf-local)
-$(call proto-build,radv_build)
 
 tests_objs := $(tests_objs) $(src-o-files)
diff --git a/proto/rip/Makefile b/proto/rip/Makefile
index b9ff62d6..f4a6fa72 100644
--- a/proto/rip/Makefile
+++ b/proto/rip/Makefile
@@ -2,6 +2,5 @@ src := packets.c rip.c
 obj := $(src-o-files)
 $(all-daemon)
 $(cf-local)
-$(call proto-build,rip_build)
 
 tests_objs := $(tests_objs) $(src-o-files)
diff --git a/proto/rpki/Makefile b/proto/rpki/Makefile
index 8e3a2761..0f60b2a0 100644
--- a/proto/rpki/Makefile
+++ b/proto/rpki/Makefile
@@ -2,6 +2,5 @@ src := rpki.c packets.c tcp_transport.c ssh_transport.c transport.c
 obj := $(src-o-files)
 $(all-daemon)
 $(cf-local)
-$(call proto-build,rpki_build)
 
 tests_objs := $(tests_objs) $(src-o-files)
diff --git a/proto/static/Makefile b/proto/static/Makefile
index 26aed31f..de6e819b 100644
--- a/proto/static/Makefile
+++ b/proto/static/Makefile
@@ -2,6 +2,5 @@ src := static.c
 obj := $(src-o-files)
 $(all-daemon)
 $(cf-local)
-$(call proto-build,static_build)
 
 tests_objs := $(tests_objs) $(src-o-files)
diff --git a/sysdep/unix/Makefile b/sysdep/unix/Makefile
index 51ab98a9..d0d36b5f 100644
--- a/sysdep/unix/Makefile
+++ b/sysdep/unix/Makefile
@@ -2,8 +2,6 @@ src := alloc.c io.c krt.c log.c main.c random.c
 obj := $(src-o-files)
 $(all-daemon)
 $(cf-local)
-$(call proto-build,kif_build)
-$(call proto-build,krt_build)
 $(conf-y-targets): $(s)krt.Y
 
 src := $(filter-out main.c, $(src))