ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/make/Makefile.in
(Generate patch)

Comparing trunk/make/Makefile.in (file contents):
Revision 962 by gezelter, Wed May 17 19:54:27 2006 UTC vs.
Revision 964 by tim, Fri May 19 15:11:27 2006 UTC

# Line 96 | Line 96 | IncludeDirs = \
96          samples/zcons
97  
98   IncludeDirs = \
99 <        @ZLIB_INC_DIR@ \
99 >        @MPI_INC_DIR@ \
100          @FFTW_INC_DIR@ \
101          @CGAL_INC_DIR@ \
102 <        @MPI_INC_DIR@
102 >        @ZLIB_INC_DIR@
103  
104   LibraryDirs = \
105 <        @ZLIB_LIB_DIR@ \
105 >        @MPI_LIB_DIR@ \
106          @FFTW_LIB_DIR@ \
107          @CGAL_LIB_DIR@ \
108 <        @MPI_LIB_DIR@
108 >        @ZLIB_LIB_DIR@
109  
110   Libraries = \
111          @LIBS@ \
112 <        @ZLIB@ \
112 >        @MPI_LIB@ \
113 >        @MPI_F90_LIB@ \
114          @FFTW_LIBS@ \
115          @CGAL_LIBS@ \
116 <        @MPI_LIB@ \
116 <        @MPI_F90_LIB@
116 >        @ZLIB@
117  
118   OopseHome       = @OOPSE_HOME@
119   ForceParamDir   = $(OopseHome)/share/forceFields
# Line 398 | Line 398 | RmiOptions             = -d $(TargetDir) -classpath $(
398   JniOptions             =
399   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
400                           -sourcepath $(SourceDir)
401 < COptions               = $(FrcDeclare) $(SingleDeclare) @CPPFLAGS@ @CFLAGS@
402 < CParallelOptions       = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CPPFLAGS@ @CFLAGS@
403 < CppOptions             = $(FrcDeclare) $(SingleDeclare) @CPPFLAGS@ @CXXFLAGS@
404 < CppParallelOptions     = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CPPFLAGS@ @CXXFLAGS@
401 > COptions               = $(FrcDeclare) $(SingleDeclare) @CFLAGS@
402 > CParallelOptions       = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CFLAGS@
403 > CppOptions             = $(FrcDeclare) $(SingleDeclare) @CXXFLAGS@
404 > CppParallelOptions     = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CXXFLAGS@
405   ifeq "$(UseSingle)" "yes"
406   FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @PREPDEFFLAG@$(SingleDeclare) @FCFLAGS_SRCEXT@
407   FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(SingleDeclare) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines