Update Makefiles

2020-08-25 09:39:50 +02:00
parent ec5df791b4
commit 7ce43c80f3
3 changed files with 8 additions and 29 deletions
@@ -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 += -lImage -ljpeg
-LFLAGS += -L$(ROOTPATH)/Libraries/Image/lib/$(ARCH)
-CFLAGS += -I$(ROOTPATH)/Libraries/Image/include
+LIBRARIES += Http
+LIBRARIES += Logging
+LIBRARIES += Utilities
+LIBRARIES += Image

 CFLAGS += -I$(ROOTPATH)/Libraries/CTPL
 CFLAGS += -I$(ROOTPATH)/Libraries/filesystem
@@ -27,3 +16,6 @@ LFLAGS += -pthread
 CFLAGS += -I$(ROOTPATH) -I$(ROOTPATH)/Libraries

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