From 9edaf8bfa59397b40a52dcce5f4a49568c4cafad Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 16 Dec 2019 09:22:50 +0100
Subject: [PATCH] CONFIG: default compilation is 'Opt' in Makefiles

- only include compiler-family rules for C++ once

STYLE: minor cleanup of wmake/src Makefile
---
 wmake/rules/General/general | 10 +++++++---
 wmake/src/Makefile          | 21 ++++++++++++---------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/wmake/rules/General/general b/wmake/rules/General/general
index fdd53275d6..8c433e46fa 100644
--- a/wmake/rules/General/general
+++ b/wmake/rules/General/general
@@ -14,11 +14,16 @@ GLIBS      = -lm
 GLIB_LIBS  =
 
 
-COMPILER_TYPE   = $(shell echo "$(WM_COMPILER)" | sed -e 's/[0-9].*//')
-DEFAULT_RULES   = $(WM_DIR)/rules/$(WM_ARCH)$(COMPILER_TYPE)
+COMPILER_FAMILY = $(shell echo "$(WM_COMPILER)" | sed -e 's/[0-9].*//')
+DEFAULT_RULES   = $(WM_DIR)/rules/$(WM_ARCH)$(COMPILER_FAMILY)
 RULES           = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER)
 WMAKE_BIN       = $(WM_DIR)/platforms/$(WM_ARCH)$(WM_COMPILER)
 
+# Default compilation is 'Opt' - never permit an empty value
+ifeq ($(WM_COMPILE_OPTION),)
+    WM_COMPILE_OPTION = Opt
+endif
+
 ifeq ($(WM_SCHEDULER),)
     AND = &&
 else
@@ -26,7 +31,6 @@ else
 endif
 
 include $(DEFAULT_RULES)/general
-include $(DEFAULT_RULES)/c++
 sinclude $(RULES)/general
 sinclude $(RULES)/c++
 include $(GENERAL_RULES)/transform
diff --git a/wmake/src/Makefile b/wmake/src/Makefile
index 20c4907d08..2b602f11c1 100644
--- a/wmake/src/Makefile
+++ b/wmake/src/Makefile
@@ -63,10 +63,13 @@ archTarget  := $(shell basename $(WMAKE_BIN))
 # Targets
 #------------------------------------------------------------------------------
 
-.PHONY: all clean message
+.PHONY: all clean message old
 
 all: $(WMAKE_BIN)/lemon$(EXT_EXE) $(WMAKE_BIN)/wmkdepend$(EXT_EXE) message
 
+# Flex-based processing
+old: $(WMAKE_BIN)/wmkdep$(EXT_EXE)
+
 message:
 ifneq ($(archHost),$(archTarget))
 	@echo "built wmake-bin ($(archTarget)) for $(archHost) host"
@@ -76,7 +79,7 @@ endif
 
 clean:
 	@echo "clean wmake-bin ($(archTarget))"
-	@rm -rf $(WMAKE_BIN) 2>/dev/null
+	@rm -rf $(WMAKE_BIN)
 	@rmdir $(shell dirname $(WMAKE_BIN)) 2>/dev/null || true
 
 $(WMAKE_BIN)/lemon$(EXT_EXE): lemon.c
@@ -88,17 +91,17 @@ $(WMAKE_BIN)/wmkdep$(EXT_EXE): wmkdep.l
 	@mkdir -p $(WMAKE_BIN)
 	$(call QUIET_MESSAGE,flex,$(<F))
 	$E flex -o $@.c $(<F) && $(cc) $(cFLAGS) $@.c -o $@
-	@rm -f $@.c 2>/dev/null
+	@rm -f $@.c
 
 $(WMAKE_BIN)/wmkdepend$(EXT_EXE): wmkdepend.cc
 	@mkdir -p $(WMAKE_BIN)
 	$(call QUIET_MESSAGE,wmkdepend,$(<F))
-	$E $(CC) $(c++FLAGS) $(c++LESSWARN) $(<F) -o $@
+	$E $(CC) $(c++FLAGS) $(<F) -o $@
 
-# $(WMAKE_BIN)/wmkdepend$(EXT_EXE): wmkdepend.rl
-# 	@mkdir -p $(WMAKE_BIN)
-# 	$(call QUIET_MESSAGE,ragel,$(<F))
-# 	$E ragel -G2 -o $@.cc $(<F) && $(CC) $(c++FLAGS) $(c++LESSWARN) $@.cc -o $@
-# 	@rm -f $@.cc 2>/dev/null
+#$(WMAKE_BIN)/wmkdepend$(EXT_EXE): wmkdepend.rl
+#	@mkdir -p $(WMAKE_BIN)
+#	$(call QUIET_MESSAGE,ragel,$(<F))
+#	$E ragel -G2 -o $@.cc $(<F) && $(CC) $(c++FLAGS) $@.cc -o $@
+#	@rm -f $@.cc
 
 #------------------------------------------------------------------------------