diff options
| author | David Tardon <dtardon@redhat.com> | 2012-12-02 10:51:37 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-12-02 10:56:48 +0100 |
| commit | c2eca359af3eb88ebde341df5b87c24e178f5d5c (patch) | |
| tree | 349c09453bbb3514bd67332f6be3c16702a6ee56 /filter | |
| parent | f02ac6e7c8da9e6e3b2263f028637723a8cf4829 (diff) | |
move setting up of ext. executables out of gbuild.mk
Change-Id: Icacd44abfa5bf5f75f0ee719b39fba6821976a8a
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/Configuration_filter.mk | 9 | ||||
| -rw-r--r-- | filter/CustomTarget_svg.mk | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index dd4a09d8a9a5..d7fbe1e80537 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -22,9 +22,9 @@ # semi-integrated with the stuff from Configuration.mk; not exactly pretty... ifeq ($(SOLAR_JAVA),) -filter_MERGE_TARGET := $(gb_PYTHONTARGET) \ +filter_MERGE_TARGET := $(call gb_ExternalExecutable_get_deps,python) \ $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge -filter_MERGE := $(gb_PYTHON) \ +filter_MERGE := $(call gb_ExternalExecutable_get_command,python) \ $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge else # SOLAR_JAVA filter_MERGE_TARGET := $(OUTDIR_FOR_BUILD)/bin/FCFGMerge.jar @@ -229,11 +229,12 @@ $(call gb_Configuration_get_clean_target,fcfg_langpack) : \ # so generate non-pattern rules which have higher priority even in GNUmake 3.81 define filter_XcuResTarget__rule $$(call filter_XcuResTarget_get_target,$(1)) : \ - $(filter_XSLT_langfilter) $(filter_XcuFilterUiTarget) + $(filter_XSLT_langfilter) $(filter_XcuFilterUiTarget) \ + | $(call gb_ExternalExecutable_get_deps,xsltproc) $$(call gb_Output_announce,$(1),$(true),XCU,1) $$(call gb_Helper_abbreviate_dirs,\ mkdir -p $$(dir $$@) && \ - $(gb_XSLTPROC) --nonet --stringparam lang $(1) \ + $(call gb_ExternalExecutable_get_command,xsltproc) --nonet --stringparam lang $(1) \ $(filter_XSLT_langfilter) \ $(filter_XcuFilterUiTarget) > $$@) endef diff --git a/filter/CustomTarget_svg.mk b/filter/CustomTarget_svg.mk index 1b374ff6969a..461907e93907 100644 --- a/filter/CustomTarget_svg.mk +++ b/filter/CustomTarget_svg.mk @@ -59,12 +59,12 @@ $(filter_GEN_svg_Tokens_cxx) : $(filter_GEN_svg_Tokens_gperf) > $(filter_GEN_svg_Tokens_cxx)) $(filter_GEN_svg_Script_hxx) : \ - $(gb_PYTHONTARGET) \ + $(call gb_ExternalExecutable_get_deps,python) \ $(filter_SRC_svg_PresentationEngine) $(filter_SRC_svg_Js2Hxx) \ | $(filter_SVGWORK)/.dir $(call gb_Output_announce,$@,build,PY ,1) $(call gb_Helper_abbreviate_dirs, \ - $(gb_PYTHON) $(filter_SRC_svg_Js2Hxx) \ + $(call gb_ExternalExecutable_get_command,python) $(filter_SRC_svg_Js2Hxx) \ $(filter_SRC_svg_PresentationEngine) \ $(filter_GEN_svg_Script_hxx)) |