--- trunk/OOPSE-2.0/make/Makefile.in	2004/09/30 15:41:35	1514
+++ trunk/OOPSE-2.0/make/Makefile.in	2004/10/04 16:24:39	1522
@@ -72,20 +72,27 @@ IncludeDirs = \
 	restraints \
 
 IncludeDirs = \
-	/usr/include \
-	/usr/local/include 
+	@SPRNG_INC_DIR@ \
+	@MPI_INC_DIR@
 
 LibraryDirs = \
-        /usr/lib \
-	/usr/local/mpich/lib \
-	/usr/local/lib \
-	/usr/local/intel/compiler80/lib \
+	@SPRNG_LIB_DIR@ \
+	@MPI_LIB_DIR@ 
 
 Libraries = \
-        mpich \
-	sprng \
-	ifcore \
+	@SPRNG_LIB@ \
+	@MPI_LIB@ 
 
+LinkOptions = \
+	@F90LIBS@
+
+OopseHome       = @OOPSE_HOME@
+ForceParamDir   = @OOPSE_HOME@/share/forceFields/
+SampleSimDir    = @OOPSE_HOME@/share/samples/
+FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
+ParallelDeclare = -DIS_MPI
+
+
 #---------------------------------------------------------------------------
 #
 #  Directories
@@ -200,10 +207,10 @@ ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))
     Executable             = $(BinDir)/$(Main)
     ParallelExecutable     = $(BinDir)/$(Main)_MPI
   else
-    SharedLibrary          = $(LibDir)/lib$(subst /,,$(Package)).so 
-    StaticLibrary          = $(LibDir)/lib$(subst /,,$(Package)).a
-    ParallelSharedLibrary  = $(LibDir)/lib$(subst /,,$(Package))_MPI.so 
-    ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(Package))_MPI.a
+    SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package))).so
+    StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package))).a
+    ParallelSharedLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.so
+    ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.a
   endif
 endif
 #
@@ -213,8 +220,10 @@ LocalLibs        = $(subst /,,$(PackageLibs))
 JavaPackageNames = $(subst /,.,$(JavaPackages))
 IncludePath      = -I$(SourceDir) $(IncludeDirs:%=-I%)
 LibDirs          = -L$(LibDir)    $(LibraryDirs:%=-L%)
-LocalLibs        = $(subst /,,$(PackageLibs))
-LibList          = $(LocalLibs:%=-l%) $(Libraries:%=-l%)
+LocalLibs        = $(subst /,,$(patsubst %, oopse_%, $(PackageLibs))) 
+ParallelLocalLibs= $(subst /,,$(patsubst %, oopse_%_MPI, $(PackageLibs))) 
+LibList          = $(LocalLibs:%=-l%) $(Libraries)
+ParallelLibList  = $(LocalLibs:%=-l%) $(Libraries)
 
 
 #---------------------------------------------------------------------------
@@ -260,8 +269,13 @@ FortranOptions         =
 JniOptions             =
 RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
 			 -sourcepath $(SourceDir)
+COptions               = $(FrcDeclare)
+CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
+CppOptions             = $(FrcDeclare)
+CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
 FortranOptions         =
-F90Options             =  -I$(SourceDir) -module $(TargetDir) 
+F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir) 
+F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
 JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
 			 -sourcepath $(SourceDir) -deprecation
 JavaRunOptions         = -classpath $(ClassPath) 
@@ -423,7 +437,7 @@ $(ParallelExecutable) : $(ParallelObjectFiles)
 	$(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@
 
 $(ParallelExecutable) : $(ParallelObjectFiles)
-	$(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ParallelObjectFiles) -o $@
+	$(Linker) $(LinkOptions) $(LibDirs) $(ParallelLibList) $(ParallelObjectFiles) -o $@
 
 # Anything else is just copied from source to target
 $(PackageTargetDir)/% : $(PackageSourceDir)/%
@@ -501,7 +515,8 @@ ifneq "$(words $(F90Files))" "0"
 endif
 
 ifneq "$(words $(F90Files))" "0"
-	$(DEV_ROOT)/scripts/sfmakedepend  -I $(DEV_ROOT)/src -d '$$(DEV_ROOT)/obj' -f ./Make.ftemp -h *.F90
+	$(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/obj/' -D__F90  *.F90 > Make.ftemp
+	$(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/MPIobj/' -DIS_MPI -D__F90  *.F90 >> Make.ftemp
 	cat Make.ftemp >> $(DependencyFile)
 endif
 	$(Delete) Make.cpptemp Make.ctemp Make.ftemp