diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-03-18 09:13:08 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-03-18 09:13:08 +0000 |
| commit | 421ad1fc5216bf23290786d79d938e02d8bce183 (patch) | |
| tree | 0a6abfc3c365b4acb871021fbb597fd187b44f22 /solenv | |
| parent | 8f7b05a6b9631583c18b1caec13fdb7e1bad6bf7 (diff) | |
INTEGRATION: CWS vq12 (1.60.132); FILE MERGED
2005/02/20 18:09:44 vq 1.60.132.1: #i29609# Use $(IFEXIST) and $(THEN) macros to use the correct syntax
for W32-4nt or W32-tcsh.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/rules.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index f6917b887b01..e0310516de94 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -614,12 +614,12 @@ $(SLO)$/%.obj : %.asm @echo Making: $@ .IF "$(COM)"=="WTC" $(ASM) $(AFLAGS) -D$(COM) $*.asm -fo=$(SLO)\$*.obj - +-if exist $*.err @del $*.err + +-$(IFEXIST) $*.err $(THEN) $(RM) $*.err .ELSE .IF "$(COM)"=="MSC" .IF "$(ASM)"=="ml" $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)\$*.obj $*.asm - +-if exist $*.err @del $*.err + +-$(IFEXIST) $*.err $(THEN) $(RM) $*.err .ELSE # "$(ASM)"=="ml" @+-$(RM) $@ >& $(NULLDEV) $(ASM) $(AFLAGS) $*.asm,$(SLO)\$*.obj; @@ -633,9 +633,9 @@ $(OBJ)$/%.obj : %.asm .IF "$(COM)"=="MSC" .IF "$(ASM)"=="ml" $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)\$*.obj $*.asm - +-if exist $*.err @del $*.err + +-$(IFEXIST) $*.err $(THEN) $(RM) $*.err .ELSE # "$(ASM)"=="ml" - @+if exist $@ $(RM) $@ >& $(NULLDEV) + @+$(IFEXIST) $@ $(THEN) $(RM) $@ >& $(NULLDEV) $(ASM) $(AFLAGS) $*.asm,$(OBJ)\$*.obj; .ENDIF # "$(ASM)"=="ml" .ENDIF "$(COM)"=="MSC" |