Fixed some bugs with the tinyos-tools that have crept in due to incompatibilities...

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

diff --git a/support/make/avr/avr.rules b/support/make/avr/avr.rules
index b28b740fd57ccd8686c524dd1f206047f7f77107..11e3b6d43c16beb0de8d5f7eeb2350bfa4b9b0d3 100644 (file)
--- a/support/make/avr/avr.rules
+++ b/support/make/avr/avr.rules
@@ -7,13 +7,12 @@ define AVR_HELP
 
    debug    : compile with minimal optimization and debug symbols
    debugopt : compile with debug symbols
-   xnp      : compile for network programming
 
  Programmer options:
 
    dapa         : (default) use parallel port programmer
    mib510,<dev> : use MIB510/MIB520 serial port programming board at port <dev>
-   eprb,<host> : use EPRB at hostname <host>
+   eprb,<host> : use EPRB (MIB600) at hostname <host>
    avrisp,<dev> : use AVRISP serial programmer at port <dev>
 
    The dev or host parameter for the programmer option need not be specified,
@@ -37,7 +36,11 @@ NCC = ncc
 LIBS = -lm
 
 # Use __ as the separator - requires nesC 1.2.9 or later
-PFLAGS += -fnesc-separator=__
+ifneq ($(filter sim,$(GOALS)),sim)
+ifneq ($(filter sim-sf,$(GOALS)),sim-sf)
+       PFLAGS += -fnesc-separator=__
+endif
+endif
 AMADDR = ActiveMessageAddressC__addr
 BUILDDIR ?= build/$(PLATFORM)
 MAIN_EXE = $(BUILDDIR)/main.exe
@@ -65,6 +68,9 @@ else
 endif
 
 ifeq ($(PROGRAMMER),avrdude)
+  ifeq ($(findstring Darwin, $(shell uname)), Darwin)
+    AVRDUDE_CONF ?= /opt/local/etc/avrdude.conf
+  endif
   AVRDUDE_CONF ?= /etc/avrdude/avrdude.conf
   ifeq ($(shell [ -f /bin/cygwin1.dll ] && echo cygwin),cygwin)
     AVRDUDE_CONF := $(shell cygpath -m $(AVRDUDE_CONF))
@@ -94,7 +100,7 @@ $(if $(PROGRAM),,$(call TOSMake_include,avr/$(DEFAULT_PROGRAM).extra))
 ifneq ($(wildcard $(VOLUMEFILE)), )
 build_storage: $(BUILDDIR)/StorageVolumes.h
 
-exe0: build_storage
+exe0: build_storage 
 
 VOLUME_ALLOCATOR_FLAGS ?= 
 $(BUILDDIR)/StorageVolumes.h: $(VOLUMEFILE)
@@ -134,11 +140,16 @@ ihex: exe FORCE
 exe: exe0 bytes FORCE
        @:
 
-exe0: builddir $(BUILD_EXTRA_DEPS) FORCE
+exe0: builddir $(BUILD_EXTRA_DEPS) $(COMPONENT).nc FORCE
        @echo "    compiling $(COMPONENT) to a $(PLATFORM) binary"
        $(NCC) -o $(MAIN_EXE) $(NCC_SAFE_TINYOS_FLAGS) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(WIRING_CHECK_FLAGS) $(COMPONENT).nc $(LIBS) $(LDFLAGS)
 ifdef WIRING_CHECK_FILE
        @nescc-wiring $(WIRING_CHECK_FILE)
+endif
+ifdef STACK_CHECK
+       @echo
+       @-tos-ramsize $(PLATFORM) $(MAIN_EXE)
+       @echo
 endif
        @echo "    compiled $(COMPONENT) to $(MAIN_EXE)"