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 832 by tim, Fri Dec 30 15:32:55 2005 UTC vs.
Revision 848 by gezelter, Wed Jan 11 23:06:08 2006 UTC

# Line 115 | Line 115 | LinkOptions = \
115   ModuleCase      = @F90_MODULE_NAMES@
116   ModSuffix       = @MOD@
117   LinkOptions = \
118 <        @F90LIBS@
118 >        @FCLIBS@
119  
120   ParallelLinkOptions = \
121 <        @F90LIBS@
121 >        @FCLIBS@
122  
123  
124   #---------------------------------------------------------------------------
# Line 351 | Line 351 | FortranCompiler        = @FC@
351   StaticArchiver         = @AR@
352   DynamicArchiver        = @CC@
353   FortranCompiler        = @FC@
354 – F90Compiler            = @F90@
354   JavaCompiler           = $(JAVA_HOME)/bin/javac
355   JavaArchiver           = $(JAVA_HOME)/bin/jar
356   JarSigner              = $(JAVA_HOME)/bin/jarsigner
# Line 377 | Line 376 | CParallelOptions       = $(FrcDeclare) $(ParallelDecla
376                           -sourcepath $(SourceDir)
377   COptions               = $(FrcDeclare) @CFLAGS@
378   CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
379 < CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
380 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
381 < FortranOptions         =
382 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
384 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
379 > CppOptions             = $(FrcDeclare) @CXXFLAGS@
380 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
381 > FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@
382 > FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclar) @FCFLAGS_SRCEXT@
383   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
384                           -sourcepath $(SourceDir) -deprecation
385   JavaRunOptions         = -classpath $(ClassPath)
# Line 517 | Line 515 | $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
515  
516   # .F90 -> .o
517   $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
518 <        $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
518 >        $(FortranCompiler) $(FortranOptions) $(IncludePath) -c $< -o $@
519          if test -n "`ls *.$(ModSuffix)`"; then \
520            $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
521          fi
522  
523   $(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile)
524 <        $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
524 >        $(FortranCompiler) $(FortranParallelOptions) $(IncludePath) -c $< -o $@
525          if test -n "`ls *.$(ModSuffix)`"; then \
526            $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
527          fi

Diff Legend

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