[Firebug-cvs] firebug/project/src/multihop Makefile,1.11,1.12

[<ash...@us...>]

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

Modified Files:
	Makefile 
Log Message:


Index: Makefile
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/multihop/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Makefile	27 Jun 2003 19:17:20 -0000	1.11
--- Makefile	2 Jul 2003 00:19:22 -0000	1.12
***************
*** 10,31 ****
  
  
! 
! TOSROOT=/cygdrive/c
! 
  DATASTRUCTURE=$(TOSROOT)/broken/experimental/terence/tos/lib/DataStructure
  ROUTESTACK=$(TOSROOT)/broken/experimental/terence/apps/mh6
! INCLUDES=-I$(DATASTRUCTURE) -I$(ROUTESTACK) -I$(TOSROOT)/tinyos-1.x/tos
  
! #INCLUDES=-I$(TOSROOT)/Blast-0.1/Sender -I$(TOSROOT)/Blast-0.1/Interface -I$(TOSROOT)/Blast-0.1/DataStructure -I$(TOSROOT)/Blast-0.1/VirtualComm -I$(TOSROOT)/Blast-0.1/ParentSelection 
! #-I$(TOSROOT)/tinyos-1.x/tos
  
! PLATFORM=mica2
! MAIN_EXE= build/$(PLATFORM)/main.exe
! MAIN_SREC= build/$(PLATFORM)/main.srec
  
  
! APPLICATION = CollectDataFB.nc
! #APPLICATION = BaseStation.nc
  
  
  
--- 10,95 ----
  
  
! UISP = uisp
! UISP_FLAGS = -dprog=dapa $(UISP_EXTRA_FLAGS)
! TOSROOT=/cygdrive/c/tinyos-1.x
! PLATFORMS= mica mica2 pc
  DATASTRUCTURE=$(TOSROOT)/broken/experimental/terence/tos/lib/DataStructure
  ROUTESTACK=$(TOSROOT)/broken/experimental/terence/apps/mh6
! INCLUDES=-I$(DATASTRUCTURE) -I$(ROUTESTACK) 
! PFLAGS := $(PFLAGS) -Wall -Wshadow -DDEF_TOS_AM_GROUP=0x7d
  
! PLATAUX=$(PLATFORMS) all
! PLATFORM := $(filter $(PLATAUX), $(MAKECMDGOALS))
! PFLAGS := -target=$(PLATFORM) $(PFLAGS)
! MAKECMDGOALS := $(filter-out $(PLATAUX), $(MAKECMDGOALS)) 
! BUILDDIR= build/$(PLATFORM)
! MAIN_EXE= $(BUILDDIR)/main.exe
! MAIN_SREC= $(BUILDDIR)/main.srec
! TARGETS= CollectDataFB BaseStation
! TARGET := $(filter $(TARGETS), $(MAKECMDGOALS))
! MAKECMDGOALS := $(filter-out $(TARGET), $(MAKECMDGOALS))
  
! ifeq ($(PLATFORM), pc)
! PFLAGS := -g -O0 -pthread $(PFLAGS) -fnesc-nido-tosnodes=1000 -fnesc-cfile=$(BUILDDIR)/app.c
! MAIN_TARGET = $(MAIN_EXE)
! else
! PFLAGS := -Os $(PFLAGS) -finline-limit=100000 -fnesc-cfile=$(BUILDDIR)/app.c
! MAIN_TARGET = $(MAIN_SREC)
! endif
  
+ NCC := ncc -board=micasb
  
! ######################################################################
! # top-level rules.  switch based on MAKECMDGOALS
! ######################################################################
! 
! #
! # rules for make clean
! #
! ifeq ($(MAKECMDGOALS)_x, clean_x)
! 
! PLATFORM=
  
+ $(PLATAUX):
+ 	@echo ""
+ 
+ else
+ 
+ ifeq ($(PLATFORM)_x,_x)
+ $(error $(PLATAUX) $(MAKECMDGOALS) $(USAGE))
+ endif
+ 
+ MAKECMDGOALS := $(patsubst install.%,install,$(MAKECMDGOALS))
+ MAKECMDGOALS := $(patsubst reinstall.%,reinstall,$(MAKECMDGOALS))
+ 
+ #
+ # rules for make install <platform>
+ #
+ ifeq ($(MAKECMDGOALS)_x, install_x)
+ 
+ $(PLATAUX):
+ 	@true
+ 
+ else
+ ifeq ($(MAKECMDGOALS)_x, reinstall_x)
+ 
+ $(PLATAUX):
+ 	@true
+ 
+ else
+ all:
+ 	for platform in $(PLATFORMS); do \
+ 		$(MAKE) $$platform $(DOCS) || exit 1; \
+ 	done
+ 
+ $(PLATFORMS): build
+ 
+ endif
+ endif
+ endif
+ 
+ 
+ #APPLICATION = CollectDataFB.nc
+ #APPLICATION = BaseStation.nc
  
  
***************
*** 40,86 ****
  
  
! pc:
! 	ncc -board=micasb -o build/pc/main.exe -g -O0 -pthread -target=pc  -Wall -Wshadow -DDEF_TOS_AM_GROUP=0x7d -fnesc-nido-tosnodes=1000 -fnesc-cfile=build/pc/app.c $(INCLUDES) $(APPLICATION) -lm
! 
! 
! mica:
! 	ncc -board=micasb -o build/mica/main.exe -Os -target=mica  -Wall -Wshadow -DDEF_TOS_AM_GROUP=0x7d -finline-limit=100000 -fnesc-cfile=build/mica/app.c $(INCLUDES) $(APPLICATION) -lm
  
- mica2:
- 	ncc -board=micasb -o build/mica2/main.exe -Os -target=mica2  -Wall -Wshadow -DDEF_TOS_AM_GROUP=0x7d -finline-limit=100000 -fnesc-cfile=build/mica2/app.c $(INCLUDES) $(APPLICATION) -lm
  install: $(MAIN_SREC) FORCE
! 	$(MAKE) $(PLATFORM) re$@
! 
  
  install.%: $(MAIN_SREC) FORCE
  	$(MAKE) $(PLATFORM) re$@
  
- UISP = uisp
- UISP_FLAGS = -dprog=dapa $(UISP_EXTRA_FLAGS)
- 
  reinstall: FORCE
! 	@echo " installing mica binary "
! 	$(UISP) $(UISP_FLAGS) --erase
! 	sleep 1
! 	$(UISP) $(UISP_FLAGS) --upload if=build/$(PLATFORM)/main.srec
! 	sleep 1
! 	$(UISP) $(UISP_FLAGS) --verify if=build/$(PLATFORM)/main.srec
! 
  
  reinstall.%: FORCE
! 	@echo " installing mica binary "
! 	set-mote-id build/$(PLATFORM)/main.srec build/$(PLATFORM)/main.srec.out `echo $@ |sed 's:reinstall.::g'`
  	$(UISP) $(UISP_FLAGS) --erase
  	sleep 1
! 	$(UISP) $(UISP_FLAGS) --upload if=build/$(PLATFORM)/main.srec.out
  	sleep 1
! 	$(UISP) $(UISP_FLAGS) --verify if=build/$(PLATFORM)/main.srec.out
  
  $(MAIN_SREC): $(MAIN_EXE)
! 	avr-objcopy --output-target=srec build/$(PLATFORM)/main.exe build/$(PLATFORM)/main.srec
  
  clean: 
! 	rm build/mica/*
! 	rm build/pc/*
  
  
--- 104,149 ----
  
  
! build: $(MAIN_TARGET)
  
  install: $(MAIN_SREC) FORCE
! 	@$(MAKE) $(PLATFORM) re$@
  
  install.%: $(MAIN_SREC) FORCE
  	$(MAKE) $(PLATFORM) re$@
  
  reinstall: FORCE
! 	@echo "    installing $(PLATFORM) binary"
! 	$(UISP) $(UISP_FLAGS) --erase 
! 	sleep 1	     
! 	$(UISP) $(UISP_FLAGS) --upload if=$(MAIN_SREC)
! 	sleep 1	     
! 	$(UISP) $(UISP_FLAGS) --verify if=$(MAIN_SREC)
  
  reinstall.%: FORCE
! 	@echo " installing $(PLATFORM) binary "
! 	set-mote-id $(BUILDDIR)/main.srec $(BUILDDIR)/main.srec.out `echo $@ |sed 's:reinstall.::g'`
  	$(UISP) $(UISP_FLAGS) --erase
  	sleep 1
! 	$(UISP) $(UISP_FLAGS) --upload if=$(BUILDDIR)/main.srec.out
  	sleep 1
! 	$(UISP) $(UISP_FLAGS) --verify if=$(BUILDDIR)/main.srec.out
! 
! 
! $(MAIN_EXE): $(BUILDDIR) FORCE
! 	@echo "    compiling $(TARGET) to a $(PLATFORM) binary"
! 	$(NCC) -o $(MAIN_EXE) $(PFLAGS) $(CFLAGS) $(INCLUDES) $(TARGET).nc -lm $(LDFLAGS)
! 	@echo "    compiled $(COMPONENT) to $@"
! 	@objdump -h $(MAIN_EXE) | perl -ne '$$b{$$1}=hex $$2 if /^\s*\d+\s*\.(text|data|bss)\s+(\S+)/; END { printf("%16d bytes in ROM\n%16d bytes in RAM\n",$$b{text}+$$b{data},$$b{bss}); }'
  
  $(MAIN_SREC): $(MAIN_EXE)
! 	avr-objcopy --output-target=srec $(MAIN_EXE) $(MAIN_SREC)
! 
! $(BUILDDIR):
! 	mkdir -p $(BUILDDIR)
  
  clean: 
! 	rm -rf $(BUILDDIR)
! 	rm -f core.*
! 	rm -f *~