diff options
| author | David Tardon <dtardon@redhat.com> | 2012-12-29 10:00:49 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-12-29 13:06:49 +0100 |
| commit | 11a9ce33f74e28ecfd3db358a1e77856b36cfc38 (patch) | |
| tree | ba0561310ce78df8fccde474756fc78966a49aab /filter | |
| parent | 43a3f734f9df07bbd11cad3e9418814b37be058c (diff) | |
rethink external executable setup
Change-Id: I5293fea9b5404b82e72761407d325c408a2e45ca
(cherry picked from commit bbf2f413958e7be2bef34c62932fc76f83e7ed18)
Signed-off-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/Configuration_filter.mk | 4 | ||||
| -rw-r--r-- | filter/CustomTarget_svg.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index d7fbe1e80537..df6681b847c1 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -22,7 +22,7 @@ # semi-integrated with the stuff from Configuration.mk; not exactly pretty... ifeq ($(SOLAR_JAVA),) -filter_MERGE_TARGET := $(call gb_ExternalExecutable_get_deps,python) \ +filter_MERGE_TARGET := $(call gb_ExternalExecutable_get_dependencies,python) \ $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge filter_MERGE := $(call gb_ExternalExecutable_get_command,python) \ $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge @@ -230,7 +230,7 @@ $(call gb_Configuration_get_clean_target,fcfg_langpack) : \ define filter_XcuResTarget__rule $$(call filter_XcuResTarget_get_target,$(1)) : \ $(filter_XSLT_langfilter) $(filter_XcuFilterUiTarget) \ - | $(call gb_ExternalExecutable_get_deps,xsltproc) + | $(call gb_ExternalExecutable_get_dependencies,xsltproc) $$(call gb_Output_announce,$(1),$(true),XCU,1) $$(call gb_Helper_abbreviate_dirs,\ mkdir -p $$(dir $$@) && \ diff --git a/filter/CustomTarget_svg.mk b/filter/CustomTarget_svg.mk index 461907e93907..67be7c02a173 100644 --- a/filter/CustomTarget_svg.mk +++ b/filter/CustomTarget_svg.mk @@ -59,7 +59,7 @@ $(filter_GEN_svg_Tokens_cxx) : $(filter_GEN_svg_Tokens_gperf) > $(filter_GEN_svg_Tokens_cxx)) $(filter_GEN_svg_Script_hxx) : \ - $(call gb_ExternalExecutable_get_deps,python) \ + $(call gb_ExternalExecutable_get_dependencies,python) \ $(filter_SRC_svg_PresentationEngine) $(filter_SRC_svg_Js2Hxx) \ | $(filter_SVGWORK)/.dir $(call gb_Output_announce,$@,build,PY ,1) |