--- trunk/uoms/src/Makefile	2010/04/08 10:41:26	3
+++ trunk/uoms/src/Makefile	2010/04/23 09:49:46	7
@@ -3,18 +3,25 @@
 
 include ./config/make.def
 
-ifeq ($(NTHREADS),0)
-	THREADS = $(THREADS_SWITCH)1
+ifndef NTHREADS
+	NT=1
 else
-	THREADS = $(THREADS_SWITCH)$(NTHREADS)
+	ifeq ($(NTHREADS),0)
+		NT=1
+	else
+		NT=$(NTHREADS)
+	endif
 endif
 
-default : usage UOMS.upc data_print.o utilities.o affinity.o mem_manager.o init.o timers.o \
+
+THREADS = $(THREADS_SWITCH)$(NT)
+
+default : usage UOMS.upc data_print_$(NT).o utilities_$(NT).o affinity_$(NT).o mem_manager_$(NT).o init_$(NT).o timers.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.o utils/*_$(NT).o
 
 usage :
 	@ echo "Type \"make help\" for usage"
@@ -23,20 +30,20 @@
 timers.o : timers/timers.c
 	$(CC) $(CFLAGS) timers/timers.c -c -o timers/timers.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: "
@@ -50,9 +57,9 @@
 	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 -Rf config/make.def