X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2FMakefile;h=72d37de2f3bef8afd3f1559f7ba5740ab78b1a22;hb=f5d659a02be34c0b0b0a7660ad283c90c4a3c182;hp=9c62076bff1396b05a67deb500c6b73d7835e535;hpb=aad2d0b9707f863eeb09d53cd15b5758ccb1b4e2;p=matches%2FMCTX3420.git

diff --git a/server/Makefile b/server/Makefile
index 9c62076..72d37de 100644
--- 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
-OBJ = log.o sensor.o fastcgi.o thread.o main.o
+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) *~