X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=server%2FMakefile;h=3838876948c94872693578ed1fd403de04c18997;hb=5d57467589ecefdf5bb5985005705a1c8460c623;hp=0858d7d59062c4cf35fcba929464fdf4567fb5f7;hpb=e14a8636e0f9b4f097ee053367776efd977e7c92;p=matches%2FMCTX3420.git

diff --git a/server/Makefile b/server/Makefile
index 0858d7d..3838876 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -1,11 +1,20 @@
 # 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=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
+OBJ = log.o control.o data.o fastcgi.o main.o sensor.o actuator.o image.o
 RM = rm -f
 
 BIN = server
+#BIN2 = stream
+
+all : $(BIN) $(BIN2)
+
+stream : stream.c
+	$(CXX) $(FLAGS) -o stream stream.c $(LIB)
+
+intertest : interferometer.c
+	$(CXX) $(FLAGS) -o intertest interferometer.c $(LIB)
 
 
 $(BIN) : $(OBJ)
@@ -18,11 +27,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) *~