X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2FMakefile;h=39a71fbaee29ec0145868fbf1e138d083fc73c30;hb=75b9743b95672218a61811b03433c0ab6e00ec5c;hp=a87fdcde70d757b9f78df897cbd3a10e8417051d;hpb=be4e13604e52cdc7986b726124d007a664f534b7;p=matches%2FMCTX3420.git

diff --git a/server/Makefile b/server/Makefile
index a87fdcd..39a71fb 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -1,14 +1,18 @@
 # Makefile for server software
 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
-OBJ = log.o control.o data.o fastcgi.o main.o sensor.o actuator.o image.o bbb_pin.o bbb_pin_defines.o pin_test.o login.o
+FLAGS = -std=gnu99 -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 sensors/sensors.a actuators/actuators.a
 RM = rm -f
 
 BIN = server
 #BIN2 = stream
 
-all : $(BIN) $(BIN2)
+all :
+	$(MAKE) -C sensors
+	$(MAKE) -C actuators
+	$(MAKE) $(BIN)
+
 
 
 $(BIN) : $(OBJ)
@@ -19,12 +23,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) *~