diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-10-05 15:20:20 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-10-05 15:20:20 +0000 |
| commit | 3ac9a2b925973850337ddc9bd3a3e555a076dcbc (patch) | |
| tree | c2c3de4af303001d8c6a7d4b17c4eddf277ab3f5 /solenv/inc/rules.mk | |
| parent | 4f7cc96757174be8f7fd00bdf69980154afa9bbc (diff) | |
INTEGRATION: CWS vq37 (1.72.6); FILE MERGED
2006/10/04 19:29:23 vq 1.72.6.1: #i69989# Add missing '-' in tg_config.mk and remove unneeded '+'.
Diffstat (limited to 'solenv/inc/rules.mk')
| -rw-r--r-- | solenv/inc/rules.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index 16f33e35574a..95fff1e2c2fc 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -4,9 +4,9 @@ # # $RCSfile: rules.mk,v $ # -# $Revision: 1.73 $ +# $Revision: 1.74 $ # -# last change: $Author: kz $ $Date: 2006-10-05 12:36:17 $ +# last change: $Author: kz $ $Date: 2006-10-05 16:20:20 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -475,7 +475,7 @@ $(MISC)$/s_%.dpcc : $(MISC)$/%.dpsc : @+-$(RM) $@ >& $(NULLDEV) - @+-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))} >& $(NULLDEV) + @-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))} >& $(NULLDEV) @$(MAKEDEPEND) -f - -p$(PAR)$/{$(subst,$(@:d:d:d), $(@:d:d))} -o.par -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(*:b).scp > $@ .IF "$(LAZY_DEPS)"=="" @echo $@ : $(PAR)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).par >> $@ @@ -618,21 +618,21 @@ $(MISC)$/%.sh : %.sh @+tr -d "\015" < $< > $@ $(COMMONMISC)$/$(TARGET)$/%.ulf : %.ulf - +-$(MKDIR) $(@:d) + -$(MKDIR) $(@:d) +-$(RM) $@ $(WRAPCMD) $(ULFEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all +$(RENAME) $@.$(INPATH) $@ +-$(RM) $@.$(INPATH) $(COMMONMISC)$/$(TARGET)$/%.xrb : %.xrb - +-$(MKDIR) $(@:d) + -$(MKDIR) $(@:d) +-$(RM) $@ $(WRAPCMD) $(XMLEX) -t xrb -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all +$(RENAME) $@.$(INPATH) $@ +-$(RM) $@.$(INPATH) $(COMMONMISC)$/$(TARGET)$/%.xrm : %.xrm - +-$(MKDIR) $(@:d) + -$(MKDIR) $(@:d) +-$(RM) $@ $(WRAPCMD) $(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all +$(RENAME) $@.$(INPATH) $@ |