Update comments for Doxygen. Move old, unused files to the testing folder.

[matches/MCTX3420.git] / server / Makefile

diff --git a/server/Makefile b/server/Makefile
index 34d604e..10be3ec 100644 (file)
--- 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 $<
@@ -24,6 +28,7 @@ $(BIN) : $(OBJ)
 
 clean :
        make -C sensors clean
+       make -C actuators clean
        $(RM) $(BIN) $(BIN2)
        $(RM) *.o