From 9935f20d85c8e4893a9793c8d5beb6d77f1203ef Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Fri, 25 May 2007 09:51:40 +0000
Subject: INTEGRATION: CWS mingwport04 (1.85.26); FILE MERGED 2007/04/18
 14:22:08 vg 1.85.26.1: #144877# localized strings

---
 solenv/inc/rules.mk | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'solenv/inc/rules.mk')

diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index fab696ffa83e..6a4c0c939ba4 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: rules.mk,v $
 #
-#   $Revision: 1.87 $
+#   $Revision: 1.88 $
 #
-#   last change: $Author: kz $ $Date: 2007-05-10 15:10:49 $
+#   last change: $Author: vg $ $Date: 2007-05-25 10:51:40 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -233,7 +233,7 @@ $(OBJ)$/%.obj : %.c
     $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ENDIF
 .ELSE
-    @$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $*.c )
+    @$(TYPE) $(mktmp $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $*.c )
     @$(ECHONL)
 .IF "$(COM)"=="GCC"
     $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $*.c
@@ -276,7 +276,7 @@ $(SLO)$/%.obj : $(MISC)$/%.c
      $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
 .ELSE
     @@-$(RM) $@
-    @$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(MISC)$/$*.c )
+    @$(TYPE) $(mktmp $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(MISC)$/$*.c )
     @$(ECHONL)
 .IF "$(COM)"=="GCC"
     $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(MISC)$/$*.c 
@@ -538,9 +538,9 @@ $(SLO)$/%.obj : %.asm
 .IF "$(COM)"=="GCC"
 .IF "$(ASM)"=="ml"
        $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)$/$*.obj $*.asm
-       @+-$(RM) $*.err >& $(NULLDEV)
+       @@-$(RM) $*.err
 .ELSE			# "$(ASM)"=="ml"
-        @+-$(RM) $@ >&  $(NULLDEV)
+        @@-$(RM) $@
         $(ASM) $(AFLAGS) $*.asm,$(SLO)$/$*.obj;
 .ENDIF			# "$(ASM)"=="ml"
 .ELSE
@@ -566,9 +566,9 @@ $(OBJ)$/%.obj : %.asm
 .IF "$(COM)"=="GCC"
 .IF "$(ASM)"=="ml"
        $(ASM) $(AFLAGS) -D$(COM) /Fo$(OBJ)$/$*.obj $*.asm
-       @+-$(RM) $*.err >& $(NULLDEV)
+       @@-$(RM) $*.err
 .ELSE			# "$(ASM)"=="ml"
-        @+-$(RM) $@ >&  $(NULLDEV)
+        @@-$(RM) $@
         $(ASM) $(AFLAGS) $*.asm,$(OBJ)$/$*.obj;
 .ENDIF			# "$(ASM)"=="ml"
 .ELSE
-- 
cgit