Changeset 9243 for trunk/make

Timestamp:

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

Author:

bird

Message:

Improved dependencies on the makefiles.

Location:

trunk/make

Files:

• setup.optional.emx.mk (modified) (2 diffs)
• setup.optional.ilink.mk (modified) (1 diff)
• setup.optional.vac3xx.mk (modified) (2 diffs)
• setup.optional.watcom11x.mk (modified) (2 diffs)
• setup.optional.wlink.mk (modified) (2 diffs)
• setup.os2allrc.mk (modified) (2 diffs)
• setup.os2allwrc.mk (modified) (2 diffs)
• setup.os2ar.mk (modified) (1 diff)
• setup.os2as.mk (modified) (2 diffs)
• setup.os2ld.mk (modified) (1 diff)

trunk/make/setup.optional.emx.mk

@@ -1 @@
-# $Id: setup.optional.emx.mk,v 1.2 2002-05-16 11:37:00 bird Exp $
+# $Id: setup.optional.emx.mk,v 1.3 2002-09-14 23:31:27 bird Exp $
 
 #
@@ -7 +7 @@
 #
 
+MAKE_INCLUDE_CX_OPT = $(PATH_MAKE)\setup.optional.emx.mk
 
 #

trunk/make/setup.optional.ilink.mk

@@ -1 @@
-# $Id: setup.optional.ilink.mk,v 1.2 2002-08-28 04:40:58 bird Exp $
+# $Id: setup.optional.ilink.mk,v 1.3 2002-09-14 23:31:27 bird Exp $
+MAKE_INCLUDE_CX_OPT = $(PATH_MAKE)\setup.optional.ilink.mk
 
 #

trunk/make/setup.optional.vac3xx.mk

@@ -1 @@
-# $Id: setup.optional.vac3xx.mk,v 1.5 2002-09-05 02:56:11 bird Exp $
+# $Id: setup.optional.vac3xx.mk,v 1.6 2002-09-14 23:31:27 bird Exp $
 
 #
@@ -6 +6 @@
 #  Concidering the size of this, it really make sense putting it here.
 #
+MAKE_INCLUDE_CX_OPT = $(PATH_MAKE)\setup.optional.vac3xx.mk
 
 

trunk/make/setup.optional.watcom11x.mk

@@ -1 @@
-# $Id: setup.optional.watcom11x.mk,v 1.8 2002-08-30 20:51:08 bird Exp $
+# $Id: setup.optional.watcom11x.mk,v 1.9 2002-09-14 23:31:28 bird Exp $
 
 #
@@ -6 +6 @@
 #  Concidering the size of this, it really make sense putting it here.
 #
+MAKE_INCLUDE_CX_OPT = $(PATH_MAKE)\setup.optional.watcom11x.mk
 
 

trunk/make/setup.optional.wlink.mk

@@ -1 @@
-# $Id: setup.optional.wlink.mk,v 1.5 2002-08-30 18:57:13 bird Exp $
+# $Id: setup.optional.wlink.mk,v 1.6 2002-09-14 23:31:28 bird Exp $
 
 #
@@ -6 +6 @@
 #  Concidering the size of this, it really make sense putting it here.
 #
+MAKE_INCLUDE_LD_OPT = $(PATH_MAKE)\setup.optional.wlink.mk
 
 

trunk/make/setup.os2allrc.mk

@@ -1 @@
-# $Id: setup.os2allrc.mk,v 1.1 2002-08-30 18:27:22 bird Exp $
+# $Id: setup.os2allrc.mk,v 1.2 2002-09-14 23:35:26 bird Exp $
+
+MAKE_INCLUDE_RC_SETUP = $(PATH_MAKE)\setup.os2allrc.mk
 
 #
@@ -20 +22 @@
 !if "$(BUILD_MODE)" != "RELEASE"
            -DDEBUG \
-!endif      
+!endif
            $(RC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(RC_INCLUDES:-I=-i ) $(ALL_INCLUDES:-I=-i ) -i $(PATH_INCLUDES:;= -i )
 RL_FLAGS = -x2 -n

trunk/make/setup.os2allwrc.mk

@@ -1 @@
-# $Id: setup.os2allwrc.mk,v 1.1 2002-08-30 18:27:22 bird Exp $
+# $Id: setup.os2allwrc.mk,v 1.2 2002-09-14 23:35:26 bird Exp $
+
+MAKE_INCLUDE_ORC_SETUP = $(PATH_MAKE)\setup.os2allwrc.mk
 
 #
@@ -12 +14 @@
 !if "$(BUILD_MODE)" != "RELEASE"
               -DDEBUG \
-!endif              
+!endif
               $(ORC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES:-D__WINE__=) \
               $(ALL_INCLUDES) $(ORC_INCLUDES) -I$(PATH_INCLUDES) \

trunk/make/setup.os2ar.mk

@@ -1 @@
-# $Id: setup.os2ar.mk,v 1.1 2002-08-29 10:01:41 bird Exp $
+# $Id: setup.os2ar.mk,v 1.2 2002-09-14 23:35:27 bird Exp $
 
 #
 # Archiver(/lib manager) fanout.
 #
-_AR_INCLUDED = 0
+MAKE_INCLUDE_AR_SETUP =
 !ifdef AR_USE_WLIB
-_AR_INCLUDED = 1
 ! include $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)allwlib.mk
+MAKE_INCLUDE_AR_SETUP = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)allwlib.mk
 !endif
 !ifdef AR_USE_ILIB
-_AR_INCLUDED = 1
-! include $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)allilib.mk
+MAKE_INCLUDE_AR_SETUP = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)allilib.mk
 !endif
 !ifdef AR_USE_LIB
-_AR_INCLUDED = 1
-! include $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)alllib.mk
+MAKE_INCLUDE_AR_SETUP = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)alllib.mk
 !endif
 
 # Use default one (for the given environment)
-!if !$(_AR_INCLUDED)
+!if "$(MAKE_INCLUDE_AR_SETUP)" == ""
 ! if "$(BUILD_ENV:WAT=xxx)" != "$(BUILD_ENV)" # (watcom check)
-!  include $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)allwlib.mk
+MAKE_INCLUDE_AR_SETUP = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)allwlib.mk
 ! else
-!  include $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)allilib.mk
+MAKE_INCLUDE_AR_SETUP = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)allilib.mk
 ! endif
 !endif
 
+!include $(MAKE_INCLUDE_AR_SETUP)
+

trunk/make/setup.os2as.mk

@@ -1 @@
-# $Id: setup.os2as.mk,v 1.2 2002-08-30 18:27:22 bird Exp $
+# $Id: setup.os2as.mk,v 1.3 2002-09-14 23:35:27 bird Exp $
 
 #
@@ -6 +6 @@
 !ifdef AS_USE_MASM5
 # Alternate assembler: MASM v5.10
+MAKE_INCLUDE_AS_SETUP = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)allmasm510.mk
 ! include $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)allmasm510.mk
 !else
 # Default assembler:   ALP
-! include $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)allalp.mk
+MAKE_INCLUDE_AS_SETUP = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)allalp.mk
 !endif
+!include $(MAKE_INCLUDE_AS_SETUP)
 

trunk/make/setup.os2ld.mk

@@ -1 @@
-# $Id: setup.os2ld.mk,v 1.1 2002-08-29 10:01:43 bird Exp $
+# $Id: setup.os2ld.mk,v 1.2 2002-09-14 23:35:27 bird Exp $
 
 #
 # LD (link editor) fanout.
 #
-_LD_INCLUDED = 0
+MAKE_INCLUDE_LD_SETUP =
 !ifdef LD_USE_WLINK
-_LD_INCLUDED = 1
-TOOL_MAPSYM_TYPE = WLINK
-! include $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)wlink.mk
+TOOL_MAPSYM_TYPE        = WLINK
+MAKE_INCLUDE_LD_SETUP   = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)wlink.mk
 !endif
 !ifdef LD_USE_ILINK
-_LD_INCLUDED = 1
-TOOL_MAPSYM_TYPE = ILINK
-! include $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)ilink.mk
+TOOL_MAPSYM_TYPE        = ILINK
+MAKE_INCLUDE_LD_SETUP   = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)ilink.mk
 !endif
 !ifdef LD_USE_LINK
-_LD_INCLUDED = 1
-TOOL_MAPSYM_TYPE = LINK
-! include $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)link.mk
+TOOL_MAPSYM_TYPE        = LINK
+MAKE_INCLUDE_LD_SETUP   = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)link.mk
 !endif
 !ifdef LD_USE_LINK386
-_LD_INCLUDED = 1
-TOOL_MAPSYM_TYPE = LINK386
-! include $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)link386.mk
-_TOOL_MAPSYM_ =
+TOOL_MAPSYM_TYPE        = LINK386
+MAKE_INCLUDE_LD_SETUP   = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)link386.mk
 !endif
 
-
 # Use default one (for the given environment)
-!if !$(_LD_INCLUDED)
+!if "$(MAKE_INCLUDE_LD_SETUP)" == ""
 ! if "$(BUILD_ENV:WAT=xxx)" != "$(BUILD_ENV)" # (watcom check)
-TOOL_MAPSYM_TYPE = WLINK
-!  include $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)wlink.mk
+TOOL_MAPSYM_TYPE        = WLINK
+MAKE_INCLUDE_LD_SETUP   = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)wlink.mk
 ! else
 !  if "$(LD_FORMAT)" == "NE"
-TOOL_MAPSYM_TYPE = LINK
-!   include $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)link.mk
+TOOL_MAPSYM_TYPE        = LINK
+MAKE_INCLUDE_LD_SETUP   = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)link.mk
 !  else
-TOOL_MAPSYM_TYPE = ILINK
-!   include $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)ilink.mk
+TOOL_MAPSYM_TYPE        = ILINK
+MAKE_INCLUDE_LD_SETUP   = $(PATH_MAKE)\setup.$(SHT_TRGPLTFRM)$(SHT_BLDMD)ilink.mk
 !  endif
 ! endif
 !endif
 
+!include $(MAKE_INCLUDE_LD_SETUP)
+