Changeset 9165 for trunk/make/process.mak

Timestamp:

Aug 29, 2002, 12:01:46 PM (23 years ago)

Author:

bird

Message:

Added new tools. Restructured tools. More options. Fixes.

File:

• trunk/make/process.mak (modified) (12 diffs)

trunk/make/process.mak

@@ -1 @@
-# $Id: process.mak,v 1.24 2002-08-27 03:01:01 bird Exp $
+# $Id: process.mak,v 1.25 2002-08-29 10:01:40 bird Exp $
 
 #
@@ -436 +436 @@
 _SRC = $(PATH_CURRENT)\$<
 !endif
+_DST = $(PATH_TARGET)\$(@F)
 
 
@@ -446 +447 @@
 ! endif
 !if "$(TARGET_MODE)" == "SYS" || "$(TARGET_MODE)" == "SYSLIB" || "$(TARGET_MODE)" == "IFS" || "$(TARGET_MODE)" == "IFSLIB"
-    $(TOOL_JOB_SUB) $(AS) $(AS_FLAGS_SYS) $(_SRC) $(AS_OBJ_OUT)$@
-!else
-    $(TOOL_JOB_SUB) $(AS) $(AS_FLAGS) $(_SRC) $(AS_OBJ_OUT)$@
+! ifdef AS_CMD_SYS
+    $(TOOL_JOB_SUB) $(AS_CMD_SYS)
+! else
+    $(TOOL_JOB_SUB) $(AS) $(AS_FLAGS_SYS) $(_SRC) $(AS_OBJ_OUT)$(_DST)
+! endif
+!else
+! ifdef AS_CMD
+    $(TOOL_JOB_SUB) $(AS_CMD)
+! else
+    $(TOOL_JOB_SUB) $(AS) $(AS_FLAGS) $(_SRC) $(AS_OBJ_OUT)$(_DST)
+! endif
 !endif
 
@@ -458 +467 @@
 !endif
 !if "$(TARGET_MODE)" == "SYS" || "$(TARGET_MODE)" == "SYSLIB" || "$(TARGET_MODE)" == "IFS" || "$(TARGET_MODE)" == "IFSLIB"
-    $(AS) $(AS_FLAGS_SYS) $(_SRC) $(AS_OBJ_OUT)$(PATH_TARGET)\$(@F)
-!else
-    $(AS) $(AS_FLAGS) $(_SRC) $(AS_OBJ_OUT)$(PATH_TARGET)\$(@F)
+! ifdef AS_CMD_SYS
+    $(AS_CMD_SYS)
+! else
+    $(AS) $(AS_FLAGS_SYS) $(_SRC) $(AS_OBJ_OUT)$(_DST)
+! endif
+!else
+! ifdef AS_CMD
+    $(AS_CMD)
+! else
+    $(AS) $(AS_FLAGS) $(_SRC) $(AS_OBJ_OUT)$(_DST)
+! endif
 !endif
 
@@ -489 +506 @@
         $(CXX_LST_OUT)$(PATH_TARGET)\$(@B).s \
 !endif
-        $(CXX_OBJ_OUT)$@ $(_SRC)
+        $(CXX_OBJ_OUT)$(_DST) $(_SRC)
 
 .cpp.$(EXT_OBJ):
@@ -501 +518 @@
         $(CXX_LST_OUT)$(PATH_TARGET)\$(@B).s \
 !endif
-        $(CXX_OBJ_OUT)$(PATH_TARGET)\$(@F) $(_SRC)
+        $(CXX_OBJ_OUT)$(_DST) $(_SRC)
 
 
@@ -555 +572 @@
         $(CC_LST_OUT)$(PATH_TARGET)\$(@B).s \
 !endif
-        $(CC_OBJ_OUT)$@ $(_SRC)
+        $(CC_OBJ_OUT)$(_DST) $(_SRC)
 
 .c.$(EXT_OBJ):
@@ -567 +584 @@
         $(CC_LST_OUT)$(PATH_TARGET)\$(@B).s \
 !endif
-        $(CC_OBJ_OUT)$(PATH_TARGET)\$(@F) $(_SRC)
+        $(CC_OBJ_OUT)$(_DST) $(_SRC)
 
 
@@ -601 +618 @@
     @ \
 !endif
-    $(TOOL_JOB_SUB) $(RC) $(RC_FLAGS) $(_SRC) $@
+    $(TOOL_JOB_SUB) $(RC) $(RC_FLAGS) $(_SRC) $(_DST)
 
 .rc.res:
@@ -609 +626 @@
     @ \
 !endif
-    $(RC) $(RC_FLAGS) $(_SRC) $(PATH_TARGET)\$(@F)
+    $(RC) $(RC_FLAGS) $(_SRC) $(_DST)
 
 
@@ -624 +641 @@
     @ \
 !endif
-    $(AS) $(AS_FLAGS) $(PATH_TARGET)\$(@B).asm $(AS_OBJ_OUT)$(PATH_TARGET)\$(@F)
+    $(AS) $(AS_FLAGS) $(PATH_TARGET)\$(@B).asm $(AS_OBJ_OUT)$(_DST)
 
 .orc.obj:
@@ -637 +654 @@
     @ \
 !endif
-    $(AS) $(AS_FLAGS) $(PATH_TARGET)\$(@B).asm $(AS_OBJ_OUT)$(PATH_TARGET)\$(@F)
+    $(AS) $(AS_FLAGS) $(PATH_TARGET)\$(@B).asm $(AS_OBJ_OUT)$(_DST)