diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2013-03-25 11:57:39 +0100 |
|---|---|---|
| committer | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2013-03-25 12:01:59 +0100 |
| commit | 56a52889e65a17e324fc10cf341690385f5a9dd9 (patch) | |
| tree | 00b1b49b1ea5fc63c2ab01838a55afb5d420c1ad /solenv | |
| parent | 2d8547d095897037388b27075fd7dc182a4e4912 (diff) | |
Remove unneeded project and projectroot parameters
Plus avoid use of Export::sLanguages member outside
of the class.
Change-Id: I33702816fdb4980d690cfe8fcd8cc3fbd0df1dd8
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/AllLangResTarget.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/Configuration.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/ExtensionTarget.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/InstallModuleTarget.mk | 2 |
4 files changed, 1 insertions, 5 deletions
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 6bb25468d1da..f6f7feba1700 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -57,7 +57,6 @@ echo $(POFILES) > $${MERGEINPUT} && \ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \ - -p $(firstword $(subst /, ,$(2))) \ -i $(3) \ -o $(1) \ -m $${MERGEINPUT} \ diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 068bbd54ee54..65e9885e219d 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -269,7 +269,6 @@ echo $(POFILES) > $${MERGEINPUT} && \ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_XcuMergeTarget_CFGEXCOMMAND) \ - -p $(firstword $(subst /, ,$(2))) \ -i $(3) \ -o $(1) \ -m $${MERGEINPUT} \ diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index 171d754c1e48..575007091438 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -94,7 +94,6 @@ $(call gb_ExtensionTarget_get_workdir,%)/description.xml : $(gb_ExtensionTarget_ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(call gb_ExtensionTarget_get_workdir,$*) && \ $(gb_ExtensionTarget_XRMEXCOMMAND) \ - -p $(PRJNAME) \ -i $(filter %.xml,$^) \ -o $@ \ -m $${MERGEINPUT} \ @@ -132,7 +131,6 @@ $(call gb_ExtensionTarget_get_target,$(1)) : FILES := META-INF description.xml $(call gb_ExtensionTarget_get_target,$(1)) : LICENSE := $(call gb_ExtensionTarget_get_target,$(1)) : LOCATION := $(SRCDIR)/$(2) $(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := $(PLATFORMID) -$(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2))) $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : \ $(SRCDIR)/$(2)/description.xml $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml :| \ diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index 7d22385bae78..6d1c710af2b3 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -121,7 +121,7 @@ $(call gb_Output_announce,$(2),$(true),SUM,1) MERGEINPUT=`$(gb_MKTEMP)` && \ echo $(SCP_POFILES) > $${MERGEINPUT} && \ $(call gb_Helper_abbreviate_dirs,\ - $(gb_ScpMergeTarget_COMMAND) -p scp2 -i $(SCP_SOURCE) -o $(1) -m $${MERGEINPUT} -l all ) && \ + $(gb_ScpMergeTarget_COMMAND) -i $(SCP_SOURCE) -o $(1) -m $${MERGEINPUT} -l all ) && \ rm -rf $${MERGEINPUT} endef |