72 |
|
restraints \ |
73 |
|
|
74 |
|
IncludeDirs = \ |
75 |
< |
/usr/include \ |
76 |
< |
/usr/local/include |
75 |
> |
@SPRNG_INC_DIR@ \ |
76 |
> |
@MPI_INC_DIR@ |
77 |
|
|
78 |
|
LibraryDirs = \ |
79 |
< |
/usr/lib \ |
80 |
< |
/usr/local/mpich/lib \ |
81 |
< |
/usr/local/lib \ |
82 |
< |
/usr/local/intel/compiler81/lib \ |
79 |
> |
@SPRNG_LIB_DIR@ \ |
80 |
> |
@MPI_LIB_DIR@ |
81 |
|
|
82 |
|
Libraries = \ |
83 |
< |
mpich \ |
84 |
< |
sprng \ |
85 |
< |
ifcore \ |
83 |
> |
@SPRNG_LIB@ \ |
84 |
> |
@MPI_LIB@ |
85 |
> |
|
86 |
> |
LinkOptions = \ |
87 |
> |
@F90LIBS@ |
88 |
> |
|
89 |
> |
OopseHome = @OOPSE_HOME@ |
90 |
> |
ForceParamDir = @OOPSE_HOME@/share/forceFields/ |
91 |
> |
SampleSimDir = @OOPSE_HOME@/share/samples/ |
92 |
> |
FrcDeclare = -DFRC_PATH="$(ForceParamDir)" |
93 |
> |
ParallelDeclare = -DIS_MPI |
94 |
|
|
95 |
+ |
|
96 |
|
#--------------------------------------------------------------------------- |
97 |
|
# |
98 |
|
# Directories |
221 |
|
IncludePath = -I$(SourceDir) $(IncludeDirs:%=-I%) |
222 |
|
LibDirs = -L$(LibDir) $(LibraryDirs:%=-L%) |
223 |
|
LocalLibs = $(subst /,,$(patsubst %, oopse_%, $(PackageLibs))) |
224 |
< |
LibList = $(LocalLibs:%=-l%) $(Libraries:%=-l%) |
224 |
> |
ParallelLocalLibs= $(subst /,,$(patsubst %, oopse_%_MPI, $(PackageLibs))) |
225 |
> |
LibList = $(LocalLibs:%=-l%) $(Libraries) |
226 |
> |
ParallelLibList = $(LocalLibs:%=-l%) $(Libraries) |
227 |
|
|
228 |
|
|
229 |
|
#--------------------------------------------------------------------------- |
269 |
|
JniOptions = |
270 |
|
RmiOptions = -d $(TargetDir) -classpath $(ClassPath) \ |
271 |
|
-sourcepath $(SourceDir) |
272 |
+ |
COptions = $(FrcDeclare) |
273 |
+ |
CParallelOptions = $(FrcDeclare) $(ParallelDeclare) |
274 |
+ |
CppOptions = $(FrcDeclare) |
275 |
+ |
CppParallelOptions = $(FrcDeclare) $(ParallelDeclare) |
276 |
|
FortranOptions = |
277 |
< |
F90Options = -I$(SourceDir) -module $(TargetDir) |
277 |
> |
F90Options = @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir) |
278 |
> |
F90ParallelOptions = @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir) @PREPDEFFLAG@$(ParallelDeclare) |
279 |
|
JavaCompilerOptions = -d $(TargetDir) -classpath $(ClassPath) \ |
280 |
|
-sourcepath $(SourceDir) -deprecation |
281 |
|
JavaRunOptions = -classpath $(ClassPath) |
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)/% |