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 1405 by gezelter, Tue Jan 19 22:33:57 2010 UTC vs.
Revision 1461 by gezelter, Wed Jul 7 15:54:25 2010 UTC

# Line 127 | Line 127 | InstallDocDir   = $(OpenMDHome)/doc
127   SampleSimDir    = $(OpenMDHome)/samples
128   InstallBinDir   = $(OpenMDHome)/bin
129   InstallDocDir   = $(OpenMDHome)/doc
130 + SvnDeclare     :=-DSVN_REV="$(shell svnversion -n . | sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/" | grep "[0-9]")"
131   FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
132   F90Declare      = -D__FORTRAN90
133   UseSingle       = @USE_SINGLE_PRECISION@
# Line 405 | Line 406 | RmiOptions             = -d $(TargetDir) -classpath $(
406   JniOptions             =
407   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
408                           -sourcepath $(SourceDir)
409 < COptions               = $(FrcDeclare) $(SingleDeclare) @CFLAGS@
410 < CParallelOptions       = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CFLAGS@
411 < CppOptions             = $(FrcDeclare) $(SingleDeclare) @CXXFLAGS@
412 < CppParallelOptions     = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CXXFLAGS@
409 > COptions               = $(SvnDeclare) $(FrcDeclare) $(SingleDeclare) @CFLAGS@
410 > CParallelOptions       = $(SvnDeclare) $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CFLAGS@
411 > CppOptions             = $(SvnDeclare) $(FrcDeclare) $(SingleDeclare) @CXXFLAGS@
412 > CppParallelOptions     = $(SvnDeclare) $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CXXFLAGS@
413   ifeq "$(UseSingle)" "yes"
414   FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @PREPDEFFLAG@$(SingleDeclare) @FCFLAGS_SRCEXT@
415   FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(SingleDeclare) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines