diff options
author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2009-09-28 17:14:56 +0200 |
---|---|---|
committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2009-09-28 17:14:56 +0200 |
commit | eede210b11921ae92386ded4431b350e43c54049 (patch) | |
tree | 644c24847f64f4a470246407409a3967d2781fd2 /solenv/inc/target.mk | |
parent | c6703df672656c8203eb1dee3882e00fd9f11e16 (diff) | |
parent | 41821fa93ada11053a53be14429e5f7236b9bf03 (diff) |
update to DEV300_m60
Diffstat (limited to 'solenv/inc/target.mk')
-rw-r--r-- | solenv/inc/target.mk | 484 |
1 files changed, 239 insertions, 245 deletions
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index b0fabb84d649..705368b3b4e3 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -56,21 +56,21 @@ INCEXT*=. INCPRE*=. INCPOST*=. .IF "$(PRE)"!="" -ENVINCPRE+=-I$(PRE)$/inc +ENVINCPRE+=-I$(PRE)/inc .ENDIF # "$(PRE)"!="" .IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"=="" -UNOINCLUDES=$(SOLARINCDIR)$/offuh +UNOINCLUDES=$(SOLARINCDIR)/offuh .ENDIF # "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"=="" SOLARINC+=$(JDKINCS) # make sure INCLUDE isn't set INCLUDE:= .EXPORT : INCLUDE .IF "$(PRJINC)"!="" -INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST) +INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) .ELSE # "$(PRJINC)"!="" -INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST) +INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) .ENDIF # "$(PRJINC)"!="" -INCLUDE_C=$(subst,$/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE)) +INCLUDE_C=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE)) .EXPORT : LIB # --- Compiler ----------------------------------------------------- @@ -89,32 +89,32 @@ SUBDIRSDEPS=$(RC_SUBDIRSDEPS) .IF "$(L10N_framework)"=="" .IF "$(DEPOBJFILES)"!="" -DEPCOLLECT_SLO+:=$(foreach,i,$(DEPOBJFILES) $(eq,$i,$(subst,$(SLO),ttt $i) $(NULL) $(subst,$(SLO)$/,not_existing$/s_ $(i:s/.obj/.dpcc/)))) -DEPCOLLECT_OBJ+:=$(foreach,i,$(DEPOBJFILES) $(eq,$i,$(subst,$(OBJ),ttt $i) $(NULL) $(subst,$(OBJ)$/,not_existing$/o_ $(i:s/.obj/.dpcc/)))) +DEPCOLLECT_SLO+:=$(foreach,i,$(DEPOBJFILES) $(eq,$i,$(subst,$(SLO),ttt $i) $(NULL) $(subst,$(SLO)/,not_existing/s_ $(i:s/.obj/.dpcc/)))) +DEPCOLLECT_OBJ+:=$(foreach,i,$(DEPOBJFILES) $(eq,$i,$(subst,$(OBJ),ttt $i) $(NULL) $(subst,$(OBJ)/,not_existing/o_ $(i:s/.obj/.dpcc/)))) .ENDIF # "$(DEPOBJFILES)"!="" # point to not existing directory as there is no creation intended anyway and # stat call looks faster -DEPCOLLECT_SLO+:=$(subst,$(SLO)$/,not_existing$/s_ $(SLOFILES:s/.obj/.dpcc/)) -DEPCOLLECT_OBJ+:=$(subst,$(OBJ)$/,not_existing$/o_ $(OBJFILES:s/.obj/.dpcc/)) +DEPCOLLECT_SLO+:=$(subst,$(SLO)/,not_existing/s_ $(SLOFILES:s/.obj/.dpcc/)) +DEPCOLLECT_OBJ+:=$(subst,$(OBJ)/,not_existing/o_ $(OBJFILES:s/.obj/.dpcc/)) .ENDIF # "$(L10N_framework)"=="" DEPFILESx+:=$(subst,$(PAR),$(MISC) $(ALLPARFILES:s/.par/.dpsc/)) .IF "$(L10N_framework)"=="" .IF "$(RCFILES)"!="" .IF "$(RESNAME)"!="" -DEPFILESx+:=$(MISC)$/$(RESNAME).dpcc +DEPFILESx+:=$(MISC)/$(RESNAME).dpcc .ELSE # "$(RESNAME)"!="" -DEPFILESx+:=$(MISC)$/$(TARGET).dprc +DEPFILESx+:=$(MISC)/$(TARGET).dprc .ENDIF # "$(RESNAME)"!="" .ENDIF # "$(RCFILES)"!="" .ENDIF # "$(L10N_framework)"=="" DEPFILES:=$(uniq $(DEPFILESx)) DEPCOLLECT_SLO!:=$(strip $(uniq $(DEPCOLLECT_SLO))) .IF "$(DEPCOLLECT_SLO)"!="" -DEPFILE_SLO+:=$(MISC)$/all_$(TARGET).dpslo +DEPFILE_SLO+:=$(MISC)/all_$(TARGET).dpslo .ENDIF # "$(DEPCOLLECT_SLO)"!="" DEPCOLLECT_OBJ!:=$(strip $(uniq $(DEPCOLLECT_OBJ))) .IF "$(DEPCOLLECT_OBJ)"!="" -DEPFILE_OBJ+:=$(MISC)$/all_$(TARGET).dpobj +DEPFILE_OBJ+:=$(MISC)/all_$(TARGET).dpobj .ENDIF # "$(DEPCOLLECT_OBJ)"!="" .ENDIF # "$(nodep)"=="" @@ -160,19 +160,19 @@ APP9TARGET= .IF "$(IDLFILES)"!="" -URDFILES+=$(foreach,i,$(IDLFILES:s/.idl/.urd/:f) $(OUT)$/ucr$/$(IDLPACKAGE)$/$i) +URDFILES+=$(foreach,i,$(IDLFILES:s/.idl/.urd/:f) $(OUT)/ucr/$(IDLPACKAGE)/$i) UNOIDLTARGETS+=$(URDFILES) .IF "$(URDFILES)"!="" -LOCALDBTARGET=$(OUT)$/ucr$/$(TARGET).db +LOCALDBTARGET=$(OUT)/ucr/$(TARGET).db .ENDIF .IF "$(URDDOC)" != "" -URDDOCFILES+=$(foreach,i,$(IDLFILES:s/.idl/.urd/:f) $(OUT)$/ucrdoc$/$(IDLPACKAGE)$/$i) +URDDOCFILES+=$(foreach,i,$(IDLFILES:s/.idl/.urd/:f) $(OUT)/ucrdoc/$(IDLPACKAGE)/$i) UNOIDLTARGETS+=$(URDDOCFILES) .IF "$(URDDOCFILES)"!="" -LOCALDOCDBTARGET=$(OUT)$/ucrdoc$/$(TARGET).db +LOCALDOCDBTARGET=$(OUT)/ucrdoc/$(TARGET).db .ENDIF .ENDIF # "$(URDDOC)" != "" @@ -180,10 +180,10 @@ LOCALDOCDBTARGET=$(OUT)$/ucrdoc$/$(TARGET).db .ENDIF # "$(IDLFILES)"!="" .IF "$(UNOIDLDBFILES)"!="" -UNOIDLDBTARGET=$(OUT)$/ucr$/$(PRJNAME).db +UNOIDLDBTARGET=$(OUT)/ucr/$(PRJNAME).db .IF "$(URDDOC)" != "" -UNOIDLDBDOCFILES:=$(subst,$/ucr$/,$/ucrdoc$/ $(UNOIDLDBFILES)) -UNOIDLDBDOCTARGET=$(OUT)$/ucrdoc$/$(PRJNAME)_doc.db +UNOIDLDBDOCFILES:=$(subst,/ucr/,/ucrdoc/ $(UNOIDLDBFILES)) +UNOIDLDBDOCTARGET=$(OUT)/ucrdoc/$(PRJNAME)_doc.db .IF "$(UNOIDLDBREGS)"!="" UNOIDLDBDOCREGS=$(foreach,i,$(UNOIDLDBREGS) $(i:d)$(i:b)_doc$(i:e)) .ENDIF # "$(UNOIDLDBREGS)"!="" @@ -192,14 +192,14 @@ UNOIDLDBDOCREGS=$(foreach,i,$(UNOIDLDBREGS) $(i:d)$(i:b)_doc$(i:e)) .IF "$(IDLFILES)"!="" .IF "$(PACKAGE)"!="" -IDLDIRS=$(SOLARIDLDIR)$/$(PACKAGE) +IDLDIRS=$(SOLARIDLDIR)/$(PACKAGE) .ELSE # "$(PACKAGE)"!="" IDLDIRS=$(SOLARIDLDIR) .ENDIF # "$(PACKAGE)"!="" .IF "$(LOCALIDLFILES)$(EXTERNIDLFILES)"!="" .IF "$(EXTERNIDLFILES)"!="" -DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(IDLDIRS)$/$i) +DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(IDLDIRS)/$i) .ELSE # "$(EXTERNIDLFILES)"!="" DEPIDLFILES:=$(IDLFILES) .ENDIF # "$(EXTERNIDLFILES)"!="" @@ -214,12 +214,12 @@ DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(!null,$(shell @$(FIND) . -name $i -print) .IF "$(L10N_framework)"=="" .IF "$(JARFILES)"!="" -LOCALJARS:=$(foreach,i,$(shell @@-cd $(JARDIR) && ls -1 $(JARFILES) ) $(JARDIR)$/$i) +LOCALJARS:=$(foreach,i,$(shell @@-cd $(JARDIR) && ls -1 $(JARFILES) ) $(JARDIR)/$i) NEWCLASS:=$(LOCALJARS) -NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARBINDIR)$/$i $(NULL))) +NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARBINDIR)/$i $(NULL))) .ENDIF # "$(JARFILES)"!="" .IF "$(EXTRAJARFILES)"!="" -NEWCLASS+=$(foreach,i,$(EXTRAJARFILES) $(COMMON_BUILD_TOOLS)$/$i) +NEWCLASS+=$(foreach,i,$(EXTRAJARFILES) $(COMMON_BUILD_TOOLS)/$i) .ENDIF # "$(EXTRAJARFILES)"!="" .IF "$(GENJAVACLASSFILES)"!="" NEWCLASS+=$(CLASSGENDIR) @@ -240,25 +240,25 @@ EXCEPTIONSNOOPTTARGET=do_it_exceptions_noopt .IF "$(LIBTARGET)"=="" .IF "$(OBJFILES)$(IDLOBJFILES)"!="" -OBJTARGET=$(LB)$/$(TARGET).lib +OBJTARGET=$(LB)/$(TARGET).lib .ENDIF .IF "$(SLOFILES)$(IDLSLOFILES)"!="" -SLOTARGET=$(SLB)$/$(TARGET).lib +SLOTARGET=$(SLB)/$(TARGET).lib .ENDIF .ENDIF # "$(LIBTARGET)"=="" .IF "$(SECOND_BUILD)"!="" .IF "$($(SECOND_BUILD)_SLOFILES)"!="" .IF "$(LIBTARGET)"=="" -$(SECOND_BUILD)SLOTARGET=$(SLB)$/$(SECOND_BUILD)_$(TARGET).lib +$(SECOND_BUILD)SLOTARGET=$(SLB)/$(SECOND_BUILD)_$(TARGET).lib .ENDIF # "$(LIBTARGET)"=="" REAL_$(SECOND_BUILD)_SLOFILES=$(foreach,i,$($(SECOND_BUILD)_SLOFILES) $(i:d)$(SECOND_BUILD)_$(i:f)) .ENDIF .IF "$($(SECOND_BUILD)_OBJFILES)"!="" .IF "$(LIBTARGET)"=="" -$(SECOND_BUILD)OBJTARGET=$(LB)$/$(SECOND_BUILD)_$(TARGET).lib +$(SECOND_BUILD)OBJTARGET=$(LB)/$(SECOND_BUILD)_$(TARGET).lib .ENDIF # "$(LIBTARGET)"=="" REAL_$(SECOND_BUILD)_OBJFILES=$(foreach,i,$($(SECOND_BUILD)_OBJFILES) $(i:d)$(SECOND_BUILD)_$(i:f)) .ENDIF @@ -286,80 +286,80 @@ NOLIBSLOTARGET=$(SLOFILES) .ENDIF .IF "$(SRC1FILES)"!="" -SRC1TARGET=$(SRS)$/$(SRS1NAME).srs -DEPSRS1FILE+=$(MISC)$/$(TARGET).$(SRS1NAME).dprr +SRC1TARGET=$(SRS)/$(SRS1NAME).srs +DEPSRS1FILE+=$(MISC)/$(TARGET).$(SRS1NAME).dprr DEPSRSFILES+=$(DEPSRS1FILE) .ENDIF .IF "$(SRC2FILES)"!="" -SRC2TARGET=$(SRS)$/$(SRS2NAME).srs -DEPSRS2FILE+=$(MISC)$/$(TARGET).$(SRS2NAME).dprr +SRC2TARGET=$(SRS)/$(SRS2NAME).srs +DEPSRS2FILE+=$(MISC)/$(TARGET).$(SRS2NAME).dprr DEPSRSFILES+=$(DEPSRS2FILE) .ENDIF .IF "$(SRC3FILES)"!="" -SRC3TARGET=$(SRS)$/$(SRS3NAME).srs -DEPSRS3FILE+=$(MISC)$/$(TARGET).$(SRS3NAME).dprr +SRC3TARGET=$(SRS)/$(SRS3NAME).srs +DEPSRS3FILE+=$(MISC)/$(TARGET).$(SRS3NAME).dprr DEPSRSFILES+=$(DEPSRS3FILE) .ENDIF .IF "$(SRC4FILES)"!="" -SRC4TARGET=$(SRS)$/$(SRS4NAME).srs -DEPSRS4FILE+=$(MISC)$/$(TARGET).$(SRS4NAME).dprr +SRC4TARGET=$(SRS)/$(SRS4NAME).srs +DEPSRS4FILE+=$(MISC)/$(TARGET).$(SRS4NAME).dprr DEPSRSFILES+=$(DEPSRS4FILE) .ENDIF .IF "$(SRC5FILES)"!="" -SRC5TARGET=$(SRS)$/$(SRS5NAME).srs -DEPSRS5FILE+=$(MISC)$/$(TARGET).$(SRS5NAME).dprr +SRC5TARGET=$(SRS)/$(SRS5NAME).srs +DEPSRS5FILE+=$(MISC)/$(TARGET).$(SRS5NAME).dprr DEPSRSFILES+=$(DEPSRS5FILE) .ENDIF .IF "$(SRC6FILES)"!="" -SRC6TARGET=$(SRS)$/$(SRS6NAME).srs -DEPSRS6FILE+=$(MISC)$/$(TARGET).$(SRS6NAME).dprr +SRC6TARGET=$(SRS)/$(SRS6NAME).srs +DEPSRS6FILE+=$(MISC)/$(TARGET).$(SRS6NAME).dprr DEPSRSFILES+=$(DEPSRS6FILE) .ENDIF .IF "$(SRC7FILES)"!="" -SRC7TARGET=$(SRS)$/$(SRS7NAME).srs -DEPSRS7FILE+=$(MISC)$/$(TARGET).$(SRS7NAME).dprr +SRC7TARGET=$(SRS)/$(SRS7NAME).srs +DEPSRS7FILE+=$(MISC)/$(TARGET).$(SRS7NAME).dprr DEPSRSFILES+=$(DEPSRS7FILE) .ENDIF .IF "$(SRC8FILES)"!="" -SRC8TARGET=$(SRS)$/$(SRS8NAME).srs -DEPSRS8FILE+=$(MISC)$/$(TARGET).$(SRS8NAME).dprr +SRC8TARGET=$(SRS)/$(SRS8NAME).srs +DEPSRS8FILE+=$(MISC)/$(TARGET).$(SRS8NAME).dprr DEPSRSFILES+=$(DEPSRS8FILE) .ENDIF .IF "$(SRC9FILES)"!="" -SRC9TARGET=$(SRS)$/$(SRS9NAME).srs -DEPSRS9FILE+=$(MISC)$/$(TARGET).$(SRS9NAME).dprr +SRC9TARGET=$(SRS)/$(SRS9NAME).srs +DEPSRS9FILE+=$(MISC)/$(TARGET).$(SRS9NAME).dprr DEPSRSFILES+=$(DEPSRS9FILE) .ENDIF .IF "$(SOLAR_JAVA)"!="" .IF "$(JAVAFILES)$(JAVACLASSFILES)$(GENJAVAFILES)"!="" .IF "$(JAVAFILES)$(JAVACLASSFILES)"=="$(JAVAFILES)" -JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:s/.java//).class) +JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:s/.java//).class) .ELSE # "$(JAVAFILES)$(JAVACLASSFILES)"=="$(JAVAFILES)" .IF "$(JAVAFILES)$(JAVACLASSFILES)"=="$(JAVACLASSFILES)" -JAVAFILES= $(foreach,i,$(JAVACLASSFILES) $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(i:s/.class//).java)) +JAVAFILES= $(foreach,i,$(JAVACLASSFILES) $(subst,$(CLASSDIR)/$(PACKAGE)/, $(i:s/.class//).java)) .ENDIF # "$(JAVAFILES)$(JAVACLASSFILES)"=="$(JAVACLASSFILES)" .ENDIF # "$(JAVAFILES)$(JAVACLASSFILES)"=="$(JAVAFILES)" -JAVATARGET:=$(MISC)$/$(TARGET)_dummy.java +JAVATARGET:=$(MISC)/$(TARGET)_dummy.java .ENDIF # "$(JAVAFILES)$(JAVACLASSFILES)$(GENJAVAFILES)"!="" .IF "$(JARTARGET)"!="" JARCLASSDIRS*=. .IF "$(NEW_JAR_PACK)"!="" -JARMANIFEST*=$(CLASSDIR)$/$(TARGET)$/META-INF$/MANIFEST.MF +JARMANIFEST*=$(CLASSDIR)/$(TARGET)/META-INF/MANIFEST.MF .ENDIF # "$(NEW_JAR_PACK)"!="" -JARTARGETN=$(CLASSDIR)$/$(JARTARGET) +JARTARGETN=$(CLASSDIR)/$(JARTARGET) .IF "$(NOJARDEP)$(NEW_JAR_PACK)"=="" JARTARGETDEP=$(JARTARGET).dep -JARTARGETDEPN=$(MISC)$/$(JARTARGET).dep +JARTARGETDEPN=$(MISC)/$(JARTARGET).dep .ENDIF # "$(NOJARDEP)$(NEW_JAR_PACK)"=="" .ENDIF # "$(JARTARGET)"!="" .ELSE # "$(SOLAR_JAVA)"!="" @@ -372,49 +372,49 @@ javauno:= .IF "$(RCFILES)"!="" RESNAME*=$(TARGET) .IF "$(RCFILES)" != "verinfo.rc" -RCTARGET=$(RES)$/$(RESNAME).res +RCTARGET=$(RES)/$(RESNAME).res .ELSE # "$(RCFILES)" != "verinfo.rc" RCFILES= .ENDIF # "$(RCFILES)" != "verinfo.rc" .ENDIF # "$(RCFILES)"!="" .ENDIF # "$(L10N_framework)"=="" -LOCALIZE_ME_DEST:=$(foreach,i,$(LOCALIZE_ME) $(INCCOM)$/$(i:f:s/_tmpl//)) +LOCALIZE_ME_DEST:=$(foreach,i,$(LOCALIZE_ME) $(INCCOM)/$(i:f:s/_tmpl//)) .IF "$(SCP1TARGET)"!="" -SCP1TARGETN:=$(foreach,i,$(SCP1LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP1TARGET)$(SCPPOST)) +SCP1TARGETN:=$(foreach,i,$(SCP1LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP1TARGET)$(SCPPOST)) .ENDIF .IF "$(SCP2TARGET)"!="" -SCP2TARGETN:=$(foreach,i,$(SCP2LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP2TARGET)$(SCPPOST)) +SCP2TARGETN:=$(foreach,i,$(SCP2LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP2TARGET)$(SCPPOST)) .ENDIF .IF "$(SCP3TARGET)"!="" -SCP3TARGETN:=$(foreach,i,$(SCP3LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP3TARGET)$(SCPPOST)) +SCP3TARGETN:=$(foreach,i,$(SCP3LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP3TARGET)$(SCPPOST)) .ENDIF .IF "$(SCP4TARGET)"!="" -SCP4TARGETN:=$(foreach,i,$(SCP4LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP4TARGET)$(SCPPOST)) +SCP4TARGETN:=$(foreach,i,$(SCP4LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP4TARGET)$(SCPPOST)) .ENDIF .IF "$(SCP5TARGET)"!="" -SCP5TARGETN:=$(foreach,i,$(SCP5LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP5TARGET)$(SCPPOST)) +SCP5TARGETN:=$(foreach,i,$(SCP5LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP5TARGET)$(SCPPOST)) .ENDIF .IF "$(SCP6TARGET)"!="" -SCP6TARGETN:=$(foreach,i,$(SCP6LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP6TARGET)$(SCPPOST)) +SCP6TARGETN:=$(foreach,i,$(SCP6LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP6TARGET)$(SCPPOST)) .ENDIF .IF "$(SCP7TARGET)"!="" -SCP7TARGETN:=$(foreach,i,$(SCP7LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP7TARGET)$(SCPPOST)) +SCP7TARGETN:=$(foreach,i,$(SCP7LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP7TARGET)$(SCPPOST)) .ENDIF .IF "$(SCP8TARGET)"!="" -SCP8TARGETN:=$(foreach,i,$(SCP8LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP8TARGET)$(SCPPOST)) +SCP8TARGETN:=$(foreach,i,$(SCP8LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP8TARGET)$(SCPPOST)) .ENDIF .IF "$(SCP9TARGET)"!="" -SCP9TARGETN:=$(foreach,i,$(SCP9LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP9TARGET)$(SCPPOST)) +SCP9TARGETN:=$(foreach,i,$(SCP9LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP9TARGET)$(SCPPOST)) .ENDIF .IF "$(ZIP1TARGET)$(ZIP2TARGET)$(ZIP3TARGET)$(ZIP4TARGET)$(ZIP5TARGET)$(ZIP6TARGET)$(ZIP7TARGET)$(ZIP8TARGET)$(ZIP9TARGET)"!="$(ZIP1LIST:s/LANGDIR//)$(ZIP2LIST:s/LANGDIR//)$(ZIP3LIST:s/LANGDIR//)$(ZIP4LIST:s/LANGDIR//)$(ZIP5LIST:s/LANGDIR//)$(ZIP6LIST:s/LANGDIR//)$(ZIP7LIST:s/LANGDIR//)$(ZIP8LIST:s/LANGDIR//)$(ZIP9LIST:s/LANGDIR//)" @@ -424,7 +424,7 @@ ZIPALL=ZIPALLTARGET .ENDIF # .IF "$(APP1TARGET)"!="" -APP1TARGETN=$(BIN)$/$(APP1TARGET)$(EXECPOST) +APP1TARGETN=$(BIN)/$(APP1TARGET)$(EXECPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" .IF "$(APP1BASE)"=="" @@ -436,7 +436,7 @@ APP1BASEX=/BASE:$(APP1BASE) .ENDIF .IF "$(APP2TARGET)"!="" -APP2TARGETN=$(BIN)$/$(APP2TARGET)$(EXECPOST) +APP2TARGETN=$(BIN)/$(APP2TARGET)$(EXECPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" .IF "$(APP2BASE)"=="" @@ -448,7 +448,7 @@ APP2BASEX=/BASE:$(APP2BASE) .ENDIF .IF "$(APP3TARGET)"!="" -APP3TARGETN=$(BIN)$/$(APP3TARGET)$(EXECPOST) +APP3TARGETN=$(BIN)/$(APP3TARGET)$(EXECPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(APP3BASE)"=="" @@ -460,7 +460,7 @@ APP3BASEX=/BASE:$(APP3BASE) .ENDIF .IF "$(APP4TARGET)"!="" -APP4TARGETN=$(BIN)$/$(APP4TARGET)$(EXECPOST) +APP4TARGETN=$(BIN)/$(APP4TARGET)$(EXECPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" .IF "$(APP4BASE)"=="" @@ -472,7 +472,7 @@ APP4BASEX=/BASE:$(APP4BASE) .ENDIF .IF "$(APP5TARGET)"!="" -APP5TARGETN=$(BIN)$/$(APP5TARGET)$(EXECPOST) +APP5TARGETN=$(BIN)/$(APP5TARGET)$(EXECPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" .IF "$(APP5BASE)"=="" @@ -484,7 +484,7 @@ APP5BASEX=/BASE:$(APP5BASE) .ENDIF .IF "$(APP6TARGET)"!="" -APP6TARGETN=$(BIN)$/$(APP6TARGET)$(EXECPOST) +APP6TARGETN=$(BIN)/$(APP6TARGET)$(EXECPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" .IF "$(APP6BASE)"=="" @@ -496,7 +496,7 @@ APP6BASEX=/BASE:$(APP6BASE) .ENDIF .IF "$(APP7TARGET)"!="" -APP7TARGETN=$(BIN)$/$(APP7TARGET)$(EXECPOST) +APP7TARGETN=$(BIN)/$(APP7TARGET)$(EXECPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" .IF "$(APP7BASE)"=="" @@ -508,7 +508,7 @@ APP7BASEX=/BASE:$(APP7BASE) .ENDIF .IF "$(APP8TARGET)"!="" -APP8TARGETN=$(BIN)$/$(APP8TARGET)$(EXECPOST) +APP8TARGETN=$(BIN)/$(APP8TARGET)$(EXECPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(APP8BASE)"=="" @@ -520,7 +520,7 @@ APP8BASEX=/BASE:$(APP8BASE) .ENDIF .IF "$(APP9TARGET)"!="" -APP9TARGETN=$(BIN)$/$(APP9TARGET)$(EXECPOST) +APP9TARGETN=$(BIN)/$(APP9TARGET)$(EXECPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(APP9BASE)"=="" @@ -536,7 +536,7 @@ APP9BASEX=/BASE:$(APP9BASE) SHL1TARGET!:=$(SHL1TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" SHL1DLLPRE*=$(DLLPRE) -SHL1TARGETN=$(DLLDEST)$/$(SHL1DLLPRE)$(SHL1TARGET)$(DLLPOST) +SHL1TARGETN=$(DLLDEST)/$(SHL1DLLPRE)$(SHL1TARGET)$(DLLPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(SHL1BASE)"=="" @@ -552,7 +552,7 @@ SHL1BASEX=/BASE:$(SHL1BASE) SHL2TARGET!:=$(SHL2TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" SHL2DLLPRE*=$(DLLPRE) -SHL2TARGETN=$(DLLDEST)$/$(SHL2DLLPRE)$(SHL2TARGET)$(DLLPOST) +SHL2TARGETN=$(DLLDEST)/$(SHL2DLLPRE)$(SHL2TARGET)$(DLLPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(SHL2BASE)"=="" @@ -568,7 +568,7 @@ SHL2BASEX=/BASE:$(SHL2BASE) SHL3TARGET!:=$(SHL3TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" SHL3DLLPRE*=$(DLLPRE) -SHL3TARGETN=$(DLLDEST)$/$(SHL3DLLPRE)$(SHL3TARGET)$(DLLPOST) +SHL3TARGETN=$(DLLDEST)/$(SHL3DLLPRE)$(SHL3TARGET)$(DLLPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(SHL3BASE)"=="" @@ -584,7 +584,7 @@ SHL3BASEX=/BASE:$(SHL3BASE) SHL4TARGET!:=$(SHL4TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" SHL4DLLPRE*=$(DLLPRE) -SHL4TARGETN=$(DLLDEST)$/$(SHL4DLLPRE)$(SHL4TARGET)$(DLLPOST) +SHL4TARGETN=$(DLLDEST)/$(SHL4DLLPRE)$(SHL4TARGET)$(DLLPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(SHL4BASE)"=="" @@ -600,7 +600,7 @@ SHL4BASEX=/BASE:$(SHL4BASE) SHL5TARGET!:=$(SHL5TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" SHL5DLLPRE*=$(DLLPRE) -SHL5TARGETN=$(DLLDEST)$/$(SHL5DLLPRE)$(SHL5TARGET)$(DLLPOST) +SHL5TARGETN=$(DLLDEST)/$(SHL5DLLPRE)$(SHL5TARGET)$(DLLPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(SHL5BASE)"=="" @@ -616,7 +616,7 @@ SHL5BASEX=/BASE:$(SHL5BASE) SHL6TARGET!:=$(SHL6TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" SHL6DLLPRE*=$(DLLPRE) -SHL6TARGETN=$(DLLDEST)$/$(SHL6DLLPRE)$(SHL6TARGET)$(DLLPOST) +SHL6TARGETN=$(DLLDEST)/$(SHL6DLLPRE)$(SHL6TARGET)$(DLLPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(SHL6BASE)"=="" @@ -632,7 +632,7 @@ SHL6BASEX=/BASE:$(SHL6BASE) SHL7TARGET!:=$(SHL7TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" SHL7DLLPRE*=$(DLLPRE) -SHL7TARGETN=$(DLLDEST)$/$(SHL7DLLPRE)$(SHL7TARGET)$(DLLPOST) +SHL7TARGETN=$(DLLDEST)/$(SHL7DLLPRE)$(SHL7TARGET)$(DLLPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(SHL7BASE)"=="" @@ -648,7 +648,7 @@ SHL7BASEX=/BASE:$(SHL7BASE) SHL8TARGET!:=$(SHL8TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" SHL8DLLPRE*=$(DLLPRE) -SHL8TARGETN=$(DLLDEST)$/$(SHL8DLLPRE)$(SHL8TARGET)$(DLLPOST) +SHL8TARGETN=$(DLLDEST)/$(SHL8DLLPRE)$(SHL8TARGET)$(DLLPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(SHL8BASE)"=="" @@ -664,7 +664,7 @@ SHL8BASEX=/BASE:$(SHL8BASE) SHL9TARGET!:=$(SHL9TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" SHL9DLLPRE*=$(DLLPRE) -SHL9TARGETN=$(DLLDEST)$/$(SHL9DLLPRE)$(SHL9TARGET)$(DLLPOST) +SHL9TARGETN=$(DLLDEST)/$(SHL9DLLPRE)$(SHL9TARGET)$(DLLPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(SHL9BASE)"=="" @@ -679,73 +679,73 @@ SHL9BASEX=/BASE:$(SHL9BASE) .IF "$(UNOUCRRDB)"!="" COMPRDB*:=$(UNOUCRRDB) .ELSE # "$(UNOUCRRDB)"!="" -COMPRDB*:=$(SOLARBINDIR)$/types.rdb +COMPRDB*:=$(SOLARBINDIR)/types.rdb .ENDIF # "$(UNOUCRRDB)"!="" .ENDIF # "$(COMP1TYPELIST)$(COMP2TYPELIST)$(COMP3TYPELIST)$(COMP4TYPELIST)$(COMP5TYPELIST)$(COMP6TYPELIST)$(COMP7TYPELIST)$(COMP8TYPELIST)$(COMP9TYPELIST)"!="" .IF "$(COMP1TYPELIST)"!="" UNOTYPES+=$($(COMP1TYPELIST)_XML2CMPTYPES) -COMP1RDBTARGETN:=$(BIN)$/$(COMP1TYPELIST).rdb -#COMP1TYPELISTN:=$(MISC)$/$(COMP1TYPELIST).xml +COMP1RDBTARGETN:=$(BIN)/$(COMP1TYPELIST).rdb +#COMP1TYPELISTN:=$(MISC)/$(COMP1TYPELIST).xml .ENDIF .IF "$(COMP2TYPELIST)"!="" UNOTYPES+=$($(COMP2TYPELIST)_XML2CMPTYPES) -COMP2RDBTARGETN:=$(BIN)$/$(COMP2TYPELIST).rdb -#COMP2TYPELISTN:=$(MISC)$/$(COMP2TYPELIST).xml +COMP2RDBTARGETN:=$(BIN)/$(COMP2TYPELIST).rdb +#COMP2TYPELISTN:=$(MISC)/$(COMP2TYPELIST).xml .ENDIF .IF "$(COMP3TYPELIST)"!="" UNOTYPES+=$($(COMP3TYPELIST)_XML2CMPTYPES) -COMP3RDBTARGETN:=$(BIN)$/$(COMP3TYPELIST).rdb -#COMP3TYPELISTN:=$(MISC)$/$(COMP3TYPELIST).xml +COMP3RDBTARGETN:=$(BIN)/$(COMP3TYPELIST).rdb +#COMP3TYPELISTN:=$(MISC)/$(COMP3TYPELIST).xml .ENDIF .IF "$(COMP4TYPELIST)"!="" UNOTYPES+=$($(COMP4TYPELIST)_XML2CMPTYPES) -COMP4RDBTARGETN:=$(BIN)$/$(COMP4TYPELIST).rdb -#COMP4TYPELISTN:=$(MISC)$/$(COMP4TYPELIST).xml +COMP4RDBTARGETN:=$(BIN)/$(COMP4TYPELIST).rdb +#COMP4TYPELISTN:=$(MISC)/$(COMP4TYPELIST).xml .ENDIF .IF "$(COMP5TYPELIST)"!="" UNOTYPES+=$($(COMP5TYPELIST)_XML2CMPTYPES) -COMP5RDBTARGETN:=$(BIN)$/$(COMP5TYPELIST).rdb -#COMP5TYPELISTN:=$(MISC)$/$(COMP5TYPELIST).xml +COMP5RDBTARGETN:=$(BIN)/$(COMP5TYPELIST).rdb +#COMP5TYPELISTN:=$(MISC)/$(COMP5TYPELIST).xml .ENDIF .IF "$(COMP6TYPELIST)"!="" UNOTYPES+=$($(COMP6TYPELIST)_XML2CMPTYPES) -COMP6RDBTARGETN:=$(BIN)$/$(COMP6TYPELIST).rdb -#COMP6TYPELISTN:=$(MISC)$/$(COMP6TYPELIST).xml +COMP6RDBTARGETN:=$(BIN)/$(COMP6TYPELIST).rdb +#COMP6TYPELISTN:=$(MISC)/$(COMP6TYPELIST).xml .ENDIF .IF "$(COMP7TYPELIST)"!="" UNOTYPES+=$($(COMP7TYPELIST)_XML2CMPTYPES) -COMP7RDBTARGETN:=$(BIN)$/$(COMP7TYPELIST).rdb -#COMP7TYPELISTN:=$(MISC)$/$(COMP7TYPELIST).xml +COMP7RDBTARGETN:=$(BIN)/$(COMP7TYPELIST).rdb +#COMP7TYPELISTN:=$(MISC)/$(COMP7TYPELIST).xml .ENDIF .IF "$(COMP8TYPELIST)"!="" UNOTYPES+=$($(COMP8TYPELIST)_XML2CMPTYPES) -COMP8RDBTARGETN:=$(BIN)$/$(COMP8TYPELIST).rdb -#COMP8TYPELISTN:=$(MISC)$/$(COMP8TYPELIST).xml +COMP8RDBTARGETN:=$(BIN)/$(COMP8TYPELIST).rdb +#COMP8TYPELISTN:=$(MISC)/$(COMP8TYPELIST).xml .ENDIF .IF "$(COMP9TYPELIST)"!="" UNOTYPES+=$($(COMP9TYPELIST)_XML2CMPTYPES) -COMP9RDBTARGETN:=$(BIN)$/$(COMP9TYPELIST).rdb -#COMP9TYPELISTN:=$(MISC)$/$(COMP9TYPELIST).xml +COMP9RDBTARGETN:=$(BIN)/$(COMP9TYPELIST).rdb +#COMP9TYPELISTN:=$(MISC)/$(COMP9TYPELIST).xml .ENDIF UNOTYPES!:=$(strip $(UNOTYPES)) #moved here to get UNOTYPES from COMPxTYPELIST .IF "$(UNOTYPES)" != "" -UNOUCRHEADER=$(foreach,j,$(subst,.,$/ $(UNOTYPES)) $(UNOUCROUT)$/$(j:+".hpp")) -UNOUCRTARGET:=$(INCCOM)$/$(TARGET)_headergen.done +UNOUCRHEADER=$(foreach,j,$(subst,.,/ $(UNOTYPES)) $(UNOUCROUT)/$(j:+".hpp")) +UNOUCRTARGET:=$(INCCOM)/$(TARGET)_headergen.done .ENDIF # "$(UNOTYPES)" != "" .IF "$(HELPIDFILES)"!="" -MAKE_HELPIDS=$(MISC)$/helpids.don +MAKE_HELPIDS=$(MISC)/helpids.don .ENDIF .IF "$(HXXCOPYFILES)" != "" @@ -806,11 +806,11 @@ LIB9ARCHIV= .IF "$(RESLIB1NOVERSION)"=="" .ENDIF # "$(RESLIB1NOVERSION)"=="" .IF "$(common_build_reslib)"!="" -RESLIB1TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)LANGEXT.res -RSC_MULTI1=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB1NAME) +RESLIB1TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB1NAME)LANGEXT.res +RSC_MULTI1=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB1NAME) .ELSE # "$(common_build_reslib)"!="" -RESLIB1TARGETN=$(BIN)$/$(RESLIB1NAME)LANGEXT.res -RSC_MULTI1=$(MISC)$/rsc_$(RESLIB1NAME) +RESLIB1TARGETN=$(BIN)/$(RESLIB1NAME)LANGEXT.res +RSC_MULTI1=$(MISC)/rsc_$(RESLIB1NAME) .ENDIF # "$(common_build_reslib)"!="" # change to iso if resmgr is changed RESLIB1TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB1TARGETN))) @@ -820,11 +820,11 @@ RESLIB1TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB1TARGETN)) .IF "$(RESLIB2NOVERSION)"=="" .ENDIF # "$(RESLIB2NOVERSION)"=="" .IF "$(common_build_reslib)"!="" -RESLIB2TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)LANGEXT.res -RSC_MULTI2=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB2NAME) +RESLIB2TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB2NAME)LANGEXT.res +RSC_MULTI2=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB2NAME) .ELSE # "$(common_build_reslib)"!="" -RESLIB2TARGETN=$(BIN)$/$(RESLIB2NAME)LANGEXT.res -RSC_MULTI2=$(MISC)$/rsc_$(RESLIB2NAME) +RESLIB2TARGETN=$(BIN)/$(RESLIB2NAME)LANGEXT.res +RSC_MULTI2=$(MISC)/rsc_$(RESLIB2NAME) .ENDIF # "$(common_build_reslib)"!="" RESLIB2TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB2TARGETN))) .ENDIF @@ -833,11 +833,11 @@ RESLIB2TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB2TARGETN)) .IF "$(RESLIB3NOVERSION)"=="" .ENDIF # "$(RESLIB3NOVERSION)"=="" .IF "$(common_build_reslib)"!="" -RESLIB3TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)LANGEXT.res -RSC_MULTI3=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB3NAME) +RESLIB3TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB3NAME)LANGEXT.res +RSC_MULTI3=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB3NAME) .ELSE # "$(common_build_reslib)"!="" -RESLIB3TARGETN=$(BIN)$/$(RESLIB3NAME)LANGEXT.res -RSC_MULTI3=$(MISC)$/rsc_$(RESLIB3NAME) +RESLIB3TARGETN=$(BIN)/$(RESLIB3NAME)LANGEXT.res +RSC_MULTI3=$(MISC)/rsc_$(RESLIB3NAME) .ENDIF # "$(common_build_reslib)"!="" RESLIB3TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB3TARGETN))) .ENDIF @@ -846,11 +846,11 @@ RESLIB3TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB3TARGETN)) .IF "$(RESLIB4NOVERSION)"=="" .ENDIF # "$(RESLIB4NOVERSION)"=="" .IF "$(common_build_reslib)"!="" -RESLIB4TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)LANGEXT.res -RSC_MULTI4=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB4NAME) +RESLIB4TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB4NAME)LANGEXT.res +RSC_MULTI4=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB4NAME) .ELSE # "$(common_build_reslib)"!="" -RESLIB4TARGETN=$(BIN)$/$(RESLIB4NAME)LANGEXT.res -RSC_MULTI4=$(MISC)$/rsc_$(RESLIB4NAME) +RESLIB4TARGETN=$(BIN)/$(RESLIB4NAME)LANGEXT.res +RSC_MULTI4=$(MISC)/rsc_$(RESLIB4NAME) .ENDIF # "$(common_build_reslib)"!="" RESLIB4TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB4TARGETN))) .ENDIF @@ -859,11 +859,11 @@ RESLIB4TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB4TARGETN)) .IF "$(RESLIB5NOVERSION)"=="" .ENDIF # "$(RESLIB5NOVERSION)"=="" .IF "$(common_build_reslib)"!="" -RESLIB5TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)LANGEXT.res -RSC_MULTI5=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB5NAME) +RESLIB5TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB5NAME)LANGEXT.res +RSC_MULTI5=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB5NAME) .ELSE # "$(common_build_reslib)"!="" -RESLIB5TARGETN=$(BIN)$/$(RESLIB5NAME)LANGEXT.res -RSC_MULTI5=$(MISC)$/rsc_$(RESLIB5NAME) +RESLIB5TARGETN=$(BIN)/$(RESLIB5NAME)LANGEXT.res +RSC_MULTI5=$(MISC)/rsc_$(RESLIB5NAME) .ENDIF # "$(common_build_reslib)"!="" RESLIB5TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB5TARGETN))) .ENDIF @@ -872,11 +872,11 @@ RESLIB5TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB5TARGETN)) .IF "$(RESLIB6NOVERSION)"=="" .ENDIF # "$(RESLIB6NOVERSION)"=="" .IF "$(common_build_reslib)"!="" -RESLIB6TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)LANGEXT.res -RSC_MULTI6=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB6NAME) +RESLIB6TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB6NAME)LANGEXT.res +RSC_MULTI6=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB6NAME) .ELSE # "$(common_build_reslib)"!="" -RESLIB6TARGETN=$(BIN)$/$(RESLIB6NAME)LANGEXT.res -RSC_MULTI6=$(MISC)$/rsc_$(RESLIB6NAME) +RESLIB6TARGETN=$(BIN)/$(RESLIB6NAME)LANGEXT.res +RSC_MULTI6=$(MISC)/rsc_$(RESLIB6NAME) .ENDIF # "$(common_build_reslib)"!="" RESLIB6TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB6TARGETN))) .ENDIF @@ -885,11 +885,11 @@ RESLIB6TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB6TARGETN)) .IF "$(RESLIB7NOVERSION)"=="" .ENDIF # "$(RESLIB7NOVERSION)"=="" .IF "$(common_build_reslib)"!="" -RESLIB7TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)LANGEXT.res -RSC_MULTI7=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB7NAME) +RESLIB7TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB7NAME)LANGEXT.res +RSC_MULTI7=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB7NAME) .ELSE # "$(common_build_reslib)"!="" -RESLIB7TARGETN=$(BIN)$/$(RESLIB7NAME)LANGEXT.res -RSC_MULTI7=$(MISC)$/rsc_$(RESLIB7NAME) +RESLIB7TARGETN=$(BIN)/$(RESLIB7NAME)LANGEXT.res +RSC_MULTI7=$(MISC)/rsc_$(RESLIB7NAME) .ENDIF # "$(common_build_reslib)"!="" RESLIB7TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB7TARGETN))) .ENDIF @@ -898,11 +898,11 @@ RESLIB7TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB7TARGETN)) .IF "$(RESLIB8NOVERSION)"=="" .ENDIF # "$(RESLIB8NOVERSION)"=="" .IF "$(common_build_reslib)"!="" -RESLIB8TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)LANGEXT.res -RSC_MULTI8=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB8NAME) +RESLIB8TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB8NAME)LANGEXT.res +RSC_MULTI8=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB8NAME) .ELSE # "$(common_build_reslib)"!="" -RESLIB8TARGETN=$(BIN)$/$(RESLIB8NAME)LANGEXT.res -RSC_MULTI8=$(MISC)$/rsc_$(RESLIB8NAME) +RESLIB8TARGETN=$(BIN)/$(RESLIB8NAME)LANGEXT.res +RSC_MULTI8=$(MISC)/rsc_$(RESLIB8NAME) .ENDIF # "$(common_build_reslib)"!="" RESLIB8TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB8TARGETN))) .ENDIF @@ -911,53 +911,53 @@ RESLIB8TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB8TARGETN)) .IF "$(RESLIB9NOVERSION)"=="" .ENDIF # "$(RESLIB9NOVERSION)"=="" .IF "$(common_build_reslib)"!="" -RESLIB9TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)LANGEXT.res -RSC_MULTI9=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB9NAME) +RESLIB9TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB9NAME)LANGEXT.res +RSC_MULTI9=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB9NAME) .ELSE # "$(common_build_reslib)"!="" -RESLIB9TARGETN=$(BIN)$/$(RESLIB9NAME)LANGEXT.res -RSC_MULTI9=$(MISC)$/rsc_$(RESLIB9NAME) +RESLIB9TARGETN=$(BIN)/$(RESLIB9NAME)LANGEXT.res +RSC_MULTI9=$(MISC)/rsc_$(RESLIB9NAME) .ENDIF # "$(common_build_reslib)"!="" RESLIB9TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB9TARGETN))) .ENDIF .IF "$(INDPRESLIB1NAME)"!="" -INDPRESLIB1TARGETN=$(BIN)$/$(INDPRESLIB1NAME).dll +INDPRESLIB1TARGETN=$(BIN)/$(INDPRESLIB1NAME).dll .ENDIF .IF "$(DEF1NAME)"!="" -DEF1TARGETN=$(MISC)$/$(DEF1NAME).def +DEF1TARGETN=$(MISC)/$(DEF1NAME).def .ENDIF .IF "$(DEF2NAME)"!="" -DEF2TARGETN=$(MISC)$/$(DEF2NAME).def +DEF2TARGETN=$(MISC)/$(DEF2NAME).def .ENDIF .IF "$(DEF3NAME)"!="" -DEF3TARGETN=$(MISC)$/$(DEF3NAME).def +DEF3TARGETN=$(MISC)/$(DEF3NAME).def .ENDIF .IF "$(DEF4NAME)"!="" -DEF4TARGETN=$(MISC)$/$(DEF4NAME).def +DEF4TARGETN=$(MISC)/$(DEF4NAME).def .ENDIF .IF "$(DEF5NAME)"!="" -DEF5TARGETN=$(MISC)$/$(DEF5NAME).def +DEF5TARGETN=$(MISC)/$(DEF5NAME).def .ENDIF .IF "$(DEF6NAME)"!="" -DEF6TARGETN=$(MISC)$/$(DEF6NAME).def +DEF6TARGETN=$(MISC)/$(DEF6NAME).def .ENDIF .IF "$(DEF7NAME)"!="" -DEF7TARGETN=$(MISC)$/$(DEF7NAME).def +DEF7TARGETN=$(MISC)/$(DEF7NAME).def .ENDIF .IF "$(DEF8NAME)"!="" -DEF8TARGETN=$(MISC)$/$(DEF8NAME).def +DEF8TARGETN=$(MISC)/$(DEF8NAME).def .ENDIF .IF "$(DEF9NAME)"!="" -DEF9TARGETN=$(MISC)$/$(DEF9NAME).def +DEF9TARGETN=$(MISC)/$(DEF9NAME).def .ENDIF # IZ65415 - catch obsolete macro. Can be removed later. @@ -968,36 +968,36 @@ NO_SDINAME_allowed .IF "$(SDI1NAME)"!="" .DIRCACHE=no -SDI1TARGET=$(MISC)$/$(SDI1NAME).don -HIDSID1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(SDI1NAME)_sid.hid +SDI1TARGET=$(MISC)/$(SDI1NAME).don +HIDSID1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI1NAME)_sid.hid .ENDIF .IF "$(SDI2NAME)"!="" .DIRCACHE=no -SDI2TARGET=$(MISC)$/$(SDI2NAME).don -HIDSID2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(SDI2NAME)_sid.hid +SDI2TARGET=$(MISC)/$(SDI2NAME).don +HIDSID2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI2NAME)_sid.hid .ENDIF .IF "$(SDI3NAME)"!="" .DIRCACHE=no -SDI3TARGET=$(MISC)$/$(SDI3NAME).don -HIDSID3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(SDI3NAME)_sid.hid +SDI3TARGET=$(MISC)/$(SDI3NAME).don +HIDSID3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI3NAME)_sid.hid .ENDIF .IF "$(SDI4NAME)"!="" .DIRCACHE=no -SDI4TARGET=$(MISC)$/$(SDI4NAME).don -HIDSID4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(SDI4NAME)_sid.hid +SDI4TARGET=$(MISC)/$(SDI4NAME).don +HIDSID4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI4NAME)_sid.hid .ENDIF .IF "$(SDI5NAME)"!="" .DIRCACHE=no -SDI5TARGET=$(MISC)$/$(SDI5NAME).don -HIDSID5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(SDI5NAME)_sid.hid +SDI5TARGET=$(MISC)/$(SDI5NAME).don +HIDSID5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI5NAME)_sid.hid .ENDIF .IF "$(XMLPROPERTIES)"!="" -XMLPROPERTIESN:=$(foreach,i,$(XMLPROPERTIES) $(MISC)$/$(TARGET)_$(i:s/.xrb/.done/)) +XMLPROPERTIESN:=$(foreach,i,$(XMLPROPERTIES) $(MISC)/$(TARGET)_$(i:s/.xrb/.done/)) .ENDIF # "$(XMLPROPERTIES)"!="" .IF "$(UNIXTEXT)"!="" @@ -1007,36 +1007,36 @@ CONVERTUNIXTEXT:=$(UNIXTEXT) .ENDIF # "$(UNIXTEXT)"!="" .IF "$(EXTUPDATEINFO_NAME)"!="" -EXTUPDATEINFO_DEST:=$(MISC)$/$(EXTUPDATEINFO_NAME) +EXTUPDATEINFO_DEST:=$(MISC)/$(EXTUPDATEINFO_NAME) EXTUPDATEINFO_SOURCE*=description.xml .ENDIF # "$(EXTUPDATEINFO_NAME)"!="" .IF "$(JAVACLASSFILES:s/DEFINED//)"!="" || "$(javauno)"!="" .IF "$(L10N_framework)"=="" -TARGETDPJ=$(MISC)$/$(TARGET).dpj +TARGETDPJ=$(MISC)/$(TARGET).dpj .ENDIF # "$(L10N_framework)"=="" .ENDIF .IF "$(no_hids)$(NO_HIDS)"=="" BUILDHIDS:=TRUE .IF "$(GEN_HID_OTHER)"!="" -PRJHIDOTHERTARGET=$(SRS)$/hidother.hid -COMMONPRJHIDOTHERTARGET=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC)$/$(TARGET)_othr.hid) +PRJHIDOTHERTARGET=$(SRS)/hidother.hid +COMMONPRJHIDOTHERTARGET=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC)/$(TARGET)_othr.hid) .ENDIF .IF "$(GEN_HID2)"!="" -PRJHID2TARGET=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid.lst +PRJHID2TARGET=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst .ENDIF .ENDIF # "$(no_hids)$(NO_HIDS)"=="" .IF "$(make_srs_deps)"=="" .IF "$(SRCFILES)" != "" || "$(SRC1FILES)" != "" || "$(SRC2FILES)" != "" -DPRTARGET= $(MISC)$/$(TARGET).dpr +DPRTARGET= $(MISC)/$(TARGET).dpr .ENDIF .ENDIF .IF "$(make_zip_deps)"=="" .IF "$(ZIP1TARGET)" != "" || "$(ZIP2TARGET)" != "" || "$(ZIP3TARGET)" != "" -DPZTARGET= $(MISC)$/$(TARGET).dpz +DPZTARGET= $(MISC)/$(TARGET).dpz .ENDIF # "$(ZIP1TARGET)" != "" || "$(ZIP2TARGET)" != "" || "$(ZIP3TARGET)" != "" .ENDIF # "$(make_zip_deps)"=="" @@ -1060,7 +1060,7 @@ ALL_JAVA_TARGETS= \ .IF "$(lintit)"=="" .IF "$(L10N_framework)"!="" ALLTAR: \ - "$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk" \ + "$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk" \ $(SUBDIRS) \ $(DPRTARGET) \ $(DPZTARGET) \ @@ -1112,7 +1112,7 @@ ALLTAR: \ .ELSE # "$(L10N_framework)"!="" ALLTAR: \ - "$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk" \ + "$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk" \ $(MAKEDEMODIR) $(MAKECOMPDIR) $(MAKEXLDIR) \ $(COMPVERMK) \ $(JAVAVERMK) \ @@ -1233,7 +1233,7 @@ ALLTAR : \ $(SHL1TARGETN_X64) $(SHL2TARGETN_X64) .ENDIF # "$(BUILD_X64)"!="" -ALLTAR : "$(SOLARINCDIR)$/$(UPD)minor.mk" +ALLTAR : "$(SOLARINCDIR)/$(UPD)minor.mk" .IF "$(EXCEPTIONSNOOPT_FLAG)"=="" TARGETDEPS+=$(EXCEPTIONSNOOPTTARGET) @@ -1295,7 +1295,7 @@ $(UNOUCRHEADER): $(UNOUCRTARGET) : $(UNOUCRDEP) .IF "$(XML2MK_FILES)"!="" - @@-$(RM) $(foreach,i,$(XML2MK_FILES) $(MISC)$/$(i).mk) + @@-$(RM) $(foreach,i,$(XML2MK_FILES) $(MISC)/$(i).mk) .ENDIF # "$(XML2MK_FILES)"!="" @@-$(MKDIRHIER) $(UNOUCROUT) $(CPPUMAKER) @$(mktmp $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(UNOTYPES:^"-T") $(UNOUCRRDB)) && $(TOUCH) $@ @@ -1345,27 +1345,27 @@ ALLTAR: $(OBJFILES) $(SLOFILES) .ENDIF # "$(lintit)"=="" .IF "$(SDINAME)"!="" -$(OBJ)$/$(CINTERNAME).obj : $(SDITARGET) +$(OBJ)/$(CINTERNAME).obj : $(SDITARGET) .ENDIF .IF "$(SDI1NAME)"!="" -$(OBJ)$/$(CINTER1NAME).obj : $(SDI1TARGET) +$(OBJ)/$(CINTER1NAME).obj : $(SDI1TARGET) .ENDIF .IF "$(SDI2NAME)"!="" -$(OBJ)$/$(CINTER2NAME).obj : $(SDI2TARGET) +$(OBJ)/$(CINTER2NAME).obj : $(SDI2TARGET) .ENDIF .IF "$(SDI3NAME)"!="" -$(OBJ)$/$(CINTER3NAME).obj : $(SDI3TARGET) +$(OBJ)/$(CINTER3NAME).obj : $(SDI3TARGET) .ENDIF .IF "$(SDI4NAME)"!="" -$(OBJ)$/$(CINTER4NAME).obj : $(SDI4TARGET) +$(OBJ)/$(CINTER4NAME).obj : $(SDI4TARGET) .ENDIF .IF "$(SDI5NAME)"!="" -$(OBJ)$/$(CINTER5NAME).obj : $(SDI5TARGET) +$(OBJ)/$(CINTER5NAME).obj : $(SDI5TARGET) .ENDIF .IF "$(SOLAR_JAVA)"!="" @@ -1398,38 +1398,36 @@ $(LOCALIZESDF)%: @@-$(MKDIRHIER) $(@:d) .IF "$(LOCALIZATION_FOUND)"=="" -.IF "$(LOCALSDFFILE)"!="" -$(LOCALSDFFILE) : $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip +.IF "$(LOCALIZESDF)"!="" +"$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip @@-$(MKDIRHIER) $(@:d) - @@-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)_$(TARGET) - -unzip -o -d $(COMMONMISC)$/$(PRJNAME) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(subst,$(COMMONMISC)$/$(PRJNAME)$/, $@) - $(TOUCH) $@ - -.ENDIF # "$(LOCALSDFFILE)"!="" -.ENDIF # "$(LOCALIZATION_FOUND)"=="" + @@-$(MKDIRHIER) $(COMMONMISC)/$(PRJNAME)_$(TARGET) + @@$(IFNOTEXIST) $(LOCALIZESDF) $(THEN) unzip -o -d $(COMMONMISC)/$(PRJNAME)_$(TARGET) $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip $(FI) + @@-cp -r $(COMMONMISC)/$(PRJNAME)_$(TARGET)/* $(COMMONMISC)/$(PRJNAME) + @@-$(RM) -rf $(COMMONMISC)/$(PRJNAME)_$(TARGET) .ENDIF # "$(LOCALIZESDF)"!="" .ENDIF # "$(WITH_LANG)"!="" .IF "$(EXTUPDATEINFO_NAME)"!="" $(EXTUPDATEINFO_DEST) : $(EXTUPDATEINFO_SOURCE) - $(PERL) $(SOLARENV)$/bin/make_ext_update_info.pl --out $(EXTUPDATEINFO_DEST) $(foreach,i,$(EXTUPDATEINFO_URLS) --update-url "$i") $(EXTUPDATEINFO_SOURCE) + $(PERL) $(SOLARENV)/bin/make_ext_update_info.pl --out $(EXTUPDATEINFO_DEST) $(foreach,i,$(EXTUPDATEINFO_URLS) --update-url "$i") $(EXTUPDATEINFO_SOURCE) .ENDIF # "$(EXTUPDATEINFO_NAME)"!="" makedoc: - @@-mkdir $(OUT)$/ucrdoc - $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(DEPIDLFILES:+"\n")) -# -$(UNOIDL) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -Bdoc -P..$/$(PRJNAME)$/$(IDLPACKAGE) -OH$(PRJ)$/..$/unodoc $(DOCIDLFILES) $(IDLFILES) + @@-mkdir $(OUT)/ucrdoc + $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)/ucrdoc/$(IDLPACKAGE) $(DEPIDLFILES:+"\n")) +# -$(UNOIDL) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -Bdoc -P../$(PRJNAME)/$(IDLPACKAGE) -OH$(PRJ)/../unodoc $(DOCIDLFILES) $(IDLFILES) .IF "$(LOCALDBTARGET)"!="" $(LOCALDBTARGET) : $(URDFILES) $(DEPIDLFILES) - $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)$/ucr$/$(IDLPACKAGE) $(all_outdated_idl)) + $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)/ucr/$(IDLPACKAGE) $(all_outdated_idl)) -$(RM) $@ $(REGMERGE) $@ UCR @$(mktmp $(URDFILES)) .ENDIF .IF "$(LOCALDOCDBTARGET)"!="" $(LOCALDOCDBTARGET) : $(URDDOCFILES) $(DEPIDLFILES) - $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(all_outdated_idl)) + $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)/ucrdoc/$(IDLPACKAGE) $(all_outdated_idl)) -$(RM) $@ $(REGMERGE) $@ UCR @$(mktmp $(URDDOCFILES)) .ENDIF @@ -1454,12 +1452,12 @@ $(UNOIDLDBDOCTARGET) : $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS) .IF "$(SCP_PRODUCT_TYPE)"!="" $(SCP_PRODUCT_TYPE): - @@-$(MKDIRHIER) $(PAR)$/$@ - @@-$(MKDIRHIER) $(BIN)$/$@ + @@-$(MKDIRHIER) $(PAR)/$@ + @@-$(MKDIRHIER) $(BIN)/$@ .ENDIF # "$(PARFILES)"!="" -"$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg" : +"$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg" : $(TOUCH) $@ .IF "$(COMPVERMK)"!="" @@ -1468,7 +1466,7 @@ $(SCP_PRODUCT_TYPE): COMPVERMK_PHONY:=.PHONY .ENDIF # "$(COMPATH:s!\!/!)"!="$(COMPATH_STORED)" COMPVTMP:=$(mktmp iii) -"$(COMPVERMK)" $(COMPVERMK_PHONY): $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg +"$(COMPVERMK)" $(COMPVERMK_PHONY): $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg .IF "$(CCNUMVER)"!="" @echo COMNAME:=$(COMNAME) > $(COMPVTMP) @echo COMID:=$(COMID) >> $(COMPVTMP) @@ -1495,7 +1493,7 @@ COMPVTMP:=$(mktmp iii) .IF "$(JAVALOCATION)"!="$(JAVA_HOME)" "$(JAVAVERMK)" .PHONY : .ELSE # "$(JAVALOCATION)"!="$(JAVA_HOME)" -"$(JAVAVERMK)" : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg +"$(JAVAVERMK)" : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg .ENDIF # "$(JAVALOCATION)"!="$(JAVA_HOME)" @-$(RM) $@ @echo JAVAVER:=$(JAVAVER) > $@ @@ -1514,23 +1512,23 @@ $(TARGETDEPS) : $(LOCALIZE_ME_DEST) .IF "$(WITH_LANG)"=="" $(LOCALIZE_ME_DEST) : $(LOCALIZE_ME) - -$(RM) $(INCCOM)$/$(TARGET)_lastrun.mk + -$(RM) $(INCCOM)/$(TARGET)_lastrun.mk -$(MKDIR) $(@:d) -$(RM) $@ $(COPY) $(@:b:+"_tmpl")$(@:e) $@ .ELSE # "$(WITH_LANG)"=="" # LASTRUN_MERGED -.INCLUDE .IGNORE : $(INCCOM)$/$(TARGET)_lastrun.mk +.INCLUDE .IGNORE : $(INCCOM)/$(TARGET)_lastrun.mk .IF "$(LASTRUN_MERGED)"=="TRUE" $(LOCALIZE_ME_DEST) : $(LOCALIZE_ME) $(LOCALIZESDF) .ELSE # "$(LASTRUN_MERGED)"=="TRUE" $(LOCALIZE_ME_DEST) .PHONY : $(LOCALIZE_ME) $(LOCALIZESDF) - echo LASTRUN_MERGED:=TRUE > $(INCCOM)$/$(TARGET)_lastrun.mk + echo LASTRUN_MERGED:=TRUE > $(INCCOM)/$(TARGET)_lastrun.mk .ENDIF # "$(LASTRUN_MERGED)"=="TRUE" -$(MKDIR) $(@:d) -$(RM) $@ - $(TRANSEX) -p $(PRJNAME) -i $(@:b:+"_tmpl")$(@:e) -o $(@:d)$/$(@:b:+"_tmpl")$(@:e).$(INPATH) -m $(LOCALIZESDF) -l all + $(TRANSEX) -p $(PRJNAME) -i $(@:b:+"_tmpl")$(@:e) -o $(@:d)/$(@:b:+"_tmpl")$(@:e).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $(@:d)$(@:b:+"_tmpl")$(@:e).$(INPATH) $@ .ENDIF # "$(WITH_LANG)"=="" @@ -1541,13 +1539,13 @@ $(LOCALIZE_ME_DEST) .PHONY : $(LOCALIZE_ME) $(LOCALIZESDF) XML_ISO_CODE*=-ISO99 $(L10N_framework) .ENDIF .IF "$(WITH_LANG)"!="" -$(MISC)$/$(TARGET)_%.done : $(COMMONMISC)$/$(TARGET)$/%.xrb +$(MISC)/$(TARGET)_%.done : $(COMMONMISC)/$(TARGET)/%.xrb .ELSE # "$(WITH_LANG)"!="" -$(MISC)$/$(TARGET)_%.done : %.xrb +$(MISC)/$(TARGET)_%.done : %.xrb .ENDIF # "$(WITH_LANG)"!="" - @@-$(RM) $(MISC)$/$(<:b).interm$(TARGET) - native2ascii -encoding UTF8 $< $(MISC)$/$(<:b).interm$(TARGET) && $(XMLEX) -i $(MISC)$/$(<:b).interm$(TARGET) -o $(CLASSDIR) $(XML_ISO_CODE) -g -d $@ - @@$(RM) $(MISC)$/$(<:b).interm$(TARGET) + @@-$(RM) $(MISC)/$(<:b).interm$(TARGET) + native2ascii -encoding UTF8 $< $(MISC)/$(<:b).interm$(TARGET) && $(XMLEX) -i $(MISC)/$(<:b).interm$(TARGET) -o $(CLASSDIR) $(XML_ISO_CODE) -g -d $@ + @@$(RM) $(MISC)/$(<:b).interm$(TARGET) .ENDIF # "$(XMLPROPERTIES)"!="" .IF "$(HIDSID1PARTICLE)$(SDI1TARGET)$(HIDSID2PARTICLE)$(SDI2TARGET)$(HIDSID3PARTICLE)$(SDI3TARGET)$(HIDSID4PARTICLE)$(SDI4TARGET)$(HIDSID5PARTICLE)$(SDI5TARGET)$(HIDSID6PARTICLE)$(SDI6TARGET)$(HIDSID7PARTICLE)$(SDI7TARGET)$(HIDSID8PARTICLE)$(SDI8TARGET)$(HIDSID9PARTICLE)$(SDI9TARGET)"!="" @@ -1689,7 +1687,7 @@ $(COMMONPRJHIDOTHERTARGET) : $(PRJHIDOTHERTARGET) .IF "$(make_srs_deps)"=="" .IF "$(SRCFILES)" != "" || "$(SRC1FILES)" != "" || "$(SRC2FILES)" != "" .IF "$(nodep)"=="" -.INCLUDE : $(MISC)$/$(TARGET).dpr +.INCLUDE : $(MISC)/$(TARGET).dpr .ENDIF # "$(nodep)"=="" .ENDIF .ENDIF @@ -1697,7 +1695,7 @@ $(COMMONPRJHIDOTHERTARGET) : $(PRJHIDOTHERTARGET) .IF "$(make_zip_deps)"=="" .IF "$(ZIP1TARGET)" != "" || "$(ZIP2TARGET)" != "" || "$(ZIP3TARGET)" != "" .IF "$(nodep)"=="" -.INCLUDE : $(MISC)$/$(TARGET).dpz +.INCLUDE : $(MISC)/$(TARGET).dpz # introduce separation char missing_zipdep_langs=$(alllangiso:^"+":+"+") some_dummy_var:=$(foreach,i,$(zipdep_langs) $(assign missing_zipdep_langs:=$(strip $(subst,+$(i)+, $(missing_zipdep_langs))))) @@ -1711,11 +1709,11 @@ ZIPDEPPHONY=.PHONY last_target: @echo ------------- -$(MISC)$/$(TARGET)genjava.mk: $(IDLFILES) +$(MISC)/$(TARGET)genjava.mk: $(IDLFILES) .IF "$(JAVACLASSFILES:s/DEFINED//)"!="" .IF "$(L10N_framework)"=="" -.INCLUDE .IGNORE : $(MISC)$/$(TARGET).dpj +.INCLUDE .IGNORE : $(MISC)/$(TARGET).dpj $(TARGETDPJ) : $(JAVAFILES) $(JAVATARGET) .ENDIF # "$(L10N_framework)"=="" .ENDIF @@ -1781,29 +1779,29 @@ ALLTAR : forcedeps # - several kill targets - # ------------------------- -"$(TMP)$/makedt.don": - @$(TOUCH) $(TMP)$/makedt.don +"$(TMP)/makedt.don": + @$(TOUCH) $(TMP)/makedt.don killbin: .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" - @$(IFEXIST) $(BIN)$/$(SHL1TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL1TARGET).dll $(FI) - @$(IFEXIST) $(BIN)$/$(SHL2TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL2TARGET).dll $(FI) - @$(IFEXIST) $(BIN)$/$(SHL3TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL3TARGET).dll $(FI) - @$(IFEXIST) $(BIN)$/$(SHL4TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL4TARGET).dll $(FI) - @$(IFEXIST) $(BIN)$/$(SHL5TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL5TARGET).dll $(FI) - @$(IFEXIST) $(BIN)$/$(SHL6TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL6TARGET).dll $(FI) - @$(IFEXIST) $(BIN)$/$(SHL7TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL7TARGET).dll $(FI) - @$(IFEXIST) $(BIN)$/$(SHL8TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL8TARGET).dll $(FI) - @$(IFEXIST) $(BIN)$/$(SHL9TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL9TARGET).dll $(FI) - @$(IFEXIST) $(BIN)$/$(APP1TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP1TARGET)$(EXECPOST) $(FI) - @$(IFEXIST) $(BIN)$/$(APP2TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP2TARGET)$(EXECPOST) $(FI) - @$(IFEXIST) $(BIN)$/$(APP3TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP3TARGET)$(EXECPOST) $(FI) - @$(IFEXIST) $(BIN)$/$(APP4TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP4TARGET)$(EXECPOST) $(FI) - @$(IFEXIST) $(BIN)$/$(APP5TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP5TARGET)$(EXECPOST) $(FI) - @$(IFEXIST) $(BIN)$/$(APP6TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP6TARGET)$(EXECPOST) $(FI) - @$(IFEXIST) $(BIN)$/$(APP7TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP7TARGET)$(EXECPOST) $(FI) - @$(IFEXIST) $(BIN)$/$(APP8TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP8TARGET)$(EXECPOST) $(FI) - @$(IFEXIST) $(BIN)$/$(APP9TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP9TARGET)$(EXECPOST) $(FI) + @$(IFEXIST) $(BIN)/$(SHL1TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL1TARGET).dll $(FI) + @$(IFEXIST) $(BIN)/$(SHL2TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL2TARGET).dll $(FI) + @$(IFEXIST) $(BIN)/$(SHL3TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL3TARGET).dll $(FI) + @$(IFEXIST) $(BIN)/$(SHL4TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL4TARGET).dll $(FI) + @$(IFEXIST) $(BIN)/$(SHL5TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL5TARGET).dll $(FI) + @$(IFEXIST) $(BIN)/$(SHL6TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL6TARGET).dll $(FI) + @$(IFEXIST) $(BIN)/$(SHL7TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL7TARGET).dll $(FI) + @$(IFEXIST) $(BIN)/$(SHL8TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL8TARGET).dll $(FI) + @$(IFEXIST) $(BIN)/$(SHL9TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL9TARGET).dll $(FI) + @$(IFEXIST) $(BIN)/$(APP1TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP1TARGET)$(EXECPOST) $(FI) + @$(IFEXIST) $(BIN)/$(APP2TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP2TARGET)$(EXECPOST) $(FI) + @$(IFEXIST) $(BIN)/$(APP3TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP3TARGET)$(EXECPOST) $(FI) + @$(IFEXIST) $(BIN)/$(APP4TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP4TARGET)$(EXECPOST) $(FI) + @$(IFEXIST) $(BIN)/$(APP5TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP5TARGET)$(EXECPOST) $(FI) + @$(IFEXIST) $(BIN)/$(APP6TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP6TARGET)$(EXECPOST) $(FI) + @$(IFEXIST) $(BIN)/$(APP7TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP7TARGET)$(EXECPOST) $(FI) + @$(IFEXIST) $(BIN)/$(APP8TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP8TARGET)$(EXECPOST) $(FI) + @$(IFEXIST) $(BIN)/$(APP9TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP9TARGET)$(EXECPOST) $(FI) .ELSE # "$(GUI)"=="WNT" .IF "$(SHL1TARGET)"!="" @@ -1925,7 +1923,7 @@ killlib: clean_misc : .IF "$(MISC)"!="" - rm -rf $(MISC)$/* + rm -rf $(MISC)/* @echo misc is gone! .ELSE # "$(MISC)"!="" @echo can\'t be done! $$(MISC) not defined. @@ -1933,11 +1931,7 @@ clean_misc : clean_all : .IF "$(OUT)"!="" -.IF "$(USE_SHELL)"!="4nt" - test -f $(PRJ)$/prj/build.lst && rm -rf $(OUT) -.ELSE # "$(USE_SHELL)"!="4nt" - $(IFEXIST) $(PRJ)$/prj/build.lst $(THEN) del /sxyz $(OUT) $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" + test -f $(PRJ)/prj/build.lst && rm -rf $(OUT) @echo local output tree is gone! .ELSE # "$(OUT)"!="" @echo can\'t be done! $$(OUT) not defined. @@ -1984,15 +1978,15 @@ delzip: force_dmake_to_error .IF "$(make_srs_deps)"=="" -$(MISC)$/$(TARGET).dpr : $(SRCFILES) $(SRC1FILES) $(SRC2FILES) $(SRC3FILES) +$(MISC)/$(TARGET).dpr : $(SRCFILES) $(SRC1FILES) $(SRC2FILES) $(SRC3FILES) .ENDIF .IF "$(make_zip_deps)"=="" -$(MISC)$/$(TARGET).dpz $(ZIPDEPPHONY) : $(ZIP1TARGETN) $(ZIP2TARGETN) $(ZIP3TARGETN) $(ZIP4TARGETN) $(ZIP5TARGETN) $(ZIP6TARGETN) $(ZIP7TARGETN) $(ZIP8TARGETN) $(ZIP9TARGETN) +$(MISC)/$(TARGET).dpz $(ZIPDEPPHONY) : $(ZIP1TARGETN) $(ZIP2TARGETN) $(ZIP3TARGETN) $(ZIP4TARGETN) $(ZIP5TARGETN) $(ZIP6TARGETN) $(ZIP7TARGETN) $(ZIP8TARGETN) $(ZIP9TARGETN) .ENDIF VERSIONTMP:=$(mktmp iii) -$(INCCOM)$/%_version.h : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg +$(INCCOM)/%_version.h : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg @echo $(EMQ)#define _BUILD $(EMQ)"$(BUILD)$(EMQ)" > $(VERSIONTMP) @echo $(EMQ)#define _UPD $(EMQ)"$(UPD)$(EMQ)" >> $(VERSIONTMP) @echo $(EMQ)#define _LAST_MINOR $(EMQ)"$(LAST_MINOR)$(EMQ)" >> $(VERSIONTMP) @@ -2020,17 +2014,17 @@ UNOUCRDEPxxx : $(UNOUCRDEP); #new hid.lst trigger with GEN_HID2=TRUE -$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid.lst .PHONY : +$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst .PHONY : @echo Making $@ : @echo --------------- @echo $(WORK_STAMP).$(LAST_MINOR) 010101010101010 > $@.$(ROUT).tmp - $(TYPE) $(SOLARCOMMONBINDIR)$/hid$/*.hid | tr -d "\015" | $(SORT) -u >> $@.$(ROUT).tmp + $(TYPE) $(SOLARCOMMONBINDIR)/hid/*.hid | tr -d "\015" | $(SORT) -u >> $@.$(ROUT).tmp @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) @-$(RENAME) $@.$(ROUT).tmp $@ @-mkdir $(@:d)hid - $(PERL) $(SOLARENV)$/bin$/gen_userfeedback_VCL_names.pl $@ $(SOLARCOMMONBINDIR)$/win $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid$/userfeedback_VCL_names.csv.$(ROUT).tmp - @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid$/userfeedback_VCL_names.csv $(FI) - @-$(RENAME) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid$/userfeedback_VCL_names.csv.$(ROUT).tmp $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid$/userfeedback_VCL_names.csv + $(PERL) $(SOLARENV)/bin/gen_userfeedback_VCL_names.pl $@ $(SOLARCOMMONBINDIR)/win $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp + @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv $(FI) + @-$(RENAME) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv .IF "$(SOLAR_JAVA)"!="" @@ -2042,7 +2036,7 @@ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid.lst .PHONY : .INCLUDE : tg_merge.mk wordcount: - wc *.* >> $(TMP)$/wc.lst + wc *.* >> $(TMP)/wc.lst testt: @echo test |