Adjusting C++ files to compile with gcc 4.9.3

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

diff --git a/iotjava/iotruntime/cpp/iotslave/Makefile b/iotjava/iotruntime/cpp/iotslave/Makefile
index 48b8955449d7c38c523b564a9a99de5e958268aa..80cecbba6f74d144a71e2471b422f8486edd3d27 100755 (executable)
--- a/iotjava/iotruntime/cpp/iotslave/Makefile
+++ b/iotjava/iotruntime/cpp/iotslave/Makefile
@@ -4,7 +4,7 @@ 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
@@ -16,6 +16,16 @@ java:
 PHONY += cpp
 cpp:
        $(G++) $(GCCFLAGS) -o IoTSlave.o IoTSlave.cpp $(INCLUDE) $(CCCLINKERFLAGS)
+       cp IoTSlave.o $(BASE)/bin/iotruntime/slave/
+
+PHONY += cpp-arm
+cpp-arm:
+       $(ARM_G++) $(GCCFLAGS) -o IoTSlave.o IoTSlave.cpp $(INCLUDE) $(CCCLINKERFLAGS)
+       cp IoTSlave.o $(BASE)/bin/iotruntime/slave/
+
+PHONY += cpp-test
+cpp-test:
+       $(G++) $(GCCFLAGS) -o SetRelationTest.o SetRelationTest.cpp $(INCLUDE) $(CCCLINKERFLAGS)
 
 PHONY += run
 run:
@@ -31,5 +41,13 @@ clean:
        rm -rf *.o
        rm -rf *.log
        rm -rf gmon.out
+       rm -rf *.zip
+       rm -rf *.jar
+       #rm -rf *.so
+       pkill IoTSlave
+
+PHONY += kill
+kill:
+       pkill IoTSlave
 
 .PHONY: $(PHONY)