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

Comparing trunk/OOPSE-2.0/make/Makefile.in (file contents):
Revision 2531 by tim, Fri Dec 30 15:32:55 2005 UTC vs.
Revision 2550 by tim, Thu Jan 12 15:22:34 2006 UTC

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

Diff Legend

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