More makefile parameterisation

srg-imperial · Feb 22, 2011 · cdba112 · cdba112
1 parent 0c1f38d
commit cdba112
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/benchmarks/mri-q/src/opencl/Makefile b/benchmarks/mri-q/src/opencl/Makefile
@@ -7,20 +7,20 @@ COMMON_DIR=../../../../common
 CLFAGS=
 
 all: obj/main.o obj/file.o obj/common.o obj/ocl-wrapper.o
-	g++ -lOpenCL obj/common.o obj/ocl-wrapper.o obj/file.o obj/main.o -o ../../bin/$(BENCHMARK)-$(VERSION)
+	$(CXXLD) -lOpenCL obj/common.o obj/ocl-wrapper.o obj/file.o obj/main.o -o ../../bin/$(BENCHMARK)-$(VERSION)
 	cp computeQ.cl ../../bin/
 
 obj/main.o: main.cpp
-	g++ $(CFLAGS) -I$(COMMON_DIR) -D OPENCL_PLATFORM="\"$(OPENCL_PLATFORM)\"" -D OPENCL_DEVICE_ID=$(OPENCL_DEVICE_ID) -c main.cpp -o obj/main.o
+	$(CXX) $(CFLAGS) -I$(COMMON_DIR) -D OPENCL_PLATFORM="\"$(OPENCL_PLATFORM)\"" -D OPENCL_DEVICE_ID=$(OPENCL_DEVICE_ID) -c main.cpp -o obj/main.o
 
 obj/file.o: file.cpp file.h
-	g++ $(CFLAGS) -I$(COMMON_DIR) -c file.cpp -o obj/file.o
+	$(CXX) $(CFLAGS) -I$(COMMON_DIR) -c file.cpp -o obj/file.o
 
 obj/common.o: $(COMMON_DIR)/common.cpp $(COMMON_DIR)/common.h
-	g++ $(CFLAGS) -c $(COMMON_DIR)/common.cpp -o obj/common.o
+	$(CXX) $(CFLAGS) -c $(COMMON_DIR)/common.cpp -o obj/common.o
 
 obj/ocl-wrapper.o: $(COMMON_DIR)/ocl-wrapper.cpp $(COMMON_DIR)/ocl-wrapper.h
-	g++ $(CFLAGS) -c $(COMMON_DIR)/ocl-wrapper.cpp -o obj/ocl-wrapper.o
+	$(CXX) $(CFLAGS) -c $(COMMON_DIR)/ocl-wrapper.cpp -o obj/ocl-wrapper.o
 
 clean:
 	rm -f obj/*

diff --git a/benchmarks/rpes/src/opencl/Makefile b/benchmarks/rpes/src/opencl/Makefile
@@ -5,8 +5,6 @@ BENCHMARK=rpes
 VERSION=opencl
 COMMON_DIR=../../../../common
 CLFAGS=
-CXX=g++
-CXXLD=g++
 
 all: obj/main.o obj/common.o obj/ocl-wrapper.o
 	$(CXXLD) -lOpenCL obj/common.o obj/ocl-wrapper.o obj/main.o -o ../../bin/$(BENCHMARK)-$(VERSION)

diff --git a/common/common.mk b/common/common.mk
@@ -2,3 +2,5 @@
 OPENCL_PLATFORM=NVIDIA CUDA
 OPENCL_DEVICE_ID=0
 
+CXX=g++
+CXXLD=g++