INTEGRATION: CWS warnings01 (1.64.28); FILE MERGED

2006/04/07 18:29:29 sb 1.64.28.2: RESYNC: (1.64-1.65); FILE MERGED 2005/10/13 09:27:05 sb 1.64.28.1: #i53898# Added CAPTURE_COMMAND/CAPTURE_OUTPUT to capture the command line to generate SLO/obj files from cxx (used in soltools/testhxx); if there is demand, this mechanism can be added to more rules.

INTEGRATION: CWS warnings01 (1.64.28); FILE MERGED
2006/04/07 18:29:29 sb 1.64.28.2: RESYNC: (1.64-1.65); FILE MERGED 2005/10/13 09:27:05 sb 1.64.28.1: #i53898# Added CAPTURE_COMMAND/CAPTURE_OUTPUT to capture the command line to generate SLO/obj files from cxx (used in soltools/testhxx); if there is demand, this mechanism can be added to more rules.
814a23b8 · Jens-Heiner Rechtien · eecfdb1e · 814a23b8
Kaydet (Commit) 814a23b8 authored Haz 19, 2006 tarafından Jens-Heiner Rechtien
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

rules.mk solenv/inc/rules.mk +6 -5

No files found.
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: rules.mk,v $
 #
-#   $Revision: 1.65 $
+#   $Revision: 1.66 $
 #
-#   last change: $Author: rt $ $Date: 2006-03-08 13:59:48 $
+#   last change: $Author: hr $ $Date: 2006-06-19 17:12:28 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -88,15 +88,16 @@ $(SLO)$/%.obj : %.cxx
    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) -E  $(CFLAGSINCXX)$(PWD)$/$*.cxx
 .ELSE
    @$(RM) $@ $(@:s/.obj/.o/)
-    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+    $(CAPTURE_COMMAND) $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx $(CAPTURE_OUTPUT)
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
+.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && \
+        "$(CAPTURE_COMMAND)"==""
    $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
 .ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
    +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
 .ENDIF
 .ELSE			# "$(GUI)"=="UNX"
    @+-$(RM) $@ >& $(NULLDEV)
-    @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
+    @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) $(CAPTURE_OUTPUT)
    @+$(ECHONL)
    $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
 .ENDIF			# "$(GUI)"=="UNX"