Formating changes, added Emacs modelines

[omk.git] / snippets / base

diff --git a/snippets/base b/snippets/base
index cb2fb87a6a10a8db376d4f43f6d83ac20ec417dc..01d1e8a924875d648758ac05ef4d46d61c94c1aa 100644 (file)
--- a/snippets/base
+++ b/snippets/base
@@ -1,4 +1,4 @@
-#  Makefile.rules - OCERA make framework common project rules -*- makefile -*-
+#  Makefile.rules - OCERA make framework common project rules -*- makefile-gmake -*-
 #
 #  (C) Copyright 2003 by Pavel Pisa - OCERA team member
 #  (C) Copyright 2006 by Michal Sojka - Czech Technical University, FEE, DCE
@@ -55,7 +55,7 @@ build-pseudo-pass: prepare
        $(Q3)$(MAKE) -C $(MAKERULES_DIR) -f Makefile.rules build
        @$(QUIET_CMD_ECHO) "Compilation finished"
 
-prepare-pass: $(omk_checks)
+prepare-pass:: $(omk_checks)
 else
 # Run make in the top-level directory
 all:
@@ -266,13 +266,12 @@ $(foreach subdir,$(EXTRA_RULES_SUBDIRS),$(eval $(call extra_rules_subdir_templat
 
 # Usage: $(call omk_pass_template,<pass name>)
 define omk_pass_template
-.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)))
+.PHONY: $(pass) $(pass)-msg $(pass)-subdirs
+$(pass):: $(pass)-subdirs $(pass)-msg mkdir-omk-work
+$(foreach subdir,$(SUBDIRS),$$(eval $$(call omk_pass_subdir_template,$(pass),$(subdir))))
 
 $(pass)-msg: $(pass)-subdirs
-       +@echo "make[omk]: $(pass) in $(RELATIVE_DIR)"
+       +@$(QUIET_CMD_ECHO) "make[omk]: $(pass) in $(RELATIVE_DIR)"
 endef
 
 mkdir-omk-work:
@@ -294,7 +293,7 @@ default-config:
 
 $(eval $(call omk_pass_template,default-config-pass,$$(LOCAL_BUILD_DIR),,always))
 
-default-config-pass-local:
+default-config-pass::
 #      $(Q3)echo Default config for $(RELATIVE_DIR)
        $(Q3)echo "# Config for $(RELATIVE_DIR)" >> "$(CONFIG_FILE)-default"
        $(Q3)$(foreach x, $(default_CONFIG), echo '$(x)' | \