From 57148536881ded71b1eaa6745ca1db643a37f27e Mon Sep 17 00:00:00 2001
From: "simon.fanetti" <simon.fanetti@etu.hesge.ch>
Date: Thu, 19 Mar 2020 01:33:29 +0100
Subject: [PATCH] change makes

---
 Makefile                | 4 ++--
 src/components/Makefile | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 1becae4..2eb971e 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ all:
 	$(MAKE) -C src
 	$(MAKE) build -C .
 	$(MAKE) pack -C .
-#	$(MAKE) link -C .
+	$(MAKE) link -C .
 
 build: $(OBJS)
 
@@ -23,7 +23,7 @@ build: $(OBJS)
 	$(CCP) -c $(CFLAGS) $< -o $@
 
 pack:
-	gcc -shared -Wl,-soname,$(LIB_FULL_NAME) $(OBJSALL) -o $(LIB_FULL_NAME)
+	gcc -shared -Wl,-soname,$(LIB_FULL_NAME) -o $(LIB_FULL_NAME) $(OBJSALL) $(OPENCVFLAG) $(CAMERAFLAG)
 
 link:
 	-ln -s $(LIB_FULL_NAME) $(LIBNAME).so.$(LIB_MAJOR_VERS)
diff --git a/src/components/Makefile b/src/components/Makefile
index 579a1bf..174f235 100644
--- a/src/components/Makefile
+++ b/src/components/Makefile
@@ -6,11 +6,8 @@ CAMERAFLAG=-lrealsense2
 
 build: $(OBJS)
 
-camera.o: camera.cpp
-	g++ -c $(CFLAGS) $(OPENCVFLAG) $(CAMERAFLAG) $< -o $@
-
 %.o: %.cpp 
-	g++ -c $(CFLAGS) $(OPENCVFLAG) $< -o $@
+	g++ -c $(CFLAGS) $< -o $@
 
 clean:
 	-rm -f *.o
-- 
GitLab