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

---
 Makefile.conf   | 22 +++++++---------------
 Makefile.target | 13 -------------
 Makefiles       |  2 +-
 3 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 Makefile.target

diff --git a/Makefile.conf b/Makefile.conf
index 2a30c16..0d691ea 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -2,21 +2,10 @@
 # Makefile.conf
 #
 
-LFLAGS += -lHttp -lcrypto -lcurl -lssl -lz
-LFLAGS += -L$(ROOTPATH)/Libraries/Http/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Http/include
-
-LFLAGS += -lLogging
-LFLAGS += -L$(ROOTPATH)/Libraries/Logging/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Logging/include
-
-LFLAGS += -lUtilities
-LFLAGS += -L$(ROOTPATH)/Libraries/Utilities/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Utilities/include
-
-LFLAGS += -lMQTT -lmosquitto
-LFLAGS += -L$(ROOTPATH)/Libraries/MQTT/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/MQTT/include
+LIBRARIES += Http
+LIBRARIES += MQTT
+LIBRARIES += Logging
+LIBRARIES += Utilities
 
 CFLAGS += -I$(ROOTPATH)/Libraries/clipp/include
 CFLAGS += -I$(ROOTPATH)/Libraries/inih
@@ -29,3 +18,6 @@ LFLAGS += -pthread
 CFLAGS += -I$(ROOTPATH) -I$(ROOTPATH)/Libraries
 
 DEBUGDIR := .debug
+
+TARGETS += ToonBridge
+
diff --git a/Makefile.target b/Makefile.target
deleted file mode 100644
index a00dad6..0000000
--- a/Makefile.target
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Makefile.target
-#
-
-ToonBridge.$(ARCH): $(OBJECTS) Application/ToonBridge.o.$(ARCH)
-	$(call build_target_arch,$@,$^)
-
-ToonBridge:
-	$(call build_target,$@)
-
-.DEFAULT_GOAL := ToonBridge
-
-TARGETS += ToonBridge
diff --git a/Makefiles b/Makefiles
index cd9ef1a..5afd04e 160000
--- a/Makefiles
+++ b/Makefiles
@@ -1 +1 @@
-Subproject commit cd9ef1a1b0f7b88f36b0c51b4209d1859aca83aa
+Subproject commit 5afd04e99bb8e0d186b928aadb5029d4deb4357b