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

Comparing trunk/OOPSE-3.0/make/Makefile.in (file contents):
Revision 1517 by tim, Fri Oct 1 21:59:28 2004 UTC vs.
Revision 1521 by gezelter, Mon Oct 4 16:06:18 2004 UTC

# Line 72 | Line 72 | IncludeDirs = \
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
# Line 200 | Line 207 | ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))
207      Executable             = $(BinDir)/$(Main)
208      ParallelExecutable     = $(BinDir)/$(Main)_MPI
209    else
210 <    SharedLibrary          = $(LibDir)/lib$(subst /,,$(Package)).so
211 <    StaticLibrary          = $(LibDir)/lib$(subst /,,$(Package)).a
212 <    ParallelSharedLibrary  = $(LibDir)/lib$(subst /,,$(Package))_MPI.so
213 <    ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(Package))_MPI.a
210 >    SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package))).so
211 >    StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package))).a
212 >    ParallelSharedLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.so
213 >    ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.a
214    endif
215   endif
216   #
# Line 213 | Line 220 | LocalLibs        = $(subst /,,$(PackageLibs))
220   JavaPackageNames = $(subst /,.,$(JavaPackages))
221   IncludePath      = -I$(SourceDir) $(IncludeDirs:%=-I%)
222   LibDirs          = -L$(LibDir)    $(LibraryDirs:%=-L%)
223 < LocalLibs        = $(subst /,,$(PackageLibs))
224 < LibList          = $(LocalLibs:%=-l%) $(Libraries:%=-l%)
223 > LocalLibs        = $(subst /,,$(patsubst %, oopse_%, $(PackageLibs)))
224 > LibList          = $(LocalLibs:%=-l%) $(Libraries)
225  
226  
227   #---------------------------------------------------------------------------
# Line 260 | Line 267 | FortranOptions         =
267   JniOptions             =
268   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
269                           -sourcepath $(SourceDir)
270 + COptions               = $(FrcDeclare)
271 + CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
272 + CppOptions             = $(FrcDeclare)
273 + CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
274   FortranOptions         =
275 < F90Options             =  -I$(SourceDir) -module $(TargetDir)
275 > F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir)
276 > F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
277   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
278                           -sourcepath $(SourceDir) -deprecation
279   JavaRunOptions         = -classpath $(ClassPath)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines