Changeset 2895 for trunk/kBuild/tools/OPENWATCOM-16.kmk

Timestamp:

Sep 8, 2016, 3:28:37 PM (9 years ago)

Author:

bird

Message:

Use kObjDep more.

File:

• trunk/kBuild/tools/OPENWATCOM-16.kmk (modified) (3 diffs)

trunk/kBuild/tools/OPENWATCOM-16.kmk

@@ -44 +44 @@
 TOOL_OPENWATCOM-16_COMPILE_AS_DEPEND =
 TOOL_OPENWATCOM-16_COMPILE_AS_DEPORD =
-TOOL_OPENWATCOM-16_COMPILE_AS_OUTPUT = $(obj).err
+TOOL_OPENWATCOM-16_COMPILE_AS_OUTPUT_MAYBE = $(obj).err
+ifdef TOOL_OPENWATCOM_USE_KSUBMIT
+define TOOL_OPENWATCOM-16_COMPILE_AS_CMDS
+        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP_BD,, -P $(DEP_OBJ_INT) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)") \
+                $(TOOL_OPENWATCOM_AS) \
+                $(flags) \
+                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
+                $(addprefix -d, $(defs)) \
+                -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
+                -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
+                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
+endef
+else
 define TOOL_OPENWATCOM-16_COMPILE_AS_CMDS
         $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_AS) \
@@ -53 +65 @@
                 -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
                 $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
-        $(QUIET)$(APPEND) -n $(obj).err
-## @todo dependencies
-endef
+        $(QUIET)$(DEP_OBJ) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)"
+endef
+endif
 
 TOOL_OPENWATCOM-16_COMPILE_C_DEPEND =
 TOOL_OPENWATCOM-16_COMPILE_C_DEPORD =
-TOOL_OPENWATCOM-16_COMPILE_C_OUTPUT = $(obj).err
+TOOL_OPENWATCOM-16_COMPILE_C_OUTPUT_MAYBE = $(obj).err
+ifdef TOOL_OPENWATCOM_USE_KSUBMIT
 define TOOL_OPENWATCOM-16_COMPILE_C_CMDS
-        $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_CC16) \
-                $(flags) \
-                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
-                $(addprefix -d, $(defs)) \
-                -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
-                -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
-                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
-        $(QUIET)$(APPEND) -n $(obj).err
-## @todo dependencies
-endef
+        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP_BD,, -P $(DEP_OBJ_INT) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)") \
+                $(TOOL_OPENWATCOM_CC16) \
+                $(flags) \
+                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
+                $(addprefix -d, $(defs)) \
+                -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
+                -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
+                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
+endef
+else
+define TOOL_OPENWATCOM-16_COMPILE_C_CMDS
+        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_CC16) \
+                $(flags) \
+                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
+                $(addprefix -d, $(defs)) \
+                -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
+                -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
+                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
+        $(QUIET)$(DEP_OBJ) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)"
+endef
+endif
 
 TOOL_OPENWATCOM-16_COMPILE_CXX_DEPEND =
 TOOL_OPENWATCOM-16_COMPILE_CXX_DEPORD =
-TOOL_OPENWATCOM-16_COMPILE_CXX_OUTPUT = $(obj).err
+TOOL_OPENWATCOM-16_COMPILE_CXX_OUTPUT_MAYBE = $(obj).err
+ifdef TOOL_OPENWATCOM_USE_KSUBMIT
 define TOOL_OPENWATCOM-16_COMPILE_CXX_CMDS
-        $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_CXX16) \
-                $(flags) \
-                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
-                $(addprefix -d, $(defs)) \
-                -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
-                -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
-                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
-        $(QUIET)$(APPEND) -n $(obj).err
-## @todo dependencies
-endef
+        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP_BD,, -P $(DEP_OBJ_INT) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)") \
+                $(TOOL_OPENWATCOM_CXX16) \
+                $(flags) \
+                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
+                $(addprefix -d, $(defs)) \
+                -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
+                -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
+                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
+endef
+else
+define TOOL_OPENWATCOM-16_COMPILE_CXX_CMDS
+        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP_BD) $(TOOL_OPENWATCOM_CXX16) \
+                $(flags) \
+                $(addsuffix , $(addprefix -i=, $(call TOOL_OPENWATCOM_FIX_SLASHES,$(incs)))) \
+                $(addprefix -d, $(defs)) \
+                -fo=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)) \
+                -fr=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(obj)).err \
+                $(call TOOL_OPENWATCOM_FIX_SLASHES,$(abspath $(source)))
+        $(QUIET)$(DEP_OBJ) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)"
+endef
+endif
 
 TOOL_OPENWATCOM-16_COMPILE_RC_OUTPUT =
@@ -91 +127 @@
 TOOL_OPENWATCOM-16_COMPILE_RC_DEPORD =
 define TOOL_OPENWATCOM-16_COMPILE_RC_CMDS
-        $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP) \
+        $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP) \
                 $(TOOL_OPENWATCOM_RC) -r\
                 $(flags) \