Get rid of TOS and use TOSDIR like the other Makefiles in support/sdk/java.

diff --git a/support/sdk/java/net/tinyos/message/Makefile b/support/sdk/java/net/tinyos/message/Makefile
index 291c73e010a18469a01ae8645d5fbe15e0542fff..67a6db48226812dafacd290b640a555dba3e872b 100644 (file)
--- a/support/sdk/java/net/tinyos/message/Makefile
+++ b/support/sdk/java/net/tinyos/message/Makefile
@@ -5,7 +5,6 @@ INITIAL_TARGETS = SerialPacket.class SerialPacket.java
 ROOT = ../../..
 include $(ROOT)/Makefile.include
 
-TOS=$(shell ncc -print-tosdir)
 SERIAL_H = $(TOSDIR)/lib/serial/Serial.h
 
 SerialPacket.java: $(SERIAL_H) FORCE

diff --git a/support/sdk/java/net/tinyos/packet/Makefile b/support/sdk/java/net/tinyos/packet/Makefile
index a8754031a4dac6e53efb96353a95f23e5d27c173..29cb31710aa2e876daec8a4db522c8560038fb95 100644 (file)
--- a/support/sdk/java/net/tinyos/packet/Makefile
+++ b/support/sdk/java/net/tinyos/packet/Makefile
@@ -5,8 +5,7 @@ INITIAL_TARGETS = Serial.class Serial.java
 ROOT = ../../..
 include $(ROOT)/Makefile.include
 
-TOS=$(shell ncc -print-tosdir)
-SERIAL_H = $(TOS)/lib/serial/Serial.h
+SERIAL_H = $(TOSDIR)/lib/serial/Serial.h
 
 Serial.java: $(SERIAL_H) FORCE
        ncg -o $@ -java-classname=net.tinyos.packet.Serial java $(SERIAL_H) Serial.h