From f198731b81939a08f786956cb6cde108354dc379 Mon Sep 17 00:00:00 2001
From: JDierkse <j.dierkse@madeo.nl>
Date: Tue, 25 Aug 2020 09:38:50 +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 f2d6a9c..acf677b 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 += -lImage -ljpeg
-LFLAGS += -L$(ROOTPATH)/Libraries/Image/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Image/include
+LIBRARIES += Http
+LIBRARIES += Logging
+LIBRARIES += Utilities
+LIBRARIES += Image
 
 CFLAGS += -I$(ROOTPATH)/Libraries/asio/asio/include
 CFLAGS += -I$(ROOTPATH)/Libraries/filesystem
@@ -26,3 +15,6 @@ LFLAGS += -lpthread
 CFLAGS += -I$(ROOTPATH) -I$(ROOTPATH)/Libraries
 
 DEBUGDIR := .debug
+
+TARGETS += AlarmServer
+
diff --git a/Makefile.target b/Makefile.target
deleted file mode 100644
index 1e2ccbd..0000000
--- a/Makefile.target
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Makefile.target
-#
-
-AlarmServer.$(ARCH): $(OBJECTS) Application/AlarmServer.o.$(ARCH)
-	$(call build_target_arch,$@,$^)
-
-AlarmServer:
-	$(call build_target,$@)
-
-.DEFAULT_GOAL := AlarmServer
-
-TARGETS += AlarmServer
diff --git a/Makefiles b/Makefiles
index 5e11355..5afd04e 160000
--- a/Makefiles
+++ b/Makefiles
@@ -1 +1 @@
-Subproject commit 5e113555ebd4e049b287b3c94c4ef33e151ea4e6
+Subproject commit 5afd04e99bb8e0d186b928aadb5029d4deb4357b