Changes to vxWorks support. Still not fully functional.

[omk.git] / snippets / linux

diff --git a/snippets/linux b/snippets/linux
index 90e892683b3d1fa1a4ea747aa5ad1a9ddb42a971..107c534213f1f6319213f53c7917418b220fecb8 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
@@ -188,6 +188,7 @@ endef
 
 
 # Syntax: $(call PROGRAM_template,<dir>,<executable-name>,<executable-suffix>,<linker-sript>)
+# FIXME: ???????? asi je tu blbej komentar
 define PROGRAM_template
 
 USER_IDLS  += $$($(1)_SERVER_IDL) $$($(1)_CLIENT_IDL) $$($(1)_IDL)
@@ -273,9 +274,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 +560,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 +660,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