summaryrefslogtreecommitdiff
path: root/solenv/inc
diff options
context:
space:
mode:
Diffstat (limited to 'solenv/inc')
-rw-r--r--solenv/inc/_tg_srs.mk60
-rw-r--r--solenv/inc/antsettings.mk7
-rw-r--r--solenv/inc/rules.mk4
-rw-r--r--solenv/inc/target.mk26
-rw-r--r--solenv/inc/templates/extension_tmpl.mk4
-rw-r--r--solenv/inc/tg_dep.mk8
-rw-r--r--solenv/inc/tg_srs.mk8
7 files changed, 60 insertions, 57 deletions
diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk
index 7f4bcff19fe4..1c0357111ea8 100644
--- a/solenv/inc/_tg_srs.mk
+++ b/solenv/inc/_tg_srs.mk
@@ -15,11 +15,11 @@ ALLTAR : $(HIDSRS1PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(PWD:f).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES)
+$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES)
@echo ------------------------------
@echo Making: $@
- @@-$(RM) $(MISC)$/$(PWD:f).$(SRS1NAME).dprr
- $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS1NAME).srs} -fo=$@ $(SRC1FILES)
+ @@-$(RM) $(MISC)$/$(TARGET).$(SRS1NAME).dprr
+ $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS1NAME).srs} -fo=$@ -p=$(TARGET) $(SRC1FILES)
.IF "$(WITH_LANG)"!=""
$(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
@@ -64,11 +64,11 @@ ALLTAR : $(HIDSRS2PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(PWD:f).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES)
+$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES)
@echo ------------------------------
@echo Making: $@
- @@-$(RM) $(MISC)$/$(PWD:f).$(SRS2NAME).dprr
- $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS2NAME).srs} -fo=$@ $(SRC2FILES)
+ @@-$(RM) $(MISC)$/$(TARGET).$(SRS2NAME).dprr
+ $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS2NAME).srs} -fo=$@ -p=$(TARGET) $(SRC2FILES)
.IF "$(WITH_LANG)"!=""
$(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
@@ -113,11 +113,11 @@ ALLTAR : $(HIDSRS3PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(PWD:f).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES)
+$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES)
@echo ------------------------------
@echo Making: $@
- @@-$(RM) $(MISC)$/$(PWD:f).$(SRS3NAME).dprr
- $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS3NAME).srs} -fo=$@ $(SRC3FILES)
+ @@-$(RM) $(MISC)$/$(TARGET).$(SRS3NAME).dprr
+ $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS3NAME).srs} -fo=$@ -p=$(TARGET) $(SRC3FILES)
.IF "$(WITH_LANG)"!=""
$(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
@@ -162,11 +162,11 @@ ALLTAR : $(HIDSRS4PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(PWD:f).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES)
+$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES)
@echo ------------------------------
@echo Making: $@
- @@-$(RM) $(MISC)$/$(PWD:f).$(SRS4NAME).dprr
- $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS4NAME).srs} -fo=$@ $(SRC4FILES)
+ @@-$(RM) $(MISC)$/$(TARGET).$(SRS4NAME).dprr
+ $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS4NAME).srs} -fo=$@ -p=$(TARGET) $(SRC4FILES)
.IF "$(WITH_LANG)"!=""
$(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
@@ -211,11 +211,11 @@ ALLTAR : $(HIDSRS5PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(PWD:f).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES)
+$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES)
@echo ------------------------------
@echo Making: $@
- @@-$(RM) $(MISC)$/$(PWD:f).$(SRS5NAME).dprr
- $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS5NAME).srs} -fo=$@ $(SRC5FILES)
+ @@-$(RM) $(MISC)$/$(TARGET).$(SRS5NAME).dprr
+ $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS5NAME).srs} -fo=$@ -p=$(TARGET) $(SRC5FILES)
.IF "$(WITH_LANG)"!=""
$(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
@@ -260,11 +260,11 @@ ALLTAR : $(HIDSRS6PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(PWD:f).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES)
+$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES)
@echo ------------------------------
@echo Making: $@
- @@-$(RM) $(MISC)$/$(PWD:f).$(SRS6NAME).dprr
- $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS6NAME).srs} -fo=$@ $(SRC6FILES)
+ @@-$(RM) $(MISC)$/$(TARGET).$(SRS6NAME).dprr
+ $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS6NAME).srs} -fo=$@ -p=$(TARGET) $(SRC6FILES)
.IF "$(WITH_LANG)"!=""
$(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
@@ -309,11 +309,11 @@ ALLTAR : $(HIDSRS7PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(PWD:f).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES)
+$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES)
@echo ------------------------------
@echo Making: $@
- @@-$(RM) $(MISC)$/$(PWD:f).$(SRS7NAME).dprr
- $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS7NAME).srs} -fo=$@ $(SRC7FILES)
+ @@-$(RM) $(MISC)$/$(TARGET).$(SRS7NAME).dprr
+ $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS7NAME).srs} -fo=$@ -p=$(TARGET) $(SRC7FILES)
.IF "$(WITH_LANG)"!=""
$(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
@@ -358,11 +358,11 @@ ALLTAR : $(HIDSRS8PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(PWD:f).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES)
+$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES)
@echo ------------------------------
@echo Making: $@
- @@-$(RM) $(MISC)$/$(PWD:f).$(SRS8NAME).dprr
- $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS8NAME).srs} -fo=$@ $(SRC8FILES)
+ @@-$(RM) $(MISC)$/$(TARGET).$(SRS8NAME).dprr
+ $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS8NAME).srs} -fo=$@ -p=$(TARGET) $(SRC8FILES)
.IF "$(WITH_LANG)"!=""
$(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
@@ -407,11 +407,11 @@ ALLTAR : $(HIDSRS9PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(PWD:f).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES)
+$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES)
@echo ------------------------------
@echo Making: $@
- @@-$(RM) $(MISC)$/$(PWD:f).$(SRS9NAME).dprr
- $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS9NAME).srs} -fo=$@ $(SRC9FILES)
+ @@-$(RM) $(MISC)$/$(TARGET).$(SRS9NAME).dprr
+ $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS9NAME).srs} -fo=$@ -p=$(TARGET) $(SRC9FILES)
.IF "$(WITH_LANG)"!=""
$(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
@@ -456,11 +456,11 @@ ALLTAR : $(HIDSRS10PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(PWD:f).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES)
+$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES)
@echo ------------------------------
@echo Making: $@
- @@-$(RM) $(MISC)$/$(PWD:f).$(SRS10NAME).dprr
- $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS10NAME).srs} -fo=$@ $(SRC10FILES)
+ @@-$(RM) $(MISC)$/$(TARGET).$(SRS10NAME).dprr
+ $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS10NAME).srs} -fo=$@ -p=$(TARGET) $(SRC10FILES)
.IF "$(WITH_LANG)"!=""
$(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
diff --git a/solenv/inc/antsettings.mk b/solenv/inc/antsettings.mk
index 7288e9b13931..1153fabd5a16 100644
--- a/solenv/inc/antsettings.mk
+++ b/solenv/inc/antsettings.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: antsettings.mk,v $
#
-# $Revision: 1.7 $
+# $Revision: 1.7.166.1 $
#
# This file is part of OpenOffice.org.
#
@@ -84,5 +84,8 @@ ANT_FLAGS!:=-Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) -Doptimize=$(
ANT=
ANT_FLAGS=
.ENDIF
-
+
+.IF "$(WITH_LANG)"!=""
+ANT_FLAGS+=-Dsolar.langs="$(WITH_LANG)" -Dsolar.localized="true"
+.ENDIF # "$(WITH_LANG)"!=""
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index ccdc133fca45..1287cc3d859d 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: rules.mk,v $
#
-# $Revision: 1.103 $
+# $Revision: 1.103.4.1 $
#
# This file is part of OpenOffice.org.
#
@@ -624,7 +624,7 @@ $(MISC)$/%.dpr :
@echo Making: $@
@@-$(RM) $@
dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) NO_HIDS=true make_srs_deps=true $(DEPSRSFILES)
- -$(TYPE) $(MISC)$/$(PWD:f).*.dprr >> $@
+ -$(TYPE) $(MISC)$/$(TARGET).*.dprr >> $@
.ENDIF # "$(nodep)"==""
$(MISC)$/%.dpz :
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 1e5fab265438..02008467c033 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: target.mk,v $
#
-# $Revision: 1.211 $
+# $Revision: 1.211.4.1 $
#
# This file is part of OpenOffice.org.
#
@@ -280,55 +280,55 @@ NOLIBSLOTARGET=$(SLOFILES)
.IF "$(SRC1FILES)"!=""
SRC1TARGET=$(SRS)$/$(SRS1NAME).srs
-DEPSRS1FILE+=$(MISC)$/$(PWD:f).$(SRS1NAME).dprr
+DEPSRS1FILE+=$(MISC)$/$(TARGET).$(SRS1NAME).dprr
DEPSRSFILES+=$(DEPSRS1FILE)
.ENDIF
.IF "$(SRC2FILES)"!=""
SRC2TARGET=$(SRS)$/$(SRS2NAME).srs
-DEPSRS2FILE+=$(MISC)$/$(PWD:f).$(SRS2NAME).dprr
+DEPSRS2FILE+=$(MISC)$/$(TARGET).$(SRS2NAME).dprr
DEPSRSFILES+=$(DEPSRS2FILE)
.ENDIF
.IF "$(SRC3FILES)"!=""
SRC3TARGET=$(SRS)$/$(SRS3NAME).srs
-DEPSRS3FILE+=$(MISC)$/$(PWD:f).$(SRS3NAME).dprr
+DEPSRS3FILE+=$(MISC)$/$(TARGET).$(SRS3NAME).dprr
DEPSRSFILES+=$(DEPSRS3FILE)
.ENDIF
.IF "$(SRC4FILES)"!=""
SRC4TARGET=$(SRS)$/$(SRS4NAME).srs
-DEPSRS4FILE+=$(MISC)$/$(PWD:f).$(SRS4NAME).dprr
+DEPSRS4FILE+=$(MISC)$/$(TARGET).$(SRS4NAME).dprr
DEPSRSFILES+=$(DEPSRS4FILE)
.ENDIF
.IF "$(SRC5FILES)"!=""
SRC5TARGET=$(SRS)$/$(SRS5NAME).srs
-DEPSRS5FILE+=$(MISC)$/$(PWD:f).$(SRS5NAME).dprr
+DEPSRS5FILE+=$(MISC)$/$(TARGET).$(SRS5NAME).dprr
DEPSRSFILES+=$(DEPSRS5FILE)
.ENDIF
.IF "$(SRC6FILES)"!=""
SRC6TARGET=$(SRS)$/$(SRS6NAME).srs
-DEPSRS6FILE+=$(MISC)$/$(PWD:f).$(SRS6NAME).dprr
+DEPSRS6FILE+=$(MISC)$/$(TARGET).$(SRS6NAME).dprr
DEPSRSFILES+=$(DEPSRS6FILE)
.ENDIF
.IF "$(SRC7FILES)"!=""
SRC7TARGET=$(SRS)$/$(SRS7NAME).srs
-DEPSRS7FILE+=$(MISC)$/$(PWD:f).$(SRS7NAME).dprr
+DEPSRS7FILE+=$(MISC)$/$(TARGET).$(SRS7NAME).dprr
DEPSRSFILES+=$(DEPSRS7FILE)
.ENDIF
.IF "$(SRC8FILES)"!=""
SRC8TARGET=$(SRS)$/$(SRS8NAME).srs
-DEPSRS8FILE+=$(MISC)$/$(PWD:f).$(SRS8NAME).dprr
+DEPSRS8FILE+=$(MISC)$/$(TARGET).$(SRS8NAME).dprr
DEPSRSFILES+=$(DEPSRS8FILE)
.ENDIF
.IF "$(SRC9FILES)"!=""
SRC9TARGET=$(SRS)$/$(SRS9NAME).srs
-DEPSRS9FILE+=$(MISC)$/$(PWD:f).$(SRS9NAME).dprr
+DEPSRS9FILE+=$(MISC)$/$(TARGET).$(SRS9NAME).dprr
DEPSRSFILES+=$(DEPSRS9FILE)
.ENDIF
@@ -1388,19 +1388,19 @@ $(EXTUPDATEINFO_DEST) : $(EXTUPDATEINFO_SOURCE)
makedoc:
@@-mkdir $(OUT)$/ucrdoc
- $(IDLC) @$(mktmp $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(DEPIDLFILES:+"\n"))
+ $(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 $(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 $(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
diff --git a/solenv/inc/templates/extension_tmpl.mk b/solenv/inc/templates/extension_tmpl.mk
index 4aad2adb3614..fdc597c67164 100644
--- a/solenv/inc/templates/extension_tmpl.mk
+++ b/solenv/inc/templates/extension_tmpl.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: extension_tmpl.mk,v $
#
-# $Revision: 1.3 $
+# $Revision: 1.3.56.1 $
#
# This file is part of OpenOffice.org.
#
@@ -60,7 +60,7 @@ EXTENSION_ZIPNAME:=MyExtension
@all:
@echo "$(EXTENSIONNAME) - extension disabled."
.ENDIF
-.IF "$(SOLAR_JAVA)"!=""
+.IF "$(SOLAR_JAVA)"==""
@all:
@echo "$(EXTENSIONNAME) - extension requires java."
.ENDIF
diff --git a/solenv/inc/tg_dep.mk b/solenv/inc/tg_dep.mk
index c58b374a4a13..e80a66429678 100644
--- a/solenv/inc/tg_dep.mk
+++ b/solenv/inc/tg_dep.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: tg_dep.mk,v $
#
-# $Revision: 1.30 $
+# $Revision: 1.30.166.1 $
#
# This file is part of OpenOffice.org.
#
@@ -32,12 +32,12 @@
.IF "$(SLOFILES)$(OBJFILES)$(DEPOBJFILES)$(SRCFILES)$(SRC1FILES)$(SRC2FILES)$(SRC3FILES)$(RCFILES)$(HDBDEPNTARGET)$(IDLFILES)$(PARFILES)$(ZIP1TARGET)$(ZIP2TARGET)$(ZIP3TARGET)$(ZIP4TARGET)$(ZIP5TARGET)$(ZIP6TARGET)$(ZIP7TARGET)$(ZIP8TARGET)$(ZIP9TARGET)$(COMP1TYPELIST)$(COMP2TYPELIST)$(COMP3TYPELIST)$(COMP4TYPELIST)$(COMP5TYPELIST)$(COMP6TYPELIST)$(COMP7TYPELIST)$(COMP8TYPELIST)$(COMP9TYPELIST)"!=""
ALLDEP .PHONY:
.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
- @-$(IFEXIST) $(SRS)$/$(PWD:f).*.dpr $(THEN) $(RM:s/+//) $(SRS)$/$(PWD:f).*.dpr >& $(NULLDEV) $(FI)
+ @-$(IFEXIST) $(SRS)$/$(TARGET).*.dpr $(THEN) $(RM:s/+//) $(SRS)$/$(TARGET).*.dpr >& $(NULLDEV) $(FI)
.ELSE
- @@-$(RM) $(SRS)$/$(PWD:f).*.dpr
+ @@-$(RM) $(SRS)$/$(TARGET).*.dpr
.ENDIF
@@-$(RM) $(MISC)$/$(TARGET).dpr
- @@-$(RM) $(MISC)$/$(PWD:f).*.dprr
+ @@-$(RM) $(MISC)$/$(TARGET).*.dprr
@@-$(RM) $(MISC)$/$(TARGET).dpj
@@-$(RM) $(MISC)$/$(TARGET).dpz
@@-$(RM) $(MISC)$/$(COMP1TYPELIST).mk $(MISC)$/$(COMP2TYPELIST).mk $(MISC)$/$(COMP3TYPELIST).mk $(MISC)$/$(COMP4TYPELIST).mk $(MISC)$/$(COMP5TYPELIST).mk $(MISC)$/$(COMP6TYPELIST).mk $(MISC)$/$(COMP7TYPELIST).mk $(MISC)$/$(COMP8TYPELIST).mk $(MISC)$/$(COMP9TYPELIST).mk
diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk
index 93a58e3f26a6..9d8a3ca37321 100644
--- a/solenv/inc/tg_srs.mk
+++ b/solenv/inc/tg_srs.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: tg_srs.mk,v $
#
-# $Revision: 1.26 $
+# $Revision: 1.26.164.1 $
#
# This file is part of OpenOffice.org.
#
@@ -47,11 +47,11 @@ ALLTAR : $(HIDSRS$(TNR)PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(PWD:f).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES)
+$(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES)
@echo ------------------------------
@echo Making: $@
- @@-$(RM) $(MISC)$/$(PWD:f).$(SRS$(TNR)NAME).dprr
- $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS$(TNR)NAME).srs} -fo=$@ $(SRC$(TNR)FILES)
+ @@-$(RM) $(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr
+ $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS$(TNR)NAME).srs} -fo=$@ -p=$(TARGET) $(SRC$(TNR)FILES)
.IF "$(WITH_LANG)"!=""
$(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
generated by cgit (git 2.34.1) at 2025-01-31 07:15:33 +0000