filter: add missing dependencies on python

Change-Id: Ibaf38ad8000f7c4276aed91250c4bff1c78dd091

filter: add missing dependencies on python
Change-Id: Ibaf38ad8000f7c4276aed91250c4bff1c78dd091
3e0d7e60 · Michael Stahl · 47f73da0 · 3e0d7e60 · 3e0d7e60
Kaydet (Commit) 3e0d7e60 authored Kas 30, 2012 tarafından Michael Stahl
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

Configuration_filter.mk filter/Configuration_filter.mk +4 -2

CustomTarget_svg.mk filter/CustomTarget_svg.mk +1 -0

No files found.
--- 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_TARGET := $(gb_PYTHONTARGET) \
-filter_MERGE := $(gb_PYTHON) $(filter_MERGE_TARGET)
+	$(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)

--- 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)