Revision 160
trying to fix some compilation problems
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 |
|
20 |
ar sr ../libcolonet_wireless.a colonet_wireless.o
|
|
21 | 21 |
# ranlib libcolonet_wireless.a |
22 | 22 |
|
23 | 23 |
colonet_wireless_test.o: tests/colonet_wireless_test.cpp |
trunk/code/projects/colonet/ColonetServer/Makefile | ||
---|---|---|
20 | 20 |
#this takes the library directory and puts a -L in front of each directory name so it can be used in a gcc statement |
21 | 21 |
LIBRARY_DIRS_FOR_GCC = $(patsubst %,-L%, $(LIBRARY_DIRS)) |
22 | 22 |
|
23 |
CONTENTS_OF_WIRELESS_ARCHIVE = $(shell ar t ../lib/libcolonet_wireless.a) |
|
24 |
|
|
23 | 25 |
.PHONY : all clean |
24 | 26 |
|
25 | 27 |
all: ColonetServer |
26 | 28 |
|
27 |
ColonetServer: $(COLONETCPPFILES) $(COLONETFILES) $(LOGGINGFILES) |
|
28 |
ar x ../lib/colonet_wireless/libcolonet_wireless.a |
|
29 |
ColonetServer: $(COLONETCPPFILES) $(COLONETFILES) $(LOGGINGFILES) ../lib/libcolonet_wireless.a |
|
30 |
@echo "---begin compilation---" |
|
31 |
@echo "" |
|
32 |
@echo "---unpacking archive file---" |
|
33 |
ar x ../lib/libcolonet_wireless.a |
|
34 |
@echo "" |
|
35 |
@echo "---create object files---" |
|
29 | 36 |
$(CC) $(CFLAGS) -c $(COLONETFILES) $(INCLUDE_DIRS_FOR_GCC) |
30 | 37 |
$(CC) $(CFLAGS) -c $(COLONETCPPFILES) $(INCLUDE_DIRS_FOR_GCC) |
31 | 38 |
$(CC) $(CFLAGS) -c $(LOGGINGFILES) $(INCLUDE_DIRS_FOR_GCC) |
32 |
$(CC) $(CFLAGS) $(COLONETOBJECTS) $(COLONETCPPOBJECTS) $(LOGGINGOBJECTS) $(LIBRARY_DIRS_FOR_GCC) -lpthread $(INCLUDE_DIRS_FOR_GCC) -o $@ |
|
39 |
@echo "" |
|
40 |
@echo "---link files---" |
|
41 |
$(CC) $(CFLAGS) $(COLONETOBJECTS) $(COLONETCPPOBJECTS) $(LOGGINGOBJECTS) $(LIBRARY_DIRS_FOR_GCC) $(CONTENTS_OF_WIRELESS_ARCHIVE) -lpthread $(INCLUDE_DIRS_FOR_GCC) -o $@ |
|
42 |
@echo "" |
|
43 |
@echo "---finish compilation---" |
|
33 | 44 |
|
34 | 45 |
clean: |
35 | 46 |
rm -rf *.o ColonetServer |
Also available in: Unified diff