X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2FMakefile;h=c314b2063d639ecc5cd062f78201f5910a3f816c;hb=0654fb285c91da103314610cd4f27295e3da38f3;hp=74ba473123398c0a283101d0105b6c5713e332b9;hpb=8f94dbb551783aad414b57ba6da4596f19dc80a6;p=matches%2FMCTX3420.git

diff --git a/server/Makefile b/server/Makefile
index 74ba473..c314b20 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -1,17 +1,18 @@
 # Makefile for server software
 CXX = gcc
-FLAGS = -std=c99 -Wall -Werror -pedantic -g
-LIB = -lfcgi -lssl -lcrypto -lpthread -lm
-OBJ = log.o control.o data.o fastcgi.o main.o sensor.o
+FLAGS = -std=gnu99 -Wall -pedantic -g -I/usr/include/opencv -I/usr/include/opencv2/highgui -L/usr/lib `mysql_config --cflags`
+LIB = -lfcgi -lssl -lcrypto -lpthread -lm -lopencv_highgui -lopencv_core -lopencv_ml -lopencv_imgproc -lldap -lcrypt `mysql_config --libs`
+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)
 
-#stream : stream.c
-#	$(CXX) -o stream stream.c -I/usr/include/opencv -I/usr/include/opencv2/highgui -L/usr/lib -lopencv_highgui -lopencv_core -lopencv_ml -lopencv_imgproc -lm
 
 
 $(BIN) : $(OBJ)
@@ -22,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) *~