git.ucc.asn.au
/
matches
/
MCTX3420.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
[matches/MCTX3420.git]
/
server
/
Makefile
diff --git
a/server/Makefile
b/server/Makefile
index
fd4d7ec
..
c5be05f
100644
(file)
--- a/
server/Makefile
+++ b/
server/Makefile
@@
-1,20
+1,18
@@
# Makefile for server software
CXX = gcc
FLAGS = -std=c99 -Wall -pedantic -g -I/usr/include/opencv -I/usr/include/opencv2/highgui -L/usr/lib
# 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
-OBJ = log.o control.o data.o fastcgi.o main.o sensor.o actuator.o image.o
gpio.o
+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 actuators/actuators.a
RM = rm -f
BIN = server
#BIN2 = stream
RM = rm -f
BIN = server
#BIN2 = stream
-all : $(BIN) $(BIN2)
+all :
+ $(MAKE) -C sensors
+ $(MAKE) -C actuators
+ $(MAKE) $(BIN)
-stream : stream.c
- $(CXX) $(FLAGS) -o stream stream.c $(LIB)
-
-intertest : interferometer.c
- $(CXX) $(FLAGS) -o intertest interferometer.c $(LIB)
$(BIN) : $(OBJ)
$(BIN) : $(OBJ)
@@
-25,12
+23,13
@@
$(BIN) : $(OBJ)
$(CXX) $(FLAGS) -c $<
$(CXX) $(FLAGS) -c $<
-
clean :
clean :
+ make -C sensors clean
$(RM) $(BIN) $(BIN2)
$(RM) *.o
clean_full: #cleans up all backup files
$(RM) $(BIN) $(BIN2)
$(RM) *.o
clean_full: #cleans up all backup files
+ make -C sensors clean_full
$(RM) $(BIN) $(BIN2) $(OBJ) $(LINKOBJ)
$(RM) *.*~
$(RM) *~
$(RM) $(BIN) $(BIN2) $(OBJ) $(LINKOBJ)
$(RM) *.*~
$(RM) *~
UCC
git Repository :: git.ucc.asn.au