From 64628e2845164492c48b6d8547e066e8baf0e731 Mon Sep 17 00:00:00 2001 From: JDierkse Date: Tue, 25 Aug 2020 09:22:44 +0200 Subject: [PATCH] Update Makefiles --- Makefile.conf | 11 ++++------- Makefile.dep | 6 ++++++ Makefile.target | 12 ------------ Makefiles | 2 +- 4 files changed, 11 insertions(+), 20 deletions(-) create mode 100644 Makefile.dep delete mode 100644 Makefile.target diff --git a/Makefile.conf b/Makefile.conf index fc91075..39a86b0 100644 --- a/Makefile.conf +++ b/Makefile.conf @@ -2,12 +2,9 @@ # Makefile.conf # -LFLAGS += -lUtilities -LFLAGS += -L$(ROOTPATH)/Libraries/Utilities/lib/$(ARCH) -CFLAGS += -I$(ROOTPATH)/Libraries/Utilities/include - -LFLAGS += -lLogging -LFLAGS += -L$(ROOTPATH)/lib/$(ARCH) -CFLAGS += -I$(ROOTPATH) -I$(ROOTPATH)/include +LIBRARIES += Utilities DEBUGDIR := .debug + +TARGETS += Logging.a + diff --git a/Makefile.dep b/Makefile.dep new file mode 100644 index 0000000..8f19ed0 --- /dev/null +++ b/Makefile.dep @@ -0,0 +1,6 @@ +# +# Makefile.dep +# + +LFLAGS += -lLogging + diff --git a/Makefile.target b/Makefile.target deleted file mode 100644 index 9c5d109..0000000 --- a/Makefile.target +++ /dev/null @@ -1,12 +0,0 @@ -# -# Makefile.target -# - -Logging.a.$(ARCH) : $(OBJECTS) - $(call build_target_library_arch,$@,$^) -Logging.a: - $(call build_target,$@) - -.DEFAULT_GOAL := Logging.a - -TARGETS += Logging.a diff --git a/Makefiles b/Makefiles index cd9ef1a..5afd04e 160000 --- a/Makefiles +++ b/Makefiles @@ -1 +1 @@ -Subproject commit cd9ef1a1b0f7b88f36b0c51b4209d1859aca83aa +Subproject commit 5afd04e99bb8e0d186b928aadb5029d4deb4357b