Adjusting C++ files to compile with gcc 4.9.3

[iot2.git] / benchmarks / Makefile

diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index 3a130ebc12be8e16e200bde6fdbd0f567d88d67b..9c23cbdceef743b7e609ab5f5ed7edafbbf4155f 100644 (file)
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -4,7 +4,19 @@ BOOFJARS := $(BOOFDIR)/BoofCV-feature-0.21.jar:$(BOOFDIR)/BoofCV-io-0.21.jar:$(B
 
 include $(BASE)/common.mk
 
-all: interfaces annotation drivers Lifxtest SmartLights Irrigation
+# Compile Java
+j-all: copy_libs interfaces annotation drivers-j Lifxtest SmartLights Irrigation Speaker HomeSecurity
+
+# Compile C++
+c-all: drivers-c Lifxtest-c
+
+PHONY += copy_libs
+copy_libs:
+       sudo cp ../jars/*.jar /usr/share/java
+       sudo cp ../jars/java-cup-bin-11b-20160615/*.jar /usr/share/java
+       sudo cp libs/boofcv_libs/*.jar /usr/share/java
+       sudo cp libs/georegression_libs/*.jar /usr/share/java
+       sudo cp libs/jlayer_libs/*.jar /usr/share/java
 
 PHONY += interfaces
 interfaces:
@@ -14,24 +26,36 @@ PHONY += annotation
 annotation:
        $(JAVAC) -d $(BIN_DIR) -classpath $(BIN_DIR):. annotation/*java
 
-PHONY += drivers
-drivers:
-       $(MAKE) -C drivers
+PHONY += drivers-j
+drivers-j:
+       $(MAKE) -C drivers/Java
+
+PHONY += drivers-c
+drivers-c:
+       $(MAKE) -C drivers/Cpp
 
 PHONY += Lifxtest
 Lifxtest:
-       $(MAKE) -C Lifxtest
+       $(MAKE) -C Java/Lifxtest
+
+PHONY += Lifxtest-c
+Lifxtest-c:
+       $(MAKE) -C Cpp/Lifxtest
 
 PHONY += SmartLights
 SmartLights:
-       $(MAKE) -C SmartLightsController
+       $(MAKE) -C Java/SmartLightsController
 
 PHONY += Irrigation
 Irrigation:
-       $(MAKE) -C IrrigationController
+       $(MAKE) -C Java/IrrigationController
 
 PHONY += Speaker
 Speaker:
-       $(MAKE) -C SpeakerController
+       $(MAKE) -C Java/SpeakerController
+
+PHONY += HomeSecurity
+HomeSecurity:
+       $(MAKE) -C Java/HomeSecurityController
 
 .PHONY: $(PHONY)