--- trunk/OOPSE-3.0/make/Makefile.in	2004/10/04 16:06:18	1521
+++ trunk/OOPSE-3.0/make/Makefile.in	2004/10/05 14:14:46	1524
@@ -221,7 +221,9 @@ LibList          = $(LocalLibs:%=-l%) $(Libraries)
 IncludePath      = -I$(SourceDir) $(IncludeDirs:%=-I%)
 LibDirs          = -L$(LibDir)    $(LibraryDirs:%=-L%)
 LocalLibs        = $(subst /,,$(patsubst %, oopse_%, $(PackageLibs))) 
+ParallelLocalLibs= $(subst /,,$(patsubst %, oopse_%_MPI, $(PackageLibs))) 
 LibList          = $(LocalLibs:%=-l%) $(Libraries)
+ParallelLibList  = $(LocalLibs:%=-l%) $(Libraries)
 
 
 #---------------------------------------------------------------------------
@@ -435,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)/%
@@ -476,14 +478,14 @@ _distcleanall :
 _distcleanall :
 	$(Delete) $(ObjectFiles) \
 	          $(ParallelObjectFiles) \
-		  $(JarFile) \
+		        $(JarFile) \
 	          $(SharedLibrary) \
 	          $(StaticLibrary) \
 	          $(ParallelSharedLibrary) \
 	          $(ParallelStaticLibrary) \
 	          $(Executable) \
 	          $(ParallelExecutable) \
-	          $(DependencyFile)
+	          $(DependencyFile) 
 
 
 # make depend
@@ -496,8 +498,8 @@ $(DependencyFile) : $(DerivedSource)
 	$(Print) $@ 
 	@cd $(PackageSourceDir)
 
-	touch Make.ctemp
-	touch Make.ctemp
+	@touch Make.ctemp
+	@touch Make.ctemp
 
 ifneq "$(words $(CppFiles))" "0"
 	$(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
@@ -513,8 +515,8 @@ ifneq "$(words $(F90Files))" "0"
 endif
 
 ifneq "$(words $(F90Files))" "0"
-	$(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
+	$(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/obj/' -D__FORTRAN90  $(F90Files) > Make.ftemp
+	$(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/MPIobj/' -DIS_MPI -D__FORTRAN90  $(F90Files) >> Make.ftemp
 	cat Make.ftemp >> $(DependencyFile)
 endif
 	$(Delete) Make.cpptemp Make.ctemp Make.ftemp
@@ -546,6 +548,10 @@ pure : $(Executable).pure
 
 pure : $(Executable).pure
 
+#make cvslog
+cvslog:
+	$(DEV_ROOT)/scripts/cvs2cl.pl
+
 # Execute
 _runexe :
 	$(Executable) $(RunParameters)