[Firebug-cvs] firebug/project/src/multihop Makefile,1.16,1.17

[<do...@us...>]

Update of /cvsroot/firebug/firebug/project/src/multihop
In directory sc8-pr-cvs1:/tmp/cvs-serv22038

Modified Files:
	Makefile 
Log Message:
Fixed makefile problems with blast.

Index: Makefile
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/multihop/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile	22 Aug 2003 06:47:44 -0000	1.16
--- Makefile	25 Aug 2003 22:51:50 -0000	1.17
***************
*** 3,11 ****
  #/*////////////////////////////////////////////////////////*/
  #/**
! # * Max Min Chen, David Doolin
  # */
  #/*////////////////////////////////////////////////////////*/
  
- ## This is the Makefile for multihop.
  
  #ifndef XBOWROOT
--- 3,10 ----
  #/*////////////////////////////////////////////////////////*/
  #/**
! # * Max Min Chen, David Doolin, Anshuman Sharma
  # */
  #/*////////////////////////////////////////////////////////*/
  
  
  #ifndef XBOWROOT
***************
*** 16,35 ****
  UISP = uisp
  UISP_FLAGS = -dprog=dapa $(UISP_EXTRA_FLAGS)
! TOSROOT=/cygdrive/c
! XBOWROOT = $(TOSROOT)/tinyos-1.x/contrib/xbow
  
  PLATFORMS= mica mica2 pc
- #DATASTRUCTURE=$(TOSROOT)/broken/experimental/terence/tos/lib/DataStructure
- #ROUTESTACK=$(TOSROOT)/broken/experimental/terence/apps/mh6
- #INCLUDES=-I$(DATASTRUCTURE) -I$(ROUTESTACK) 
- #CC1000=-I/cygdrive/d/tinyos-1.x/tos/platform/mica2
  
! INCLUDES=-I$(TOSROOT)/Blast-0.11/Sender              \
!          -I$(TOSROOT)/Blast-0.11/Interface           \
!          -I$(TOSROOT)/Blast-0.11/DataStructure       \
!          -I$(TOSROOT)/Blast-0.11/VirtualComm         \
!          -I$(TOSROOT)/Blast-0.11/ParentSelection     \
!          -I$(TOSROOT)/tinyos-1.x/tos                \
!          -I$(XBOWROOT)/tos/sensorboards/mts400      \
           -I$(XBOWROOT)/tos/interfaces
  
--- 15,29 ----
  UISP = uisp
  UISP_FLAGS = -dprog=dapa $(UISP_EXTRA_FLAGS)
! 
  
  PLATFORMS= mica mica2 pc
  
! 
! INCLUDES=-I$(BLASTROOT)/Sender                  \
!          -I$(BLASTROOT)/Interface               \
!          -I$(BLASTROOT)/DataStructure           \
!          -I$(BLASTROOT)/VirtualComm             \
!          -I$(BLASTROOT)/ParentSelection         \
!          -I$(XBOWROOT)/tos/sensorboards/mts400  \
           -I$(XBOWROOT)/tos/interfaces
  
***************
*** 45,49 ****
  MAIN_EXE= $(BUILDDIR)/main.exe
  MAIN_SREC= $(BUILDDIR)/main.srec
! TARGETS= CollectDataFB BaseStation
  TARGET := $(filter $(TARGETS), $(MAKECMDGOALS))
  MAKECMDGOALS := $(filter-out $(TARGET), $(MAKECMDGOALS))
--- 39,43 ----
  MAIN_EXE= $(BUILDDIR)/main.exe
  MAIN_SREC= $(BUILDDIR)/main.srec
! TARGETS= CollectDataFB BaseStation TestMTS400
  TARGET := $(filter $(TARGETS), $(MAKECMDGOALS))
  MAKECMDGOALS := $(filter-out $(TARGET), $(MAKECMDGOALS))
***************
*** 109,125 ****
  
  
- #APPLICATION = CollectDataFB.nc
- #APPLICATION = BaseStation.nc
- 
- 
- # Uncomment the following to see how the 
- # shell variables are set.
- #$DATASTRUCTURE
- #$INCLUDES
- 
  ##  Make a pc build
  ##  -Wshadow warns when globals are shadowed by locals.
- 
- 
  
  build: $(MAIN_TARGET)
--- 103,108 ----