From 715212fc144556dd06095c27603c13d05f842f32 Mon Sep 17 00:00:00 2001
From: Rene Stange <rsta2@o2online.de>
Date: Mon, 14 Mar 2022 08:56:51 +0100
Subject: [PATCH] Cleanup Makefile (#46)

---
 src/Makefile       | 29 +++--------------------------
 src/Synth_Dexed.mk | 31 +++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 26 deletions(-)
 create mode 100644 src/Synth_Dexed.mk

diff --git a/src/Makefile b/src/Makefile
index f5a98bd..f826c48 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,34 +4,11 @@
 
 CIRCLE_STDLIB_DIR = ../circle-stdlib
 SYNTH_DEXED_DIR = ../Synth_Dexed/src
-CMSIS_CORE_INCLUDE_DIR = ../CMSIS_5/CMSIS/Core/Include
-CMSIS_DSP_INCLUDE_DIR = ../CMSIS_5/CMSIS/DSP/Include
-CMSIS_DSP_PRIVATE_INCLUDE_DIR = ../CMSIS_5/CMSIS/DSP/PrivateInclude
-CMSIS_DSP_SOURCE_DIR = ../CMSIS_5/CMSIS/DSP/Source
+CMSIS_DIR = ../CMSIS_5/CMSIS
 
 OBJS = main.o kernel.o minidexed.o config.o userinterface.o \
        mididevice.o midikeyboard.o serialmididevice.o pckeyboard.o \
-       sysexfileloader.o perftimer.o ky040.o \
-       $(SYNTH_DEXED_DIR)/PluginFx.o \
-       $(SYNTH_DEXED_DIR)/dexed.o \
-       $(SYNTH_DEXED_DIR)/dx7note.o \
-       $(SYNTH_DEXED_DIR)/env.o \
-       $(SYNTH_DEXED_DIR)/exp2.o \
-       $(SYNTH_DEXED_DIR)/fm_core.o \
-       $(SYNTH_DEXED_DIR)/fm_op_kernel.o \
-       $(SYNTH_DEXED_DIR)/freqlut.o \
-       $(SYNTH_DEXED_DIR)/lfo.o \
-       $(SYNTH_DEXED_DIR)/pitchenv.o \
-       $(SYNTH_DEXED_DIR)/porta.o \
-       $(SYNTH_DEXED_DIR)/sin.o \
-       $(CMSIS_DSP_SOURCE_DIR)/SupportFunctions/SupportFunctions.o
-
-INCLUDE += -I $(SYNTH_DEXED_DIR)
-INCLUDE += -I $(CMSIS_CORE_INCLUDE_DIR)
-INCLUDE += -I $(CMSIS_DSP_INCLUDE_DIR)
-INCLUDE += -I $(CMSIS_DSP_PRIVATE_INCLUDE_DIR)
-CXXFLAGS += -DARM_MATH_NEON
-
-EXTRACLEAN = $(SYNTH_DEXED_DIR)/*.o $(SYNTH_DEXED_DIR)/*.d $(CMSIS_DSP_SOURCE_DIR)/SupportFunctions/*.o $(CMSIS_DSP_SOURCE_DIR)/SupportFunctions/*.d
+       sysexfileloader.o perftimer.o ky040.o
 
+include ./Synth_Dexed.mk
 include ./Rules.mk
diff --git a/src/Synth_Dexed.mk b/src/Synth_Dexed.mk
new file mode 100644
index 0000000..7953394
--- /dev/null
+++ b/src/Synth_Dexed.mk
@@ -0,0 +1,31 @@
+#
+# Synth_Dexed.mk
+#
+
+CMSIS_CORE_INCLUDE_DIR = $(CMSIS_DIR)/Core/Include
+CMSIS_DSP_INCLUDE_DIR = $(CMSIS_DIR)/DSP/Include
+CMSIS_DSP_PRIVATE_INCLUDE_DIR = $(CMSIS_DIR)/DSP/PrivateInclude
+CMSIS_DSP_SOURCE_DIR = $(CMSIS_DIR)/DSP/Source
+
+OBJS += \
+       $(SYNTH_DEXED_DIR)/PluginFx.o \
+       $(SYNTH_DEXED_DIR)/dexed.o \
+       $(SYNTH_DEXED_DIR)/dx7note.o \
+       $(SYNTH_DEXED_DIR)/env.o \
+       $(SYNTH_DEXED_DIR)/exp2.o \
+       $(SYNTH_DEXED_DIR)/fm_core.o \
+       $(SYNTH_DEXED_DIR)/fm_op_kernel.o \
+       $(SYNTH_DEXED_DIR)/freqlut.o \
+       $(SYNTH_DEXED_DIR)/lfo.o \
+       $(SYNTH_DEXED_DIR)/pitchenv.o \
+       $(SYNTH_DEXED_DIR)/porta.o \
+       $(SYNTH_DEXED_DIR)/sin.o \
+       $(CMSIS_DSP_SOURCE_DIR)/SupportFunctions/SupportFunctions.o
+
+INCLUDE += -I $(SYNTH_DEXED_DIR)
+INCLUDE += -I $(CMSIS_CORE_INCLUDE_DIR)
+INCLUDE += -I $(CMSIS_DSP_INCLUDE_DIR)
+INCLUDE += -I $(CMSIS_DSP_PRIVATE_INCLUDE_DIR)
+CXXFLAGS += -DARM_MATH_NEON
+
+EXTRACLEAN = $(SYNTH_DEXED_DIR)/*.[od] $(CMSIS_DSP_SOURCE_DIR)/SupportFunctions/*.[od]