Fix performance degradation when W/OMK_WHOLE_TREE is used.

[omk.git] / snippets / vxworks

diff --git a/snippets/vxworks b/snippets/vxworks
index 48bfa2d9f84fc0308865f280f982c9e47ee1c7a7..e3483ddc654e7bd9e4c5849de2faa91eef9ce4ce 100644 (file)
--- 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
@@ -21,7 +23,7 @@ kernel-mod-pass: kernel-lib-pass
 kernel-modpost-pass: kernel-mod-pass
 kernel-pass: kernel-mod-pass kernel-modpost-pass
 
-OMK_SERIALIZE_INCLUDED = y
+override OMK_SERIALIZE_INCLUDED = y
 endif
 
 
@@ -114,6 +116,7 @@ $(USER_LIB_DIR)/lib$(1).a: #$$($(1)_OBJS)
        echo 'OBJ_DIR = $(USER_OBJS_DIR)' >> Makefile.lib.$(1); \
        echo 'LIB_ROOT = $(USER_LIB_DIR)' >> Makefile.lib.$(1); \
        echo 'VPATH = $(SOURCES_DIR)' >> Makefile.lib.$(1); \
+#      echo 'LIBDIRBASE = ' >> Makefile.lib.$(1); \
        echo 'include $$$$(WIND_USR)/make/rules.library' >> Makefile.lib.$(1); 
        $(WRENV) -p $(WRPACKAGE) $(MAKE) CPU=$(CPU) TOOL=$(TOOL) -f Makefile.lib.$(1)
 endef
@@ -152,14 +155,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 +163,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