Better organization of make targets

The main thing to keep in mind is that only one build command
should (must?) be executed in a cmake-generated build directory.
Otherwise, parallelly running make commands (e.g., ninjas) may each
other's artifacts (e.g., .ninja_deps).

JerryScript-DCO-1.0-Signed-off-by: Akos Kiss [email protected]

Author: akosthekiss

Makefile

@@ -245,35 +245,41 @@ $(foreach __SYSTEM,$(NATIVE_SYSTEM) $(MCU_SYSTEMS), \
 
 # Make rule macro to preform cppcheck on a build target.
 #
-# $(1) - build target
+# $(1) - rule to define in the current Makefile
 # $(2) - system name
+# $(3) - target(s) to check
 define CPPCHECK_RULE
-.PHONY: check-cpp.$(1)
-check-cpp.$(1): $$(BUILD_DIR)/$(2)/Makefile prerequisites
-	$$(Q)+$$(call SHLOG,$$(BUILD_COMMAND) -C $$(BUILD_DIR)/$(2) cppcheck.$(1),$$(BUILD_DIR)/$(2)/cppcheck.$(1).log,cppcheck run)
+.PHONY: $(1)
+$(1): $$(BUILD_DIR)/$(2)/Makefile prerequisites
+	$$(Q) $$(call SHLOG,$$(BUILD_COMMAND) -C $$(BUILD_DIR)/$(2) $(3),$$(BUILD_DIR)/$(2)/$(1).log,cppcheck run)
 endef
 
 $(foreach __TARGET,$(JERRY_NATIVE_TARGETS), \
-  $(eval $(call CPPCHECK_RULE,$(__TARGET),$(NATIVE_SYSTEM))))
+  $(eval $(call CPPCHECK_RULE,check-cpp.$(__TARGET),$(NATIVE_SYSTEM),cppcheck.$(__TARGET))))
+
+$(eval $(call CPPCHECK_RULE,check-cpp.$(NATIVE_SYSTEM),$(NATIVE_SYSTEM),$(foreach __TARGET,$(JERRY_NATIVE_TARGETS),cppcheck.$(__TARGET))))
 
 $(foreach __TARGET,$(JERRY_STM32F3_TARGETS), \
-  $(eval $(call CPPCHECK_RULE,$(__TARGET),stm32f3)))
+  $(eval $(call CPPCHECK_RULE,check-cpp.$(__TARGET),stm32f3,cppcheck.$(__TARGET))))
+
+$(eval $(call CPPCHECK_RULE,check-cpp.mcu_stm32f3,stm32f3,$(foreach __TARGET,$(JERRY_STM32F3_TARGETS),cppcheck.$(__TARGET))))
 
 $(foreach __TARGET,$(JERRY_STM32F4_TARGETS), \
-  $(eval $(call CPPCHECK_RULE,$(__TARGET),stm32f4)))
+  $(eval $(call CPPCHECK_RULE,check-cpp.$(__TARGET),stm32f4,cppcheck.$(__TARGET))))
+
+$(eval $(call CPPCHECK_RULE,check-cpp.mcu_stm32f4,stm32f4,$(foreach __TARGET,$(JERRY_STM32F4_TARGETS),cppcheck.$(__TARGET))))
 
-$(eval $(call CPPCHECK_RULE,unittests,$(NATIVE_SYSTEM)))
+$(eval $(call CPPCHECK_RULE,check-cpp.unittests,$(NATIVE_SYSTEM),cppcheck.unittests))
 
 # Make rule macro to build a/some target(s) and copy out the result(s).
 #
-# $(1) - target to define in the current Makefile
+# $(1) - rule to define in the current Makefile
 # $(2) - name of the system which has a cmake-generated Makefile
 # $(3) - target(s) to build with the cmake-generated Makefile
-# $(4) - description of the target (printed if make fails)
 define BUILD_RULE
 .PHONY: $(1)
 $(1): $$(BUILD_DIR)/$(2)/Makefile prerequisites
-	$$(Q) $$(call SHLOG,$$(BUILD_COMMAND) -C $$(BUILD_DIR)/$(2) $(3),$$(BUILD_DIR)/$(2)/$(1).log,$(4))
+	$$(Q) $$(call SHLOG,$$(BUILD_COMMAND) -C $$(BUILD_DIR)/$(2) $(3),$$(BUILD_DIR)/$(2)/$(1).log,Build)
 	$$(Q) $$(foreach __TARGET,$(3), \
             mkdir -p $$(OUT_DIR)/$$(__TARGET); \
             $$(if $$(findstring unittests,$$(__TARGET)), \
@@ -288,21 +294,21 @@ $(1): $$(BUILD_DIR)/$(2)/Makefile prerequisites
 endef
 
 $(foreach __TARGET,$(JERRY_NATIVE_TARGETS), \
-  $(eval $(call BUILD_RULE,$(__TARGET),$(NATIVE_SYSTEM),$(__TARGET),Build)))
+  $(eval $(call BUILD_RULE,$(__TARGET),$(NATIVE_SYSTEM),$(__TARGET))))
 
-$(eval $(call BUILD_RULE,build-all.$(NATIVE_SYSTEM),$(NATIVE_SYSTEM),$(JERRY_NATIVE_TARGETS),Build))
+$(eval $(call BUILD_RULE,build.$(NATIVE_SYSTEM),$(NATIVE_SYSTEM),$(JERRY_NATIVE_TARGETS)))
 
 $(foreach __TARGET,$(JERRY_STM32F3_TARGETS), \
-  $(eval $(call BUILD_RULE,$(__TARGET),stm32f3,$(__TARGET).bin,Build)))
+  $(eval $(call BUILD_RULE,$(__TARGET),stm32f3,$(__TARGET).bin)))
 
-$(eval $(call BUILD_RULE,build-all.mcu_stm32f3,stm32f3,$(patsubst %,%.bin,$(JERRY_STM32F3_TARGETS)),Build))
+$(eval $(call BUILD_RULE,build.mcu_stm32f3,stm32f3,$(patsubst %,%.bin,$(JERRY_STM32F3_TARGETS))))
 
 $(foreach __TARGET,$(JERRY_STM32F4_TARGETS), \
-  $(eval $(call BUILD_RULE,$(__TARGET),stm32f4,$(__TARGET).bin,Build)))
+  $(eval $(call BUILD_RULE,$(__TARGET),stm32f4,$(__TARGET).bin)))
 
-$(eval $(call BUILD_RULE,build-all.mcu_stm32f4,stm32f4,$(patsubst %,%.bin,$(JERRY_STM32F4_TARGETS)),Build))
+$(eval $(call BUILD_RULE,build.mcu_stm32f4,stm32f4,$(patsubst %,%.bin,$(JERRY_STM32F4_TARGETS))))
 
-$(eval $(call BUILD_RULE,unittests,$(NATIVE_SYSTEM),unittests,Build))
+$(eval $(call BUILD_RULE,unittests,$(NATIVE_SYSTEM),unittests))
 
 # Make rule macro to test a build target with a test suite.
 #
@@ -316,7 +322,7 @@ $(eval $(call BUILD_RULE,unittests,$(NATIVE_SYSTEM),unittests,Build))
 # others output. This manifests mostly in the repeated builds of jerry-libc and
 # its non-deterministically vanishing .a files.
 define JSTEST_RULE
-test-js.$(1).$(2): build-all.$$(NATIVE_SYSTEM)
+test-js.$(1).$(2): build.$$(NATIVE_SYSTEM)
 	$$(Q) $$(call SHLOG,./tools/runners/run-test-suite.sh \
           $$(OUT_DIR)/$(1)/jerry \
           $$(OUT_DIR)/$(1)/check/$(2) \
@@ -346,10 +352,10 @@ check-vera: prerequisites
 	$(Q) ./tools/check-vera.sh
 
 .PHONY: check-cpp
-check-cpp: $(patsubst %,check-cpp.%,$(JERRY_NATIVE_TARGETS) $(JERRY_STM32F3_TARGETS) $(JERRY_STM32F4_TARGETS) unittests)
+check-cpp: check-cpp.$(NATIVE_SYSTEM) $(foreach __SYSTEM,$(MCU_SYSTEMS),check-cpp.mcu_$(__SYSTEM)) check-cpp.unittests
 
 .PHONY: build
-build: $(patsubst %,build-all.%,$(NATIVE_SYSTEM) $(foreach __SYSTEM,$(MCU_SYSTEMS),mcu_$(__SYSTEM)))
+build: build.$(NATIVE_SYSTEM) $(foreach __SYSTEM,$(MCU_SYSTEMS),build.mcu_$(__SYSTEM))
 
 .PHONY: test-unit
 test-unit: unittests
@@ -371,11 +377,13 @@ test-js-precommit: \
             test-js.$(__TARGET).$(firstword $(subst :, ,$(__SUITE)))))
 
 .PHONY: precommit
-precommit: 
-	$(Q) $(MAKE) --no-print-directory clean
-	$(Q) echo "Running checks, building engine & unit tests..."
-	$(Q)+$(MAKE) --no-print-directory check-signed-off check-vera check-cpp build unittests
-	$(Q) echo "...running unit tests..."
+precommit: prerequisites
+	$(Q)+$(MAKE) --no-print-directory clean
+	$(Q) echo "Running checks..."
+	$(Q)+$(MAKE) --no-print-directory check-signed-off check-vera check-cpp
+	$(Q) echo "...building engine..."
+	$(Q)+$(MAKE) --no-print-directory build
+	$(Q) echo "...building and running unit tests..."
 	$(Q)+$(MAKE) --no-print-directory test-unit
 	$(Q) echo "...running precommit JS tests..."
 	$(Q)+$(MAKE) --no-print-directory test-js-precommit