Allow the build directory to be customized

[tinyos-2.x.git] / support / make / avr / avr.rules

diff --git a/support/make/avr/avr.rules b/support/make/avr/avr.rules
index 3afd445a6c6b018e8ce97fb3fcb3301115de7fd7..7d18ede8be90f8378dd6bcb46ca4a6cc31edf9ca 100644 (file)
--- a/support/make/avr/avr.rules
+++ b/support/make/avr/avr.rules
@@ -36,18 +36,19 @@ PROGRAMMER ?= uisp
 NCC = ncc
 LIBS = -lm
 
-
 AMADDR = ActiveMessageAddressC\$$addr
 # Uncomment the next two lines if you have a toolchain without the dollar sign
 # patch. This needs nesc 1.2.8 or newer (1.2.9 is recommended).
 #PFLAGS += -fnesc-separator=__
 #AMADDR = ActiveMessageAddressC__addr
-BUILDDIR = build/$(PLATFORM)
+BUILDDIR ?= build/$(PLATFORM)
 MAIN_EXE = $(BUILDDIR)/main.exe
 MAIN_SREC = $(BUILDDIR)/main.srec
 MAIN_IHEX = $(BUILDDIR)/main.ihex
 INSTALL_SREC = $(MAIN_SREC).out$(if $(NODEID),-$(NODEID),)
 VOLUMEFILE = volumes-at45db.xml
+VOLUME_ALLOCATOR ?= tos-storage-at45db
+VOLUME_ALLOCATOR_FLAGS ?=
 
 PFLAGS += -Wall -Wshadow $(NESC_FLAGS)
 PFLAGS += -target=$(PLATFORM) -fnesc-cfile=$(BUILDDIR)/app.c -board=$(SENSORBOARD)
@@ -96,7 +97,7 @@ ifneq ($(wildcard $(VOLUMEFILE)), )
 exe0: $(BUILDDIR)/StorageVolumes.h
 
 $(BUILDDIR)/StorageVolumes.h: $(VOLUMEFILE)
-       tos-storage-at45db $(PLATFORMDIR) <$(VOLUMEFILE) >$@ || rm -f $@
+       $(VOLUME_ALLOCATOR) $(VOLUME_ALLOCATOR_FLAGS) $(PLATFORMDIR) <$(VOLUMEFILE) >$@ || rm -f $@
 
 PFLAGS += -I$(BUILDDIR)
 endif
@@ -130,9 +131,6 @@ exe: exe0 bytes FORCE
 
 exe0: builddir $(BUILD_EXTRA_DEPS) FORCE
        @echo "    compiling $(COMPONENT) to a $(PLATFORM) binary"
-ifdef MAKE_DEPUTY_FLAG
-       @echo "  ***** compiling Safe TinyOS *****"
-endif
        $(NCC) -o $(MAIN_EXE) $(NCC_SAFE_TINYOS_FLAG) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(WIRING_CHECK_FLAGS) $(COMPONENT).nc $(LIBS) $(LDFLAGS)
 ifdef WIRING_CHECK_FILE
        @nescc-wiring $(WIRING_CHECK_FILE)