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

---
 Makefile.conf   | 23 ++++++++---------------
 Makefile.target | 19 -------------------
 Makefiles       |  2 +-
 3 files changed, 9 insertions(+), 35 deletions(-)
 delete mode 100644 Makefile.target

diff --git a/Makefile.conf b/Makefile.conf
index 3aaf78b..387ea9d 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 += -lTimer
-LFLAGS += -L$(ROOTPATH)/Libraries/Timer/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Timer/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
+LIBRARIES += Http
+LIBRARIES += Timer
+LIBRARIES += Logging
+LIBRARIES += Utilities
 
 CFLAGS += -I$(ROOTPATH)/Libraries/clipp/include
 CFLAGS += -I$(ROOTPATH)/Libraries/inih
@@ -28,3 +17,7 @@ LFLAGS += -lpthread
 CFLAGS += -I$(ROOTPATH) -I$(ROOTPATH)/Libraries
 
 DEBUGDIR := .debug
+
+TARGETS += PresenceDetection
+TARGETS += Test
+
diff --git a/Makefile.target b/Makefile.target
deleted file mode 100644
index 5eac06a..0000000
--- a/Makefile.target
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Makefile.target
-#
-
-PresenceDetection.$(ARCH): $(OBJECTS) Application/PresenceDetection.o.$(ARCH)
-	$(call build_target_arch,$@,$^)
-
-test.$(ARCH): $(OBJECTS) Application/Test.o.$(ARCH)
-	$(call build_target_arch,$@,$^)
-
-PresenceDetection:
-	$(call build_target,$@)
-
-test:
-	$(call build_target,$@)
-
-.DEFAULT_GOAL := PresenceDetection
-
-TARGETS += PresenceDetection test
diff --git a/Makefiles b/Makefiles
index 5e11355..5afd04e 160000
--- a/Makefiles
+++ b/Makefiles
@@ -1 +1 @@
-Subproject commit 5e113555ebd4e049b287b3c94c4ef33e151ea4e6
+Subproject commit 5afd04e99bb8e0d186b928aadb5029d4deb4357b