Project

General

Profile

Revision 392

moved colonet_wireless into the colonet server

View differences:

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

  
6
COLONETCPPFILES = Main.cpp ColonetServer.cpp wirelessMessageHandler.cpp ConnectionPool.cpp Command.cpp
6
COLONETCPPFILES = Main.cpp ColonetServer.cpp wirelessMessageHandler.cpp ConnectionPool.cpp Command.cpp colonet_wireless.cpp
7 7
COLONETCPPOBJECTS = $(COLONETCPPFILES:.cpp=.o)
8 8
COLONETFILES = options.c
9 9
COLONETOBJECTS = $(COLONETFILES:.c=.o)
......
29 29
	make; ./ColonetServer
30 30
	../vision/vision.sh
31 31

  
32
ColonetServer: $(COLONETCPPFILES) $(COLONETFILES) $(LOGGINGFILES) -lcolonet_wireless
32
ColonetServer: $(COLONETCPPFILES) $(COLONETFILES) $(LOGGINGFILES)
33 33
	@echo "---begin compilation---"
34 34
	@echo ""
35 35
	@echo "---create object files---"
......
39 39
	@echo "---finish creating object files---"
40 40
	@echo ""
41 41
	@echo "---link files---"
42
	$(CC) $(CFLAGS) $(COLONETOBJECTS) $(COLONETCPPOBJECTS) $(LOGGINGOBJECTS) $(LIBRARY_DIRS_FOR_GCC) -lpthread -lcolonet_wireless -lwireless_colonet  $(INCLUDE_DIRS_FOR_GCC) -o $@
42
	$(CC) $(CFLAGS) $(COLONETOBJECTS) $(COLONETCPPOBJECTS) $(LOGGINGOBJECTS) $(LIBRARY_DIRS_FOR_GCC) -lpthread -lwireless_colonet  $(INCLUDE_DIRS_FOR_GCC) -o $@
43 43
	@echo "---finish linking files---"
44 44
	@echo ""
45 45
	@echo "---finish compilation---"

Also available in: Unified diff