[Libreoffice-commits] .: filter/Configuration_filter.mk filter/CustomTarget_svg.mk

[Libreoffice Gerrit user]

 filter/Configuration_filter.mk |    6 ++++--
 filter/CustomTarget_svg.mk     |    1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 3e0d7e60bc00b36cca0755a6b02879e0a1cc2484
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Nov 30 18:19:47 2012 +0100

    filter: add missing dependencies on python
    
    Change-Id: Ibaf38ad8000f7c4276aed91250c4bff1c78dd091

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 5b41bda..dd4a09d 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -22,8 +22,10 @@
 # semi-integrated with the stuff from Configuration.mk; not exactly pretty...
 
 ifeq ($(SOLAR_JAVA),)
-filter_MERGE_TARGET := $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge
-filter_MERGE := $(gb_PYTHON) $(filter_MERGE_TARGET)
+filter_MERGE_TARGET := $(gb_PYTHONTARGET) \
+	$(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge
+filter_MERGE := $(gb_PYTHON) \
+	$(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge
 else # SOLAR_JAVA
 filter_MERGE_TARGET := $(OUTDIR_FOR_BUILD)/bin/FCFGMerge.jar
 filter_MERGE := $(JAVAINTERPRETER) $(JAVAIFLAGS) -jar $(filter_MERGE_TARGET)
diff --git a/filter/CustomTarget_svg.mk b/filter/CustomTarget_svg.mk
index f20b5c1..1b374ff 100644
--- a/filter/CustomTarget_svg.mk
+++ b/filter/CustomTarget_svg.mk
@@ -59,6 +59,7 @@ $(filter_GEN_svg_Tokens_cxx) : $(filter_GEN_svg_Tokens_gperf)
 			 > $(filter_GEN_svg_Tokens_cxx))
 
 $(filter_GEN_svg_Script_hxx) : \
+			$(gb_PYTHONTARGET) \
 			$(filter_SRC_svg_PresentationEngine) $(filter_SRC_svg_Js2Hxx) \
 			| $(filter_SVGWORK)/.dir
 	$(call gb_Output_announce,$@,build,PY ,1)