odin: makefile: fix parallel build

There were two issues with the way the targets are defined.

1. The .%.build target cannot depend on both clean and _init. It works
fine with a single-core build, but when executing it in parallel, the
clean target breaks the _init target. To make it work in parallel the
_init target now directly depends on the clean target.

2. The _set_<xxx> targets have to be executed before the _build_it
target - they cannot be executed at the same time. This has been
reworked to use a dynamically defined targets to avoid creating an extra
wrapper target for each of them.

Signed-off-by: Tomasz Gorochowik <[email protected]>

Author: tgorochowik

ODIN_II/Makefile

@@ -36,19 +36,23 @@ help:
 		large_test		run the complete battery of test before merging changes\n\
 	"
 
-_init:
+_init: clean
 	mkdir -p $(ODIN_BUILD_DIR)
 
 clean:
 	$(RM) -f $(ODIN_BUILD_DIR)/.*.build
 	$(RM) -Rf $(BUILD_DIR)/CMakeCache.txt
 	$(RM) -Rf $(BUILD_DIR)/ODIN_II
 
-_build_it:
+define _build_it_gen
+_build_it_$(1): _set_$(1)
 	cd $(BUILD_DIR) &&\
 	$(BUILDER)
 
-$(ODIN_BUILD_DIR)/.%.build: clean _init
+$(1): _build_it_$(1)
+endef
+
+$(ODIN_BUILD_DIR)/.%.build: _init
 	touch $@
 
 _set_build: $(ODIN_BUILD_DIR)/.regular.build
@@ -71,15 +75,8 @@ _set_clang_tidy: $(ODIN_BUILD_DIR)/.tidy.build
 	cd $(BUILD_DIR) &&\
 	cmake  $(CMAKE_GEN_ARGS) $(CMAKE_ARGS) -DODIN_TIDY=on ..
 
-build: _set_build _build_it
-
-debug: _set_debug _build_it
-
-warn: _set_warn _build_it
-
-gcov: _set_gcov _build_it
-
-clang_tidy: _set_clang_tidy _build_it
+BUILD_IT_TARGETS = build debug warn gcov clang_tidy
+$(foreach  t,$(BUILD_IT_TARGETS), $(eval $(call _build_it_gen,$(t))))
 
 scrub:
 	find SRC/ -type f \( -iname \*.gcno -or -iname \*.gcda -or -iname \*.gcov \) -exec rm -f {} \;