X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2FMakefile;h=bb70c4f3d74e9cd91076d735f3083ceeb4d35eca;hb=f44384c0c76c6621f049ade9e2de00be4bfeafd0;hp=ef834a13cd922047b4a0ae43316cae6cbaf87c54;hpb=519940987ceb9e379c91645daba84dc87680ffb8;p=matches%2FMCTX3420.git

diff --git a/server/Makefile b/server/Makefile
index ef834a1..bb70c4f 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -1,11 +1,17 @@
 # Makefile for server software
 CXX = gcc
 FLAGS = -std=c99 -Wall -Werror -pedantic -g
-LIB = -lpthread -lfcgi -lssl -lcrypto
-OBJ = log.o sensor.o fastcgi.o thread.o main.o
+LIB = -lfcgi -lssl -lcrypto -lpthread -lm
+OBJ = log.o control.o data.o fastcgi.o main.o sensor.o actuator.o
 RM = rm -f
 
 BIN = server
+#BIN2 = stream
+
+all : $(BIN) $(BIN2)
+
+#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)
@@ -18,11 +24,11 @@ $(BIN) : $(OBJ)
 
 
 clean :
-	$(RM) $(BIN)
+	$(RM) $(BIN) $(BIN2)
 	$(RM) *.o
 
 clean_full: #cleans up all backup files
-	$(RM) $(BIN) $(OBJ) $(LINKOBJ)
+	$(RM) $(BIN) $(BIN2) $(OBJ) $(LINKOBJ)
 	$(RM) *.*~
 	$(RM) *~