From f36984db0dd4518cae04130170af1e73f1c91ec1 Mon Sep 17 00:00:00 2001
From: Mutah <fgirault@gmail.com>
Date: Fri, 14 May 2021 00:23:21 +0200
Subject: [PATCH] Add v4l tools to build system

---
 Makefile          |  9 +++++++--
 src/v4l2/Makefile | 29 ++++++++++++++++++++---------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 1032d589..76e2d940 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ DYN_LIB = $(LIB_DIR)/libfloatimg.so
 
 VERBOSITY = 0
 
-all: 	lib funcs tools
+all: 	lib funcs tools v4l2
 
 # shared: $(DYN_LIB)
 
@@ -28,14 +28,19 @@ funcs:	lib
 	gcc -shared $(OBJ_DIR)/*.o -lnetpbm -lpnglite -lcfitsio -ltiff	-lz -lm -o $(DYN_LIB)
 
 
-tools:
+tools: lib
 	mkdir -p build/bin
 	$(MAKE) -C src/tools
 
+v4l2:
+	mkdir -p build/bin
+	$(MAKE) -C src/v4l2
+
 clean:
 	$(MAKE) -C src/lib clean
 	$(MAKE) -C src/funcs clean
 	$(MAKE) -C src/tools clean
+	$(MAKE) -C src/v4l2 clean
 	rm -rf "./build"
 
 install: all
diff --git a/src/v4l2/Makefile b/src/v4l2/Makefile
index 5260e695..5a57c64f 100644
--- a/src/v4l2/Makefile
+++ b/src/v4l2/Makefile
@@ -1,13 +1,24 @@
 
+BIN_DIR = ../../build/bin
+
+STATIC_LIB = ../../build/lib/libfloatimg.a
 
 COPT = -Wall -fpic -g -no-pie -DDEBUG_LEVEL=0
-DEPS = ../floatimg.h  ../libfloatimg.a Makefile
+
+DEPS = ../floatimg.h  $(STATIC_LIB) Makefile
+
 LOBJ = funcs.o v4l2_pr_structs.o
 
-all:	grabvidseq t video-infos nc-camcontrol
+EXECUTABLES = $(BIN_DIR)/grabvidseq $(BIN_DIR)/video-infos \
+	$(BIN_DIR)/nc-camcontrol
+
+all:	grabvidseq video-infos nc-camcontrol
 
 t:	t.c Makefile ${DEPS} funcs.o v4l2_pr_structs.o
-	gcc ${COPT} $< funcs.o v4l2_pr_structs.o ../libfloatimg.a -o $@
+	gcc ${COPT} $< funcs.o v4l2_pr_structs.o $(STATIC_LIB) -o $@
+
+clean:
+	rm -rf $(EXECUTABLES) $(LOBJ)
 
 funcs.o:	funcs.c funcs.h Makefile
 	gcc ${COPT} -c $<
@@ -18,21 +29,21 @@ rgb2fimg.o:	rgb2fimg.c funcs.h Makefile
 v4l2_pr_structs.o:	v4l2_pr_structs.c v4l2_pr_structs.h Makefile
 	gcc ${COPT} -c $<
 
-grabvidseq: grabvidseq.c ${DEPS} rgb2fimg.o 
-	gcc ${COPT} $<  rgb2fimg.o ../libfloatimg.a -lpnglite -lz -lm 	\
-		-lcfitsio -lv4l2 -ltiff -o $@
+grabvidseq: grabvidseq.c ${DEPS} rgb2fimg.o
+	gcc ${COPT} $<  rgb2fimg.o $(STATIC_LIB) -lpnglite -lz -lm 	\
+		-lcfitsio -lv4l2 -ltiff -o $(BIN_DIR)/$@
 
 video-infos: video-infos.c Makefile funcs.o v4l2_pr_structs.o
-	gcc -Wall -g $<  ${LOBJ} ../libfloatimg.a -o $@
+	gcc -Wall -g $<  ${LOBJ} $(STATIC_LIB) -o $(BIN_DIR)/$@
 
 nc-camcontrol: nc-camcontrol.c Makefile funcs.o v4l2_pr_structs.o
-	gcc -Wall -g $<  ${LOBJ} ../libfloatimg.a -lcurses -o $@
+	gcc -Wall -g $<  ${LOBJ} $(STATIC_LIB) -lcurses -o $(BIN_DIR)/$@
 
 #		---------------
 #		external things
 
 capture: capture.c Makefile
-	gcc -Wall -g $<       -o $@
+	gcc -Wall -g $< o $(BIN_DIR)$@