--- trunk/OOPSE-4/make/Makefile.in	2004/10/05 19:35:59	1525
+++ trunk/OOPSE-4/make/Makefile.in	2004/10/05 22:57:01	1527
@@ -84,9 +84,6 @@ LinkOptions = \
 	@MPI_LIB@ \
 	@MPI_F90_LIB@
 
-LinkOptions = \
-	@F90LIBS@
-
 OopseHome       = @OOPSE_HOME@
 ForceParamDir   = @OOPSE_HOME@/share/forceFields/
 SampleSimDir    = @OOPSE_HOME@/share/samples/
@@ -109,7 +106,16 @@ CurrentDir        = $(CURDIR)
 BinDir            = $(DEV_ROOT)/bin
 DocsDir           = $(DEV_ROOT)/docs
 CurrentDir        = $(CURDIR)
+RPath = $(shell cd $(DEV_ROOT); pwd)/lib:$(OopseHome)/lib
+ParallelRPath = $(shell cd $(DEV_ROOT); pwd)/MPIlib:$(OopseHome)/MPIlib
+LinkOptions = \
+	@F90LIBS@ \
+	-Wl,-R$(RPath)
 
+ParallelLinkOptions = \
+	@F90LIBS@ \
+	-Wl,-R$(ParallelRPath)
+
 ifdef Source
 #get the relative path of current package to source directory
 # /home/maul/gezelter/src/code/src/UseTheForce/Darkside --> UseTheForce/Darkside
@@ -482,10 +488,10 @@ $(Executable) : $(ObjectFiles)
 
 # Executable
 $(Executable) : $(ObjectFiles)
-	$(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(LibList) $(LibList) $(LibList) -o $@
+	$(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(LibList) -o $@
 
 $(ParallelExecutable) : $(ParallelObjectFiles)
-	$(Linker) $(ParallelObjectFiles) $(LinkOptions) $(ParallelLibDirs) $(ParallelLibList) $(ParallelLibList) $(ParallelLibList) -o $@
+	$(Linker) $(ParallelObjectFiles)  $(ParallelLinkOptions) $(ParallelLibDirs) $(LibList) -o $@
 
 # Anything else is just copied from source to target
 $(PackageTargetDir)/% : $(PackageSourceDir)/%
@@ -508,7 +514,9 @@ _buildall : \
 	$(RmiStubFiles) \
 	$(RmiSkeletonFiles) \
 	$(OtherTargetFiles) \
+	$(SharedLibrary) \
 	$(StaticLibrary) \
+	$(ParallelSharedLibrary) \
 	$(ParallelStaticLibrary) \
 	$(JarFile) \
 	$(Executable) \
@@ -522,6 +530,7 @@ _buildall : \
 	$(RmiStubFiles) \
 	$(RmiSkeletonFiles) \
 	$(OtherTargetFiles) \
+	$(SharedLibrary) \
 	$(StaticLibrary) \
 	$(JarFile) \
 	$(Executable)