Changeset 9240 for trunk/make

Timestamp:

Sep 15, 2002, 1:27:04 AM (23 years ago)

Author:

bird

Message:

Improved dependencies on the makefiles a lot.

File:

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

trunk/make/process.mak

@@ -1 @@
-# $Id: process.mak,v 1.30 2002-09-12 03:22:37 bird Exp $
+# $Id: process.mak,v 1.31 2002-09-14 23:27:04 bird Exp $
 
 #
@@ -843 +843 @@
     @ \
 ! endif
-    $(TOOL_DEP) $(TOOL_DEP_FLAGS) -o$$(PATH_TARGET) -d$(TARGET_DEPEND)\
+    $(TOOL_DEP) \
 ! ifdef TARGET_NO_DEP
         -x$(TARGET_NO_DEP: =;)\
 ! endif
-        $(TOOL_DEP_FILES)
+        @<<
+$(TOOL_DEP_FLAGS)
+-o$$(PATH_TARGET)
+-d$(TARGET_DEPEND)
+-srcadd AS:$$(MAKE_INCLUDE_AS_SETUP)
+-srcadd AS:$$(MAKE_INCLUDE_AS_OPT)
+-srcadd RC:$$(MAKE_INCLUDE_RC_SETUP)
+-srcadd ORC:$$(MAKE_INCLUDE_ORC_SETUP)
+-srcadd CX:$$(MAKE_INCLUDE_SETUP)
+-srcadd CX:$$(MAKE_INCLUDE_CX_OPT)
+$(TOOL_DEP_FILES)
+<<
 !endif
 !ifdef SUBDIRS_DEP
@@ -1249 +1260 @@
 # -----------------------------------------------------------------------------
 !if "$(TARGET_MODE)" == "EXE" || "$(TARGET_MODE)" == "DLL" || "$(TARGET_MODE)" == "SYS" || "$(TARGET_MODE)" == "IFS" || "$(TARGET_MODE)" == "VDD"
-$(TARGET): $(TARGET_OBJS) $(TARGET_RES) $(TARGET_DEF) $(TARGET_DEPS) $(TARGET_LIBS)
+$(TARGET): $(TARGET_OBJS) $(TARGET_RES) $(TARGET_DEF) $(TARGET_DEPS) $(TARGET_LIBS) \
+           $(MAKEFILE) $(MAKE_INCLUDE_SETUP) $(MAKE_INCLUDE_LD_SETUP) $(MAKE_INCLUDE_LD_OPT) $(PATH_ROOT)\$(BUILD_SETUP_MAK) $(MAKE_INCLUDE_PROCESS) $(PATH_MAKE)\setup.tools.mk
 !if "$(TOOL_JOB_WAIT)" != ""
 ! ifndef BUILD_QUIET
@@ -1282 +1294 @@
     @$(TOOL_RM) "$(TARGET_LNK)"
     \
-! ifdef BUILD_VERBOSE
+! ifndef BUILD_VERBOSE
     @ \
 ! endif
@@ -1388 +1400 @@
 # Lib parameter file.
 #
-$(TARGET_LNK): $(MAKE_INCLUDE_PROCESS) $(MAKE_INCLUDE_SETUP) $(PATH_MAKE)\setup.mak $(MAKEFILE)
+$(TARGET_LNK):  $(MAKEFILE) $(MAKE_INCLUDE_SETUP) $(MAKE_INCLUDE_AR_SETUP) $(PATH_ROOT)\$(BUILD_SETUP_MAK)
     @$(TOOL_ECHOTXT) Creating Lib Input File $(CLRRST)<<$@
 $(AR_LNK1)
@@ -1416 +1428 @@
 # -----------------------------------------------------------------------------
 !ifdef TARGET_ILIB
-$(TARGET_ILIB): $(TARGET_IDEF)
+$(TARGET_ILIB): $(TARGET_IDEF) $(MAKEFILE) $(MAKE_INCLUDE_SETUP) $(MAKE_INCLUDE_AR_SETUP) $(PATH_MAKE)\setup.tools.mk
     @$(ECHO) Creating Import Library $(CLRFIL)$@ $(CLRRST)
     \