diff options
author | Oliver Bolte <obo@openoffice.org> | 2008-02-25 15:40:16 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2008-02-25 15:40:16 +0000 |
commit | 5521e01c9933b313804e8f74582eaffc5df216c2 (patch) | |
tree | 29aec289ffe766e18b61c4f9b873e89f45ca93a5 | |
parent | 4c6a1eebbcbbd9a436dbdc45115f414c379be5d6 (diff) |
INTEGRATION: CWS supdremove02 (1.22.376); FILE MERGED
2008/01/31 15:25:35 rt 1.22.376.1: #i85482# Remove UPD from resource name
-rw-r--r-- | solenv/inc/_tg_rslb.mk | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/solenv/inc/_tg_rslb.mk b/solenv/inc/_tg_rslb.mk index 69192ac38af8..4c3cbb5453dc 100644 --- a/solenv/inc/_tg_rslb.mk +++ b/solenv/inc/_tg_rslb.mk @@ -29,7 +29,7 @@ $(RSC_MULTI1) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$(RESLIB1VERSION)$i.res} \ + -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}$/$i \ -lip={$j} ) \ -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ @@ -44,7 +44,7 @@ $(RSC_MULTI1) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(BIN)$/$(RESLIB1NAME)$(RESLIB1VERSION)$i.res} \ + -fs={$(BIN)$/$(RESLIB1NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}$/$i \ -lip={$j} ) \ -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ @@ -107,7 +107,7 @@ $(RSC_MULTI2) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$(RESLIB2VERSION)$i.res} \ + -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}$/$i \ -lip={$j} ) \ -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ @@ -122,7 +122,7 @@ $(RSC_MULTI2) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(BIN)$/$(RESLIB2NAME)$(RESLIB2VERSION)$i.res} \ + -fs={$(BIN)$/$(RESLIB2NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}$/$i \ -lip={$j} ) \ -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ @@ -185,7 +185,7 @@ $(RSC_MULTI3) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$(RESLIB3VERSION)$i.res} \ + -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}$/$i \ -lip={$j} ) \ -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ @@ -200,7 +200,7 @@ $(RSC_MULTI3) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(BIN)$/$(RESLIB3NAME)$(RESLIB3VERSION)$i.res} \ + -fs={$(BIN)$/$(RESLIB3NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}$/$i \ -lip={$j} ) \ -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ @@ -263,7 +263,7 @@ $(RSC_MULTI4) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$(RESLIB4VERSION)$i.res} \ + -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}$/$i \ -lip={$j} ) \ -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ @@ -278,7 +278,7 @@ $(RSC_MULTI4) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(BIN)$/$(RESLIB4NAME)$(RESLIB4VERSION)$i.res} \ + -fs={$(BIN)$/$(RESLIB4NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}$/$i \ -lip={$j} ) \ -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ @@ -341,7 +341,7 @@ $(RSC_MULTI5) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$(RESLIB5VERSION)$i.res} \ + -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}$/$i \ -lip={$j} ) \ -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ @@ -356,7 +356,7 @@ $(RSC_MULTI5) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(BIN)$/$(RESLIB5NAME)$(RESLIB5VERSION)$i.res} \ + -fs={$(BIN)$/$(RESLIB5NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}$/$i \ -lip={$j} ) \ -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ @@ -419,7 +419,7 @@ $(RSC_MULTI6) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$(RESLIB6VERSION)$i.res} \ + -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}$/$i \ -lip={$j} ) \ -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ @@ -434,7 +434,7 @@ $(RSC_MULTI6) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(BIN)$/$(RESLIB6NAME)$(RESLIB6VERSION)$i.res} \ + -fs={$(BIN)$/$(RESLIB6NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}$/$i \ -lip={$j} ) \ -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ @@ -497,7 +497,7 @@ $(RSC_MULTI7) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$(RESLIB7VERSION)$i.res} \ + -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}$/$i \ -lip={$j} ) \ -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ @@ -512,7 +512,7 @@ $(RSC_MULTI7) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(BIN)$/$(RESLIB7NAME)$(RESLIB7VERSION)$i.res} \ + -fs={$(BIN)$/$(RESLIB7NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}$/$i \ -lip={$j} ) \ -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ @@ -575,7 +575,7 @@ $(RSC_MULTI8) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$(RESLIB8VERSION)$i.res} \ + -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}$/$i \ -lip={$j} ) \ -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ @@ -590,7 +590,7 @@ $(RSC_MULTI8) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(BIN)$/$(RESLIB8NAME)$(RESLIB8VERSION)$i.res} \ + -fs={$(BIN)$/$(RESLIB8NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}$/$i \ -lip={$j} ) \ -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ @@ -653,7 +653,7 @@ $(RSC_MULTI9) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$(RESLIB9VERSION)$i.res} \ + -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}$/$i \ -lip={$j} ) \ -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ @@ -668,7 +668,7 @@ $(RSC_MULTI9) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(BIN)$/$(RESLIB9NAME)$(RESLIB9VERSION)$i.res} \ + -fs={$(BIN)$/$(RESLIB9NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}$/$i \ -lip={$j} ) \ -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ @@ -731,7 +731,7 @@ $(RSC_MULTI10) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB10NAME)$(RESLIB10VERSION)$i.res} \ + -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB10NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}$/$i \ -lip={$j} ) \ -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ @@ -746,7 +746,7 @@ $(RSC_MULTI10) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(BIN)$/$(RESLIB10NAME)$(RESLIB10VERSION)$i.res} \ + -fs={$(BIN)$/$(RESLIB10NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}$/$i \ -lip={$j} ) \ -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ |