X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2FMakefile;h=244490baecee836ec9b3248b692a31ff1b28979a;hb=f858232d7c564f14e6d2fb9d616f8e12a1ec9171;hp=72d37de2f3bef8afd3f1559f7ba5740ab78b1a22;hpb=28f8552a303697ce72687fb6fc09d4ab70f26465;p=matches%2FMCTX3420.git

diff --git a/server/Makefile b/server/Makefile
index 72d37de..244490b 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -1,18 +1,15 @@
 # Makefile for server software
 CXX = gcc
-FLAGS = -std=c99 -Wall -Werror -pedantic -g
-LIB = -lfcgi -lssl -lcrypto -lpthread -lm
-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 -lldap -lcrypt
+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 login.o
 RM = rm -f
 
 BIN = server
-BIN2 = stream
+#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)
 	$(CXX) $(FLAGS) -o $(BIN) $(OBJ) $(LIB)