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 1518 by tim, Sat Oct 2 04:22:07 2004 UTC vs.
Revision 1523 by tim, Mon Oct 4 20:56:51 2004 UTC

# Line 72 | Line 72 | IncludeDirs = \
72          restraints \
73  
74   IncludeDirs = \
75 <        /usr/include \
76 <        /usr/local/include
75 >        @SPRNG_INC_DIR@ \
76 >        @MPI_INC_DIR@
77  
78   LibraryDirs = \
79 <        /usr/lib \
80 <        /usr/local/mpich/lib \
81 <        /usr/local/lib \
82 <        /usr/local/intel/compiler81/lib \
79 >        @SPRNG_LIB_DIR@ \
80 >        @MPI_LIB_DIR@
81  
82   Libraries = \
83 <        mpich \
84 <        sprng \
87 <        ifcore \
83 >        @SPRNG_LIB@ \
84 >        @MPI_LIB@
85  
86 + LinkOptions = \
87 +        @F90LIBS@
88 +
89 + OopseHome       = @OOPSE_HOME@
90 + ForceParamDir   = @OOPSE_HOME@/share/forceFields/
91 + SampleSimDir    = @OOPSE_HOME@/share/samples/
92 + FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
93 + ParallelDeclare = -DIS_MPI
94 +
95 +
96   #---------------------------------------------------------------------------
97   #
98   #  Directories
# Line 214 | Line 221 | LibList          = $(LocalLibs:%=-l%) $(Libraries:%=-l
221   IncludePath      = -I$(SourceDir) $(IncludeDirs:%=-I%)
222   LibDirs          = -L$(LibDir)    $(LibraryDirs:%=-L%)
223   LocalLibs        = $(subst /,,$(patsubst %, oopse_%, $(PackageLibs)))
224 < LibList          = $(LocalLibs:%=-l%) $(Libraries:%=-l%)
224 > ParallelLocalLibs= $(subst /,,$(patsubst %, oopse_%_MPI, $(PackageLibs)))
225 > LibList          = $(LocalLibs:%=-l%) $(Libraries)
226 > ParallelLibList  = $(LocalLibs:%=-l%) $(Libraries)
227  
228  
229   #---------------------------------------------------------------------------
# Line 260 | Line 269 | FortranOptions         =
269   JniOptions             =
270   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
271                           -sourcepath $(SourceDir)
272 + COptions               = $(FrcDeclare)
273 + CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
274 + CppOptions             = $(FrcDeclare)
275 + CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
276   FortranOptions         =
277 < F90Options             =  -I$(SourceDir) -module $(TargetDir)
277 > F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir)
278 > F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
279   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
280                           -sourcepath $(SourceDir) -deprecation
281   JavaRunOptions         = -classpath $(ClassPath)
# Line 423 | Line 437 | $(ParallelExecutable) : $(ParallelObjectFiles)
437          $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@
438  
439   $(ParallelExecutable) : $(ParallelObjectFiles)
440 <        $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ParallelObjectFiles) -o $@
440 >        $(Linker) $(LinkOptions) $(LibDirs) $(ParallelLibList) $(ParallelObjectFiles) -o $@
441  
442   # Anything else is just copied from source to target
443   $(PackageTargetDir)/% : $(PackageSourceDir)/%
# Line 464 | Line 478 | _distcleanall :
478   _distcleanall :
479          $(Delete) $(ObjectFiles) \
480                    $(ParallelObjectFiles) \
481 <                  $(JarFile) \
481 >                        $(JarFile) \
482                    $(SharedLibrary) \
483                    $(StaticLibrary) \
484                    $(ParallelSharedLibrary) \
485                    $(ParallelStaticLibrary) \
486                    $(Executable) \
487                    $(ParallelExecutable) \
488 <                  $(DependencyFile)
488 >                  $(DependencyFile)
489  
490  
491   # make depend
# Line 484 | Line 498 | $(DependencyFile) : $(DerivedSource)
498          $(Print) $@
499          @cd $(PackageSourceDir)
500  
501 <        touch Make.ctemp
502 <        touch Make.ctemp
501 >        @touch Make.ctemp
502 >        @touch Make.ctemp
503  
504   ifneq "$(words $(CppFiles))" "0"
505          $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
# Line 501 | Line 515 | ifneq "$(words $(F90Files))" "0"
515   endif
516  
517   ifneq "$(words $(F90Files))" "0"
518 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/obj/' -D__F90  *.F90 > Make.ftemp
519 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/MPIobj/' -DIS_MPI -D__F90  *.F90 >> Make.ftemp
518 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/obj/' -D__F90   $(F90Files) > Make.ftemp
519 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/MPIobj/' -DIS_MPI -D__F90   $(F90Files) >> Make.ftemp
520          cat Make.ftemp >> $(DependencyFile)
521   endif
522          $(Delete) Make.cpptemp Make.ctemp Make.ftemp
# Line 534 | Line 548 | pure : $(Executable).pure
548  
549   pure : $(Executable).pure
550  
551 + #make cvslog
552 + cvslog:
553 +        $(DEV_ROOT)/scripts/cvs2cl.pl
554 +
555   # Execute
556   _runexe :
557          $(Executable) $(RunParameters)

Diff Legend

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