diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-11-06 14:44:40 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-11-06 14:44:40 +0000 |
| commit | b341641638ca95fd485c9099a2bc81d101efb586 (patch) | |
| tree | 8f7c26ae23380064f26fff7481d04ecebe47b658 /solenv/inc/rules.mk | |
| parent | 0307cb9569ed578b1f4934885342cd5b7f9a1b80 (diff) | |
INTEGRATION: CWS execshellmacrogone (1.89.66); FILE MERGED
2007/10/24 08:34:23 rene 1.89.66.2: RESYNC: (1.89-1.90); FILE MERGED
2007/10/24 06:35:45 rene 1.89.66.1: #i79760# krs patches for supressing "Executing shell macro..." output
Diffstat (limited to 'solenv/inc/rules.mk')
| -rw-r--r-- | solenv/inc/rules.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index 7de48b6ddfd7..ee9b66c23cd7 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -4,9 +4,9 @@ # # $RCSfile: rules.mk,v $ # -# $Revision: 1.90 $ +# $Revision: 1.91 $ # -# last change: $Author: vg $ $Date: 2007-09-21 09:17:06 $ +# last change: $Author: rt $ $Date: 2007-11-06 15:44:40 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -67,7 +67,7 @@ $(OBJ)$/%.obj : %.cpp .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) + $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE @@-$(RM) $@ @$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) @@ -433,8 +433,8 @@ $(MISC)$/%.dpslo : # slower but with correct output @@$(RM) $@ @$(TOUCH) $@ - @$(foreach,i,$(all_local_slo) $(shell $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $i ) >> $@ )) - @$(foreach,i,$(all_misc_slo) $(shell $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $i ) >> $@ )) + @$(foreach,i,$(all_local_slo) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $i ) >> $@ )) + @$(foreach,i,$(all_misc_slo) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $i ) >> $@ )) # for both $(TYPE) $(mktmp $(foreach,i,$(all_local_slo:b:+".obj") $(@:^"\n") : $(SLO)$/$i) $(foreach,i,$(all_misc_slo:b:+".obj") $(@:^"\n") : $(SLO)$/$i)) >> $@ @@ -444,8 +444,8 @@ $(MISC)$/%.dpobj : # slower but with correct output @@$(RM) $@ @$(TOUCH) $@ - @$(foreach,i,$(all_local_obj) $(shell $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $i ) >> $@ )) - @$(foreach,i,$(all_misc_obj) $(shell $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $i ) >> $@ )) + @$(foreach,i,$(all_local_obj) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $i ) >> $@ )) + @$(foreach,i,$(all_misc_obj) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $i ) >> $@ )) # for both $(TYPE) $(mktmp $(foreach,i,$(all_local_obj:b:+".obj") $(@:^"\n") : $(OBJ)$/$i) $(foreach,i,$(all_misc_obj:b:+".obj") $(@:^"\n") : $(OBJ)$/$i)) >> $@ @@ -645,10 +645,10 @@ $(MISC)$/%.dpj : .ENDIF .ELSE # "$(ndep)"=="" .IF "$(GUI)"=="UNX" - @echo $(shell $(STARDEP) @$(mktmp -o $@ -i $(CLASSDIR) $(foreach,i,$(JAVADEPINCLUDES:s/:/ /) -i $i) $(JAVACLASSFILES))) + @echo $(shell @$(STARDEP) @$(mktmp -o $@ -i $(CLASSDIR) $(foreach,i,$(JAVADEPINCLUDES:s/:/ /) -i $i) $(JAVACLASSFILES))) .ELSE @echo javadeps - @echo $(shell $(STARDEP) @$(mktmp -o $@ -i $(CLASSDIR) $(foreach,i,$(JAVADEPINCLUDES:s/;/ /) -i $i) $(JAVACLASSFILES))) + @echo $(shell @$(STARDEP) @$(mktmp -o $@ -i $(CLASSDIR) $(foreach,i,$(JAVADEPINCLUDES:s/;/ /) -i $i) $(JAVACLASSFILES))) .ENDIF .ENDIF # "$(nodep)"=="" |