diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-09-07 13:35:07 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-09-07 13:35:07 +0000 |
| commit | ae0228cdb340de85f42c25024986ce0e557503a3 (patch) | |
| tree | 55439cdf267c7cd8eef9a0ce6fa0c1775b3a133f /solenv/inc/tg_rslb.mk | |
| parent | 9d7d35bce00ec0b2676d0428872300cc257e3288 (diff) | |
CWS-TOOLING: integrate CWS kick4nt
Diffstat (limited to 'solenv/inc/tg_rslb.mk')
| -rw-r--r-- | solenv/inc/tg_rslb.mk | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk index 1754c1e6a192..f5e630b812f1 100644 --- a/solenv/inc/tg_rslb.mk +++ b/solenv/inc/tg_rslb.mk @@ -35,7 +35,7 @@ .IF "$(RESLIB$(TNR)TARGETN)"!="" .IF "$(BUILDHIDS)"!="" -HIDRES$(TNR)PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB$(TNR)NAME)_res.hid +HIDRES$(TNR)PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB$(TNR)NAME)_res.hid #HACK cut off the dirty srs files which are included from solver RESLIB$(TNR)HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB$(TNR)SRSFILES))) @@ -44,7 +44,7 @@ $(HIDRES$(TNR)PARTICLE): $(RESLIB$(TNR)HIDFILES) @echo Making: $@ @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) # need to strip since solaris cannot handle tab-only whitespace here - $(TYPE) $(mktmp $(strip, $(subst,$/,/ $(RESLIB$(TNR)HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp + $(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB$(TNR)HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDRES$(TNR)PARTICLE) @@ -61,12 +61,12 @@ $(RSC_MULTI$(TNR)) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB$(TNR)NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}$/$i \ + -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB$(TNR)NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ -ft=$@ \ $(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \ @@ -76,12 +76,12 @@ $(RSC_MULTI$(TNR)) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(BIN)$/$(RESLIB$(TNR)NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}$/$i \ + -fs={$(BIN)/$(RESLIB$(TNR)NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil=$(BIN) \ -ft=$@ \ $(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \ |