X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2FMakefile;h=929b40d43b1ef588e18f33dabf258e3a80cab28e;hb=fad090011872a0dfe1431db94ecc66c3f9bee502;hp=196dfa1368c1885d2ebe07e4f6b5bbd1ca3953d7;hpb=b1a8334f97f84e10ee9cef96377bbdcfbf5f945c;p=matches%2FMCTX3420.git

diff --git a/server/Makefile b/server/Makefile
index 196dfa1..929b40d 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -1,14 +1,18 @@
-# Makefile for rpi side server
+# Makefile for server software
 CXX = gcc
-FLAGS = -std=c99 -Wall -Werror -pedantic -g
-LIB = -lpthread
-OBJ = log.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 bbb_pin.o bbb_pin_defines.o pin_test.o
 RM = rm -f
 
 BIN = server
+#BIN2 = stream
+
+all : $(BIN) $(BIN2)
+
 
 $(BIN) : $(OBJ)
-	$(CXX) $(FLAGS) -o $(BIN) $(OBJ)
+	$(CXX) $(FLAGS) -o $(BIN) $(OBJ) $(LIB)
 
 
 %.o : %.c
@@ -17,11 +21,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) *~