Project

General

Profile

Revision 436

Added by Jason knichel about 16 years ago

started adding support for getting position data
updated the makefile to support the position data stuff
removed a sleep in ColonetServer that didn't need to be there

View differences:

Makefile
1 1
# ColonetServer makefile
2 2

  
3 3
CC = g++
4
CFLAGS = -Wall -Wshadow -Wextra -g -pg
4
CFLAGS = -Wall -Wshadow -Wextra -g
5 5

  
6
COLONETCPPFILES = Main.cpp ColonetServer.cpp ConnectionPool.cpp Command.cpp colonet_wireless.cpp includes/*.h
6
COLONETCPPFILES = Main.cpp ColonetServer.cpp ConnectionPool.cpp Command.cpp colonet_wireless.cpp PositionMonitor.cpp
7 7
COLONETCPPOBJECTS = $(COLONETCPPFILES:.cpp=.o)
8 8
COLONETFILES = options.c
9 9
COLONETOBJECTS = $(COLONETFILES:.c=.o)
10 10
LOGGINGFILES = Log.cpp
11 11
LOGGINGOBJECTS = $(LOGGINGFILES:.cpp=.o)
12 12
9
13
VPATH = ../lib:../lib/colonet_wireless
14
INCLUDE_DIRS = ../lib/colonet_wireless ../lib ../../libwireless/lib ../lib/colonet_wireless includes
15
LIBRARY_DIRS = ../lib ../../libwireless/lib ../lib/colonet_wireless
13
COLONETHEADERFILES = includes/*.h
16 14

  
15
VPATH = ../lib:../lib/colonet_wireless:../vision
16
INCLUDE_DIRS = ../lib/colonet_wireless ../lib ../../libwireless/lib ../lib/colonet_wireless includes ../vision
17
LIBRARY_DIRS = ../lib ../../libwireless/lib ../lib/colonet_wireless ../vision
18

  
17 19
#this takes the include directory and puts a -I in front of each directory name before being used in a gcc statement
18 20
INCLUDE_DIRS_FOR_GCC = $(patsubst %, -I %, $(INCLUDE_DIRS))
19 21
#this takes the library directory and puts a -L in front of each directory name so it can be used in a gcc statement
......
31 33
../../libwireless/lib/libwireless_colonet.a: ../../libwireless/lib/*.c ../../libwireless/lib/*.h
32 34
	cd ../../libwireless/lib; make colonet
33 35

  
34
ColonetServer: ../../libwireless/lib/libwireless_colonet.a $(COLONETCPPFILES) $(COLONETFILES) $(LOGGINGFILES)
36
ColonetServer: ../../libwireless/lib/libwireless_colonet.a $(COLONETCPPFILES) $(COLONETFILES) $(LOGGINGFILES) $(COLONETHEADERFILES)
35 37
	@echo "---begin compilation---"
36 38
	@echo ""
37 39
	@echo "---create object files---"
......
41 43
	@echo "---finish creating object files---"
42 44
	@echo ""
43 45
	@echo "---link files---"
44
	$(CC) $(CFLAGS) $(COLONETOBJECTS) $(COLONETCPPOBJECTS) $(LOGGINGOBJECTS) $(LIBRARY_DIRS_FOR_GCC) -lpthread -lwireless_colonet  $(INCLUDE_DIRS_FOR_GCC) -o $@
46
	$(CC) $(CFLAGS) $(COLONETOBJECTS) $(COLONETCPPOBJECTS) $(LOGGINGOBJECTS) $(LIBRARY_DIRS_FOR_GCC) -ggdb `pkg-config opencv --cflags --libs` ../vision/vision.o -lpthread -lwireless_colonet  $(INCLUDE_DIRS_FOR_GCC) -o $@
45 47
	@echo "---finish linking files---"
46 48
	@echo ""
47 49
	@echo "---finish compilation---"

Also available in: Unified diff