~~~WIP~~~ 0.6

Signed-off-by: Omer Caspi <omer.caspi@gmail.com>

Author: omercsp

module.inc.mk

@@ -7,7 +7,7 @@ ECHO := /usr/bin/echo
 MAKEFLAGS := --no-print-directory
 SBS_MODULE_PATH := $(shell pwd)
 SBS_BASE_MAKEFILE := $(firstword $(MAKEFILE_LIST))
-SBS_VERSION := 0.5.0
+SBS_VERSION := 0.6.0
 
 # If no module name is defined use the directory as the name
 SBS_MODULE_NAME := $(MODULE_NAME)
@@ -16,11 +16,9 @@ SBS_MODULE_NAME := $(notdir $(SBS_MODULE_PATH))
 endif
 
 # Start with empty targets, lets see what the module's Makefile has for us
-SBS_EMPTY_TARGET := sbs_empty_target
-$(SBS_EMPTY_TARGET):
+SBS_EMPTY_TGT := sbs_empty_target
+$(SBS_EMPTY_TGT):
 	@true
-SBS_CLEAN_TARGET := $(SBS_EMPTY_TARGET)
-SBS_MAIN_TARGET := $(SBS_EMPTY_TARGET)
 
 ######################### Binary build start #########################
 ifneq ($(MODULE_SRCS),)
@@ -219,10 +217,7 @@ ifneq ($(filter 1,$(MODULE_VERBOSE)),1)
 SBS_Q := @
 endif
 
-# The empty target is added as an ordered dependency so the binary rule
-# will always require *something* to do. This way we can suppress the 'up to date'
-# messages without silencing the entire build output.
-$(SBS_ARTIFACT): $(SBS_OBJS) $(MODULE_EXTERN_OBJS) $(MAKEFILE_LIST) $(MODULE_BIN_DEPS) | $(SBS_EMPTY_TARGET)
+$(SBS_ARTIFACT): $(SBS_OBJS) $(MODULE_EXTERN_OBJS) $(MAKEFILE_LIST) $(MODULE_BIN_DEPS)
 ifneq ($(SBS_BIN_TYPE), $(SBS_NONE_BIN_TYPE))
 	@mkdir -p $(SBS_ARTIFACT_DIR)
 	$(if $(SBS_Q),@$(ECHO) -e "$(SBS_LD_STR)\t$(notdir $@)")
@@ -231,6 +226,8 @@ else
 .PHONY: $(SBS_ARTIFACT)
 endif
 
+SBS_MAIN_TGT := $(SBS_ARTIFACT)
+
 # $1 - source suffix
 # $2 - compiler print string (SBS_CC or CXX)
 # $3 - compiler binary (gcc or g++)
@@ -256,68 +253,84 @@ ifneq ($(MAKECMDGOALS),clean)
 -include $(SBS_OBJS_DEPS)
 endif
 
-SBS_CLEAN_FILES := $(SBS_OBJS) $(SBS_OBJS_DEPS)
+SBS_CLN_FILES := $(SBS_OBJS) $(SBS_OBJS_DEPS)
 ifneq ($(SBS_BIN_TYPE), $(SBS_NONE_BIN_TYPE))
-SBS_CLEAN_FILES += $(SBS_ARTIFACT)
+SBS_CLN_FILES += $(SBS_ARTIFACT)
 endif
-$(SBS_ARTIFACT)_clean:
-	$(SBS_Q)rm -f $(SBS_CLEAN_FILES)
 
-SBS_MAIN_TARGET := $(SBS_ARTIFACT)
-SBS_CLEAN_TARGET := $(SBS_ARTIFACT)_clean
+SBS_CLN_TGT := $(SBS_ARTIFACT)_clean
+$(SBS_CLN_TGT):
+	$(SBS_Q)rm -f $(SBS_CLN_FILES)
 
 endif # None empty target
 ######################### Binary build end #########################
-
-ifneq ($(MODULE_SUB_MODULES),)
-$(MODULE_SUB_MODULES):
-	@$(MAKE) -C $@
-
-SBS_CLEAN_SUFFIX := __clean
-SBS_SUBMODULES_CLEAN := $(addsuffix $(SBS_CLEAN_SUFFIX),$(MODULE_SUB_MODULES))
-$(SBS_SUBMODULES_CLEAN):
-	@$(MAKE) -C $(@:$(SBS_CLEAN_SUFFIX)=) clean
-endif
-
 # Set the default target to 'all'. Make just picks up the first non empty
 # target (or such). Here we make sure we control the make behavior.
 .DEFAULT_GOAL := all
-.PHONY: all clean $(SBS_CLEAN_TARGET)
-.PHONY: $(MODULE_PRE_SUB_MODULES) $(MODULE_SUB_MODULES) $(MODULE_POST_SUB_MODULES) $(SBS_SUBMODULES_CLEAN)
+SBS_ALL_SUB_MODULES := $(MODULE_SUB_MODULES) $(MODULE_PRE_SUB_MODULES) $(MODULE_POST_SUB_MODULES)
 
-SBS_BUILD_ORDER := $(strip $(MODULE_PRE_BUILD) $(MODULE_PRE_SUB_MODULES))
-ifneq ($(SBS_ARTIFACT),)
-SBS_BUILD_ORDER := $(strip $(SBS_BUILD_ORDER) $(strip $(SBS_MODULE_NAME)))
+SBS_BUILD_DEPS := $(strip $(SBS_BASE_MAKEFILE) $(MODULE_EXT_DEPS))
+
+# Build dependencies rules
+BUILD_TITLE_TGT := SBS_BUILD_TITLE
+$(BUILD_TITLE_TGT):
+	@$(ECHO) "Building $(SBS_MODULE_NAME)"
+
+.PHONY: all $(SBS_ALL_SUB_MODULES) $(BUILD_TITLE_TGT)
+# $1 - modules list
+# $2 - 1 if it's a SBS target 0 if external pre/post build target
+# Add the moudules to the dependencies list after rule is set, so following rules depend on them
+define GenSubModuleRule
+ifneq ($1,)
+$1: $$(SBS_BUILD_DEPS)
+ifeq ($2,1)
+	@$(MAKE) -C $$@
 endif
-SBS_BUILD_ORDER := $(strip $(SBS_BUILD_ORDER) $(strip $(MODULE_SUB_MODULES)))
-SBS_BUILD_ORDER := $(strip $(SBS_BUILD_ORDER) $(strip $(MODULE_POST_BUILD) $(MODULE_POST_SUB_MODULES)))
-ifneq ($(SBS_BUILD_ORDER),$(SBS_MODULE_NAME))
-ifneq ($(SBS_BUILD_ORDER),)
-SBS_ORDER_STR := " order=[$(SBS_BUILD_ORDER)]"
+SBS_BUILD_DEPS += $1
+endif
+endef
+
+$(eval $(call GenSubModuleRule,$(MODULE_PRE_BUILD),0))
+$(eval $(call GenSubModuleRule,$(MODULE_PRE_SUB_MODULES),1))
+$(SBS_MAIN_TGT): $(SBS_BUILD_DEPS)
+$(eval $(call GenSubModuleRule,$(MODULE_SUB_MODULES),1))
+SBS_BUILD_DEPS += $(SBS_MAIN_TGT)
+$(eval $(call GenSubModuleRule,$(MODULE_POST_SUB_MODULES),1))
+$(eval $(call GenSubModuleRule,$(MODULE_POST_BUILD),0))
+
+all: $(SBS_BUILD_DEPS)
+	@true
+$(SBS_BUILD_DEPS) all: $(BUILD_TITLE_TGT)
+
+# Clean dependencies rules
+CLN_TITLE_TGT := SBS_CLEAN_TITLE
+$(CLN_TITLE_TGT):
+	@$(ECHO) "Cleaning $(SBS_MODULE_NAME)"
+
+ifneq ($(MODULE_PRE_CLN),)
+clean: $(MODULE_PRE_CLN)
 endif
+
+SBS_CLN_TGT := clean
+SBS_CLN_SUFFIX := __clean
+SBS_SUB_MODULES_CLN_TGTS := $(addsuffix $(SBS_CLN_SUFFIX),$(SBS_ALL_SUB_MODULES))
+.PHONY: $(SBS_SUB_MODULES_CLN_TGTS) $(SBS_CLN_TGT) $(CLN_TITLE_TGT)
+ifneq ($(SBS_ALL_SUB_MODULES),)
+$(SBS_SUB_MODULES_CLN_TGTS):
+	@$(MAKE) -C $(@:$(SBS_CLN_SUFFIX)=) $(SBS_CLN_TGT)
 endif
 
+ifneq ($(MODULE_POST_CLN),)
+$(MODULE_POST_CLN): $(MODULE_PRE_CLN) $(SBS_CLN_TGT) $(SBS_SUB_MODULES_CLN_TGTS)
+endif
 
-define SbsForEach
-	for t in $(1); do $(2) $$t $(3) || exit $$? ; done
-endef
+SBS_ALL_CLN_TGTS := $(MODULE_PRE_CLN) $(SBS_CLN_TGT) $(SBS_SUB_MODULES_CLN_TGTS) $(MODULE_POST_CLN)
 
-all:
-	@echo "Building '$(SBS_MODULE_NAME)'$(SBS_ORDER_STR)"
-	@$(call SbsForEach,$(MODULE_PRE_BUILD),$(MAKE) -f $(SBS_BASE_MAKEFILE))
-	@$(call SbsForEach,$(MODULE_PRE_SUB_MODULES),$(MAKE) -C)
-	@$(MAKE) -f $(SBS_BASE_MAKEFILE) $(SBS_MAIN_TARGET) $(MODULE_SUB_MODULES)
-	@$(call SbsForEach,$(MODULE_POST_SUB_MODULES),$(MAKE) -C)
-	@$(call SbsForEach,$(MODULE_POST_BUILD),$(MAKE) -f $(SBS_BASE_MAKEFILE))
-
-clean:
-	@echo "Cleaning '$(SBS_MODULE_NAME)'$(SBS_ORDER_STR)"
-	@$(call SbsForEach,$(MODULE_PRE_CLEAN),$(MAKE) -f $(SBS_BASE_MAKEFILE))
-	@$(call SbsForEach,$(MODULE_PRE_SUB_MODULES),$(MAKE) -C, clean)
-	@$(MAKE) -f $(SBS_BASE_MAKEFILE) $(SBS_CLEAN_TARGET) $(SBS_SUBMODULES_CLEAN)
-	@$(call SbsForEach,$(MODULE_POST_SUB_MODULES),$(MAKE) -C, clean)
-	@$(call SbsForEach,$(MODULE_POST_CLEAN),$(MAKE) -f $(SBS_BASE_MAKEFILE))
+clean: $(SBS_ALL_CLN_TGTS)
+	@true
+$(SBS_ALL_CLN_TGTS): $(CLN_TITLE_TGT)
 
+# Debug targets
 sbs_version:
 	@echo SBS version $(SBS_VERSION)
 
@@ -384,11 +397,11 @@ sbs_dump_module_submodules:
 
 sbs_dump_module_build_steps:
 	@$(call SbsDbgTitle,Build Steps,\
-		$(MODULE_PRE_BUILD) $(MODULE_POST_BUILD) $(MODULE_PRE_CLEAN) $(MODULE_POST_CLEAN))
+		$(MODULE_PRE_BUILD) $(MODULE_POST_BUILD) $(MODULE_PRE_CLN) $(MODULE_POST_CLN))
 	@$(call SbsDbgVar,MODULE_PRE_BUILD)
 	@$(call SbsDbgVar,MODULE_POST_BUILD)
-	@$(call SbsDbgVar,MODULE_PRE_CLEAN)
-	@$(call SbsDbgVar,MODULE_POST_CLEAN)
+	@$(call SbsDbgVar,MODULE_PRE_CLN)
+	@$(call SbsDbgVar,MODULE_POST_CLN)
 
 sbs_dump_module: sbs_dump_module_vars sbs_dump_module_submodules sbs_dump_module_build_steps
 
@@ -402,8 +415,8 @@ sbs_dump_internals:
 	@$(call SbsDbgTitle,Build Settings,Always)
 	@$(call SbsDbgVar,SBS_BIN_TYPE)
 	@$(call SbsDbgVar,SBS_FLAV)
-	@$(call SbsDbgVar,SBS_MAIN_TARGET)
-	@$(call SbsDbgVar,SBS_CLEAN_TARGET)
+	@$(call SbsDbgVar,SBS_MAIN_TGT)
+	@$(call SbsDbgVar,SBS_CLN_TGT)
 	@$(call SbsDbgVar,SBS_SRCS)
 	@$(call SbsDbgVar,SBS_CDEFS)
 	@$(call SbsDbgVar,SBS_CWARNS)