X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2FMakefile;h=10be3ec5b4fce488d5da6821acc723953e3d1d33;hb=27ff700c938e48bd88ca63575d65575150d9e842;hp=f754c472bcb41fd247048b957ab2365dabf9956b;hpb=744b902d7f7b532ddb19d95828d8787653e1b84c;p=matches%2FMCTX3420.git

diff --git a/server/Makefile b/server/Makefile
index f754c47..10be3ec 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -1,33 +1,40 @@
 # Makefile for server software
 CXX = gcc
-FLAGS = -std=c99 -Wall -Werror -pedantic -g
-LIB = -lpthread -lfcgi -lssl -lcrypto
-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 
 
 
 $(BIN) : $(OBJ)
 	$(CXX) $(FLAGS) -o $(BIN) $(OBJ) $(LIB)
 
+microscope : microscope.o
+	$(CXX) $(FLAGS) -o microscope microscope.o $(LIB)
+
 
 %.o : %.c
 	$(CXX) $(FLAGS) -c $<
 
 
-
 clean :
-	$(RM) $(BIN)
+	make -C sensors clean
+	make -C actuators 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) *~