--- trunk/uoms/src/Makefile	2010/04/05 17:12:14	1
+++ trunk/uoms/src/Makefile	2010/11/30 13:05:36	15
@@ -1,58 +1,73 @@
 # Makefile for the UPC Operations Microbenchmarking Suite 
-# 2009
+# 2010
 
 include ./config/make.def
 
-ifeq ($(NTHREADS),0)
-	THREADS = $(THREADS_SWITCH)1
+ifndef NTHREADS
+	THREADS = 
+	NTHREADS = dyn
+	NT = _dyn
 else
-	THREADS = $(THREADS_SWITCH)$(NTHREADS)
+	ifeq ($(NTHREADS),0)
+		_NT=1
+	else
+		_NT=$(NTHREADS)
+	endif
+	THREADS = $(THREADS_SWITCH)$(_NT)
+	NT=_$(_NT)
 endif
 
-default : usage UOMS.upc data_print.o utilities.o affinity.o mem_manager.o init.o timers.o \
+
+default : usage UOMS.upc data_print$(NT).o utilities$(NT).o affinity$(NT).o mem_manager$(NT).o init$(NT).o timers$(NT).o \
 	timers/timers.h
 	mkdir -p ../bin
-	$(UPCC) $(UPCFLAGS) $(THREADS) UOMS.upc -c -I./timers -o UOMS.o
-	$(UPCLINK) $(UPCFLAGS) $(THREADS) -o ../bin/UOMS.$(NTHREADS) *.o \
-	timers/timers.o utils/*.o
+	$(UPCC) $(UPCFLAGS) $(THREADS) UOMS.upc -c -I./timers -o UOMS$(NT).o
+	$(UPCLINK) $(UPCLINKFLAGS) $(THREADS) -o ../bin/UOMS.$(NTHREADS) *$(NT).o \
+	timers/timers$(NT).o utils/*$(NT).o
 
 usage :
 	@ echo "Type \"make help\" for usage"
 	@ echo " "
 
-timers.o : timers/timers.c
-	$(CC) $(CFLAGS) timers/timers.c -c -o timers/timers.o
+timers$(NT).o : timers/timers.c
+	$(CC) $(CFLAGS) timers/timers.c -c -o timers/timers$(NT).o
 
-affinity.o : affinity.upc
-	$(UPCC) $(UPCFLAGS) $(THREADS) affinity.upc -c -o affinity.o
+affinity$(NT).o : affinity.upc
+	$(UPCC) $(UPCFLAGS) $(THREADS) affinity.upc -c -o affinity$(NT).o
 
-mem_manager.o : mem_manager.upc
-	$(UPCC) $(UPCFLAGS) $(THREADS) mem_manager.upc -c -o mem_manager.o
+mem_manager$(NT).o : mem_manager.upc
+	$(UPCC) $(UPCFLAGS) $(THREADS) mem_manager.upc -c -o mem_manager$(NT).o
 
-init.o : init.upc
-	$(UPCC) $(UPCFLAGS) $(THREADS) init.upc -c -o init.o
+init$(NT).o : init.upc
+	$(UPCC) $(UPCFLAGS) $(THREADS) init.upc -c -o init$(NT).o
 
-data_print.o : utils/data_print.upc
-	$(UPCC) $(UPCFLAGS) $(THREADS) -I./ utils/data_print.upc -c -o utils/data_print.o
+data_print$(NT).o : utils/data_print.upc
+	$(UPCC) $(UPCFLAGS) $(THREADS) -I./ utils/data_print.upc -c -o utils/data_print$(NT).o
 
-utilities.o : utils/utilities.upc
-	$(UPCC) $(UPCFLAGS) $(THREADS) utils/utilities.upc -c -o utils/utilities.o
+utilities$(NT).o : utils/utilities.upc
+	$(UPCC) $(UPCFLAGS) $(THREADS) utils/utilities.upc -c -o utils/utilities$(NT).o
 
 help :
-	@ echo "Usage: "
+	@ echo ""
+	@ echo "Usage"
+	@ echo "-----"
+	@ echo "For a static thread setup type:"
 	@ echo "make NTHREADS=NUMBER_OF_UPC_THREADS"
 	@ echo " "
 	@ echo "E.g., for 128 threads:"
 	@ echo "make NTHREADS=128"
 	@ echo " "
+	@ echo "For a dynamic thread setup just type:"
+	@ echo "make "
+	@ echo ""
 
 clean	:
 	rm -f *.o
 	rm -f timers/*.o
 	rm -f utils/*.o
+	rm -Rf *pthread-link
 
 mrproper : clean
-	rm -Rf *pthread-link*
 	find ../ -name '*~' | xargs rm -Rf
 	rm -Rf ../bin/*
-	rm -f config/make.def
+	rm -Rf config/make.def