[Tinyos-commits] CVS: tinyos-1.x/tools/make Makedefaults, 1.5, 1.6 bnp.extra, 1.14, 1.15

[Jonathan Hui]

Update of /cvsroot/tinyos/tinyos-1.x/tools/make
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26884

Modified Files:
	Makedefaults bnp.extra 
Log Message:
- While TOSBoot is installed by default, allow the user to override
TINYOS_NP simply by setting it to something else.



Index: Makedefaults
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/Makedefaults,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makedefaults	18 May 2005 02:15:42 -0000	1.5
--- Makedefaults	28 Jul 2005 22:57:50 -0000	1.6
***************
*** 2,5 ****
--- 2,6 ----
  #$Id$
  
+ TINYOS_NP ?= BNP
  DEFAULT_LOCAL_GROUP ?= 0x7d
  NESC_FLAGS ?= -Wnesc-all

Index: bnp.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/bnp.extra,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** bnp.extra	28 Jul 2005 21:00:46 -0000	1.14
--- bnp.extra	28 Jul 2005 22:57:50 -0000	1.15
***************
*** 5,9 ****
  TOSBOOT_DIR ?= $(TOSDIR)/lib/Deluge/TOSBoot/build
  
! ifndef NO_TOSBOOT
  
    CFLAGS += -I$(DELUGE_DIR)
--- 5,9 ----
  TOSBOOT_DIR ?= $(TOSDIR)/lib/Deluge/TOSBoot/build
  
! ifeq ($(TINYOS_NP),BNP)
  
    CFLAGS += -I$(DELUGE_DIR)