ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/make/Makefile.in
(Generate patch)

Comparing trunk/make/Makefile.in (file contents):
Revision 958 by gezelter, Wed May 17 03:03:03 2006 UTC vs.
Revision 962 by gezelter, Wed May 17 19:54:27 2006 UTC

# Line 122 | Line 122 | F90Declare      = -D__FORTRAN90
122   DocDir          = $(OopseHome)/doc
123   FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
124   F90Declare      = -D__FORTRAN90
125 + UseSingle       = @USE_SINGLE_PRECISION@
126 + ifeq "$(UseSingle)" "yes"
127 + SingleDeclare   = -DSINGLE_PRECISION
128 + else
129 + SingleDeclare   =
130 + endif
131   ParallelDeclare = -DIS_MPI
132 + SinglePrecision = -DSINGLE_PRECISION
133   UseMPI          = @USE_MPI@
134   ModuleCase      = @F90_MODULE_NAMES@
135   ModSuffix       = @MOD@
# Line 391 | Line 398 | RmiOptions             = -d $(TargetDir) -classpath $(
398   JniOptions             =
399   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
400                           -sourcepath $(SourceDir)
401 < COptions               = $(FrcDeclare) @CPPFLAGS@ @CFLAGS@
402 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CPPFLAGS@ @CFLAGS@
403 < CppOptions             = $(FrcDeclare) @CPPFLAGS@ @CXXFLAGS@
404 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CPPFLAGS@ @CXXFLAGS@
401 > COptions               = $(FrcDeclare) $(SingleDeclare) @CPPFLAGS@ @CFLAGS@
402 > CParallelOptions       = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CPPFLAGS@ @CFLAGS@
403 > CppOptions             = $(FrcDeclare) $(SingleDeclare) @CPPFLAGS@ @CXXFLAGS@
404 > CppParallelOptions     = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CPPFLAGS@ @CXXFLAGS@
405 > ifeq "$(UseSingle)" "yes"
406 > FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @PREPDEFFLAG@$(SingleDeclare) @FCFLAGS_SRCEXT@
407 > FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(SingleDeclare) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@
408 > else
409   FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@
410   FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@
411 + endif
412   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
413                           -sourcepath $(SourceDir) -deprecation
414   JavaRunOptions         = -classpath $(ClassPath)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines