ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/make/Makefile
(Generate patch)

Comparing trunk/OOPSE-2.0/make/Makefile (file contents):
Revision 1521 by gezelter, Mon Oct 4 16:06:18 2004 UTC vs.
Revision 1522 by gezelter, Mon Oct 4 16:24:39 2004 UTC

# Line 73 | Line 73 | IncludeDirs = \
73  
74   IncludeDirs = \
75          /usr/local/include \
76 <        
76 >        /usr/local/mpich/include
77  
78   LibraryDirs = \
79          /usr/local/lib \
80 <        
80 >        /usr/local/mpich/lib
81  
82   Libraries = \
83          -lsprng \
84 <        
84 >        -lmpich
85  
86   LinkOptions = \
87           -L/usr/local/intel/compiler81/lib -L/usr/lib -lifport -lifcore -limf -lm -lcxa -lirc -lunwind -lirc_s
# Line 221 | Line 221 | LibList          = $(LocalLibs:%=-l%) $(Libraries)
221   IncludePath      = -I$(SourceDir) $(IncludeDirs:%=-I%)
222   LibDirs          = -L$(LibDir)    $(LibraryDirs:%=-L%)
223   LocalLibs        = $(subst /,,$(patsubst %, oopse_%, $(PackageLibs)))
224 + ParallelLocalLibs= $(subst /,,$(patsubst %, oopse_%_MPI, $(PackageLibs)))
225   LibList          = $(LocalLibs:%=-l%) $(Libraries)
226 + ParallelLibList  = $(LocalLibs:%=-l%) $(Libraries)
227  
228  
229   #---------------------------------------------------------------------------
# Line 435 | Line 437 | $(ParallelExecutable) : $(ParallelObjectFiles)
437          $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@
438  
439   $(ParallelExecutable) : $(ParallelObjectFiles)
440 <        $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ParallelObjectFiles) -o $@
440 >        $(Linker) $(LinkOptions) $(LibDirs) $(ParallelLibList) $(ParallelObjectFiles) -o $@
441  
442   # Anything else is just copied from source to target
443   $(PackageTargetDir)/% : $(PackageSourceDir)/%

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines