[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/TestNetwork Makefile, 1.1.2.6, 1.1.2.7

[Kyle Jamieson]

Update of /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24117/apps/tests/TestNetwork

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	Makefile 
Log Message:
Instrumenting the Collection forwarding engine with diagnostic packets to the UART in case of exceptions.

Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/Attic/Makefile,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** Makefile	10 Jun 2006 21:19:11 -0000	1.1.2.6
--- Makefile	14 Jun 2006 18:57:43 -0000	1.1.2.7
***************
*** 10,14 ****
  BUILD_EXTRA_DEPS += tn-injector #tn-listener
  LISTEN_OBJS = collection_msg.o test_network_msg.o tn-listener.o $(LIBMOTE)
! INJECT_OBJS = set_rate_msg.o tn-injector.o $(LIBMOTE)
  
  %.o: %.c
--- 10,27 ----
  BUILD_EXTRA_DEPS += tn-injector #tn-listener
  LISTEN_OBJS = collection_msg.o test_network_msg.o tn-listener.o $(LIBMOTE)
! INJECT_OBJS = set_rate_msg.o tn-injector.o collection_debug_msg.o $(LIBMOTE)
! 
! # arguments: output filename stem, input filename, struct name
! define mig_templ
! MIGFILES += $(1).c $(1).h $(1).java $(1).o
! $(1).c:
! 	mig -o $(1).h c -target=$$(PLATFORM) $$(CFLAGS) $$(TFLAGS) $(2) $(3)
! $(1).java:
! 	mig -o $(1).java java -target=$$(PLATFORM) $$(CFLAGS) $$(TFLAGS) $(2) $(3)
! endef
! 
! $(eval $(call mig_templ,test_network_msg,TestNetwork.h,TestNetworkMsg))
! $(eval $(call mig_templ,set_rate_msg,$(TOSDIR)/lib/net/DisseminationEngine.h,dissemination_message))
! $(eval $(call mig_templ,collection_debug_msg,$(TOSDIR)/lib/net/collection/UartDbgMsg.h,CollectionDebugMsg))
  
  %.o: %.c
***************
*** 21,47 ****
  	gcc -v $(TFLAGS) $(CFLAGS) -o $@ $(INJECT_OBJS)
  
! tn-listener.o: tn-listener.c
! 	gcc $(TFLAGS) $(CFLAGS) -c -o $@ $<
  
  tn-injector.o: tn-injector.c test_network_msg.c
  	gcc $(TFLAGS) $(CFLAGS) -c -o $@ $<
  
! test_network_msg.c:
! 	mig -o test_network_msg.h c -target=$(PLATFORM) $(CFLAGS) $(TFLAGS) TestNetwork.h TestNetworkMsg 
! 
! set_rate_msg.c:
! 	mig -o set_rate_msg.h c -target=$(PLATFORM) $(CFLAGS) $(TFLAGS) $(TOSDIR)/lib/net/DisseminationEngine.h dissemination_message
! 
! set_rate_msg.o: set_rate_msg.c
! 	gcc $(CFLAGS) $(TFLAGS) -c -o $@ $<
  
! test_network_msg.o: test_network_msg.c
! 	gcc $(CFLAGS) $(TFLAGS) -c -o $@ $<
  
  
! collection_msg.c:
! 	mig -o collection_msg.h c -target=$(PLATFORM) $(CFLAGS) $(TFLAGS) $(TOSDIR)/lib/net/collection/ForwardingEngine.h collection_header
  
  
  include $(MAKERULES)
  
--- 34,60 ----
  	gcc -v $(TFLAGS) $(CFLAGS) -o $@ $(INJECT_OBJS)
  
! #tn-listener.o: tn-listener.c
! #	gcc $(TFLAGS) $(CFLAGS) -c -o $@ $<
  
  tn-injector.o: tn-injector.c test_network_msg.c
  	gcc $(TFLAGS) $(CFLAGS) -c -o $@ $<
  
! #test_network_msg.c:
! #	mig -o test_network_msg.h c -target=$(PLATFORM) $(CFLAGS) $(TFLAGS) TestNetwork.h TestNetworkMsg 
  
! #set_rate_msg.c:
! #	mig -o set_rate_msg.h c -target=$(PLATFORM) $(CFLAGS) $(TFLAGS) $(TOSDIR)/lib/net/DisseminationEngine.h dissemination_message
  
+ #set_rate_msg.o: set_rate_msg.c
+ #	gcc $(CFLAGS) $(TFLAGS) -c -o $@ $<
  
! #test_network_msg.o: test_network_msg.c
! #	gcc $(CFLAGS) $(TFLAGS) -c -o $@ $<
  
+ #collection_msg.c:
+ #	mig -o collection_msg.h c -target=$(PLATFORM) $(CFLAGS) $(TFLAGS) $(TOSDIR)/lib/net/collection/ForwardingEngine.h collection_header
  
  include $(MAKERULES)
  
+ migclean:
+ 	rm -rf $(MIGFILES)