Changeset 9225 for trunk/make

Timestamp:

Sep 12, 2002, 5:11:34 AM (23 years ago)

Author:

bird

Message:

Allways stamp the .def file before linking. (Build level info.)

File:

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

trunk/make/process.mak

@@ -1 @@
-# $Id: process.mak,v 1.28 2002-09-12 02:55:54 bird Exp $
+# $Id: process.mak,v 1.29 2002-09-12 03:11:34 bird Exp $
 
 #
@@ -1221 +1221 @@
 # -----------------------------------------------------------------------------
 !if "$(TARGET_MODE)" == "EXE" || "$(TARGET_MODE)" == "DLL" || "$(TARGET_MODE)" == "SYS" || "$(TARGET_MODE)" == "IFS" || "$(TARGET_MODE)" == "VDD"
-$(TARGET): $(TARGET_OBJS) $(TARGET_RES) $(TARGET_DEF_LINK) $(TARGET_LNK) $(TARGET_DEPS) $(TARGET_LIBS)
+$(TARGET): $(TARGET_OBJS) $(TARGET_RES) $(TARGET_DEF) $(TARGET_DEPS) $(TARGET_LIBS)
 !if "$(TOOL_JOB_WAIT)" != ""
 ! ifndef BUILD_QUIET
@@ -1232 +1232 @@
     $(TOOL_JOB_WAIT)
 !endif
-    @$(ECHO) Linking $(TARGET_MODE) $(CLRFIL)$@ $(CLRRST)
-    \
-!ifndef BUILD_VERBOSE
-    @ \
-!endif
-!ifdef TARGET_IGNORE_LINKER_WARNINGS
-    -4 \
-!endif
-!if "$(TARGET_MODE)" == "EXE"
-    $(LINK_CMD_EXE)
-!endif
-!if "$(TARGET_MODE)" == "DLL"
-    $(LINK_CMD_DLL)
-!endif
-!if "$(TARGET_MODE)" == "SYS"
-    $(LINK_CMD_SYS)
-!endif
-!if "$(TARGET_MODE)" == "IFS"
-    $(LINK_CMD_IFS)
-!endif
-!if "$(TARGET_MODE)" == "VDD"
-    $(LINK_CMD_VDD)
-!endif
-!if "$(TARGET_RES)" != "" && "$(RL)" != ""
-    @$(ECHO) Linking Resources $(CLRRST)
+!if "$(TARGET_DEF_LINK)" != "$(TARGET_DEF)"
+! ifndef BUILD_QUIET
+    @$(ECHO) Stamping deffile with build level info.$(CLRRST)
+! endif
     \
 ! ifndef BUILD_VERBOSE
     @ \
 ! endif
-    $(RL) $(RL_FLAGS) $(TARGET_RES) $@
-!endif
-!if "$(TARGET_DLLRNAME)" != ""
-    @$(ECHO) Dll Rename $(TARGET_DLLRNAME)
-    \
-! ifndef BUILD_VERBOSE
-    @ \
-! endif
-    $(TOOL_DLLRNAME) $(TARGET) $(TARGET_DLLRNAME)
-!endif
-!if "$(TOOL_MAPSYM)" != "" && "$(TARGET_SYM)" != "" && "$(TARGET_MAP)" != ""
-    \
-! ifndef BUILD_VERBOSE
-    @ \
-! endif
-    $(TOOL_MAPSYM) $(TARGET_MAP) $(TARGET_SYM)
-!endif
-!if "$(BUILD_MODE)" == "RELEASE"
-    \
-! ifndef BUILD_VERBOSE
-    @ \
-! endif
-    $(TOOL_COPY) "$@" "$(_TARGET_DEB)"
-! if "$(TOOL_STRIP)" != ""
-    \
-!  ifndef BUILD_VERBOSE
-    @ \
-!  endif
-    $(TOOL_STRIP) $@
-! endif
-!endif
-
-
-#
-# Linker parameter file.
-#
-$(TARGET_LNK): $(MAKE_INCLUDE_PROCESS) $(MAKE_INCLUDE_SETUP) $(PATH_MAKE)\setup.mak $(MAKEFILE)
+    $(TOOL_BLDLEVEL) $(BUILD_BLDLEVEL_FLAGS) $(TARGET_BLDLEVEL_FLAGS) -R$(TARGET_DEF) $(TARGET_DEF) $(TARGET_DEF_LINK)
+!endif
 !ifndef TOOL_DEFCONV
-    @$(TOOL_ECHOTXT) Creating Linker Input File $(CLRRST)<<$@
+    @$(TOOL_ECHOTXT) Creating Linker Input File $(CLRRST)<<$(TARGET_LNK)
 $(LINK_LNK1)
 $(LINK_LNK2)
@@ -1307 +1251 @@
 <<KEEP
 !else
-    @$(ECHO) Creating Linker Input File $(CLRRST) $@
-    @$(TOOL_RM) "$@"
+    @$(ECHO) Creating Linker Input File $(CLRRST) $(TARGET_LNK)
+    @$(TOOL_RM) "$(TARGET_LNK)"
     \
 ! ifdef BUILD_VERBOSE
     @ \
 ! endif
-    $(TOOL_DEFCONV) $(TARGET_DEF_LINK) $@ <<$(TARGET_LNK)2
-#
-# LINK_LNK[1-5]:
-#
+    $(TOOL_DEFCONV) $(TARGET_DEF_LINK) $(TARGET_LNK) <<$(TARGET_LNK)2
 $(LINK_LNK1)
 $(LINK_LNK2)
@@ -1325 +1266 @@
 !endif
 !ifdef BUILD_VERBOSE
-    @type $@
-!endif
-
-
-#
-# Builddef modified definition file.
-#
-!if "$(TARGET_DEF_LINK)" != "$(TARGET_DEF)"
-$(TARGET_DEF_LINK): $(TARGET_DEF)
-! ifndef BUILD_QUIET
-    @$(ECHO) Stamping deffile with build level info.$(CLRRST)
-! endif
+    @type $(TARGET_LNK)
+!endif
+    @$(ECHO) Linking $(TARGET_MODE) $(CLRFIL)$@ $(CLRRST)
+    \
+!ifndef BUILD_VERBOSE
+    @ \
+!endif
+!ifdef TARGET_IGNORE_LINKER_WARNINGS
+    -4 \
+!endif
+!if "$(TARGET_MODE)" == "EXE"
+    $(LINK_CMD_EXE)
+!endif
+!if "$(TARGET_MODE)" == "DLL"
+    $(LINK_CMD_DLL)
+!endif
+!if "$(TARGET_MODE)" == "SYS"
+    $(LINK_CMD_SYS)
+!endif
+!if "$(TARGET_MODE)" == "IFS"
+    $(LINK_CMD_IFS)
+!endif
+!if "$(TARGET_MODE)" == "VDD"
+    $(LINK_CMD_VDD)
+!endif
+!if "$(TARGET_RES)" != "" && "$(RL)" != ""
+    @$(ECHO) Linking Resources $(CLRRST)
     \
 ! ifndef BUILD_VERBOSE
     @ \
 ! endif
-    $(TOOL_BLDLEVEL) $(BUILD_BLDLEVEL_FLAGS) $(TARGET_BLDLEVEL_FLAGS) -R$** $** $@
+    $(RL) $(RL_FLAGS) $(TARGET_RES) $@
+!endif
+!if "$(TARGET_DLLRNAME)" != ""
+    @$(ECHO) Dll Rename $(TARGET_DLLRNAME)
+    \
+! ifndef BUILD_VERBOSE
+    @ \
+! endif
+    $(TOOL_DLLRNAME) $(TARGET) $(TARGET_DLLRNAME)
+!endif
+!if "$(TOOL_MAPSYM)" != "" && "$(TARGET_SYM)" != "" && "$(TARGET_MAP)" != ""
+    \
+! ifndef BUILD_VERBOSE
+    @ \
+! endif
+    $(TOOL_MAPSYM) $(TARGET_MAP) $(TARGET_SYM)
+!endif
+!if "$(BUILD_MODE)" == "RELEASE"
+    \
+! ifndef BUILD_VERBOSE
+    @ \
+! endif
+    $(TOOL_COPY) "$@" "$(_TARGET_DEB)"
+! if "$(TOOL_STRIP)" != ""
+    \
+!  ifndef BUILD_VERBOSE
+    @ \
+!  endif
+    $(TOOL_STRIP) $@
+! endif
 !endif