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 1521 by gezelter, Mon Oct 4 16:06:18 2004 UTC vs.
Revision 1523 by tim, Mon Oct 4 20:56:51 2004 UTC

# Line 221 | Line 221 | LibList          = $(LocalLibs:%=-l%) $(Libraries)
221   IncludePath      = -I$(SourceDir) $(IncludeDirs:%=-I%)
222   LibDirs          = -L$(LibDir)    $(LibraryDirs:%=-L%)
223   LocalLibs        = $(subst /,,$(patsubst %, oopse_%, $(PackageLibs)))
224 + ParallelLocalLibs= $(subst /,,$(patsubst %, oopse_%_MPI, $(PackageLibs)))
225   LibList          = $(LocalLibs:%=-l%) $(Libraries)
226 + ParallelLibList  = $(LocalLibs:%=-l%) $(Libraries)
227  
228  
229   #---------------------------------------------------------------------------
# Line 435 | 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 476 | 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 496 | 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 513 | 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 546 | 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