Handling of EXTRA_RULES_SUBDIRS added to some other rules

Also included some small fixes

darcs-hash:20080714155425-f2ef6-020e47714ee5ca440af8ab21b707130aa6dd4be6.gz

diff --git a/snippets/sdcc b/snippets/sdcc
index af66b6f735e03e1f180d79d2c6340df055422fbb..900bfc4b0d7430d3104acef4fea3aebc088f6e53 100644 (file)
--- a/snippets/sdcc
+++ b/snippets/sdcc
@@ -365,6 +365,7 @@ check-dir:
        @$(call mkdir_def,$(USER_UTILS_DIR))
        @$(call mkdir_def,$(USER_TESTS_DIR))
 
+include-pass-submakes: extra-rules-subdirs
 # Which passes to pass
 default: include-pass library-pass binary-pass utils-pass
 

diff --git a/snippets/sysless b/snippets/sysless
index b67cc397eb44f5d3885ebf90874eb002c7ed3832..1018323e820ec14a03044a0a63d2fe85e971fea7 100644 (file)
--- a/snippets/sysless
+++ b/snippets/sysless
@@ -272,6 +272,7 @@ check-dir:
        @$(call mkdir_def,$(USER_UTILS_DIR))
        @$(call mkdir_def,$(USER_TESTS_DIR))
 
+include-pass-submakes: extra-rules-subdirs
 # Which passes to pass
 default: include-pass library-pass binary-pass utils-pass
 

diff --git a/tests/extra_rules_subdirs/runtest b/tests/extra_rules_subdirs/runtest
index 4a804894f07ac2aadc3d329adde853b8692f138f..0f77cc2a13fe4313f3471e28355e15ca0806c70a 100755 (executable)
--- a/tests/extra_rules_subdirs/runtest
+++ b/tests/extra_rules_subdirs/runtest
@@ -2,9 +2,9 @@
 
 source ../functions.sh
 
-touch default-config
+touch config.omk-default
 
-cp Makefile.rules tools/
+cp Makefile.rules subdir2/tools/
 make -k | tee make.log
 
 grep 'Extra rules goal:' make.log || error "Extra rules was not called"