Bladeren bron

Update Makefiles

JDierkse 5 jaren geleden
bovenliggende
commit
0508091529
4 gewijzigde bestanden met toevoegingen van 13 en 28 verwijderingen
  1. 5 10
      Makefile.conf
  2. 7 0
      Makefile.dep
  3. 0 17
      Makefile.target
  4. 1 1
      Makefiles

+ 5 - 10
Makefile.conf

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

+ 7 - 0
Makefile.dep

@@ -0,0 +1,7 @@
+#
+# Makefile.dep
+#
+
+LFLAGS += -lMySQL
+LFLAGS += -lmysqlclient -lmysqlcppconn
+

+ 0 - 17
Makefile.target

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

+ 1 - 1
Makefiles

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