diff Makefile @ 5:535c119ba090

rearranged code to fit project patterns
author Me@portablequad
date Fri, 28 Oct 2011 06:56:35 -0700
parents 3840d91821c4
children
line diff
     1.1 --- a/Makefile	Sat Oct 22 19:27:29 2011 -0700
     1.2 +++ b/Makefile	Fri Oct 28 06:56:35 2011 -0700
     1.3 @@ -1,31 +1,33 @@
     1.4  obj = 	\
     1.5 -	VPThread_lib/VMS/Histogram/Histogram.o \
     1.6 -	VPThread_lib/VMS/Histogram/FloatHist.o \
     1.7 -	VPThread_lib/VMS/CoreLoop.o \
     1.8 -	VPThread_lib/VMS/VMS.o \
     1.9 -	VPThread_lib/VMS/MasterLoop.o \
    1.10 -	VPThread_lib/VMS/Queue_impl/PrivateQueue.o \
    1.11 -	VPThread_lib/VMS/Hash_impl/PrivateHash.o \
    1.12 -	VPThread_lib/VMS/DynArray/DynArray.o \
    1.13 -	VPThread_lib/VPThread_PluginFns.o \
    1.14 -	VPThread_lib/VPThread_lib.o \
    1.15 -	VPThread_lib/VMS/Histogram/DblHist.o \
    1.16 -	VPThread_lib/VPThread.o \
    1.17 -	VPThread_lib/VMS/probes.o \
    1.18 -	VPThread_lib/VMS/ProcrContext.o \
    1.19 -	VPThread_lib/VPThread_Request_Handlers.o \
    1.20 -	VPThread_lib/VPThread_helper.o \
    1.21 -	VPThread_lib/VMS/Hash_impl/MurmurHash2.o \
    1.22 -	VPThread_lib/VMS/vmalloc.o \
    1.23 -	VPThread_lib/VMS/contextSwitch.o \
    1.24 -	VPThread_lib/VMS/Queue_impl/BlockingQueue.o \
    1.25 -	VPThread_lib/VMS/vutilities.o \
    1.26 -	c-ray-mt.o
    1.27 +	src/VPThread_lib/VMS/Histogram/Histogram.o \
    1.28 +	src/VPThread_lib/VMS/Histogram/FloatHist.o \
    1.29 +	src/VPThread_lib/VMS/CoreLoop.o \
    1.30 +	src/VPThread_lib/VMS/VMS.o \
    1.31 +	src/VPThread_lib/VMS/MasterLoop.o \
    1.32 +	src/VPThread_lib/VMS/Queue_impl/PrivateQueue.o \
    1.33 +	src/VPThread_lib/VMS/Hash_impl/PrivateHash.o \
    1.34 +	src/VPThread_lib/VMS/DynArray/DynArray.o \
    1.35 +	src/VPThread_lib/VPThread_PluginFns.o \
    1.36 +	src/VPThread_lib/VPThread_lib.o \
    1.37 +	src/VPThread_lib/VMS/Histogram/DblHist.o \
    1.38 +	src/VPThread_lib/VPThread.o \
    1.39 +	src/VPThread_lib/VMS/probes.o \
    1.40 +	src/VPThread_lib/VMS/ProcrContext.o \
    1.41 +	src/VPThread_lib/VPThread_Request_Handlers.o \
    1.42 +	src/VPThread_lib/VPThread_helper.o \
    1.43 +	src/VPThread_lib/VMS/Hash_impl/MurmurHash2.o \
    1.44 +	src/VPThread_lib/VMS/vmalloc.o \
    1.45 +	src/VPThread_lib/VMS/contextSwitch.o \
    1.46 +	src/VPThread_lib/VMS/Queue_impl/BlockingQueue.o \
    1.47 +	src/VPThread_lib/VMS/vutilities.o \
    1.48 +	src/Application/main.o
    1.49  
    1.50 -bin = c-ray-mt
    1.51 +bin = task_size_vs_exe_time
    1.52 +
    1.53 +NUM_CORES=4
    1.54  
    1.55  CC = gcc
    1.56 -CFLAGS = -m64 -ffast-math -fwrapv -fno-omit-frame-pointer -O3 -D VPTHREAD -D APPLICATION=C-RAY -g -Wall
    1.57 +CFLAGS = -m64 -ffast-math -fwrapv -fno-omit-frame-pointer -O3 -D VPTHREAD -D APPLICATION=C-RAY -D NUM_CORES=$(NUM_CORES) -g -Wall
    1.58  
    1.59  $(bin): $(obj)
    1.60  	$(CC) -o $@ $(obj) -lm -lpthread