diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-03-08 12:59:37 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-03-08 12:59:37 +0000 |
| commit | 31eda5b23921ced806ba0ef1523f5addb8c47af6 (patch) | |
| tree | 671051dc6d13cfe93f46cc5d77daf16d68d7f681 /solenv/inc/pstrules.mk | |
| parent | 2bcbd54ecc592232a92a589792e380235d41ede1 (diff) | |
INTEGRATION: CWS ause048 (1.38.24); FILE MERGED
2006/02/06 15:03:09 hjs 1.38.24.1: #i61266# DLLSUFFIX is obsolete. use DLLPOSTFIX instead
Diffstat (limited to 'solenv/inc/pstrules.mk')
| -rw-r--r-- | solenv/inc/pstrules.mk | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk index 2527111f3b93..7aed90000264 100644 --- a/solenv/inc/pstrules.mk +++ b/solenv/inc/pstrules.mk @@ -4,9 +4,9 @@ # # $RCSfile: pstrules.mk,v $ # -# $Revision: 1.38 $ +# $Revision: 1.39 $ # -# last change: $Author: obo $ $Date: 2006-01-20 12:09:05 $ +# last change: $Author: rt $ $Date: 2006-03-08 13:59:37 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -195,14 +195,10 @@ $(PAR)$/%.par : @echo Making: $@ @+-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))} >& $(NULLDEV) .IF "$(GUI)"=="WNT" - $(CPPLCC) -+ -P $(INCLUDE) $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre + $(CPPLCC) -+ -P $(INCLUDE) $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre .ENDIF .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="SOLARIS" - cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre -.ELSE - cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre -.ENDIF + cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre .ENDIF .IF "$(common_build_srs)"!="" +$(SCPCOMP) -l {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(TARGET)$/$(@:b).$(LANGFILEEXT)} -s $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre -o $@ |