Changeset 9243 for trunk/make/setup.os2ld.mk

Timestamp:

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

Author:

bird

Message:

Improved dependencies on the makefiles.

File:

• trunk/make/setup.os2ld.mk (modified) (1 diff)

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)
+