ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/make/Makefile
(Generate patch)

Comparing trunk/OOPSE-4/make/Makefile (file contents):
Revision 1517 by tim, Fri Oct 1 21:59:28 2004 UTC vs.
Revision 1518 by tim, Sat Oct 2 04:22:07 2004 UTC

# Line 200 | Line 200 | ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))
200      Executable             = $(BinDir)/$(Main)
201      ParallelExecutable     = $(BinDir)/$(Main)_MPI
202    else
203 <    SharedLibrary          = $(LibDir)/lib$(subst /,,$(Package)).so
204 <    StaticLibrary          = $(LibDir)/lib$(subst /,,$(Package)).a
205 <    ParallelSharedLibrary  = $(LibDir)/lib$(subst /,,$(Package))_MPI.so
206 <    ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(Package))_MPI.a
203 >    SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package))).so
204 >    StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package))).a
205 >    ParallelSharedLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.so
206 >    ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.a
207    endif
208   endif
209   #
# Line 213 | Line 213 | LocalLibs        = $(subst /,,$(PackageLibs))
213   JavaPackageNames = $(subst /,.,$(JavaPackages))
214   IncludePath      = -I$(SourceDir) $(IncludeDirs:%=-I%)
215   LibDirs          = -L$(LibDir)    $(LibraryDirs:%=-L%)
216 < LocalLibs        = $(subst /,,$(PackageLibs))
216 > LocalLibs        = $(subst /,,$(patsubst %, oopse_%, $(PackageLibs)))
217   LibList          = $(LocalLibs:%=-l%) $(Libraries:%=-l%)
218  
219  
# Line 501 | Line 501 | ifneq "$(words $(F90Files))" "0"
501   endif
502  
503   ifneq "$(words $(F90Files))" "0"
504 –        #$(DEV_ROOT)/scripts/sfmakedepend  -I $(DEV_ROOT)/src -d '$$(DEV_ROOT)/obj' -f ./Make.ftemp -h *.F90
505 –        #$(DEV_ROOT)/scripts/sfmakedepend  -I $(DEV_ROOT)/src -d '$$(DEV_ROOT)/MPIobj' -f ./Make.fmpitemp -h *.F90
506 –        #cat Make.ftemp >> $(DependencyFile)
507 –        #cat Make.fmpitemp >> $(DependencyFile)
504          $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/obj/' -D__F90  *.F90 > Make.ftemp
505          $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/MPIobj/' -DIS_MPI -D__F90  *.F90 >> Make.ftemp
506          cat Make.ftemp >> $(DependencyFile)
511 –
507   endif
508          $(Delete) Make.cpptemp Make.ctemp Make.ftemp
509 +
510   # make lib
511   lib    : $(PackageListLoop)
512          $(Print) Libraries built.

Diff Legend

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