Fixed build in subdirectories

[omk.git] / snippets / base

diff --git a/snippets/base b/snippets/base
index 31a1929722208dae547f5c610c831700de9abadf..37f6d8a0a7af07ea970946e5693b4ad3e8eff856 100644 (file)
--- a/snippets/base
+++ b/snippets/base
@@ -33,7 +33,7 @@ ifndef OUTPUT_DIR
 OUTPUT_DIR := $(MAKERULES_DIR)
 endif
 
-.PHONY: all default check-make-ver omkize
+.PHONY: all default check-make-ver omkize prepare build-pseudo-pass
 
 ifdef W
   ifeq ("$(origin W)", "command line")
@@ -45,8 +45,19 @@ ifndef OMK_WHOLE_TREE
 endif
 
 ifneq ($(OMK_WHOLE_TREE),1)
-all: check-make-ver default
+  ifndef omk_prereq_checked
+  omk_checks=check-make-ver check-dir
+  export omk_prereq_checked=1
+  endif
+all: build-pseudo-pass
+
+prepare: $(omk_checks) prepare-pass
+build-pseudo-pass: prepare
+       +@echo "make[omk]: build"
+       @$(MAKE) -C $(MAKERULES_DIR) -f Makefile.rules build
        @echo "Compilation finished"
+
+prepare-pass: $(omk_checks)
 else
 # Run make in the top-level directory
 all:
@@ -145,6 +156,25 @@ else
   QUIET_CMD_ECHO = echo
 endif
 
+# Convenient variables
+comma   := ,
+squote  := '
+#'
+empty   :=
+space   := $(empty) $(empty)
+
+###
+# Escape single quote for use in echo statements
+escsq = $(subst $(squote),'\$(squote)',$1)
+
+###
+# Strip/replace OUTPUT_DIR from/in the argument
+strip_out = $(patsubst $(OUTPUT_DIR)/%,%,$(1))
+repl_out  = $(patsubst $(OUTPUT_DIR)/%,$$(OUTPUT_DIR)/%,$(1))
+
+.PHONY: FORCE
+
+
 MAKEFILE_OMK=Makefile.omk
 # All subdirectories (even linked ones) containing Makefile.omk
 # Usage in Makefile.omk: SUBDIRS = $(ALL_OMK_SUBDIRS)
@@ -161,6 +191,7 @@ endif
 OMK_INCLUDED := 1
 endif
 
+
 check-make-ver:
        @GOOD_MAKE_VERSION=`echo $(MAKE_VERSION) | sed -n -e 's/^[4-9]\..*\|^3\.9[0-9].*\|^3\.8[1-9].*/y/p'` ; \
        if [ x$$GOOD_MAKE_VERSION != xy ] ; then \
@@ -175,7 +206,7 @@ distclean dist-clean:
 # Common OMK templates
 # ====================
 
-# Syntax: $(call mkdir,<dir name>)
+# Syntax: $(call mkdir_def,<dir name>)
 define mkdir_def
        [ -d $(1) ] || mkdir -p $(1) || exit 1
 endef
@@ -193,20 +224,26 @@ SUBDIR_MAKEFILE=$(SOURCES_DIR)/$(3)/Makefile
 SOURCESDIR_MAKEFILE=$(SOURCES_DIR)/Makefile
 endif
 
+BUILD_DIR_NAME = _build
+COMPILED_DIR_NAME = _compiled
+
+BUILD_OMK_DIR := $(OUTPUT_DIR)/$(BUILD_DIR_NAME)/omk
+OMK_WORK_DIR := $(BUILD_OMK_DIR)$(RELATIVE_DIR:%=/%)
+
+check-dir::
+       @$(call mkdir_def,$(BUILD_OMK_DIR))
+
 pass = $(strip $(1))
 
 # Call a pass in a subdirectory
-# Usage: $(call omk_pass_subdir_template,<pass name>,<build dir>,<subdir>)
+# Usage: $(call omk_pass_subdir_template,<pass name>,<subdir>)
 define omk_pass_subdir_template
-.PHONY: $(pass)-$(3)-subdir
-$(pass)-submakes: $(pass)-$(3)-subdir
-$(pass)-$(3)-subdir:
-       @$(call mkdir_def,$(2)/$(3))
-       +@$(MAKE) SOURCES_DIR=$(SOURCES_DIR)/$(3) $(NO_PRINT_DIRECTORY) \
-               RELATIVE_DIR=$(RELATIVE_PREFIX)$(3) -C $(2)/$(3) \
-               -f $(SUBDIR_MAKEFILE) $(pass)-submakes
-# In subdirectories we can call submakes directly since passes are
-# already searialized on the toplevel make.
+.PHONY: $(pass)-$(2)-subdir
+$(pass)-subdirs: $(pass)-$(2)-subdir
+$(pass)-$(2)-subdir:
+       +@$(MAKE) SOURCES_DIR=$(SOURCES_DIR)/$(2) $(NO_PRINT_DIRECTORY) \
+               RELATIVE_DIR=$(RELATIVE_PREFIX)$(2) -C $(2) \
+               -f $(SUBDIR_MAKEFILE) $(pass)
 endef
 
 ifdef OMK_TESTSROOT
@@ -222,35 +259,27 @@ extra-rules-$(1):
                SOURCES_DIR=$(SOURCES_DIR)/$(1) RELATIVE_DIR=$(RELATIVE_PREFIX)$(1) -C $(SOURCES_DIR)/$(1)
 endef
 
-.PHONY: extra-rules-subdirs
+.PHONY: extra-rules-subdirs mkdir-omk-work
 extra-rules-subdirs:
 
 $(foreach subdir,$(EXTRA_RULES_SUBDIRS),$(eval $(call extra_rules_subdir_template,$(subdir))))
 
-# Usage: $(call omk_pass_template,<pass name>,<build dir>,[<local make flags>],[<local enable condition>])
+# Usage: $(call omk_pass_template,<pass name>)
 define omk_pass_template
-.PHONY: $(pass) $(pass)-local $(pass)-check $(pass)-submakes
-$(foreach subdir,$(SUBDIRS),$(eval $(call omk_pass_subdir_template,$(pass),$(2),$(subdir))))
-$(pass):
-# Submakes have to be called this way and not as dependecies for pass
-# serialization to work
-       +@$(MAKE) SOURCES_DIR=$(SOURCES_DIR) $(NO_PRINT_DIRECTORY) \
-               RELATIVE_DIR=$(RELATIVE_DIR) \
-               -f $(SOURCESDIR_MAKEFILE) $(pass)-submakes
-$(pass)-submakes:
-       @true                   # Do not emit "nothing to be done" messages
-
-ifneq ($(4)$($(pass)_HOOKS),)
-$(pass)-submakes: $(pass)-this-dir
-$(pass)-this-dir: $(foreach subdir,$(SUBDIRS),$(pass)-$(subdir)-subdir)
+.PHONY: $(pass) $(pass)-local $(pass)-msg $(pass)-subdirs
+$(pass): $(pass)-local
+$(pass)-local: $(pass)-subdirs $(pass)-msg mkdir-omk-work
+$(foreach subdir,$(SUBDIRS),$(call omk_pass_subdir_template,$(pass),$(subdir)))
+
+$(pass)-msg: $(pass)-subdirs
        +@echo "make[omk]: $(pass) in $(RELATIVE_DIR)"
-       @$(call mkdir_def,$(2))
-       +@$(MAKE) $(NO_PRINT_DIRECTORY) SOURCES_DIR=$(SOURCES_DIR) RELATIVE_DIR=$(RELATIVE_DIR) -C $(2) \
-               -f $(SOURCESDIR_MAKEFILE) $(3) $(check-target) $(1:%=%-local)
-$(pass)-local: $($(pass)_HOOKS)
-endif
 endef
 
+mkdir-omk-work:
+       @$(call mkdir_def,$(OMK_WORK_DIR))
+
+
+
 # =======================
 # DEFAULT CONFIG PASS
 
@@ -259,7 +288,7 @@ default-config:
        @echo "# This file should not be altered manually" >> "$(CONFIG_FILE)-default"
        @echo "# Overrides should be stored in file $(notdir $(CONFIG_FILE))" >> "$(CONFIG_FILE)-default"
        @echo >> "$(CONFIG_FILE)-default"
-       @$(MAKE) $(NO_PRINT_DIRECTORY) -C $(OUTPUT_DIR) \
+       @$(MAKE) $(NO_PRINT_DIRECTORY) -C $(MAKERULES_DIR) \
                RELATIVE_DIR="" SOURCES_DIR=$(OUTPUT_DIR) \
                -f $(OUTPUT_DIR)/Makefile default-config-pass
 
@@ -283,6 +312,10 @@ omkize:
              cp -v Makefile "$${d}/Makefile"; \
           fi \
        done
+
+include prepare #omkbuild
+include build #omkbuild
+
 # Local Variables:
 # mode:makefile-gmake
 # End: