浏览代码

Update Makefiles

JDierkse 5 年之前
父节点
当前提交
654fc94d12
共有 3 个文件被更改,包括 9 次插入35 次删除
  1. 8 15
      Makefile.conf
  2. 0 19
      Makefile.target
  3. 1 1
      Makefiles

+ 8 - 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 += -lTimer
-LFLAGS += -L$(ROOTPATH)/Libraries/Timer/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Timer/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
+LIBRARIES += Http
+LIBRARIES += Timer
+LIBRARIES += Logging
+LIBRARIES += Utilities
 
 CFLAGS += -I$(ROOTPATH)/Libraries/clipp/include
 CFLAGS += -I$(ROOTPATH)/Libraries/inih
@@ -28,3 +17,7 @@ LFLAGS += -lpthread
 CFLAGS += -I$(ROOTPATH) -I$(ROOTPATH)/Libraries
 
 DEBUGDIR := .debug
+
+TARGETS += PresenceDetection
+TARGETS += Test
+

+ 0 - 19
Makefile.target

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

+ 1 - 1
Makefiles

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