Project

General

Profile

Revision 480

moved colonet_defs and fixed robot makefile

View differences:

Makefile
4 4

  
5 5
# Relative path to the root directory (containing lib directory)
6 6
#ifndef COLONYROOT
7
COLONYROOT = ../../../../../
7
COLONYROOT = ../../../../..
8 8
#endif
9 9

  
10 10
# Target file name (without extension).
......
121 121
CINCS = -I$(COLONYROOT)/code/lib/include/libdragonfly
122 122
CINCS += -L$(COLONYROOT)/code/lib/bin
123 123
ifdef USE_WIRELESS
124
	CINCS += -I$(COLONYROOT)/code/projects/libwireless/lib -I$(COLONYROOT)/code/projects/colonet/lib -I$(COLONYROOT)/code/projects/colonet/lib/colonet_dragonfly
124
	CINCS += -I$(COLONYROOT)/code/projects/libwireless/lib -I$(COLONYROOT)/code/projects/colonet/common -I$(COLONYROOT)/code/projects/colonet/robot/colonet_dragonfly
125 125
endif
126 126

  
127 127
#---------------- Compiler Options ----------------
......
326 326
# Default target.
327 327
all: begin gccversion sizebefore build sizeafter end
328 328

  
329
../../lib/colonet_dragonfly/libcolonet_dragonfly.a: ../../lib/colonet_dragonfly/colonet_dragonfly.c ../../lib/colonet_dragonfly/colonet_dragonfly.h
330
	cd ../../lib/colonet_dragonfly; make
329
$(COLONYROOT)/code/projects/colonet/robot/colonet_dragonfly/libcolonet_dragonfly.a: $(COLONYROOT)/code/projects/colonet/robot/colonet_dragonfly/colonet_dragonfly.c $(COLONYROOT)/code/projects/colonet/robot/colonet_dragonfly/colonet_dragonfly.h
330
	cd $(COLONYROOT)/code/projects/colonet/robot/colonet_dragonfly; make
331 331

  
332
build: ../../lib/colonet_dragonfly/libcolonet_dragonfly.a elf hex eep lss sym
332
build: $(COLONYROOT)/code/projects/colonet/robot/colonet_dragonfly/libcolonet_dragonfly.a elf hex eep lss sym
333 333

  
334 334
elf: $(TARGET).elf
335 335
hex: $(TARGET).hex

Also available in: Unified diff