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

[Phil Levis]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	Makefile 
Log Message:
Can build apps now.


Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/Attic/Makefile,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** Makefile	3 Jun 2006 23:14:20 -0000	1.1.2.4
--- Makefile	8 Jun 2006 20:30:09 -0000	1.1.2.5
***************
*** 2,6 ****
  CFLAGS += -I$(TOSDIR)/lib/net -I$(TOSDIR)/lib/net/collection
  
! TFLAGS =  -I$(TOSDIR)/../apps/tests/TestDissemination \
            -I$(TOSDIR)/../support/sdk/c \
  	  -I$(TOSDIR)/types \
--- 2,6 ----
  CFLAGS += -I$(TOSDIR)/lib/net -I$(TOSDIR)/lib/net/collection
  
! TFLAGS +=  -I$(TOSDIR)/../apps/tests/TestDissemination \
            -I$(TOSDIR)/../support/sdk/c \
  	  -I$(TOSDIR)/types \
***************
*** 12,26 ****
  INJECT_OBJS = set_rate_msg.o tn-injector.o $(LIBMOTE)
  
  tn-listener: $(LISTEN_OBJS)
! 	gcc -v $(CFLAGS) $(TFLAGS) -o $@ $(LISTEN_OBJS)
  
  tn-injector: $(INJECT_OBJS)
! 	gcc -v $(CFLAGS) $(TFLAGS) -o $@ $(INJECT_OBJS)
  
  tn-listener.o: tn-listener.c
! 	gcc $(CFLAGS) $(TFLAGS) -c -o $@ $<
  
  tn-injector.o: tn-injector.c test_network_msg.c
! 	gcc $(CFLAGS) $(TFLAGS) -c -o $@ $<
  
  test_network_msg.c:
--- 12,29 ----
  INJECT_OBJS = set_rate_msg.o tn-injector.o $(LIBMOTE)
  
+ %.o: %.c
+ 	gcc -v  $(TFLAGS) $(CFLAGS) -c -o $@ $<
+ 
  tn-listener: $(LISTEN_OBJS)
! 	gcc -v $(TFLAGS) $(CFLAGS) -o $@ $(LISTEN_OBJS)
  
  tn-injector: $(INJECT_OBJS)
! 	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: