Cleaning up C++ slave.

[iot2.git] / iotjava / Makefile

diff --git a/iotjava/Makefile b/iotjava/Makefile
index 81b323c0df9b5065dfacb67e78751482c1e1024e..6ca70c7524f282387e106e2cebe42777a2b44ea2 100644 (file)
--- a/iotjava/Makefile
+++ b/iotjava/Makefile
@@ -1,8 +1,9 @@
+
 BASE := ..
 
 include $(BASE)/common.mk
 
-all: mkdir tree parser compiler rmi runtime installer
+all: mkdir tree parser compiler rmi runtime runtime-cpp installer
 
 infra: runtime installer
 
@@ -10,6 +11,11 @@ PHONY += mkdir
 mkdir:
        [ -d ../bin ] || mkdir ../bin
 
+# C++ slave
+PHONY += runtime-cpp
+runtime-cpp:
+       cd iotruntime/cpp/iotslave; make cpp
+
 # Parser compilation and run
 PHONY += tree
 tree:
@@ -237,9 +243,10 @@ runtime:
        $(JAVAC) -classpath .:$(RUNTIMEJARS):$(PHONEJARS):$(ZIPJARS) iotruntime/*.java iotruntime/master/*.java iotruntime/slave/*.java iotruntime/messages/*.java iotruntime/stub/*.java iotruntime/zigbee/*.java -d $(BIN_DIR)
        cp ../localconfig/iotruntime/IoTMaster.config $(BIN_DIR)/iotruntime/
        cp ../localconfig/iotruntime/IoTSlave.config $(BIN_DIR)/iotruntime/
-       #cp ../others/sslkey/*.jks $(BIN_DIR)/iotruntime/
+       cp ../localconfig/iotruntime/*.bash $(BIN_DIR)/iotruntime/
        cp -r ../localconfig/mysql $(BIN_DIR)/iotruntime/
        cp -r ../localconfig/tomoyo $(BIN_DIR)/iotruntime/
+       [ -d $(BIN_DIR)/iotruntime/log ] || mkdir $(BIN_DIR)/iotruntime/log
 
 PHONY += doc
 doc: runtime installer rmi compiler