[Tinyos-2-commits] CVS: tinyos-2.x/support/make Makerules, 1.5, 1.6 safe.extra, 1.1, 1.2

Kevin Klues klueska at users.sourceforge.net
Fri Sep 26 13:14:00 PDT 2008


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

Modified Files:
	Makerules safe.extra 
Log Message:
fix to allow added targets from the TOSMAKE_PATH to be able to use .extra files int he default path.  Fix is to simple push the added paths at the end instead of at the beginning.

Index: Makerules
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/Makerules,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makerules	11 Apr 2007 21:07:56 -0000	1.5
--- Makerules	26 Sep 2008 20:13:58 -0000	1.6
***************
*** 50,54 ****
  
  #  Allow users to specify additional directories to find TOSMake files.
! TOSMAKE_PATH += $(TINYOS_MAKE_PATH)
  
  #  Save makecmdgoals (a read only var) to goals so that we can modify it.
--- 50,56 ----
  
  #  Allow users to specify additional directories to find TOSMake files.
! TOSMAKE_TEMP_PATH := $(TOSMAKE_PATH)
! TOSMAKE_PATH = $(TINYOS_MAKE_PATH) 
! TOSMAKE_PATH += $(TOSMAKE_TEMP_PATH)
  
  #  Save makecmdgoals (a read only var) to goals so that we can modify it.

Index: safe.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/safe.extra,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** safe.extra	11 Feb 2008 20:12:15 -0000	1.1
--- safe.extra	26 Sep 2008 20:13:58 -0000	1.2
***************
*** 2,5 ****
  
  MAKE_DEPUTY_FLAG := 1
! export MAKE_DEPUTY_FLAG
  
--- 2,5 ----
  
  MAKE_DEPUTY_FLAG := 1
! #export MAKE_DEPUTY_FLAG
  



More information about the Tinyos-2-commits mailing list