Adding early version of IoT RMI system; for now: 1) Connects Java to Java; 2) Transla...

[iot2.git] / iotjava / Makefile

diff --git a/iotjava/Makefile b/iotjava/Makefile
index 8cfe1c6e76b362b82053b3fbf0ce22732b44f239..d40d939850a1d3682de104a25eebb34fabe3119b 100644 (file)
--- a/iotjava/Makefile
+++ b/iotjava/Makefile
@@ -17,9 +17,14 @@ compiler:
        $(JAVAC) -cp .:$(PARSERJARS) -d $(BIN_DIR) iotpolicy/*.java
        cp ../config/iotpolicy/*.pol $(BIN_DIR)/iotpolicy/
 
-PHONY += run
-run:
-       cd $(BIN_DIR)/iotpolicy; $(JAVA) -cp .:..:../$(PARSERJARS):../$(BIN_DIR) iotpolicy.IoTCompiler policy.pol requires.pol -java JavaStub -cplus CPlusStub
+PHONY += run-compiler
+run-compiler:
+       cd $(BIN_DIR)/iotpolicy; $(JAVA) -cp .:..:../$(PARSERJARS):../$(BIN_DIR) iotpolicy.IoTCompiler camerapolicy.pol camerarequires.pol lightbulbpolicy.pol lightbulbrequires.pol -cplus Cplus -java Java
+
+PHONY += rmi
+rmi:
+       $(JAVAC) -cp . -d $(BIN_DIR) iotrmi/*.java
+       $(JAVAC) -cp .:../$(BIN_DIR) -d $(BIN_DIR) iotrmi/Java/*.java
 
 PHONY += doc
 doc: iotruntime iotinstaller