Changed Makefile to be coherent with run script

Changed the invocation of the benchmarks through the time-and-save
script since we modified the parameter accepted by it.

Made some targets phony targets.

Makefile

@@ -1,5 +1,6 @@
 include common/make.config
 
+.PHONY: OPENCL_BENCHMARK_ALL OPENCL_BENCHMAR_CPU_AND_GPU OPENCL_BENCHMARK_CPU OPENCL_BENCHMARK_GPU OPENCL_BENCHMARK_GPU_PRIMARY OPENCL_BENCHMARK_GPU_SECONDARY
 RODINIA_BASE_DIR := $(shell pwd)
 
 OPENCL_BIN_DIR := $(RODINIA_BASE_DIR)/bin/linux/opencl
@@ -31,17 +32,19 @@ OPENCL:
 
 OPENCL_BENCHMARK_ALL: OPENCL_BENCHMARK_CPU OPENCL_BENCHMARK_GPU_PRIMARY OPENCL_BENCHMARK_GPU_SECONDARY
 
+OPENCL_BENCHMAR_CPU_AND_GPU: OPENCL_BENCHMARK_CPU OPENCL_BENCHMARK_GPU
+
 OPENCL_BENCHMARK_CPU:
-	for dir in $(BENCH_DIRS) ; do ./time-and-save.sh opencl/$$dir times.dat cpu ; done
+	for dir in $(BENCH_DIRS) ; do ./time-and-save.sh opencl/$$dir cpu ; done
 
 OPENCL_BENCHMARK_GPU:
-	for dir in $(BENCH_DIRS) ; do ./time-and-save.sh opencl/$$dir times.dat gpu ; done
+	for dir in $(BENCH_DIRS) ; do ./time-and-save.sh opencl/$$dir gpu ; done
 
 OPENCL_BENCHMARK_GPU_PRIMARY:
-	for dir in $(BENCH_DIRS) ; do ./time-and-save.sh opencl/$$dir times.dat gpu-primary ; done
+	for dir in $(BENCH_DIRS) ; do ./time-and-save.sh opencl/$$dir gpu-primary ; done
 
 OPENCL_BENCHMARK_GPU_SECONDARY:
-	for dir in $(BENCH_DIRS) ; do ./time-and-save.sh opencl/$$dir times.dat gpu-secondary ; done
+	for dir in $(BENCH_DIRS) ; do ./time-and-save.sh opencl/$$dir gpu-secondary ; done
 
 clean: OCL_clean OPENCL_BENCHMARK_clean