X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=benchmarks%2Fdrivers%2FJava%2FMakefile;h=46387b0c35b8e42f7a2a24284d09d8f29658d29c;hb=0f3ec8109de44e740bba5da29146aa41fb4aaa2b;hp=3d45da43db177ae71b60b9425f6ba50286efbdf8;hpb=8587d5dae9491656de998fc4dde0d4adc38ef3b9;p=iot2.git

diff --git a/benchmarks/drivers/Java/Makefile b/benchmarks/drivers/Java/Makefile
index 3d45da4..46387b0 100644
--- a/benchmarks/drivers/Java/Makefile
+++ b/benchmarks/drivers/Java/Makefile
@@ -4,7 +4,7 @@ include $(BASE)/common.mk
 
 BOOFDIR := ../libs/boofcv_libs
 BOOFJARS := $(BOOFDIR)/BoofCV-feature-0.21.jar:$(BOOFDIR)/BoofCV-io-0.21.jar:$(BOOFDIR)/BoofCV-visualize-0.21.jar:$(BOOFDIR)/BoofCV-ip-0.21.jar
-JLAYERDIR := ../libs/jlayer_libs
+JLAYERDIR := ../../libs/jlayer_libs
 JLAYERJARS := $(JLAYERDIR)/jl1.0.1.jar
 JFLAGS = -d $(BIN_DIR) -cp $(BIN_DIR):$(PHONEJARS):$(BOOFJARS):$(JLAYERJARS):$(CHECKERJARS)
 JARFLAGS = cf
@@ -31,6 +31,7 @@ PHONY += camera
 camera:
 	$(JAVAC) $(JFLAGS) AmcrestCamera/*.java
 	cp AmcrestCamera/AmcrestCamera.config $(BIN_DIR)/iotcode/AmcrestCamera
+	cp AmcrestCamera/AmcrestCamera.tomoyo $(BIN_DIR)/iotcode/AmcrestCamera
 	cd $(BIN_DIR)/iotcode/AmcrestCamera; $(JAR) $(JARFLAGS) AmcrestCamera.jar ../../iotcode/AmcrestCamera/*.class ../../iotcode/interfaces/Camera*.class ../../iotcode/interfaces/Resolution*.class
 
 PHONY += labroom
@@ -151,6 +152,7 @@ PHONY += check-camera
 check-camera:
 	$(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) AmcrestCamera/*.java
 	cp AmcrestCamera/AmcrestCamera.config $(BIN_DIR)/iotcode/AmcrestCamera
+	cp AmcrestCamera/AmcrestCamera.tomoyo $(BIN_DIR)/iotcode/AmcrestCamera
 	cd $(BIN_DIR)/iotcode/AmcrestCamera; $(JAR) $(JARFLAGS) AmcrestCamera.jar ../../iotcode/AmcrestCamera/*.class ../../iotcode/interfaces/Camera*.class ../../iotcode/interfaces/Resolution*.class
 
 PHONY += check-labroom