Pārlūkot izejas kodu

Update Makefiles

JDierkse 5 gadi atpakaļ
vecāks
revīzija
87ad7328bd
4 mainītis faili ar 13 papildinājumiem un 30 dzēšanām
  1. 6 11
      Makefile.conf
  2. 6 0
      Makefile.dep
  3. 0 18
      Makefile.target
  4. 1 1
      Makefiles

+ 6 - 11
Makefile.conf

@@ -2,20 +2,15 @@
 # Makefile.conf
 #
 
-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 += Logging
+LIBRARIES += Utilities
 
 CFLAGS += -I$(ROOTPATH)/Libraries/asio/include
 
-LFLAGS += -lNetwork
-LFLAGS += -L$(ROOTPATH)/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH) -I$(ROOTPATH)/include
-
 LFLAGS += -pthread
 
 DEBUGDIR := .debug
+
+TARGETS += Network.a
+TARGETS += test
+

+ 6 - 0
Makefile.dep

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

+ 0 - 18
Makefile.target

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

+ 1 - 1
Makefiles

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