X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2FMakefile;h=c314b2063d639ecc5cd062f78201f5910a3f816c;hb=bd93dbb92da512a1bd585ed29bc46a5e8fc60015;hp=e8d0972e9f157d7fb0572e208c3249ad2ccebc51;hpb=e31e05d40557782c7ed2e534d0582e0d50146bdd;p=matches%2FMCTX3420.git

diff --git a/server/Makefile b/server/Makefile
index e8d0972..c314b20 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -1,16 +1,18 @@
 # Makefile for server software
 CXX = gcc
-FLAGS = -std=c99 -Wall -Werror -pedantic -g
-LIB = -lfcgi -lssl -lcrypto -lpthread
-OBJ = log.o control.o sensor.o fastcgi.o thread.o main.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) stream
+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)
@@ -21,13 +23,14 @@ $(BIN) : $(OBJ)
 	$(CXX) $(FLAGS) -c $<
 
 
-
 clean :
-	$(RM) $(BIN)
+	make -C sensors clean
+	$(RM) $(BIN) $(BIN2)
 	$(RM) *.o
 
 clean_full: #cleans up all backup files
-	$(RM) $(BIN) $(OBJ) $(LINKOBJ)
+	make -C sensors clean_full
+	$(RM) $(BIN) $(BIN2) $(OBJ) $(LINKOBJ)
 	$(RM) *.*~
 	$(RM) *~