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

Comparing trunk/OOPSE-3.0/make/Makefile.in (file contents):
Revision 2547 by gezelter, Wed Jan 11 23:06:08 2006 UTC vs.
Revision 2752 by gezelter, Tue May 16 02:06:37 2006 UTC

# Line 52 | Line 52 | PackageLibs = \
52          selection \
53          restraints \
54          lattice \
55 +        hydrodynamics \
56          openbabel\
57          antlr\
58          mdParser
# Line 61 | Line 62 | Applications = \
62          applications/dump2Xyz \
63          applications/staticProps \
64          applications/dynamicProps \
65 <        applications/simpleBuilder\
65 >        applications/simpleBuilder \
66 >        applications/randomBuilder \
67          applications/nanoRodBuilder \
68 <        applications/atom2mdin
68 >        applications/nanoparticleBuilder \
69 >        applications/atom2mdin \
70 >        applications/hydrodynamics
71  
72 +
73   Samples = \
74 +        samples/alkane \
75          samples/argon \
76 +        samples/cutoff \
77 +        samples/dipole \
78 +        samples/gbljtest \
79 +        samples/lipid \
80 +        samples/metals/EAM \
81 +        samples/metals/EAM/nanoparticle \
82 +        samples/metals/EAM/nanorod \
83 +        samples/metals/Sutton-Chen \
84 +        samples/minimizer \
85 +        samples/shape \
86 +        samples/thermoIntegration/liquid \
87 +        samples/thermoIntegration/solid \
88          samples/water/dimer \
89          samples/water/spce \
90          samples/water/ssd \
# Line 75 | Line 93 | Samples = \
93          samples/water/ssd-ion \
94          samples/water/tip3p_ice \
95          samples/water/tip4p \
96 <        samples/lipid \
79 <        samples/alkane \
80 <        samples/minimizer \
81 <        samples/metals \
82 <        samples/metals/EAM \
83 <        samples/metals/EAM/nanoparticle \
84 <        samples/metals/EAM/nanorod \
85 <        samples/metals/Sutton-Chen \
86 <        samples/thermoIntegration/liquid \
87 <        samples/thermoIntegration/solid \
88 <        samples/dipole \
89 <        samples/shape \
90 <        samples/zcons \
96 >        samples/zcons
97  
98   IncludeDirs = \
99          @CGAL_INC_DIR@ \
# Line 115 | Line 121 | LinkOptions = \
121   ModuleCase      = @F90_MODULE_NAMES@
122   ModSuffix       = @MOD@
123   LinkOptions = \
124 <        @FCLIBS@
124 >        @LDFLAGS@ \
125 >        @FCLIBS@ \
126 >        @CXXFLAGS@
127 >        
128  
129   ParallelLinkOptions = \
130 <        @FCLIBS@
130 >        @LDFLAGS@ \
131 >        @FCLIBS@ \
132 >        @CXXFLAGS@
133  
134  
135   #---------------------------------------------------------------------------
# Line 374 | Line 385 | COptions               = $(FrcDeclare) @CFLAGS@
385   JniOptions             =
386   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
387                           -sourcepath $(SourceDir)
388 < COptions               = $(FrcDeclare) @CFLAGS@
389 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
390 < CppOptions             = $(FrcDeclare) @CXXFLAGS@
391 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
388 > COptions               = $(FrcDeclare) @CPPFLAGS@ @CFLAGS@
389 > CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CPPFLAGS@ @CFLAGS@
390 > CppOptions             = $(FrcDeclare) @CPPFLAGS@ @CXXFLAGS@
391 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CPPFLAGS@ @CXXFLAGS@
392   FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@
393 < FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclar) @FCFLAGS_SRCEXT@
393 > FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@
394   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
395                           -sourcepath $(SourceDir) -deprecation
396   JavaRunOptions         = -classpath $(ClassPath)
# Line 668 | Line 679 | $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(
679          $(Ranlib) $(CombinedParallelStaticLib)
680  
681   # Executable
682 < $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir)
682 > $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
683 >        if test ! -d $(BinDir); then \
684 >                $(MkDir) $(BinDir) ;\
685 >        fi
686          $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
687  
688 < $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) $(BinDir)
688 > $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
689 >        if test ! -d $(BinDir); then \
690 >                $(MkDir) $(BinDir) ;\
691 >        fi
692          $(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@
693  
694   # Anything else is just copied from source to target

Diff Legend

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