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 2752 by gezelter, Tue May 16 02:06:37 2006 UTC vs.
Revision 2960 by gezelter, Wed Jul 26 21:00:44 2006 UTC

# Line 67 | Line 67 | Applications = \
67          applications/nanoRodBuilder \
68          applications/nanoparticleBuilder \
69          applications/atom2mdin \
70 <        applications/hydrodynamics
70 >        applications/hydrodynamics \
71 >        applications/utilities
72  
73  
74   Samples = \
# Line 96 | Line 97 | IncludeDirs = \
97          samples/zcons
98  
99   IncludeDirs = \
100 +        @MPI_INC_DIR@ \
101 +        @FFTW_INC_DIR@ \
102          @CGAL_INC_DIR@ \
103 <        @MPI_INC_DIR@
103 >        @ZLIB_INC_DIR@
104  
105   LibraryDirs = \
106 +        @MPI_LIB_DIR@ \
107 +        @FFTW_LIB_DIR@ \
108          @CGAL_LIB_DIR@ \
109 <        @MPI_LIB_DIR@
109 >        @ZLIB_LIB_DIR@
110  
111   Libraries = \
112          @LIBS@ \
108        @CGAL_LIBS@ \
113          @MPI_LIB@ \
114 <        @MPI_F90_LIB@
114 >        @MPI_F90_LIB@ \
115 >        @FFTW_LIBS@ \
116 >        @CGAL_LIBS@ \
117 >        @ZLIB@
118  
119   OopseHome       = @OOPSE_HOME@
120   ForceParamDir   = $(OopseHome)/share/forceFields
# Line 116 | Line 123 | ParallelDeclare = -DIS_MPI
123   DocDir          = $(OopseHome)/doc
124   FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
125   F90Declare      = -D__FORTRAN90
126 + UseSingle       = @USE_SINGLE_PRECISION@
127 + ifeq "$(UseSingle)" "yes"
128 + SingleDeclare   = -DSINGLE_PRECISION
129 + else
130 + SingleDeclare   =
131 + endif
132   ParallelDeclare = -DIS_MPI
133 + SinglePrecision = -DSINGLE_PRECISION
134   UseMPI          = @USE_MPI@
135   ModuleCase      = @F90_MODULE_NAMES@
136   ModSuffix       = @MOD@
# Line 385 | Line 399 | COptions               = $(FrcDeclare) @CPPFLAGS@ @CFL
399   JniOptions             =
400   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
401                           -sourcepath $(SourceDir)
402 < COptions               = $(FrcDeclare) @CPPFLAGS@ @CFLAGS@
403 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CPPFLAGS@ @CFLAGS@
404 < CppOptions             = $(FrcDeclare) @CPPFLAGS@ @CXXFLAGS@
405 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CPPFLAGS@ @CXXFLAGS@
402 > COptions               = $(FrcDeclare) $(SingleDeclare) @CFLAGS@
403 > CParallelOptions       = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CFLAGS@
404 > CppOptions             = $(FrcDeclare) $(SingleDeclare) @CXXFLAGS@
405 > CppParallelOptions     = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CXXFLAGS@
406 > ifeq "$(UseSingle)" "yes"
407 > FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @PREPDEFFLAG@$(SingleDeclare) @FCFLAGS_SRCEXT@
408 > FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(SingleDeclare) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@
409 > else
410   FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@
411   FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@
412 + endif
413   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
414                           -sourcepath $(SourceDir) -deprecation
415   JavaRunOptions         = -classpath $(ClassPath)
# Line 425 | Line 444 | endif
444    MyInstallDir             = $(SampleSimDir)/$(MySample)
445    InstallFiles             = $(SampleFiles)
446    InstallCommand           = $(InstallData)
447 + endif
448 +
449 + ifneq "$(words $(ScriptFiles))" "0"
450 +  MyInstallDir             = $(InstallBinDir)
451 +  InstallFiles             = $(ScriptFiles)
452 +  InstallCommand           = $(InstallProgram)
453   endif
454  
455   ifneq "$(words $(Main))" "0"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines