INTEGRATION: CWS sb71 (1.8.14); FILE MERGED

2007/08/15 07:34:39 sb 1.8.14.4: #i77184# Windows /DELAYLOAD depends on objects delivered from sal, but is not needed for this internal tool, anyway.
2007/08/13 13:07:15 sb 1.8.14.3: #i77184# Dropped NO_WINDOWS_DELAYLOAD again (probably not needed at the moment after all).
2007/07/10 14:22:21 sb 1.8.14.2: #i77184# Improved previous change.
2007/07/10 11:10:43 sb 1.8.14.1: #i77184# soltools does not use the Windows delayload mechanism (it is below sal where the delayload.obj is built).

soltools/javadep/makefile.mk

@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.8 $
+#   $Revision: 1.9 $
 #
-#   last change: $Author: obo $ $Date: 2007-03-09 09:20:59 $
+#   last change: $Author: vg $ $Date: 2007-10-15 13:05:06 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -40,6 +40,10 @@ TARGET=javadep
 TARGETTYPE=CUI
 NO_DEFAULT_STL=TRUE
 
+# Windows /DELAYLOAD depends on objects delivered from sal, but is not needed
+# for this internal tool, anyway:
+DELAYLOADOBJ=
+
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : $(PRJ)$/util$/makefile.pmk