[Tinyos-2-commits] CVS: tinyos-2.x/support/make/avr avr.rules, 1.8, 1.9

[John Regehr]

Update of /cvsroot/tinyos/tinyos-2.x/support/make/avr
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23770/avr

Modified Files:
	avr.rules 
Log Message:
Makefile support for Safe TinyOS on AVR: Just pass the -safe option to ncc
which does the heavy lifting.

Usage: "make micaz safe"



Index: avr.rules
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/avr/avr.rules,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** avr.rules	1 Feb 2008 20:25:37 -0000	1.8
--- avr.rules	11 Feb 2008 20:12:15 -0000	1.9
***************
*** 24,27 ****
--- 24,33 ----
  HELP += $(AVR_HELP)
  
+ ifdef MAKE_DEPUTY_FLAG
+         NCC_SAFE_TINYOS_FLAG = -safe
+ else
+         NCC_SAFE_TINYOS_FLAG =
+ endif
+ 
  OBJCOPY = avr-objcopy
  OBJDUMP = avr-objdump
***************
*** 125,129 ****
  exe0: builddir $(BUILD_EXTRA_DEPS) FORCE
  	@echo "    compiling $(COMPONENT) to a $(PLATFORM) binary"
! 	$(NCC) -o $(MAIN_EXE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(WIRING_CHECK_FLAGS) $(COMPONENT).nc $(LIBS) $(LDFLAGS)
  ifdef WIRING_CHECK_FILE
  	@nescc-wiring $(WIRING_CHECK_FILE)
--- 131,138 ----
  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)