Project

General

Profile

Revision 158

changed to colonet makefiles

View differences:

trunk/code/projects/colonet/lib/colonet_wireless/Makefile
17 17
colonet_wireless.o: colonet_wireless.cpp colonet_wireless.h
18 18
	$(CC) $(CFLAGS) $(INCLUDES) -c colonet_wireless.cpp
19 19
	cp ../../../libwireless/lib/libwireless.a ../libcolonet_wireless.a
20
	ar sr ../libcolonet_wireless.a colonet_wireless.o
21
#	ranlib ../libcolonet_wireless.a
20
	ar sr libcolonet_wireless.a colonet_wireless.o
21
#	ranlib libcolonet_wireless.a
22 22

  
23 23
colonet_wireless_test.o: tests/colonet_wireless_test.cpp
24 24
	$(CC) $(CFLAGS) -I $(INCLUDES) -pthread -c tests/colonet_wireless_test.cpp
trunk/code/projects/colonet/ColonetServer/Makefile
11 11
LOGGINGOBJECTS = $(LOGGINGFILES:.cpp=.o)
12 12

  
13 13
VPATH = ../lib:../lib/colonet_wireless
14
INCLUDE_DIRS = ../lib/colonet_wireless ../lib ../../libwireless/lib
15
LIBRARY_DIRS = ../lib ../../libwireless/lib
14
INCLUDE_DIRS = ../lib/colonet_wireless ../lib ../../libwireless/lib ../lib/colonet_wireless
15
LIBRARY_DIRS = ../lib ../../libwireless/lib ../lib/colonet_wireless
16 16

  
17 17

  
18 18
#this takes the include directory and puts a -I in front of each directory name before being used in a gcc statement
......
24 24

  
25 25
all: ColonetServer
26 26

  
27
ColonetServer: $(COLONETCPPFILES) $(COLONETFILES) $(LOGGINGFILES) -lcolonet_wireless
28
	ar x ../lib/libcolonet_wireless.a
27
ColonetServer: $(COLONETCPPFILES) $(COLONETFILES) $(LOGGINGFILES)
28
	ar x ../lib/colonet_wireless/libcolonet_wireless.a
29 29
	$(CC) $(CFLAGS) -c $(COLONETFILES) $(INCLUDE_DIRS_FOR_GCC)
30 30
	$(CC) $(CFLAGS) -c $(COLONETCPPFILES) $(INCLUDE_DIRS_FOR_GCC)
31 31
	$(CC) $(CFLAGS) -c $(LOGGINGFILES) $(INCLUDE_DIRS_FOR_GCC)

Also available in: Unified diff