From 68a51506fe6b2d54995cb60d0d5966696c0577ed Mon Sep 17 00:00:00 2001 From: "R. Steve McKown" Date: Fri, 23 Apr 2010 15:52:33 -0600 Subject: [PATCH] Get rid of TOS and use TOSDIR like the other Makefiles in support/sdk/java. --- support/sdk/java/net/tinyos/message/Makefile | 1 - support/sdk/java/net/tinyos/packet/Makefile | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/support/sdk/java/net/tinyos/message/Makefile b/support/sdk/java/net/tinyos/message/Makefile index 291c73e0..67a6db48 100644 --- 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 a8754031..29cb3171 100644 --- 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 -- 2.39.2