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 2580 by gezelter, Thu Feb 2 02:57:01 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 \
# Line 116 | Line 121 | LinkOptions = \
121   ModuleCase      = @F90_MODULE_NAMES@
122   ModSuffix       = @MOD@
123   LinkOptions = \
124 +        @LDFLAGS@ \
125          @FCLIBS@ \
126 <        @CXXFLAGS@
126 >        @CXXFLAGS@
127 >        
128  
129   ParallelLinkOptions = \
130 +        @LDFLAGS@ \
131          @FCLIBS@ \
132          @CXXFLAGS@
133  
# Line 377 | 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)

Diff Legend

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