From 23f3dd5cfbe8681b4e71c8d7345bdeaafc86e077 Mon Sep 17 00:00:00 2001 From: Ondrej Zajicek Date: Wed, 1 Feb 2023 16:15:13 +0100 Subject: [PATCH] Nest: Minor cleanup in buildsystem There ware missing dependencies for proto-build.c generation, which sometimes lead to failed builds, and ignores changes in the set of built protocols. Fix that, and also improve formatting of proto-build.c --- nest/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nest/Makefile b/nest/Makefile index a2e30ee2..05a2a9c0 100644 --- a/nest/Makefile +++ b/nest/Makefile @@ -3,9 +3,11 @@ 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 "\n $(patsubst %, void %_build(void);\n,$(PROTO_BUILD))\nvoid protos_build_gen(void) {\n $(patsubst %, %_build();\n,$(PROTO_BUILD))}" > $@ + +prepare: $(o)proto-build.c tests_src := a-set_test.c a-path_test.c tests_targets := $(tests_targets) $(tests-target-files)