Adjustments and clean-ups for Makefile for C++ benchmark and drivers

[iot2.git] / benchmarks / Makefile

diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index 2a886b10633b67b630168e4797a417ead81a3f34..9c23cbdceef743b7e609ab5f5ed7edafbbf4155f 100644 (file)
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -4,7 +4,11 @@ BOOFJARS := $(BOOFDIR)/BoofCV-feature-0.21.jar:$(BOOFDIR)/BoofCV-io-0.21.jar:$(B
 
 include $(BASE)/common.mk
 
 
 include $(BASE)/common.mk
 

-all: copy_libs interfaces annotation drivers Lifxtest SmartLights Irrigation Speaker HomeSecurity
+# 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:
 
 PHONY += copy_libs
 copy_libs:


@@ -22,15 +26,21 @@ PHONY += annotation
 annotation:
        $(JAVAC) -d $(BIN_DIR) -classpath $(BIN_DIR):. annotation/*java
 
 annotation:
        $(JAVAC) -d $(BIN_DIR) -classpath $(BIN_DIR):. annotation/*java
 

-PHONY += drivers
-drivers:
+PHONY += drivers-j
+drivers-j:

        $(MAKE) -C drivers/Java
        $(MAKE) -C drivers/Java

-       #$(MAKE) -C drivers/Cpp
+
+PHONY += drivers-c
+drivers-c:
+       $(MAKE) -C drivers/Cpp

 
 PHONY += Lifxtest
 Lifxtest:
        $(MAKE) -C Java/Lifxtest
 
 PHONY += Lifxtest
 Lifxtest:
        $(MAKE) -C Java/Lifxtest

-       #$(MAKE) -C Cpp/Lifxtest
+
+PHONY += Lifxtest-c
+Lifxtest-c:
+       $(MAKE) -C Cpp/Lifxtest

 
 PHONY += SmartLights
 SmartLights:
 
 PHONY += SmartLights
 SmartLights: