[Tinyos-commits] CVS: tinyos-1.x/tools/java/net/tinyos/surge Makefile, 1.10, 1.11

[Joe Polastre]

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

Modified Files:
	Makefile 
Log Message:
updated Makefile for move of SurgeTelos to main tree
removed culler-ism


Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/java/net/tinyos/surge/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile	27 May 2005 19:10:11 -0000	1.10
--- Makefile	2 Aug 2005 18:44:48 -0000	1.11
***************
*** 4,8 ****
  
  TOS = ${TOSDIR}/..
- #TOS = /home/culler/tinyos-1.x/broken/experimental/dec/surge3
  PACKAGE = net.tinyos.surge
  MIG = mig java
--- 4,7 ----
***************
*** 24,30 ****
  
  ifeq ($(SURGE_PLATFORM),telos)
! SURGE_MSG=$(TOS)/contrib/ucb/apps/SurgeTelos/Surge.h
! SURGE_CMD_MSG=$(TOS)/contrib/ucb/apps/SurgeTelos/SurgeCmd.h
! MULTIHOP_MSG=$(TOS)/contrib/ucb/tos/lib/MultiHopLQI/MultiHop.h
  # BCAST_MSG remains the same
  endif
--- 23,29 ----
  
  ifeq ($(SURGE_PLATFORM),telos)
! SURGE_MSG=$(TOS)/apps/SurgeTelos/Surge.h
! SURGE_CMD_MSG=$(TOS)/apps/SurgeTelos/SurgeCmd.h
! MULTIHOP_MSG=$(TOS)/tos/lib/MultiHopLQI/MultiHop.h
  # BCAST_MSG remains the same
  endif