Przeglądaj źródła

Update Makefiles

JDierkse 5 lat temu
rodzic
commit
5ec4ad390c
4 zmienionych plików z 14 dodań i 35 usunięć
  1. 7 22
      Makefile.conf
  2. 6 0
      Makefile.dep
  3. 0 12
      Makefile.target
  4. 1 1
      Makefiles

+ 7 - 22
Makefile.conf

@@ -2,28 +2,13 @@
 # Makefile.conf
 #
 
-LFLAGS += -lUtilities
-LFLAGS += -L$(ROOTPATH)/Libraries/Utilities/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Utilities/include
+LIBRARIES += MySQL
+LIBRARIES += DateTime
+LIBRARIES += Timer
+LIBRARIES += Logging
+LIBRARIES += Utilities
 
-LFLAGS += -lLogging
-LFLAGS += -L$(ROOTPATH)/Libraries/Logging/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Logging/include
-
-LFLAGS += -lMySQL -lmysqlclient -lmysqlcppconn
-LFLAGS += -L$(ROOTPATH)/Libraries/MySQL/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/MySQL/include
-
-LFLAGS += -lTimer
-LFLAGS += -L$(ROOTPATH)/Libraries/Timer/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Timer/include
-
-LFLAGS += -lDateTime
-LFLAGS += -L$(ROOTPATH)/Libraries/DateTime/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/DateTime/include
+DEBUGDIR := .debug
 
-LFLAGS += -lDataStorage
-LFLAGS += -L$(ROOTPATH)/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH) -I$(ROOTPATH)/include
+TARGETS += DataStorage.a
 
-DEBUGDIR := .debug

+ 6 - 0
Makefile.dep

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

+ 0 - 12
Makefile.target

@@ -1,12 +0,0 @@
-#
-# Makefile.target
-#
-
-DataStorage.a.$(ARCH) : $(OBJECTS)
-	$(call build_target_library_arch,$@,$^)
-DataStorage.a:
-	$(call build_target,$@)
-
-.DEFAULT_GOAL := DataStorage.a
-
-TARGETS += DataStorage.a

+ 1 - 1
Makefiles

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