From 7c43bcb2d869b3d59b31a88854a66749010fc28f Mon Sep 17 00:00:00 2001
From: Chewing_Bever <roosensjef@gmail.com>
Date: Sat, 7 Nov 2020 15:29:13 +0100
Subject: [PATCH] Tidied up Makefile; fixed compile commands not generating

---
 Makefile           | 29 ++++++++++++++++++++---------
 src/CMakeLists.txt |  3 ---
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 71b7545..ff79c54 100644
--- a/Makefile
+++ b/Makefile
@@ -10,39 +10,50 @@ all: debug
 
 
 clean:
-	@ rm -rf $(BUILD_DIR)
+	@ [ ! -e '$(BINARY)' ] || rm '$(BINARY)'
+	@ rm -rf '$(BUILD_DIR)'
 .PHONY: clean
 
 
 # Release
 run-release: release
-	@ ./$(RELEASE_DIR)/$(BINARY)
+	@ ./'$(RELEASE_DIR)/$(BINARY)'
 .PHONY: run-release
 
 release: $(RELEASE_DIR)/Makefile
-	@ make -C $(RELEASE_DIR) -j$(CORES)
+	@ make -C '$(RELEASE_DIR)' -j'$(CORES)' && \
+		ln -sf '$(RELEASE_DIR)'/'$(BINARY)' ./'$(BINARY)'
 .PHONY: release
 
 $(RELEASE_DIR)/Makefile: $(SRC_DIR)/CMakeLists.txt
-	@ cmake -H$(SRC_DIR) -B$(RELEASE_DIR) -DCMAKE_BUILD_TYPE=Release
+	@ cmake \
+		-H'$(SRC_DIR)' \
+		-B'$(RELEASE_DIR)' \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
 
 clean-release:
-	@ rm -rf $(RELEASE_DIR)
+	@ rm -rf '$(RELEASE_DIR)'
 .PHONY: clean-release
 
 
 # Debug
 run-debug: debug
-	@ ./$(DEBUG_DIR)/$(BINARY)
+	@ ./'$(DEBUG_DIR)/$(BINARY)'
 .PHONY: run-debug
 
 debug: $(DEBUG_DIR)/Makefile
-	@ make -C $(DEBUG_DIR) -j$(CORES)
+	@ make -C '$(DEBUG_DIR)' -j'$(CORES)' && \
+		ln -sf '$(DEBUG_DIR)/$(BINARY)' ./'$(BINARY)'
 .PHONY: debug
 
 $(DEBUG_DIR)/Makefile: $(SRC_DIR)/CMakeLists.txt
-	@ cmake -H$(SRC_DIR) -B$(DEBUG_DIR) -DCMAKE_BUILD_TYPE=Debug
+	@ cmake \
+		-H'$(SRC_DIR)' \
+		-B'$(DEBUG_DIR)' \
+		-DCMAKE_BUILD_TYPE=Debug \
+		-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
 
 clean-debug:
-	@ rm -rf $(DEBUG_DIR)
+	@ rm -rf '$(DEBUG_DIR)'
 .PHONY: clean-debug
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index adca3d1..b26713d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,9 +5,6 @@ if (NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release)
 endif()
 
-# Create compile_commands.json
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-
 
 # =====COMPILER=====
 set(CMAKE_C_COMPILER "clang-10")