From c0f2131da7480f8576dc4ab09df0a732f9beb1c0 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sat, 20 Jan 2007 10:25:00 +0000 Subject: [PATCH] Fixed a bug in rules. Sometimes it was not possible to make include-pass from command line. darcs-hash:20070120102532-f2ef6-5688e0cd7122d7f1b16e3e99ba1ca49578b7e776.gz --- snippets/linux | 13 +++---------- snippets/rtems | 14 ++++---------- snippets/sysless | 13 ++++--------- snippets/vxworks | 14 ++++---------- 4 files changed, 15 insertions(+), 39 deletions(-) diff --git a/snippets/linux b/snippets/linux index 107c534..f1d4726 100644 --- a/snippets/linux +++ b/snippets/linux @@ -80,11 +80,11 @@ srcdir = $(SOURCES_DIR) USER_OBJS_DIR = $(USER_BUILD_DIR)/$(RELATIVE_DIR) KERN_OBJS_DIR = $(KERN_BUILD_DIR)/$(RELATIVE_DIR) -.PHONY: dep subdirs clean clean-custom cleandepend +.PHONY: dep subdirs clean clean-custom cleandepend check-dir # Some support to serialize some targets for parallel make ifneq ($(OMK_SERIALIZE_INCLUDED),y) -include-pass: $(check-dir) +include-pass: check-dir library-pass: include-pass binary-pass: library-pass kernel-lib-pass: include-pass @@ -565,13 +565,6 @@ $(eval $(call omk_pass_template, binary-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLAT OTHER_PASSES = clean install include-pass $(eval $(call omk_pass_template,$(OTHER_PASSES),$(USER_OBJS_DIR),,always)) -# Create directories only for the first time -ifndef CHECK_DIR_DONE -check-dir = check-dir -CHECK_DIR_DONE = y -endif -export CHECK_DIR_DONE - check-dir: @$(call mkdir_def,$(USER_BUILD_DIR)) @$(call mkdir_def,$(KERN_BUILD_DIR)) @@ -660,7 +653,7 @@ clean-local: clean-custom touch -t 200001010101 $(KERN_LIB_DIR)/kernel.mk ; \ fi -default: $(check-dir) include-pass library-pass binary-pass +default: include-pass library-pass binary-pass ifndef OMIT_KERNEL_PASSES # Also make kernel passes if not disabled default: kernel-lib-pass kernel-pass diff --git a/snippets/rtems b/snippets/rtems index acc58b9..3e1da67 100644 --- a/snippets/rtems +++ b/snippets/rtems @@ -50,9 +50,11 @@ srcdir = $(SOURCES_DIR) USER_OBJS_DIR = $(USER_BUILD_DIR)/$(RELATIVE_DIR) +.PHONY: check-dir + # Some support to serialize some targets for parallel make ifneq ($(OMK_SERIALIZE_INCLUDED),y) -include-pass: $(check-dir) +include-pass: check-dir library-pass: include-pass binary-pass: library-pass @@ -275,14 +277,6 @@ check-dir: @$(call mkdir_def,$(USER_BIN_DIR)) @$(call mkdir_def,$(USER_UTILS_DIR)) -# Create directories only for the first time -ifndef CHECK_DIR_DONE -check-dir = check-dir -CHECK_DIR_DONE = y -endif -export CHECK_DIR_DONE - - include-pass-local: $(call include-pass-template,$(USER_INCLUDE_DIR),include) @@ -330,7 +324,7 @@ clean-local: $(tar_EMBEDFILES:%=$(USER_OBJS_DIR)/%_tarfile) -default: $(check-dir) include-pass library-pass binary-pass +default: include-pass library-pass binary-pass # Local Variables: # mode:makefile diff --git a/snippets/sysless b/snippets/sysless index 58487dd..0464c84 100644 --- a/snippets/sysless +++ b/snippets/sysless @@ -20,9 +20,11 @@ # specified, then the value of DEFAULT_LD_SCRIPT_VARIANT from config.target is used. # PREFIX_DIR .. Prefix to directories in _compiled and _build. Used in config.omk. +.PHONY: check-dir + # Some support to serialize some targets for parallel make ifneq ($(OMK_SERIALIZE_INCLUDED),y) -include-pass: $(check-dir) +include-pass: check-dir library-pass: include-pass binary-pass utils-pass: library-pass @@ -235,15 +237,8 @@ check-dir: @$(call mkdir_def,$(USER_BIN_DIR)) @$(call mkdir_def,$(USER_UTILS_DIR)) -# Create directories only for the first time -ifndef CHECK_DIR_DONE -check-dir = check-dir -CHECK_DIR_DONE = y -endif -export CHECK_DIR_DONE - # Which passes to pass -default: $(check-dir) include-pass library-pass binary-pass utils-pass +default: include-pass library-pass binary-pass utils-pass # Local Variables: # mode:makefile diff --git a/snippets/vxworks b/snippets/vxworks index 48bfa2d..8cedab5 100644 --- a/snippets/vxworks +++ b/snippets/vxworks @@ -11,9 +11,11 @@ # xxx_SOURCES .. list of specific target sources # INCLUDES .. additional include directories and defines for user-space +.PHONY: check-dir + # Some support to serialize some targets for parallel make ifneq ($(OMK_SERIALIZE_INCLUDED),y) -include-pass: $(check-dir) +include-pass: check-dir library-pass: include-pass binary-pass: library-pass kernel-lib-pass: include-pass @@ -152,14 +154,6 @@ clean-local: $(eval $(call omk_pass_template, library-pass,$(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(lib_LIBRARIES)$(shared_LIBRARIES))) $(eval $(call omk_pass_template, binary-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(bin_PROGRAMS)$(utils_PROGRAMS))) - -# Create directories only for the first time -ifndef CHECK_DIR_DONE -check-dir = check-dir -CHECK_DIR_DONE = y -endif -export CHECK_DIR_DONE - check-dir: @$(call mkdir_def,$(USER_BUILD_DIR)) @$(call mkdir_def,$(USER_INCLUDE_DIR)) @@ -168,7 +162,7 @@ check-dir: @$(call mkdir_def,$(USER_UTILS_DIR)) -default: $(check-dir) include-pass library-pass binary-pass +default: include-pass library-pass binary-pass # Local Variables: # mode:makefile -- 2.39.2