From f16b5601f346506d0ba7a8b72a12b7f754f49cf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Kub=C3=A1nek?= <pkubanek@lsst.org>
Date: Thu, 16 Nov 2023 15:36:18 +0000
Subject: [PATCH] Simplified Makefile.inc

---
 Makefile                |  1 -
 Makefile.inc            | 10 ++++++----
 doc/version-history.rst |  8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 52012fb3..47ab7b79 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,6 @@ lib/libcRIOcpp.a: FORCE
 
 # Other Targets
 clean:
-	@$(foreach file,,echo '[RM ] ${file}'; $(RM) -r $(file);)
 	@$(foreach dir,src tests,$(MAKE) -C ${dir} $@;)
 
 tests: tests/Makefile tests/*.cpp
diff --git a/Makefile.inc b/Makefile.inc
index 2e999087..4ac555ad 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -13,13 +13,15 @@ else
   c_opts += -O3
 endif
 
+C := gcc -Wall ${c_opts}
+CPP := g++ -std=c++17 -fPIE -Wall ${c_opts}
+
 # compile x86 simulator or real cRIO stuff
 ifdef SIMULATOR
-  C := gcc -Wall ${c_opts}
-  CPP := g++ -std=c++14 -fPIE -pedantic -Wall -Wno-vla ${c_opts} -DSIMULATOR
+  CPP += -pedantic -DSIMULATOR
 else
-  C := gcc -Wall -fmessage-length=0 ${c_opts}
-  CPP := g++ -std=c++14 -fPIE -Wall -fmessage-length=0 ${c_opts}
+  C += -fmessage-length=0
+  CPP += -fmessage-length=0
   m1m3cli := m1m3cli
 endif
 
diff --git a/doc/version-history.rst b/doc/version-history.rst
index a8af60be..d799a4d3 100644
--- a/doc/version-history.rst
+++ b/doc/version-history.rst
@@ -3,23 +3,23 @@ Version History
 ###############
 
 v1.10.0
-=======
+--------
 
 * handleMissingReply, MissingReply exception
 * IRQTimeout handling
 
 v1.9.0
-======
+------
 
 * MPU changed to SerialMultiplex
 
 v1.8.0
-======
+------
 
 * LVDT ElectroMechanical readout
 
 v1.7.0
-======
+------
 
 * offsets,.. ILC commands
 * improved re-heater gain management