summaryrefslogtreecommitdiff
path: root/unoil
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-05-09 09:38:39 +0100
committerNoel Power <noel.power@novell.com>2012-05-09 09:39:19 +0100
commit736170293c1cb9b242a13c6d8cda4e23bf465b3b (patch)
treeb190c81c2cf5f45c725014e7b6089dbdd5173cfc /unoil
parentf4f4e3c050b117a8bfaa95a865b3b37bcb637516 (diff)
gbuild: remove gb_Helper_abbreviate_dirs_native
Change-Id: I0a3ad6553692fc21eaf96cf35e9c343b4d716c21
Diffstat (limited to 'unoil')
-rw-r--r--unoil/CustomTarget_climaker.mk6
-rw-r--r--unoil/CustomTarget_javamaker.mk2
2 files changed, 4 insertions, 4 deletions
diff --git a/unoil/CustomTarget_climaker.mk b/unoil/CustomTarget_climaker.mk
index 78eda26c437e..ff53b92ecf79 100644
--- a/unoil/CustomTarget_climaker.mk
+++ b/unoil/CustomTarget_climaker.mk
@@ -41,7 +41,7 @@ $(UICM)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \
$(OUTDIR)/bin/cliuno.snk $(OUTDIR)/bin/cli_uretypes.dll \
$(call gb_Executable_get_target_for_build,climaker) | $(UICM)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1)
- $(call gb_Helper_abbreviate_dirs_native, \
+ $(call gb_Helper_abbreviate_dirs, \
$(call gb_Helper_execute,climaker \
$(if $(filter -s,$(MAKEFLAGS)),,--verbose) \
--out $@ \
@@ -56,13 +56,13 @@ $(UICM)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \
$(UICM)/cli_oootypes.config : $(SRCDIR)/unoil/climaker/cli_oootypes_config \
$(SRCDIR)/unoil/climaker/version.txt | $(UICM)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
- $(call gb_Helper_abbreviate_dirs_native, \
+ $(call gb_Helper_abbreviate_dirs, \
perl $(SRCDIR)/solenv/bin/clipatchconfig.pl $^ $@)
$(UICM)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll : $(UICM)/cli_oootypes.config \
$(UICM)/cli_oootypes.dll $(OUTDIR)/bin/cliuno.snk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AL ,1)
- $(call gb_Helper_abbreviate_dirs_native, \
+ $(call gb_Helper_abbreviate_dirs, \
al -out:$@ \
-version:$(CLI_OOOTYPES_POLICY_VERSION) \
-keyfile:$(OUTDIR)/bin/cliuno.snk \
diff --git a/unoil/CustomTarget_javamaker.mk b/unoil/CustomTarget_javamaker.mk
index 943732a61d7c..94e70af7d813 100644
--- a/unoil/CustomTarget_javamaker.mk
+++ b/unoil/CustomTarget_javamaker.mk
@@ -34,7 +34,7 @@ $(call gb_CustomTarget_get_target,unoil/javamaker) : $(UIJM)/done
$(UIJM)/done : $(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \
$(call gb_Executable_get_target_for_build,javamaker) | $(UIJM)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
- $(call gb_Helper_abbreviate_dirs_native, \
+ $(call gb_Helper_abbreviate_dirs, \
rm -r $(UIJM) && \
$(call gb_Helper_execute,javamaker -BUCR -O$(UIJM) $(OUTDIR)/bin/offapi.rdb -X$(OUTDIR)/bin/udkapi.rdb) && \
touch $@)