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 1518 by tim, Sat Oct 2 04:22:07 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 >        /usr/local/include \
76 >        
77  
78   LibraryDirs = \
79 –        /usr/lib \
80 –        /usr/local/mpich/lib \
79          /usr/local/lib \
80 <        /usr/local/intel/compiler81/lib \
80 >        
81  
82   Libraries = \
83 <        mpich \
84 <        sprng \
85 <        ifcore \
83 >        -lsprng \
84 >        
85 >
86 > LinkOptions = \
87 >         -L/usr/local/intel/compiler81/lib -L/usr/lib -lifport -lifcore -limf -lm -lcxa -lirc -lunwind -lirc_s
88 >
89 > OopseHome       = /usr/local/oopse
90 > ForceParamDir   = /usr/local/oopse/share/forceFields/
91 > SampleSimDir    = /usr/local/oopse/share/samples/
92 > FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
93 > ParallelDeclare = -DIS_MPI
94  
95 +
96   #---------------------------------------------------------------------------
97   #
98   #  Directories
# Line 214 | Line 221 | LibList          = $(LocalLibs:%=-l%) $(Libraries:%=-l
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 > LibList          = $(LocalLibs:%=-l%) $(Libraries)
225  
226  
227   #---------------------------------------------------------------------------
# Line 232 | Line 239 | MakeDir                = /home/maul/gezelter/tim/code/
239   Install                = /usr/bin/install -c
240   InstallProgram         = ${INSTALL}
241   InstallData            = ${INSTALL} -m 644
242 < MakeDir                = /home/maul/gezelter/tim/code/OOPSE-2.0/ac-tools/shtool mkdir -p -f
242 > MakeDir                = /home/maul/gezelter/gezelter/OOPSE-2.0/ac-tools/shtool mkdir -p -f
243   Delete                 = rm -fr
244   StaticArchiver         = ar
245   DynamicArchiver        = icc
# 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             =  -fpp1  -O -I$(SourceDir) -module $(TargetDir)
276 > F90ParallelOptions     =  -fpp1  -O -I$(SourceDir) -module $(TargetDir)   $(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