X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2FMakefile;fp=server%2FMakefile;h=34d604e944e03a55a557175a7d572737abc3a097;hb=289794ba2dcbe6234e25e5d00531b26baee342b7;hp=f3992c80d6ada675a4608dd14bd6ec931cd23d97;hpb=71c13fe3c04db7f93a69cbc6a6c7c3dc2393bf3f;p=matches%2FMCTX3420.git

diff --git a/server/Makefile b/server/Makefile
index f3992c8..34d604e 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -2,13 +2,16 @@
 CXX = gcc
 FLAGS = -std=c99 -Wall -pedantic -g -I/usr/include/opencv -I/usr/include/opencv2/highgui -L/usr/lib
 LIB = -lfcgi -lssl -lcrypto -lpthread -lm -lopencv_highgui -lopencv_core -lopencv_ml -lopencv_imgproc -lldap -lcrypt
-OBJ = log.o control.o data.o fastcgi.o main.o sensor.o actuator.o image.o bbb_pin.o pin_test.o login.o
+OBJ = log.o control.o data.o fastcgi.o main.o sensor.o actuator.o image.o bbb_pin.o pin_test.o login.o sensors/sensors.a
 RM = rm -f
 
 BIN = server
 #BIN2 = stream
 
-all : $(BIN) $(BIN2)
+all :
+	$(MAKE) -C sensors
+	$(MAKE) $(BIN)
+
 
 
 $(BIN) : $(OBJ)
@@ -19,12 +22,13 @@ $(BIN) : $(OBJ)
 	$(CXX) $(FLAGS) -c $<
 
 
-
 clean :
+	make -C sensors clean
 	$(RM) $(BIN) $(BIN2)
 	$(RM) *.o
 
 clean_full: #cleans up all backup files
+	make -C sensors clean_full
 	$(RM) $(BIN) $(BIN2) $(OBJ) $(LINKOBJ)
 	$(RM) *.*~
 	$(RM) *~