Utils and binary passes merged in linux and rtems rules.

darcs-hash:20060731133601-f2ef6-fc24c4beffe8be386cfe4a2972b0172d8cd7b8c8.gz

diff --git a/snippets/linux b/snippets/linux
index 90e892683b3d1fa1a4ea747aa5ad1a9ddb42a971..c38688698817480a34c85fb881ea1333e657935d 100644 (file)
--- a/snippets/linux
+++ b/snippets/linux
@@ -86,7 +86,7 @@ KERN_OBJS_DIR = $(KERN_BUILD_DIR)/$(RELATIVE_DIR)
 ifneq ($(OMK_SERIALIZE_INCLUDED),y)
 include-pass: $(check-dir)
 library-pass: include-pass
-binary-pass utils-pass: library-pass
+binary-pass: library-pass
 kernel-lib-pass: include-pass
 kernel-mod-pass: kernel-lib-pass
 kernel-modpost-pass: kernel-mod-pass
@@ -273,9 +273,7 @@ endef
 library-pass-local: $(addprefix $(USER_INCLUDE_DIR)/,$(cmetric_include_HEADERS)) \
                    $(lib_LIBRARIES:%=$(USER_LIB_DIR)/lib%.a) $(shared_LIBRARIES:%=$(USER_LIB_DIR)/lib%.$(SOLIB_EXT))
 
-binary-pass-local: $(bin_PROGRAMS:%=$(USER_BIN_DIR)/%)
-
-utils-pass-local: $(utils_PROGRAMS:%=$(USER_UTILS_DIR)/%)
+binary-pass-local: $(bin_PROGRAMS:%=$(USER_BIN_DIR)/%) $(utils_PROGRAMS:%=$(USER_UTILS_DIR)/%)
 
 # Special rules for CMETRIC generated headers
 
@@ -561,8 +559,7 @@ kernel-modpost-pass:
        fi
 
 $(eval $(call omk_pass_template, library-pass,$(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(lib_LIBRARIES)$(shared_LIBRARIES)))
-$(eval $(call omk_pass_template, utils-pass,  $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(utils_PROGRAMS)))
-$(eval $(call omk_pass_template, binary-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(bin_PROGRAMS)))
+$(eval $(call omk_pass_template, binary-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(bin_PROGRAMS)$(utils_PROGRAMS)))
 
 OTHER_PASSES = clean install include-pass
 $(eval $(call omk_pass_template,$(OTHER_PASSES),$(USER_OBJS_DIR),,always))
@@ -662,10 +659,11 @@ clean-local: clean-custom
            touch -t 200001010101 $(KERN_LIB_DIR)/kernel.mk ; \
        fi
 
+default: $(check-dir) include-pass library-pass binary-pass
 ifndef OMIT_KERNEL_PASSES
-kernel-passes = kernel-lib-pass kernel-pass
+# Also make kernel passes if not disabled
+default: kernel-lib-pass kernel-pass
 endif
-default: $(check-dir) include-pass library-pass binary-pass utils-pass $(kernel-passes)
 
 # Local Variables:
 # mode:makefile

diff --git a/snippets/rtems b/snippets/rtems
index 567f765cc853a31c35f38976f56dc519fbd90ad3..acc58b9f174d5ebf3735cc17ade352eac1cf3c34 100644 (file)
--- a/snippets/rtems
+++ b/snippets/rtems
@@ -54,7 +54,7 @@ USER_OBJS_DIR = $(USER_BUILD_DIR)/$(RELATIVE_DIR)
 ifneq ($(OMK_SERIALIZE_INCLUDED),y)
 include-pass: $(check-dir)
 library-pass: include-pass
-binary-pass utils-pass: library-pass
+binary-pass: library-pass
 
 OMK_SERIALIZE_INCLUDED = y
 endif
@@ -178,7 +178,7 @@ $(2)/$(1): $$($(1)_OBJS)
        $(Q) $$(shell if [ -z "$$(filter %.cc,$$($(1)_SOURCES))" ] ; \
          then echo $$(CC)  $$(CPPFLAGS) $$(AM_CPPFLAGS) $$(AM_CFLAGS) $$(CFLAGS) ; \
          else echo $$(CXX) $$(CPPFLAGS) $$(AM_CPPFLAGS) $$(AM_CXXFLAGS) $$(CXXFLAGS) ; fi) \
-         $$(AM_LDFLAGS) $$(LDFLAGS) $$($(1)_OBJS) $$(LOADLIBES) $$($(1)_LIBS:%=-l%) -Wl,-Map,$(USER_OBJS_DIR)/$(1).exe.map \
+         $$(AM_LDFLAGS) $$(LDFLAGS) $$($(1)_OBJS) $$(LOADLIBES) $$($(1)_LIBS:%=-l%) \
          -o $(2)/$(1)
 #@echo "$(2)/$(1): \\" >$(USER_OBJS_DIR)/$(1).exe.d
 #@sed -n -e 's/^LOAD \(.*\)$$$$/  \1  \\/p' $(USER_OBJS_DIR)/$(1).exe.map  >>$(USER_OBJS_DIR)/$(1).exe.d
@@ -233,9 +233,7 @@ endef
 library-pass-local: $(addprefix $(USER_INCLUDE_DIR)/,$(cmetric_include_HEADERS)) \
                    $(lib_LIBRARIES:%=$(USER_LIB_DIR)/lib%.a) $(shared_LIBRARIES:%=$(USER_LIB_DIR)/lib%.so)
 
-binary-pass-local: $(bin_PROGRAMS:%=$(USER_BIN_DIR)/%)
-
-utils-pass-local: $(utils_PROGRAMS:%=$(USER_UTILS_DIR)/%)
+binary-pass-local: $(bin_PROGRAMS:%=$(USER_BIN_DIR)/%) $(utils_PROGRAMS:%=$(USER_UTILS_DIR)/%)
 
 # Special rules for CMETRIC generated headers
 
@@ -267,8 +265,7 @@ endif
 
 $(eval $(call omk_pass_template, include-pass,$(USER_OBJS_DIR),,$(include_HEADERS)$(nobase_include_HEADERS)$(renamed_include_HEADERS)$(config_include_HEADERS)))
 $(eval $(call omk_pass_template, library-pass,$(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(lib_LIBRARIES)$(shared_LIBRARIES)))
-$(eval $(call omk_pass_template, utils-pass,  $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(utils_PROGRAMS)))
-$(eval $(call omk_pass_template, binary-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(bin_PROGRAMS)))
+$(eval $(call omk_pass_template, binary-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(bin_PROGRAMS)$(utils_PROGRAMS)))
 
 $(eval $(call omk_pass_template,clean,$(USER_OBJS_DIR),,always))
 
@@ -333,7 +330,7 @@ clean-local:
               $(tar_EMBEDFILES:%=$(USER_OBJS_DIR)/%_tarfile)
 
 
-default: $(check-dir) include-pass library-pass binary-pass utils-pass
+default: $(check-dir) include-pass library-pass binary-pass
 
 # Local Variables:
 # mode:makefile