diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-08 15:38:00 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-08 15:38:00 +0000 |
| commit | c2d8970ca38ac525979960e845ab209d7b44cc1d (patch) | |
| tree | f4a1ba24ac7d62a566c2bc5c4934a63a5b0ff89f /solenv/inc/tg_rslb.mk | |
| parent | b61e56a8948ee4e1b29ea15e51c19b3702dd1000 (diff) | |
#i10000# fix image/resource mess
Diffstat (limited to 'solenv/inc/tg_rslb.mk')
| -rw-r--r-- | solenv/inc/tg_rslb.mk | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk index 89a5ece4147a..c9a801016e9e 100644 --- a/solenv/inc/tg_rslb.mk +++ b/solenv/inc/tg_rslb.mk @@ -2,9 +2,9 @@ # # $RCSfile: tg_rslb.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: hjs $ $Date: 2004-06-07 13:47:40 $ +# last change: $Author: hjs $ $Date: 2004-06-08 16:37:09 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -111,26 +111,6 @@ ALLTAR : $(HIDRES$(TNR)PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -.IF "$(common_build_reslib)"!="" -$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION).ilst2 : $(RSC_MULTI$(TNR)) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION).ilst2 -.ELSE # "$(common_build_reslib)"!="" -$(BIN)$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION).ilst2 : $(RSC_MULTI$(TNR)) -.IF "$(use_shell)"!="4nt" - $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@ -.ELSE # "$(use_shell)"!="4nt" - +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@ -.ENDIF # "$(use_shell)"!="4nt" - -ALLTAR : $(BIN)$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION).ilst2 -.ENDIF # "$(common_build_reslib)"!="" - $(RSC_MULTI$(TNR)) : \ $(RESLIB$(TNR)SRSFILES) \ $(RESLIB$(TNR)TARGETN) \ @@ -142,10 +122,10 @@ $(RSC_MULTI$(TNR)) : \ $(foreach,i,$(alllangext) $(rsclang_{$i}) \ $(rescharset_{$i}) \ -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION)$i.res} \ - $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \ + $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(RESLIB1IMAGES)) -lip{$j}$/$(lang_{$i}) \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subGLOBAL=$(SOLARSRC) \ -subCUSTOM=to_be_defined \ -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ @@ -159,11 +139,11 @@ $(RSC_MULTI$(TNR)) : \ $(foreach,i,$(alllangext) $(rsclang_{$i}) \ $(rescharset_{$i}) \ -fs{$(BIN)$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION)$i.res} \ - $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \ + $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(RESLIB1IMAGES)) -lip{$j}$/$(lang_{$i}) \ -lip{$j} ) \ -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \ -subGLOBAL=$(SOLARSRC) \ - -subMODULE=$(PRJ) \ + -subMODULE=$(PRJ)$/.. \ -subCUSTOM=to_be_defined \ -oil$(BIN) \ -ft$@ \ |