Separating policy file into main policy and generated interfaces; fixing lexer, parse...

[iot2.git] / iotjava / Makefile

diff --git a/iotjava/Makefile b/iotjava/Makefile
index 8d92c94553cbc14112e5f64bfa02cdc68b458860..8cfe1c6e76b362b82053b3fbf0ce22732b44f239 100644 (file)
--- a/iotjava/Makefile
+++ b/iotjava/Makefile
@@ -2,24 +2,24 @@ BASE := ..
 
 include $(BASE)/common.mk
 
-all: iotparsertree iotparser iotcompiler
+all: tree parser compiler
 
-PHONY += iotparsertree
-iotparsertree:
+PHONY += tree
+tree:
        $(JAVAC) -cp .:$(PARSERJARS) -d $(BIN_DIR) iotpolicy/tree/*.java
 
-PHONY += iotparser
-iotparser:
+PHONY += parser
+parser:
        $(JAVAC) -cp .:$(PARSERJARS) -d $(BIN_DIR) iotpolicy/parser/*.java
 
-PHONY += iotcompiler
-iotcompiler:
+PHONY += compiler
+compiler:
        $(JAVAC) -cp .:$(PARSERJARS) -d $(BIN_DIR) iotpolicy/*.java
        cp ../config/iotpolicy/*.pol $(BIN_DIR)/iotpolicy/
 
-PHONY += iotcompilestub
-iotcompilestub:
-       cd $(BIN_DIR)/iotpolicy; $(JAVA) -cp .:..:../$(PARSERJARS):../$(BIN_DIR) iotpolicy.IoTStubCompiler policy.pol
+PHONY += run
+run:
+       cd $(BIN_DIR)/iotpolicy; $(JAVA) -cp .:..:../$(PARSERJARS):../$(BIN_DIR) iotpolicy.IoTCompiler policy.pol requires.pol -java JavaStub -cplus CPlusStub
 
 PHONY += doc
 doc: iotruntime iotinstaller