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

Comparing trunk/OOPSE-2.0/make/Makefile.in (file contents):
Revision 1526 by tim, Tue Oct 5 19:35:59 2004 UTC vs.
Revision 1527 by tim, Tue Oct 5 22:57:01 2004 UTC

# Line 84 | Line 84 | LinkOptions = \
84          @MPI_LIB@ \
85          @MPI_F90_LIB@
86  
87 – LinkOptions = \
88 –        @F90LIBS@
89 –
87   OopseHome       = @OOPSE_HOME@
88   ForceParamDir   = @OOPSE_HOME@/share/forceFields/
89   SampleSimDir    = @OOPSE_HOME@/share/samples/
# Line 109 | Line 106 | CurrentDir        = $(CURDIR)
106   BinDir            = $(DEV_ROOT)/bin
107   DocsDir           = $(DEV_ROOT)/docs
108   CurrentDir        = $(CURDIR)
109 + RPath = $(shell cd $(DEV_ROOT); pwd)/lib:$(OopseHome)/lib
110 + ParallelRPath = $(shell cd $(DEV_ROOT); pwd)/MPIlib:$(OopseHome)/MPIlib
111 + LinkOptions = \
112 +        @F90LIBS@ \
113 +        -Wl,-R$(RPath)
114  
115 + ParallelLinkOptions = \
116 +        @F90LIBS@ \
117 +        -Wl,-R$(ParallelRPath)
118 +
119   ifdef Source
120   #get the relative path of current package to source directory
121   # /home/maul/gezelter/src/code/src/UseTheForce/Darkside --> UseTheForce/Darkside
# Line 482 | Line 488 | $(Executable) : $(ObjectFiles)
488  
489   # Executable
490   $(Executable) : $(ObjectFiles)
491 <        $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(LibList) $(LibList) $(LibList) -o $@
491 >        $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(LibList) -o $@
492  
493   $(ParallelExecutable) : $(ParallelObjectFiles)
494 <        $(Linker) $(ParallelObjectFiles) $(LinkOptions) $(ParallelLibDirs) $(ParallelLibList) $(ParallelLibList) $(ParallelLibList) -o $@
494 >        $(Linker) $(ParallelObjectFiles)  $(ParallelLinkOptions) $(ParallelLibDirs) $(LibList) -o $@
495  
496   # Anything else is just copied from source to target
497   $(PackageTargetDir)/% : $(PackageSourceDir)/%
# Line 508 | Line 514 | _buildall : \
514          $(RmiStubFiles) \
515          $(RmiSkeletonFiles) \
516          $(OtherTargetFiles) \
517 +        $(SharedLibrary) \
518          $(StaticLibrary) \
519 +        $(ParallelSharedLibrary) \
520          $(ParallelStaticLibrary) \
521          $(JarFile) \
522          $(Executable) \
# Line 522 | Line 530 | _buildall : \
530          $(RmiStubFiles) \
531          $(RmiSkeletonFiles) \
532          $(OtherTargetFiles) \
533 +        $(SharedLibrary) \
534          $(StaticLibrary) \
535          $(JarFile) \
536          $(Executable)

Diff Legend

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