Project

General

Profile

Revision 163

Added by Jason knichel over 16 years ago

fixed the makefiles now that the compilation issues have been fixed

View differences:

trunk/code/projects/colonet/lib/colonet_wireless/Makefile
16 16

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

  
23 22
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

  
25 23
.PHONY : all clean
26 24

  
27 25
all: ColonetServer
28 26

  
29
ColonetServer: $(COLONETCPPFILES) $(COLONETFILES) $(LOGGINGFILES) ../lib/libcolonet_wireless.a
27
ColonetServer: $(COLONETCPPFILES) $(COLONETFILES) $(LOGGINGFILES) -lcolonet_wireless
30 28
	@echo "---begin compilation---"
31 29
	@echo ""
32
	@echo "---unpacking archive file---"
33
	ar x ../lib/libcolonet_wireless.a
34
	@echo ""
35 30
	@echo "---create object files---"
36 31
	$(CC) $(CFLAGS) -c $(COLONETFILES) $(INCLUDE_DIRS_FOR_GCC)
37 32
	$(CC) $(CFLAGS) -c $(COLONETCPPFILES) $(INCLUDE_DIRS_FOR_GCC)
38 33
	$(CC) $(CFLAGS) -c $(LOGGINGFILES) $(INCLUDE_DIRS_FOR_GCC)
39 34
	@echo ""
40 35
	@echo "---link files---"
41
	$(CC) $(CFLAGS) $(COLONETOBJECTS) $(COLONETCPPOBJECTS) $(LOGGINGOBJECTS) $(LIBRARY_DIRS_FOR_GCC) $(CONTENTS_OF_WIRELESS_ARCHIVE) -lpthread $(INCLUDE_DIRS_FOR_GCC) -o $@
36
	$(CC) $(CFLAGS) $(COLONETOBJECTS) $(COLONETCPPOBJECTS) $(LOGGINGOBJECTS) $(LIBRARY_DIRS_FOR_GCC) -lpthread -lwireless -lcolonet_wireless $(INCLUDE_DIRS_FOR_GCC) -o $@
42 37
	@echo ""
43 38
	@echo "---finish compilation---"
44 39

  

Also available in: Unified diff