X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2FMakefile;h=244490baecee836ec9b3248b692a31ff1b28979a;hb=6a5de8e3b2870ca950f2116aeb9561ad7d707427;hp=f754c472bcb41fd247048b957ab2365dabf9956b;hpb=a668061144aa18eb3f127d1b17518fd6ec0cce73;p=matches%2FMCTX3420.git

diff --git a/server/Makefile b/server/Makefile
index f754c47..244490b 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -1,16 +1,14 @@
 # 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 -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
 
-all : $(BIN) stream
-
-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 
+all : $(BIN) $(BIN2)
 
 
 $(BIN) : $(OBJ)
@@ -23,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) *~