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 2736 by chuckv, Tue Apr 25 22:30:26 2006 UTC vs.
Revision 2753 by gezelter, Tue May 16 20:38:23 2006 UTC

# Line 52 | Line 52 | PackageLibs = \
52          selection \
53          restraints \
54          lattice \
55 +        hydrodynamics \
56          openbabel\
57          antlr\
58          mdParser
# Line 95 | Line 96 | IncludeDirs = \
96          samples/zcons
97  
98   IncludeDirs = \
99 +        @FFTW_INC_DIR@ \
100          @CGAL_INC_DIR@ \
101          @MPI_INC_DIR@
102  
103   LibraryDirs = \
104 +        @FFTW_LIB_DIR@ \
105          @CGAL_LIB_DIR@ \
106          @MPI_LIB_DIR@
107  
108   Libraries = \
109          @LIBS@ \
110 +        @FFTW_LIBS@ \
111          @CGAL_LIBS@ \
112          @MPI_LIB@ \
113          @MPI_F90_LIB@
# Line 120 | Line 124 | LinkOptions = \
124   ModuleCase      = @F90_MODULE_NAMES@
125   ModSuffix       = @MOD@
126   LinkOptions = \
127 +        @LDFLAGS@ \
128          @FCLIBS@ \
129 <        @CXXFLAGS@
129 >        @CXXFLAGS@
130 >        
131  
132   ParallelLinkOptions = \
133 +        @LDFLAGS@ \
134          @FCLIBS@ \
135          @CXXFLAGS@
136  
# Line 381 | Line 388 | COptions               = $(FrcDeclare) @CFLAGS@
388   JniOptions             =
389   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
390                           -sourcepath $(SourceDir)
391 < COptions               = $(FrcDeclare) @CFLAGS@
392 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
393 < CppOptions             = $(FrcDeclare) @CXXFLAGS@
394 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
391 > COptions               = $(FrcDeclare) @CPPFLAGS@ @CFLAGS@
392 > CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CPPFLAGS@ @CFLAGS@
393 > CppOptions             = $(FrcDeclare) @CPPFLAGS@ @CXXFLAGS@
394 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CPPFLAGS@ @CXXFLAGS@
395   FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@
396   FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@
397   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \

Diff Legend

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