Tweaking of Makefile (for inclusion of vips, fluidanimate and dedup benchmarks)

Makefile

@@ -2,6 +2,16 @@ PARSECMGMT=benchmarks/parsec/bin/parsecmgmt
 PARSEC_INPUTS_URL=http://parsec.cs.princeton.edu/download/3.0/parsec-3.0-input-native.tar.gz
 PARSEC_INPUTS_ARCHIVE=tmp/parsec-inputs.tar.gz
 PARSEC_INPUTS=tmp/parsec-inputs
+PARSEC_PROGRAMS=\
+	parsec.bodytrack \
+	parsec.streamcluster \
+	splash2x.volrend \
+	splash2x.lu_cb \
+	splash2x.lu_ncb \
+	splash2x.barnes \
+	parsec.vips \
+	parsec.fluidanimate \
+	parsec.dedup
 
 WORD_COUNT_INPUTS_URL=http://csl.stanford.edu/~christos/data/word_count.tar.gz
 WORD_COUNT_INPUTS_ARCHIVE=tmp/word_count_input.tar.gz
@@ -24,39 +34,13 @@ submodules:
 	make -Cbenchmarks/phoenix/phoenix-2.0
 	make -C. build-parsec
 
-wastedcores: submodules
-	cd tools/wastedcores/tools/visualizations_4.1/sched_profiler; make
-
+BUILD_PARSEC_TARGETS=$(patsubst %,build-%,$(PARSEC_PROGRAMS))
 .PHONY: build-parsec
-build-parsec: build-bodytrack build-streamcluster build-volrend build-lu_cb build-lu_ncb build-barnes #build-vips
-
-.PHONY: build-bodytrack
-build-bodytrack:
-	$(PARSECMGMT) -a build -p parsec.bodytrack -c gcc-pthreads
-
-.PHONY: build-streamcluster
-build-streamcluster:
-	$(PARSECMGMT) -a build -p parsec.streamcluster -c gcc-pthreads
-
-.PHONY: build-volrend
-build-volrend:
-	$(PARSECMGMT) -a build -p splash2x.volrend -c gcc-pthreads
-
-.PHONY: build-lu_cb
-build-lu_cb:
-	$(PARSECMGMT) -a build -p splash2x.lu_cb -c gcc-pthreads
-
-.PHONY: build-lu_ncb
-build-lu_ncb:
-	$(PARSECMGMT) -a build -p splash2x.lu_ncb -c gcc-pthreads
+build-parsec: $(BUILD_PARSEC_TARGETS)
 
-.PHONY: build-vips
-build-vips:
-	$(PARSECMGMT) -a build -p parsec.vips -c gcc-pthreads
-
-.PHONY: build-barnes
-build-parsec:
-	$(PARSECMGMT) -a build -p splash2x.barnes -c gcc-pthreads
+.PHONY: $(BUILD_PARSEC_TARGETS)
+$(BUILD_PARSEC_TARGETS): build-%:
+	$(PARSECMGMT) -a build -p $* -c gcc-pthreads
 
 $(PARSEC_INPUTS_ARCHIVE):
 	mkdir -p tmp/
@@ -83,32 +67,13 @@ $(LIN_REG_INPUTS_ARCHIVE):
 	@echo "### Downloading input for word_count (can take a while)"
 	wget $(LIN_REG_INPUTS_URL) -O $(LIN_REG_INPUTS_ARCHIVE)
 
+CLEAN_PARSEC_TARGETS=$(patsubst %,clean-%,$(PARSEC_PROGRAMS))
 .PHONY: clean-parsec
-clean-parsec: clean-bodytrack clean-streamcluster clean-volrend clean-lu_cb clean-lu_ncb #clean-vips
-
-.PHONY: clean-bodytrack
-clean-bodytrack:
-	$(PARSECMGMT) -a uninstall -p parsec.bodytrack -c gcc-pthreads
-
-.PHONY: clean-streamcluster
-clean-streamcluster:
-	$(PARSECMGMT) -a uninstall -p parsec.streamcluster -c gcc-pthreads
-
-.PHONY: clean-volrend
-clean-volrend:
-	$(PARSECMGMT) -a uninstall -p splash2x.volrend -c gcc-pthreads
-
-.PHONY: clean-lu_cb
-clean-lu_cb:
-	$(PARSECMGMT) -a uninstall -p splash2x.lu_cb -c gcc-pthreads
-
-.PHONY: clean-lu_ncb
-clean-lu_ncb:
-	$(PARSECMGMT) -a uninstall -p splash2x.lu_ncb -c gcc-pthreads
+clean-parsec: $(CLEAN_PARSEC_TARGETS)
 
-.PHONY: clean-vips
-clean-vips:
-	$(PARSECMGMT) -a uninstall -p parsec.vips -c gcc-pthreads
+.PHONY: $(CLEAN_PARSEC_TARGETS)
+$(CLEAN_PARSEC_TARGETS): clean-%:
+	$(PARSECMGMT) -a uninstall -p $* -c gcc-pthreads
 
 .PHONY: clean
 clean: