Fixed build in subdirectories

[omk.git] / snippets / base

diff --git a/snippets/base b/snippets/base
index d39f493025723c5797f1dc448e69b37e8262acfb..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:
@@ -180,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 \
@@ -194,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
@@ -229,7 +241,6 @@ define omk_pass_subdir_template
 .PHONY: $(pass)-$(2)-subdir
 $(pass)-subdirs: $(pass)-$(2)-subdir
 $(pass)-$(2)-subdir:
-       @$(call mkdir_def,$(OMK_WORK_DIR)/$(2))
        +@$(MAKE) SOURCES_DIR=$(SOURCES_DIR)/$(2) $(NO_PRINT_DIRECTORY) \
                RELATIVE_DIR=$(RELATIVE_PREFIX)$(2) -C $(2) \
                -f $(SUBDIR_MAKEFILE) $(pass)
@@ -248,7 +259,7 @@ 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))))
@@ -257,13 +268,17 @@ $(foreach subdir,$(EXTRA_RULES_SUBDIRS),$(eval $(call extra_rules_subdir_templat
 define omk_pass_template
 .PHONY: $(pass) $(pass)-local $(pass)-msg $(pass)-subdirs
 $(pass): $(pass)-local
-$(pass)-local: $(pass)-subdirs $(pass)-msg
+$(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)"
 endef
 
+mkdir-omk-work:
+       @$(call mkdir_def,$(OMK_WORK_DIR))
+
+
 
 # =======================
 # DEFAULT CONFIG PASS