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

diff --git a/support/make/avr/avr.rules b/support/make/avr/avr.rules
index 7d18ede8be90f8378dd6bcb46ca4a6cc31edf9ca..f00e0ff8b40d1ddaa26144e5eb12fdb083b73857 100644 (file)
--- a/support/make/avr/avr.rules
+++ b/support/make/avr/avr.rules
@@ -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) $(VOLUME_ALLOCATOR_FLAGS) $(PLATFORMDIR) <$(VOLUMEFILE) >$@ || rm -f $@
 
 PFLAGS += -I$(BUILDDIR)
+else
+
+build_storage:
+
 endif
 
 ifndef BUILD_DEPS

diff --git a/support/make/clean.target b/support/make/clean.target
index d6a3b39bdba925ac0846513fce348ed81f9c06d6..134795806dd83960698600c19b9d3762294e3176 100644 (file)
--- a/support/make/clean.target
+++ b/support/make/clean.target
@@ -3,4 +3,5 @@
 
 clean: FORCE
        rm -rf build $(CLEAN_EXTRA) pp
-       rm -rf _TOSSIMmodule.so TOSSIM.pyc TOSSIM.py
+       rm -rf _TOSSIMmodule.so TOSSIM.pyc TOSSIM.py app.xml simbuild
+       rm -rf VolumeMapC.nc

diff --git a/support/make/msp/msp.rules b/support/make/msp/msp.rules
index f1d4e6aef511774e44179fc6b5d1580c3e204432..d283faf596d6f5743bbf3cf357d5090ef7c4ff0f 100644 (file)
--- a/support/make/msp/msp.rules
+++ b/support/make/msp/msp.rules
@@ -64,13 +64,19 @@ $(if $(PROGRAM),,$(call TOSMake_include,msp/$(DEFAULT_PROGRAM).extra))
 
 # Build storage file if volumes.xml present
 ifneq ($(wildcard $(VOLUME_FILE)), )
-exe0: $(BUILDDIR)/StorageVolumes.h
+build_storage: $(BUILDDIR)/StorageVolumes.h
+
+exe0: build_storage
 
 VOLUME_ALLOCATOR_FLAGS ?= 
 $(BUILDDIR)/StorageVolumes.h: $(VOLUME_FILE)
        $(VOLUME_ALLOCATOR) $(VOLUME_ALLOCATOR_FLAGS) $(PLATFORMDIR) <$(VOLUME_FILE) >$@ || rm -f $@
 
 PFLAGS += -I$(BUILDDIR)
+else
+
+build_storage:
+
 endif
 
 ifndef BUILD_DEPS

diff --git a/support/make/null/null.rules b/support/make/null/null.rules
index 685ed65762dfd28ccdeed04e44b458df616283dd..58632258ea1efb344dcd616778fc1f48fa131586 100644 (file)
--- a/support/make/null/null.rules
+++ b/support/make/null/null.rules
@@ -37,12 +37,18 @@ BUILDLESS_DEPS += bytes
 # Build storage file if volumes.xml present
 # We "steal" the at45db storage spec
 ifneq ($(wildcard $(VOLUMEFILE)), )
-exe0: $(BUILDDIR)/StorageVolumes.h
+build_storage: $(BUILDDIR)/StorageVolumes.h
+
+exe0: build_storage
 
 $(BUILDDIR)/StorageVolumes.h: $(VOLUMEFILE)
        $(VOLUME_ALLOCATOR) $(VOLUME_ALLOCATOR_FLAGS) <$(VOLUMEFILE) >$@
 
 PFLAGS += -I$(BUILDDIR)
+else
+
+build_storage: 
+
 endif
 
 ifndef BUILD_DEPS

diff --git a/support/make/pxa27x/pxa27x.rules b/support/make/pxa27x/pxa27x.rules
index eea096cb79637870893c08bc0b679e1a2e8dc644..c40d39d1cee025d7f94b6e9de31a2a485e03bd07 100644 (file)
--- a/support/make/pxa27x/pxa27x.rules
+++ b/support/make/pxa27x/pxa27x.rules
@@ -54,12 +54,19 @@ $(if $(PROGRAM),,$(call TOSMake_include,pxa27x/$(DEFAULT_PROGRAM).extra))
 
 # Build storage file if volumes.xml present
 ifneq ($(wildcard $(VOLUME_FILE)), )
-exe0: $(BUILDDIR)/StorageVolumes.h
+build_storage: $(BUILDDIR)/StorageVolumes.h
 
-$(BUILDDIR)/StorageVolumes.h: $(VOLUME_FILE)
-       $(VOLUME_ALLOCATOR) <$(VOLUME_FILE) >$@
+exe0: build_storage
+
+VOLUME_ALLOCATOR_FLAGS ?= 
+$(BUILDDIR)/StorageVolumes.h: $(VOLUMEFILE)
+       $(VOLUME_ALLOCATOR) $(VOLUME_ALLOCATOR_FLAGS) $(PLATFORMDIR) <$(VOLUMEFILE) >$@ || rm -f $@
 
 PFLAGS += -I$(BUILDDIR)
+else
+
+build_storage: 
+
 endif
 
 ifndef BUILD_DEPS