strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS ooo20040704 (1.52.98); FILE MERGED

Browse source 
2004/08/09 15:21:38 vg 1.52.98.3: RESYNC MERGED 1.54 1.55
Everything below this line will be added to the revision comment.
2004/07/20 20:01:02 svesik 1.52.98.2: RESYNC: (1.52-1.54); FILE MERGED
2004/06/29 17:45:47 vq 1.52.98.1: #i29919# *crossmerge* Don't create "undeletable" nul files.
This commit is contained in:
Rüdiger Timm 2004-09-08 13:52:36 +00:00
parent c1fe866b23
commit e1b797f347
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
solenv/inc/rules.mk
View file

@ -2,9 +2,9 @@
#
# $RCSfile: rules.mk,v $
#
# $Revision: 1.56 $
# $Revision: 1.57 $
#
# last change: $Author: rt $ $Date: 2004-08-23 09:17:36 $
# last change: $Author: rt $ $Date: 2004-09-08 14:52:36 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -226,7 +226,7 @@ $(OBJ)$/%.obj : $(MISC)$/%.c
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
@+-$(RM) $@ >& $(NULLDEV)
@+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISC)$/$*.c )
@+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
@+$(ECHONL)
$(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISC)$/$*.c )
.ENDIF
@ -243,7 +243,7 @@ $(SLO)$/%.obj : $(MISC)$/%.c
+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE
@+-$(RM) $@ >& $(NULLDEV)
@+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISC)$/$*.c )
@+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
@+$(ECHONL)
.IF "$(COM)"=="GCC"
$(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISC)$/$*.c