X-Git-Url: http://rtime.felk.cvut.cz/gitweb/omk.git/blobdiff_plain/bbd0ab0e18aecd717d64be870e530015e3cb3485..3f427e1845de294f6828055e2d91e4f05e4a6b1c:/snippets/linux

diff --git a/snippets/linux b/snippets/linux
index ded6560..e9c01a8 100644
--- a/snippets/linux
+++ b/snippets/linux
@@ -654,7 +654,7 @@ $(eval $(call omk_pass_template, binary-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLAT
 
 $(eval $(call omk_pass_template,clean,$(USER_OBJS_DIR),,always))
 $(eval $(call omk_pass_template,install,$(USER_OBJS_DIR),,always))
-$(eval $(call omk_pass_template,include-pass,$(USER_OBJS_DIR),,always))
+$(eval $(call omk_pass_template,include-pass,$(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,always))
 
 check-dir:
 	@$(call mkdir_def,$(USER_BUILD_DIR))
@@ -671,13 +671,13 @@ check-dir:
 
 install-local:			# TODO
 
-include-pass-local:
-	$(call include-pass-template,$(USER_INCLUDE_DIR),include)
-	$(call include-pass-template,$(KERN_INCLUDE_DIR),kernel)
+$(eval $(call include-pass-template,$(USER_INCLUDE_DIR),include))
+$(eval $(call include-pass-template,$(KERN_INCLUDE_DIR),kernel))
 ifeq ($(CONFIG_RTLINUX),y)
-	$(call include-pass-template,$(KERN_INCLUDE_DIR),rtlinux)
+$(eval $(call include-pass-template,$(KERN_INCLUDE_DIR),rtlinux))
 endif
 
+
 ifdef USER_RULE_TEMPLATES
 
 # User-space static libraries and applications object files
@@ -754,6 +754,12 @@ clean-local: clean-custom
 	fi
 
 include-pass-submakes: extra-rules-subdirs
+
+# We must go to EXTRA_RULES_SUBDIRS beofre going to any other
+# directory, since the executables compiled in EXTRA_RULES_SUBDIRS
+# might be needed there.
+include-pass-this-dir $(foreach subdir,$(SUBDIRS),include-pass-$(subdir)-subdir): extra-rules-subdirs
+
 default: include-pass library-pass binary-pass
 ifndef OMIT_KERNEL_PASSES
 # Also make kernel passes if not disabled