Browse Source

Update Makefiles

JDierkse 5 years ago
parent
commit
c52d96b348
4 changed files with 12 additions and 26 deletions
  1. 5 7
      Makefile.conf
  2. 6 0
      Makefile.dep
  3. 0 18
      Makefile.target
  4. 1 1
      Makefiles

+ 5 - 7
Makefile.conf

@@ -2,12 +2,10 @@
 # Makefile.conf
 #
 
-LFLAGS += -lLogging
-LFLAGS += -L$(ROOTPATH)/Libraries/Logging/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Logging/include
-
-LFLAGS += -lUtilities
-LFLAGS += -L$(ROOTPATH)/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH) -I$(ROOTPATH)/include
+LIBRARIES += Logging
 
 DEBUGDIR := .debug
+
+TARGETS += Utilities.a
+TARGETS += test
+

+ 6 - 0
Makefile.dep

@@ -0,0 +1,6 @@
+#
+# Makefile.dep
+#
+
+LFLAGS += -lUtilities
+

+ 0 - 18
Makefile.target

@@ -1,18 +0,0 @@
-#
-# Makefile.target
-#
-
-Utilities.a.$(ARCH) : $(OBJECTS)
-	$(call build_target_library_arch,$@,$^)
-
-Utilities.a:
-	$(call build_target,$@)
-
-test.$(ARCH): $(OBJECTS) Test/Test.o.$(ARCH) | Utilities.a.$(ARCH)
-	$(call build_target_arch,$@,$^)
-test:
-	$(call build_target,$@)
-
-.DEFAULT_GOAL := Utilities.a
-
-TARGETS += Utilities.a test

+ 1 - 1
Makefiles

@@ -1 +1 @@
-Subproject commit cd9ef1a1b0f7b88f36b0c51b4209d1859aca83aa
+Subproject commit 5afd04e99bb8e0d186b928aadb5029d4deb4357b