From 5afd04e99bb8e0d186b928aadb5029d4deb4357b Mon Sep 17 00:00:00 2001
From: JDierkse <j.dierkse@madeo.nl>
Date: Mon, 24 Aug 2020 16:54:13 +0200
Subject: [PATCH] Add Library Dependency Specification

---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index dd1b2e7..ca3d2cf 100644
--- a/Makefile
+++ b/Makefile
@@ -82,13 +82,16 @@ define build_target_library_arch
 endef
 
 define add_target_library_arch
+        LFLAGS += -L$(ROOTPATH)/lib/$(ARCH)
+        CFLAGS += -I$(ROOTPATH) -I$(ROOTPATH)/include
+
         $(1).$(ARCH): $$(OBJECTS)
 		$$(call build_target_library_arch,$$@,$$(REALOBJECTS))
 endef
 
 define add_library
+	-include $(ROOTPATH)/Libraries/$(1)/Makefile.dep
         LIBFILES += $(ROOTPATH)/Libraries/$(1)/lib/$(ARCH)/lib$(1).a
-        LFLAGS   += -l$(1)
         LFLAGS   += -L$(ROOTPATH)/Libraries/$(1)/lib/$(ARCH)
         CFLAGS   += -I$(ROOTPATH)/Libraries/$(1)/include
 endef
@@ -122,6 +125,7 @@ define build_target
 endef
 
 define add_target_test_arch
+        -include $(ROOTPATH)/Makefile.dep
         $(1).$(ARCH): $$(OBJECTS) $$(LIBFILES) Test/Test.o.$(ARCH)
 		$$(call build_target_arch,$$@,$$(REALOBJECTS) $$(LIBFILES) Test/Test.o.$(ARCH))
 endef