added one more level of redirection for building the StorageVolume.h file. This...

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

diff --git a/support/make/avr/avr.rules b/support/make/avr/avr.rules
index ce0f17ba4a6e619ba2a46eef5b9baf2ec5933eb2..f00e0ff8b40d1ddaa26144e5eb12fdb083b73857 100644 (file)
--- a/support/make/avr/avr.rules
+++ b/support/make/avr/avr.rules
@@ -41,13 +41,13 @@ AMADDR = ActiveMessageAddressC\$$addr
 # 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 ?= tos-storage-at45db
 VOLUME_ALLOCATOR_FLAGS ?=
 
 PFLAGS += -Wall -Wshadow $(NESC_FLAGS)
@@ -94,12 +94,19 @@ $(if $(PROGRAM),,$(call TOSMake_include,avr/$(DEFAULT_PROGRAM).extra))
 
 # Build storage file if volumes.xml present
 ifneq ($(wildcard $(VOLUMEFILE)), )
-exe0: $(BUILDDIR)/StorageVolumes.h
+build_storage: $(BUILDDIR)/StorageVolumes.h
 
+exe0: build_storage
+
+VOLUME_ALLOCATOR_FLAGS ?= 
 $(BUILDDIR)/StorageVolumes.h: $(VOLUMEFILE)
-       $(VOLUME_ALLOCATOR) $(PLATFORMDIR) $(VOLUME_ALLOCATOR_FLAGS) <$(VOLUMEFILE) >$@ || rm -f $@
+       $(VOLUME_ALLOCATOR) $(VOLUME_ALLOCATOR_FLAGS) $(PLATFORMDIR) <$(VOLUMEFILE) >$@ || rm -f $@
 
 PFLAGS += -I$(BUILDDIR)
+else
+
+build_storage:
+
 endif
 
 ifndef BUILD_DEPS