Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

diff --git a/server/Makefile b/server/Makefile
index f754c47..72d37de 100644 (file)
--- a/server/Makefile
+++ b/server/Makefile
@@ -1,16 +1,17 @@
 # Makefile for server software
 CXX = gcc
 FLAGS = -std=c99 -Wall -Werror -pedantic -g
-LIB = -lpthread -lfcgi -lssl -lcrypto
+LIB = -lfcgi -lssl -lcrypto -lpthread -lm
 OBJ = log.o control.o sensor.o fastcgi.o thread.o main.o
 RM = rm -f
 
 BIN = server
+BIN2 = stream
 
-all : $(BIN) 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 
+       $(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)
@@ -23,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) *~