From 47b6000c366f941a1c53a0ff1b1a25d721badb1d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 3 Jul 2016 22:21:02 +0100
Subject: [PATCH] wmake/rules/General: Add support for WM_SCHEDULER to the
 compilation of lex, yacc and moc files

---
 wmake/rules/General/bison    | 12 ++++++++----
 wmake/rules/General/btyacc   |  6 ++++--
 wmake/rules/General/btyacc++ |  6 ++++--
 wmake/rules/General/byacc    |  6 ++++--
 wmake/rules/General/flex     |  3 ++-
 wmake/rules/General/flex++   |  3 ++-
 wmake/rules/General/general  |  6 ++++++
 wmake/rules/General/moc      |  3 ++-
 wmake/rules/General/yacc     | 12 ++++++++----
 9 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/wmake/rules/General/bison b/wmake/rules/General/bison
index b741436ad7..4811b0ec1c 100644
--- a/wmake/rules/General/bison
+++ b/wmake/rules/General/bison
@@ -1,7 +1,11 @@
 SUFFIXES += .y .Y
 
-ytoo = bison -v -d -y $< ; mv y.tab.c $(@D)/$(<F).c ; mv y.tab.h $(@D)/$(<F).h ; \
-     $(cc) $(cFLAGS) -c  $(@D)/$(<F).c -o $@
+ytoo = $(WM_SCHEDULER) bison -v -d -y $< $(AND) \
+    mv y.tab.c $(@D)/$(<F).c $(AND) \
+    mv y.tab.h $(@D)/$(<F).h $(AND) \
+    $(cc) $(cFLAGS) -c  $(@D)/$(<F).c -o $@
 
-Ytoo = bison -v -d -y $< ; mv y.tab.c $(@D)/$(<F).C ; mv y.tab.h $(@D)/$(<F).H ; \
-     $(CC) $(c++FLAGS) -c  $(@D)/$(<F).C -o $@
+Ytoo = $(WM_SCHEDULER) bison -v -d -y $< $(AND) \
+    mv y.tab.c $(@D)/$(<F).C $(AND) \
+    mv y.tab.h $(@D)/$(<F).H $(AND) \
+    $(CC) $(c++FLAGS) -c  $(@D)/$(<F).C -o $@
diff --git a/wmake/rules/General/btyacc b/wmake/rules/General/btyacc
index 44a58c3968..90124ebd45 100644
--- a/wmake/rules/General/btyacc
+++ b/wmake/rules/General/btyacc
@@ -1,4 +1,6 @@
 SUFFIXES += .y
 
-ytoo = btyacc -v -d $(SKELETON) $< ; mv y_tab.c $(@D)/$(<F).C ; mv y_tab.h $(@D)/$(<F).H ; \
-     $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@
+ytoo = $(WM_SCHEDULER) btyacc -v -d $(SKELETON) $< $(AND) \
+    mv y_tab.c $(@D)/$(<F).C $(AND) \
+    mv y_tab.h $(@D)/$(<F).H $(AND) \
+    $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@
diff --git a/wmake/rules/General/btyacc++ b/wmake/rules/General/btyacc++
index 7844558541..2aa66cc8cb 100644
--- a/wmake/rules/General/btyacc++
+++ b/wmake/rules/General/btyacc++
@@ -1,4 +1,6 @@
 SUFFIXES += .Y
 
-Ytoo = btyacc++ -v -d $(SKELETON) $< ; mv y_tab.c $(@D)/$(<F).C ; mv y_tab.h $(@D)/$(<F).H ; \
-     $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@
+Ytoo = $(WM_SCHEDULER) btyacc++ -v -d $(SKELETON) $< $(AND) \
+    mv y_tab.c $(@D)/$(<F).C $(AND) \
+    mv y_tab.h $(@D)/$(<F).H $(AND) \
+    $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@
diff --git a/wmake/rules/General/byacc b/wmake/rules/General/byacc
index 60a9e18f59..177733805c 100644
--- a/wmake/rules/General/byacc
+++ b/wmake/rules/General/byacc
@@ -1,4 +1,6 @@
 SUFFIXES += .y
 
-ytoo = byacc -v $(YYPREFIX) -d $< ; mv y.tab.c $(@D)/$(<F).C ; mv y.tab.h $(@D)/$(<F).H ; \
-     $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@
+ytoo = $(WM_SCHEDULER) byacc -v $(YYPREFIX) -d $< $(AND) \
+    mv y.tab.c $(@D)/$(<F).C $(AND) \
+    mv y.tab.h $(@D)/$(<F).H $(AND) \
+    $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@
diff --git a/wmake/rules/General/flex b/wmake/rules/General/flex
index 2b65bb2462..3f2fe373f7 100644
--- a/wmake/rules/General/flex
+++ b/wmake/rules/General/flex
@@ -1,3 +1,4 @@
 SUFFIXES += .l
 
-ltoo = flex -o $(@D)/$(<F).c $< ; $(cc) $(cFLAGS) -c  $(@D)/$(<F).c -o $@
+ltoo = $(WM_SCHEDULER) flex -o $(@D)/$(<F).c $< $(AND) \
+    $(cc) $(cFLAGS) -c  $(@D)/$(<F).c -o $@
diff --git a/wmake/rules/General/flex++ b/wmake/rules/General/flex++
index 894181b404..4a140628fc 100644
--- a/wmake/rules/General/flex++
+++ b/wmake/rules/General/flex++
@@ -1,3 +1,4 @@
 SUFFIXES += .L
 
-Ltoo = flex -+ -o$(@D)/$(<F).C -f $< ; $(CC) $(c++FLAGS) $(c++LESSWARN) -c $(@D)/$(<F).C -o $@
+Ltoo = $(WM_SCHEDULER) flex -+ -o$(@D)/$(<F).C -f $< $(AND) \
+    $(CC) $(c++FLAGS) $(c++LESSWARN) -c $(@D)/$(<F).C -o $@
diff --git a/wmake/rules/General/general b/wmake/rules/General/general
index b3f20b48e8..9d25383399 100644
--- a/wmake/rules/General/general
+++ b/wmake/rules/General/general
@@ -18,6 +18,12 @@ DEFAULT_RULES   = $(WM_DIR)/rules/$(WM_ARCH)$(COMPILER_TYPE)
 RULES           = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER)
 WMAKE_BIN       = $(WM_DIR)/platforms/$(WM_ARCH)$(WM_COMPILER)
 
+ifeq ($(WM_SCHEDULER),)
+    AND = &&
+else
+    AND = '&&'
+endif
+
 include $(DEFAULT_RULES)/general
 include $(DEFAULT_RULES)/$(WM_LINK_LANGUAGE)
 -include $(RULES)/general
diff --git a/wmake/rules/General/moc b/wmake/rules/General/moc
index 93749733e7..02a075843e 100644
--- a/wmake/rules/General/moc
+++ b/wmake/rules/General/moc
@@ -1,3 +1,4 @@
 SUFFIXES += .qt
 
-qttoo = $(QTDIR)/bin/moc -f $< -o $(@D)/$(<F).C ; $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@
+qttoo = $(WM_SCHEDULER) $(QTDIR)/bin/moc -f $< -o $(@D)/$(<F).C $(AND) \
+    $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@
diff --git a/wmake/rules/General/yacc b/wmake/rules/General/yacc
index d583a63f06..18d8902160 100644
--- a/wmake/rules/General/yacc
+++ b/wmake/rules/General/yacc
@@ -1,7 +1,11 @@
 SUFFIXES += .y .Y
 
-ytoo = yacc -v -d $< ; mv y.tab.c $(@D)/$(<F).c ; mv y.tab.h $(@D)/parser.h ; \
-     $(CC) $(c++FLAGS) -c $(@D)/$(<F).c -o $@
+ytoo = $(WM_SCHEDULER) yacc -v -d $< $(AND) \
+    mv y.tab.c $(@D)/$(<F).c $(AND) \
+    mv y.tab.h $(@D)/parser.h $(AND) \
+    $(CC) $(c++FLAGS) -c $(@D)/$(<F).c -o $@
 
-Ytoo = yacc -v -d $< ; mv y.tab.c $(@D)/$(<F).C ; mv y.tab.h $(@D)/parser.H ; \
-     $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@
+Ytoo = $(WM_SCHEDULER) yacc -v -d $< $(AND) \
+    mv y.tab.c $(@D)/$(<F).C $(AND) \
+    mv y.tab.h $(@D)/parser.H $(AND) \
+    $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@