From b5b6e71df07e675701f59ccd35269a5d0517d410 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Mon, 14 Jul 2008 15:54:00 +0000 Subject: [PATCH] Handling of EXTRA_RULES_SUBDIRS added to some other rules Also included some small fixes darcs-hash:20080714155425-f2ef6-020e47714ee5ca440af8ab21b707130aa6dd4be6.gz --- snippets/sdcc | 1 + snippets/sysless | 1 + tests/extra_rules_subdirs/runtest | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/snippets/sdcc b/snippets/sdcc index af66b6f..900bfc4 100644 --- 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 b67cc39..1018323 100644 --- 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 4a80489..0f77cc2 100755 --- 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" -- 2.39.2