Cleaning up C++ slave.

[iot2.git] / iotjava / iotruntime / cpp / iotslave / Makefile

diff --git a/iotjava/iotruntime/cpp/iotslave/Makefile b/iotjava/iotruntime/cpp/iotslave/Makefile
index 48b8955449d7c38c523b564a9a99de5e958268aa..3391b1fe74dcf63d146a1146e036d03aecac899d 100755 (executable)
--- a/iotjava/iotruntime/cpp/iotslave/Makefile
+++ b/iotjava/iotruntime/cpp/iotslave/Makefile
@@ -4,26 +4,22 @@ include $(BASE)/common.mk
 
 #GCCFLAGS = -Wall -ansi -pedantic -g -std=c++11 -pthread -pg
 GCCFLAGS = -std=c++11 -pthread -pg
-INCLUDE =  -I$(BASE)/iotjava/iotruntime/cpp/socket/ -I$(BASE)/iotjava/iotruntime/cpp/ -I$(BASE)/iotjava/iotruntime/cpp/socket/ -I$(BASE)/iotjava/iotruntime/cpp/setrelation/ -I$(BASE)/iotjava/iotrmi/C++/ -I$(BASE)/benchmarks/virtuals/ -I$(BASE)/benchmarks/drivers/Cpp/LifxLightBulb -I$(BASE)/benchmarks/Cpp/Lifxtest/
+INCLUDE =  -I$(BASE)/iotjava/iotruntime/cpp/socket/ -I$(BASE)/iotjava/iotruntime/cpp/ -I$(BASE)/iotjava/iotruntime/cpp/socket/ -I$(BASE)/iotjava/iotruntime/cpp/setrelation/ -I$(BASE)/iotjava/iotrmi/C++/ -I$(BASE)/benchmarks/virtuals/ -I$(BASE)/benchmarks/drivers/Cpp/LifxLightBulb -I$(BASE)/benchmarks/drivers/Cpp/LabRoom -I$(BASE)/benchmarks/Cpp/Lifxtest/
 CCCLINKERFLAGS = -ldl
 
-all: java cpp
-
-PHONY += java
-java:
-       javac *.java
+all: cpp
 
 PHONY += cpp
 cpp:
        $(G++) $(GCCFLAGS) -o IoTSlave.o IoTSlave.cpp $(INCLUDE) $(CCCLINKERFLAGS)
+       cp IoTSlave.o $(BASE)/bin/iotruntime/slave/
+       rm -rf IoTSlave.o
 
-PHONY += run
-run:
-       java IoTSlave
-
-PHONY += readlog
-readlog:
-       cat *.log
+PHONY += cpp-arm
+cpp-arm:
+       $(ARM_G++) $(GCCFLAGS) -o IoTSlave.o IoTSlave.cpp $(INCLUDE) $(CCCLINKERFLAGS)
+       cp IoTSlave.o $(BASE)/bin/iotruntime/slave/
+       rm -rf IoTSlave.o
 
 PHONY += clean
 clean:
@@ -31,5 +27,11 @@ clean:
        rm -rf *.o
        rm -rf *.log
        rm -rf gmon.out
+       rm -rf *.zip
+       rm -rf *.jar
+
+PHONY += kill
+kill:
+       pkill IoTSlave
 
 .PHONY: $(PHONY)