Merge branch 'devel' of sojka@rtime.felk.cvut.cz:/var/git/omk into devel

[omk.git] / snippets / base

diff --git a/snippets/base b/snippets/base
index 77a0d8d8dbe830556ed024a52be6ecf9ebbee098..c782cfec68fddb078f19da66bda10de5d3d9df3e 100644 (file)
--- a/snippets/base
+++ b/snippets/base
@@ -179,7 +179,7 @@ define mkdir_def
        [ -d $(1) ] || mkdir -p $(1) || exit 1
 endef
 
-ifneq ($(V),2)
+ifneq ($(OMK_VERBOSE),2)
 NO_PRINT_DIRECTORY := --no-print-directory
 endif
 
@@ -217,12 +217,10 @@ endif
 define extra_rules_subdir_template
 extra-rules-subdirs: extra-rules-$(1)
 extra-rules-$(1):
-       +$(MAKE) OMK_SERIALIZE_INCLUDED=n MAKERULES_DIR=$(SOURCES_DIR)/$(1) OUTPUT_DIR=$(OUTPUT_DIR) \
+       +@$(MAKE) OMK_SERIALIZE_INCLUDED=n MAKERULES_DIR=$(SOURCES_DIR)/$(1) OUTPUT_DIR=$(OUTPUT_DIR) \
                SOURCES_DIR=$(SOURCES_DIR)/$(1) RELATIVE_DIR=$(RELATIVE_PREFIX)$(1) -C $(SOURCES_DIR)/$(1)
 endef
 
-$(warning $(SOURCES_DIR))
-
 .PHONY: extra-rules-subdirs
 extra-rules-subdirs:
 
@@ -235,7 +233,7 @@ $(foreach subdir,$(SUBDIRS),$(eval $(call omk_pass_subdir_template,$(pass),$(2),
 $(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 \
+       +@$(MAKE) SOURCES_DIR=$(SOURCES_DIR) $(NO_PRINT_DIRECTORY) \
                RELATIVE_DIR=$(RELATIVE_DIR) \
                -f $(SOURCESDIR_MAKEFILE) $(pass)-submakes
 $(pass)-submakes:
@@ -284,3 +282,6 @@ omkize:
              cp -v Makefile "$${d}/Makefile"; \
           fi \
        done
+# Local Variables:
+# mode:makefile-gmake
+# End: