Bug 937024 - fix build bustage from bug 935305, rs=trivial,bustage
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Mon, 11 Nov 2013 10:15:33 +0100
changeset 170550 ee69898d2bc0f243e31c32b537e9be2475b3fa4f
parent 170549 c31c950dbf9a2a6c87d9203e8da929ef82085944
child 170551 650572c94814ccb42b3cd3c2bb8ec46569eadfff
push idunknown
push userunknown
push dateunknown
reviewerstrivial, bustage
bugs937024, 935305
milestone28.0a1
Bug 937024 - fix build bustage from bug 935305, rs=trivial,bustage
browser/themes/linux/Makefile.in
browser/themes/osx/Makefile.in
browser/themes/windows/Makefile.in
--- a/browser/themes/linux/Makefile.in
+++ b/browser/themes/linux/Makefile.in
@@ -8,20 +8,20 @@ INSTALL_TARGETS += ICON
 
 # By default, the pre-processor used for jar.mn will use "%" as a marker for ".css" files and "#"
 # otherwise. This falls apart when a file using one marker needs to include a file with the other
 # marker since the pre-processor instructions in the included file will not be processed. The
 # following SVG files need to include a file which uses "%" as the marker so we invoke the pre-
 # processor ourselves here with the marker specified. The resulting SVG files will get packaged by
 # the processing of the jar file in this directory.
 tab-selected-svg: $(srcdir)/../shared/tab-selected.svg
-	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
+	$(call py_action,preprocessor, \
 	  --marker "%" -D TAB_SIDE=start \
 	  $(ACDEFINES) \
-	  $(srcdir)/../shared/tab-selected.svg > tab-selected-start.svg
-	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
+	  $(srcdir)/../shared/tab-selected.svg > tab-selected-start.svg)
+	$(call py_action,preprocessor, \
 	  --marker "%" -D TAB_SIDE=end \
 	  $(ACDEFINES) \
-	  $(srcdir)/../shared/tab-selected.svg > tab-selected-end.svg
+	  $(srcdir)/../shared/tab-selected.svg > tab-selected-end.svg)
 
 .PHONY: tab-selected-svg
 
 export:: tab-selected-svg
--- a/browser/themes/osx/Makefile.in
+++ b/browser/themes/osx/Makefile.in
@@ -8,20 +8,20 @@ INSTALL_TARGETS += ICON
 
 # By default, the pre-processor used for jar.mn will use "%" as a marker for ".css" files and "#"
 # otherwise. This falls apart when a file using one marker needs to include a file with the other
 # marker since the pre-processor instructions in the included file will not be processed. The
 # following SVG files need to include a file which uses "%" as the marker so we invoke the pre-
 # processor ourselves here with the marker specified. The resulting SVG files will get packaged by
 # the processing of the jar file in this directory.
 tab-selected-svg: $(srcdir)/../shared/tab-selected.svg
-	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
+	$(call py_action,preprocessor, \
 	  --marker "%" -D TAB_SIDE=start \
 	  $(ACDEFINES) \
-	  $(srcdir)/../shared/tab-selected.svg > tab-selected-start.svg
-	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
+	  $(srcdir)/../shared/tab-selected.svg > tab-selected-start.svg)
+	$(call py_action,preprocessor, \
 	  --marker "%" -D TAB_SIDE=end \
 	  $(ACDEFINES) \
-	  $(srcdir)/../shared/tab-selected.svg > tab-selected-end.svg
+	  $(srcdir)/../shared/tab-selected.svg > tab-selected-end.svg)
 
 .PHONY: tab-selected-svg
 
 export:: tab-selected-svg
--- a/browser/themes/windows/Makefile.in
+++ b/browser/themes/windows/Makefile.in
@@ -8,29 +8,29 @@ INSTALL_TARGETS += ICON
 
 # By default, the pre-processor used for jar.mn will use "%" as a marker for ".css" files and "#"
 # otherwise. This falls apart when a file using one marker needs to include a file with the other
 # marker since the pre-processor instructions in the included file will not be processed. The
 # following SVG files need to include a file which uses "%" as the marker so we invoke the pre-
 # processor ourselves here with the marker specified. The resulting SVG files will get packaged by
 # the processing of the jar file in this directory.
 tab-selected-svg: $(srcdir)/../shared/tab-selected.svg
-	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
+	$(call py_action,preprocessor, \
 	  --marker "%" -D TAB_SIDE=start \
 	  $(ACDEFINES) \
-	  $(srcdir)/../shared/tab-selected.svg > tab-selected-start.svg
-	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
+	  $(srcdir)/../shared/tab-selected.svg > tab-selected-start.svg)
+	$(call py_action,preprocessor, \
 	  --marker "%" -D TAB_SIDE=end \
 	  $(ACDEFINES) \
-	  $(srcdir)/../shared/tab-selected.svg > tab-selected-end.svg
+	  $(srcdir)/../shared/tab-selected.svg > tab-selected-end.svg)
 # Same as above for aero.
-	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
+	$(call py_action,preprocessor, \
 	  --marker "%" -D TAB_SIDE=start -D WINDOWS_AERO \
 	  $(ACDEFINES) \
-	  $(srcdir)/../shared/tab-selected.svg > tab-selected-start-aero.svg
-	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
+	  $(srcdir)/../shared/tab-selected.svg > tab-selected-start-aero.svg)
+	$(call py_action,preprocessor, \
 	  --marker "%" -D TAB_SIDE=end -D WINDOWS_AERO \
 	  $(ACDEFINES) \
-	  $(srcdir)/../shared/tab-selected.svg > tab-selected-end-aero.svg
+	  $(srcdir)/../shared/tab-selected.svg > tab-selected-end-aero.svg)
 
 .PHONY: tab-selected-svg
 
 export:: tab-selected-svg