JDierkse 5 лет назад
Родитель
Сommit
f9547111b5
3 измененных файлов с 8 добавлено и 29 удалено
  1. 7 15
      Makefile.conf
  2. 0 13
      Makefile.target
  3. 1 1
      Makefiles

+ 7 - 15
Makefile.conf

@@ -2,21 +2,10 @@
 # Makefile.conf
 #
 
-LFLAGS += -lHttp -lcrypto -lcurl -lssl -lz
-LFLAGS += -L$(ROOTPATH)/Libraries/Http/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Http/include
-
-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
-
-LFLAGS += -lMQTT -lmosquitto
-LFLAGS += -L$(ROOTPATH)/Libraries/MQTT/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/MQTT/include
+LIBRARIES += Http
+LIBRARIES += MQTT
+LIBRARIES += Logging
+LIBRARIES += Utilities
 
 CFLAGS += -I$(ROOTPATH)/Libraries/clipp/include
 CFLAGS += -I$(ROOTPATH)/Libraries/inih
@@ -29,3 +18,6 @@ LFLAGS += -pthread
 CFLAGS += -I$(ROOTPATH) -I$(ROOTPATH)/Libraries
 
 DEBUGDIR := .debug
+
+TARGETS += ToonBridge
+

+ 0 - 13
Makefile.target

@@ -1,13 +0,0 @@
-#
-# Makefile.target
-#
-
-ToonBridge.$(ARCH): $(OBJECTS) Application/ToonBridge.o.$(ARCH)
-	$(call build_target_arch,$@,$^)
-
-ToonBridge:
-	$(call build_target,$@)
-
-.DEFAULT_GOAL := ToonBridge
-
-TARGETS += ToonBridge

+ 1 - 1
Makefiles

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