From 5ec4ad390c8be153aa4fa9b4de7e4c2b867ed792 Mon Sep 17 00:00:00 2001
From: JDierkse <j.dierkse@madeo.nl>
Date: Tue, 25 Aug 2020 09:17:54 +0200
Subject: [PATCH] Update Makefiles

---
 Makefile.conf   | 31 ++++++++-----------------------
 Makefile.dep    |  6 ++++++
 Makefile.target | 12 ------------
 Makefiles       |  2 +-
 4 files changed, 15 insertions(+), 36 deletions(-)
 create mode 100644 Makefile.dep
 delete mode 100644 Makefile.target

diff --git a/Makefile.conf b/Makefile.conf
index 9283278..2d9de0b 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -2,28 +2,13 @@
 # Makefile.conf
 #
 
-LFLAGS += -lUtilities
-LFLAGS += -L$(ROOTPATH)/Libraries/Utilities/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Utilities/include
-
-LFLAGS += -lLogging
-LFLAGS += -L$(ROOTPATH)/Libraries/Logging/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Logging/include
-
-LFLAGS += -lMySQL -lmysqlclient -lmysqlcppconn
-LFLAGS += -L$(ROOTPATH)/Libraries/MySQL/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/MySQL/include
-
-LFLAGS += -lTimer
-LFLAGS += -L$(ROOTPATH)/Libraries/Timer/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Timer/include
-
-LFLAGS += -lDateTime
-LFLAGS += -L$(ROOTPATH)/Libraries/DateTime/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/DateTime/include
-
-LFLAGS += -lDataStorage
-LFLAGS += -L$(ROOTPATH)/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH) -I$(ROOTPATH)/include
+LIBRARIES += MySQL
+LIBRARIES += DateTime
+LIBRARIES += Timer
+LIBRARIES += Logging
+LIBRARIES += Utilities
 
 DEBUGDIR := .debug
+
+TARGETS += DataStorage.a
+
diff --git a/Makefile.dep b/Makefile.dep
new file mode 100644
index 0000000..28d3f9a
--- /dev/null
+++ b/Makefile.dep
@@ -0,0 +1,6 @@
+#
+# Makefile.dep
+#
+
+LFLAGS += -lDataStorage
+
diff --git a/Makefile.target b/Makefile.target
deleted file mode 100644
index c3e5481..0000000
--- a/Makefile.target
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Makefile.target
-#
-
-DataStorage.a.$(ARCH) : $(OBJECTS)
-	$(call build_target_library_arch,$@,$^)
-DataStorage.a:
-	$(call build_target,$@)
-
-.DEFAULT_GOAL := DataStorage.a
-
-TARGETS += DataStorage.a
diff --git a/Makefiles b/Makefiles
index cd9ef1a..5afd04e 160000
--- a/Makefiles
+++ b/Makefiles
@@ -1 +1 @@
-Subproject commit cd9ef1a1b0f7b88f36b0c51b4209d1859aca83aa
+Subproject commit 5afd04e99bb8e0d186b928aadb5029d4deb4357b