[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/delugetools Makefile, 1.16, 1.17

[Jonathan Hui]

Update of /cvsroot/tinyos/tinyos-1.x/beta/Deluge/delugetools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17876

Modified Files:
	Makefile 
Log Message:
Updated to simplify include paths.



Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/delugetools/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile	15 Jun 2005 19:54:43 -0000	1.16
--- Makefile	27 Jun 2005 18:03:05 -0000	1.17
***************
*** 27,48 ****
  DELUGE_PLATFORM=telosb
  DELUGE_LIB=$(TOS)/../beta/Deluge/Deluge
! STM25P_LIB=$(TOS)/../beta/STM25P/STM25P
! DELUGE_PC_LIB=$(TOS)/../beta/Deluge/pc
! CC2420_LIB=$(TOS)/lib/CC2420Radio
  
  DelugeAdvMsg.java:
! 	$(MIG) -java-classname=$(PACKAGE).DelugeAdvMsg -I$(DELUGE_PC_LIB) $(DELUGE_LIB)/DelugeMsgs.h DelugeAdvMsg -o $@
  
  DelugeReqMsg.java:
! 	$(MIG) -java-classname=$(PACKAGE).DelugeReqMsg -I$(DELUGE_PC_LIB) $(DELUGE_LIB)/DelugeMsgs.h DelugeReqMsg -o $@
  
  DelugeDataMsg.java:
! 	$(MIG) -java-classname=$(PACKAGE).DelugeDataMsg -I$(DELUGE_PC_LIB) $(DELUGE_LIB)/DelugeMsgs.h DelugeDataMsg -o $@
  
  NetProgMsg.java:
! 	$(MIG) -java-classname=$(PACKAGE).NetProgMsg -I$(DELUGE_PC_LIB) $(DELUGE_LIB)/NetProgMsgs.h NetProgMsg -o $@
  
  DelugeConsts.java:
! 	$(NCG) -java-classname=$(PACKAGE).DelugeConsts -target=$(DELUGE_PLATFORM) -I$(DELUGE_LIB) -I$(STM25P_LIB) -I$(CC2420_LIB) $(DELUGE_LIB)/DelugeC.nc Deluge.h DelugePageTransfer.h DelugeMsgs.h DelugeConsts -o $@
  
  #
--- 27,46 ----
  DELUGE_PLATFORM=telosb
  DELUGE_LIB=$(TOS)/../beta/Deluge/Deluge
! INCLUDES=-I$(DELUGE_LIB) -I$(TOS)/../beta/STM25P/STM25P -I$(TOS)/lib/CC2420Radio
  
  DelugeAdvMsg.java:
! 	$(MIG) -java-classname=$(PACKAGE).DelugeAdvMsg $(INCLUDES) $(DELUGE_LIB)/DelugeMsgs.h DelugeAdvMsg -o $@
  
  DelugeReqMsg.java:
! 	$(MIG) -java-classname=$(PACKAGE).DelugeReqMsg $(INCLUDES) $(DELUGE_LIB)/DelugeMsgs.h DelugeReqMsg -o $@
  
  DelugeDataMsg.java:
! 	$(MIG) -java-classname=$(PACKAGE).DelugeDataMsg $(INCLUDES) $(DELUGE_LIB)/DelugeMsgs.h DelugeDataMsg -o $@
  
  NetProgMsg.java:
! 	$(MIG) -java-classname=$(PACKAGE).NetProgMsg $(INCLUDES) $(DELUGE_LIB)/NetProgMsgs.h NetProgMsg -o $@
  
  DelugeConsts.java:
! 	$(NCG) -java-classname=$(PACKAGE).DelugeConsts -target=$(DELUGE_PLATFORM) $(INCLUDES) $(DELUGE_LIB)/DelugeC.nc Deluge.h DelugePageTransfer.h DelugeMsgs.h DelugeConsts -o $@
  
  #