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 2474 by gezelter, Fri Dec 2 20:10:30 2005 UTC vs.
Revision 2555 by gezelter, Thu Jan 12 20:01:48 2006 UTC

# Line 66 | Line 66 | Samples = \
66          applications/atom2mdin
67  
68   Samples = \
69 +        samples/alkane \
70          samples/argon \
71 +        samples/cutoff \
72 +        samples/dipole \
73 +        samples/gbljtest \
74 +        samples/lipid \
75 +        samples/metals/EAM \
76 +        samples/metals/EAM/nanoparticle \
77 +        samples/metals/EAM/nanorod \
78 +        samples/metals/Sutton-Chen \
79 +        samples/minimizer \
80 +        samples/shape \
81 +        samples/thermoIntegration/liquid \
82 +        samples/thermoIntegration/solid \
83          samples/water/dimer \
84          samples/water/spce \
85          samples/water/ssd \
# Line 75 | Line 88 | Samples = \
88          samples/water/ssd-ion \
89          samples/water/tip3p_ice \
90          samples/water/tip4p \
91 <        samples/lipid \
79 <        samples/alkane \
80 <        samples/minimizer \
81 <        samples/metals \
82 <        samples/thermoIntegration/liquid \
83 <        samples/thermoIntegration/solid \
84 <        samples/dipole \
85 <        samples/shape \
86 <        samples/zcons \
91 >        samples/zcons
92  
93   IncludeDirs = \
94          @CGAL_INC_DIR@ \
# Line 111 | Line 116 | LinkOptions = \
116   ModuleCase      = @F90_MODULE_NAMES@
117   ModSuffix       = @MOD@
118   LinkOptions = \
119 <        @F90LIBS@
119 >        @FCLIBS@
120  
121   ParallelLinkOptions = \
122 <        @F90LIBS@
122 >        @FCLIBS@
123  
124  
125   #---------------------------------------------------------------------------
# Line 347 | Line 352 | F90Compiler            = @F90@
352   StaticArchiver         = @AR@
353   DynamicArchiver        = @CC@
354   FortranCompiler        = @FC@
350 – F90Compiler            = @F90@
355   JavaCompiler           = $(JAVA_HOME)/bin/javac
356   JavaArchiver           = $(JAVA_HOME)/bin/jar
357   JarSigner              = $(JAVA_HOME)/bin/jarsigner
# Line 373 | Line 377 | CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOP
377                           -sourcepath $(SourceDir)
378   COptions               = $(FrcDeclare) @CFLAGS@
379   CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
380 < CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
381 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
382 < FortranOptions         =
383 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
380 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
380 > CppOptions             = $(FrcDeclare) @CXXFLAGS@
381 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
382 > FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@
383 > FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclar) @FCFLAGS_SRCEXT@
384   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
385                           -sourcepath $(SourceDir) -deprecation
386   JavaRunOptions         = -classpath $(ClassPath)
# Line 513 | Line 516 | $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
516  
517   # .F90 -> .o
518   $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
519 <        $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
519 >        $(FortranCompiler) $(FortranOptions) $(IncludePath) -c $< -o $@
520          if test -n "`ls *.$(ModSuffix)`"; then \
521            $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
522          fi
523  
524   $(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile)
525 <        $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
525 >        $(FortranCompiler) $(FortranParallelOptions) $(IncludePath) -c $< -o $@
526          if test -n "`ls *.$(ModSuffix)`"; then \
527            $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
528          fi
# Line 653 | Line 656 | all_lib_parallel_objs = $(patsubst %,$(TargetDir)/%,$(
656   all_objs = $(foreach thisLib,$(LibNames), $(call find_objs, $(thisLib)))
657   all_parallel_objs = $(foreach thisLib,$(ParallelLibNames), $(call find_objs, $(thisLib)))
658   all_lib_objs = $(patsubst %,$(TargetDir)/%,$(call all_objs))
659 < all_lib_parallel_objs = $(patsubst %,$(TargetDir)/%,$(call all_parallel_objs))
659 > all_lib_parallel_objs = $(patsubst %,$(ParallelTargetDir)/%,$(call all_parallel_objs))
660  
661   $(CombinedStaticLib) : $(LibDir)/.stamp_UP
662          $(Print) creating $@            
# Line 667 | Line 670 | $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(
670  
671   # Executable
672   $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir)
673 +        @echo $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir)
674          $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
675  
676   $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) $(BinDir)

Diff Legend

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