diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-07-11 14:27:34 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-07-11 14:27:34 +0000 |
| commit | 9c63fff9165f7f91b8742a13bb62e767dd47df25 (patch) | |
| tree | 527418fbbf1e06b1c3baa319af54d901ddefe8c1 /solenv/inc | |
| parent | 6a77dd1c9b47b13406f59959706ebdba67a619e3 (diff) | |
INTEGRATION: CWS ause030 (1.61.76); FILE MERGED
2005/06/13 12:47:38 hjs 1.61.76.1: #i50647# \ cleanup; fix message
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/rules.mk | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index f57e1251de7a..95da266d4755 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -201,13 +201,13 @@ $(OBJ)$/%.obj : %.c +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ .ENDIF .ELSE - @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) + @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $*.c ) @+$(ECHONL) .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c + $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $*.c .ELSE +-@echo Cflags: $(CFLAGS) - $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) + $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $*.c ) .ENDIF .ENDIF @@ -223,9 +223,9 @@ $(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 $(MISCX)$/$*.c ) + @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(MISC)$/$*.c ) @+$(ECHONL) - $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISC)$/$*.c ) + $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(MISC)$/$*.c ) .ENDIF $(SLO)$/%.obj : $(MISC)$/%.c @@ -240,12 +240,12 @@ $(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 $(MISCX)$/$*.c ) + @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(MISC)$/$*.c ) @+$(ECHONL) .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISC)$/$*.c + $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(MISC)$/$*.c .ELSE - $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISC)$/$*.c ) + $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(MISC)$/$*.c ) .ENDIF .ENDIF @@ -613,16 +613,16 @@ $(SLO)$/%.obj : %.asm @echo ------------------------------ @echo Making: $@ .IF "$(COM)"=="WTC" - $(ASM) $(AFLAGS) -D$(COM) $*.asm -fo=$(SLO)\$*.obj + $(ASM) $(AFLAGS) -D$(COM) $*.asm -fo=$(SLO)$/$*.obj +-$(IFEXIST) $*.err $(THEN) $(RM) $*.err .ELSE .IF "$(COM)"=="MSC" .IF "$(ASM)"=="ml" - $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)\$*.obj $*.asm + $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)$/$*.obj $*.asm +-$(IFEXIST) $*.err $(THEN) $(RM) $*.err .ELSE # "$(ASM)"=="ml" @+-$(RM) $@ >& $(NULLDEV) - $(ASM) $(AFLAGS) $*.asm,$(SLO)\$*.obj; + $(ASM) $(AFLAGS) $*.asm,$(SLO)$/$*.obj; .ENDIF # "$(ASM)"=="ml" .ENDIF "$(COM)"=="MSC" .ENDIF @@ -632,11 +632,11 @@ $(OBJ)$/%.obj : %.asm @echo Making: $@ .IF "$(COM)"=="MSC" .IF "$(ASM)"=="ml" - $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)\$*.obj $*.asm + $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)$/$*.obj $*.asm +-$(IFEXIST) $*.err $(THEN) $(RM) $*.err .ELSE # "$(ASM)"=="ml" @+$(IFEXIST) $@ $(THEN) $(RM) $@ >& $(NULLDEV) - $(ASM) $(AFLAGS) $*.asm,$(OBJ)\$*.obj; + $(ASM) $(AFLAGS) $*.asm,$(OBJ)$/$*.obj; .ENDIF # "$(ASM)"=="ml" .ENDIF "$(COM)"=="MSC" |