X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2FMakefile;h=00ed88018586063543d2a75ab231ae3c70185b32;hb=15a32ab1123375e1a52c319fca71ab8d02c58261;hp=34d604e944e03a55a557175a7d572737abc3a097;hpb=289794ba2dcbe6234e25e5d00531b26baee342b7;p=matches%2FMCTX3420.git

diff --git a/server/Makefile b/server/Makefile
index 34d604e..00ed880 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -1,8 +1,8 @@
 # Makefile for server software
 CXX = gcc
-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 pin_test.o login.o sensors/sensors.a
+FLAGS = -std=gnu99 -Wall -pedantic -g -I/usr/include/opencv -I/usr/include/opencv2/highgui -L/usr/lib `mysql_config --cflags`
+LIB = -lfcgi -lssl -lcrypto -lpthread -lm -lopencv_highgui -lopencv_core -lopencv_ml -lopencv_imgproc -lldap -lcrypt `mysql_config --libs`
+OBJ = log.o control.o data.o fastcgi.o main.o sensor.o actuator.o image.o bbb_pin.o pin_test.o login.o sensors/sensors.a actuators/actuators.a
 RM = rm -f
 
 BIN = server
@@ -10,6 +10,7 @@ BIN = server
 
 all :
 	$(MAKE) -C sensors
+	$(MAKE) -C actuators
 	$(MAKE) $(BIN)
 
 
@@ -17,6 +18,9 @@ all :
 $(BIN) : $(OBJ)
 	$(CXX) $(FLAGS) -o $(BIN) $(OBJ) $(LIB)
 
+microscope : microscope.o
+	$(CXX) $(FLAGS) -o microscope microscope.o $(LIB)
+
 
 %.o : %.c
 	$(CXX) $(FLAGS) -c $<