--- trunk/OOPSE-2.0/make/Makefile.in	2004/10/08 22:10:22	1544
+++ trunk/OOPSE-2.0/make/Makefile.in	2005/01/12 23:17:02	1932
@@ -38,25 +38,23 @@ PackageLibs = \
 #packages containing libraries
 PackageLibs = \
 	utils \
+	visitors \
 	math \
 	types \
 	primitives \
-	visitors \
 	UseTheForce/DarkSide \
 	UseTheForce \
 	brains \
 	io \
-	integrators \
-	minimizers \
+	integrators\
 	constraints \
-	profiling \
-	restraints \
+	minimizers \
 
 #packages containing applications
 Applications = \
 	applications/oopse \
 	applications/dump2Xyz \
-	applications/simpleBuilder
+        applications/simpleBuilder\
 
 Samples = \
 	samples/argon \
@@ -86,10 +84,10 @@ ForceParamDir   = @OOPSE_HOME@/share/forceFields/
 	@MPI_F90_LIB@
 
 OopseHome       = @OOPSE_HOME@
-ForceParamDir   = @OOPSE_HOME@/share/forceFields/
-SampleSimDir    = @OOPSE_HOME@/share/samples/
-BinDir          = @OOPSE_HOME@/bin
-DocDir          = @OOPSE_HOME@/doc
+ForceParamDir   = $(OopseHome)/share/forceFields
+SampleSimDir    = $(OopseHome)/share/samples
+InstallBinDir   = $(OopseHome)/bin
+DocDir          = $(OopseHome)/doc
 FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
 F90Declare      = -D__FORTRAN90
 ParallelDeclare = -DIS_MPI
@@ -247,13 +245,13 @@ Move                   = mv
 #
 #---------------------------------------------------------------------------
 Print                  = @echo
-Move                   = mv
+Move                   = mv -f
 Copy                   = cp
 CCompiler              = @CC@
 CppCompiler            = @CXX@
 Linker                 = @CXX@
 MakeDepend             = makedepend
-Install                = @INSTALL@
+INSTALL                = @INSTALL@
 InstallProgram         = @INSTALL_PROGRAM@
 InstallData            = @INSTALL_DATA@
 MkDir                = @MKINSTALLDIRS@
@@ -285,13 +283,13 @@ COptions               = $(FrcDeclare)
 JniOptions             =
 RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
 			 -sourcepath $(SourceDir)
-COptions               = $(FrcDeclare)
-CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
-CppOptions             = $(FrcDeclare)
-CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
+COptions               = $(FrcDeclare) @CFLAGS@
+CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
+CppOptions             = $(FrcDeclare) @CXXFLAGS@
+CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
 FortranOptions         =
-F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir) 
-F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
+F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) 
+F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
 JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
 			 -sourcepath $(SourceDir) -deprecation
 JavaRunOptions         = -classpath $(ClassPath) 
@@ -322,28 +320,32 @@ MySample                 = $(subst $(shell cd $(DEV_RO
 #---------------------------------------------------------------------------
 
 ifneq "$(words $(SampleFiles))" "0"
-MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
-MyInstallDir             = $(SampleSimDir)/$(MySample)
-InstallFiles             = $(SampleFiles)
-InstallCommand           = $(InstallData)
+  MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
+  MyInstallDir             = $(SampleSimDir)/$(MySample)
+  InstallFiles             = $(SampleFiles)
+  InstallCommand           = $(InstallData)
 endif
 
 ifneq "$(words $(Main))" "0"
-MyInstallDir             = $(BinDir)/
-InstallFiles             = $(Executable) $(ParallelExecutable)
-InstallCommand           = $(InstallProgram)
+  MyInstallDir             = $(InstallBinDir)
+  ifeq "$(UseMPI)" "yes"
+    InstallFiles             = $(Executable) $(ParallelExecutable)
+  else
+    InstallFiles             = $(Executable)
+  endif 
+  InstallCommand           = $(InstallProgram)
 endif
 
-ifneq "$(words $(ForcefiledFiles))" "0"
-MyInstallDir             = $(ForceParamDir)
-InstallFiles             = $(ForcefiledFiles)/
-InstallCommand           = $(InstallData)
+ifneq "$(words $(ForcefieldFiles))" "0"
+  MyInstallDir             = $(ForceParamDir)
+  InstallFiles             = $(ForcefieldFiles)
+  InstallCommand           = $(InstallData)
 endif
 
 ifneq "$(words $(InstallFiles))" "0"
   InstallList            =
 else
-  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(patsubst %, $(DEV_ROOT)/%,$(Forcefield)) $(patsubst %, $(SourceDir)/%,$(Applications)) 
+  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(DEV_ROOT)/forceFields $(patsubst %, $(SourceDir)/%,$(Applications)) 
 endif
 
 InstallListLoop          = $(patsubst %,$(SourceDir)/%/.install,$(PackageList))  $(patsubst %,%/.install,$(InstallList)) 
@@ -417,17 +419,35 @@ $(PackageTargetDir)/%.o : %.F90
 # .F90 -> .o
 $(PackageTargetDir)/%.o : %.F90
 	$(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
+	if test -n "`ls *.$(ModSuffix)`"; then \
+	  $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
+	fi
 
 $(PackageParallelTargetDir)/%.o : %.F90
 	$(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
+	if test -n "`ls *.$(ModSuffix)`"; then \
+	  $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
+	fi
 
 ifeq "$(UseMPI)" "yes"
 %.o : %.F90
 	$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
+	if test -n "`ls *.$(ModSuffix)`"; then\
+          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
+        fi
+
 	$(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
+        if test -n "`ls *.$(ModSuffix)`"; then\
+          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
+        fi
+
 else
 %.o : %.F90
 	$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
+	if test -n "`ls *.$(ModSuffix)`"; then\
+          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
+        fi
+
 endif
 
 
@@ -630,28 +650,42 @@ ifneq "$(words $(CppFiles))" "0"
 	@cd $(PackageSourceDir)
 
 ifneq "$(words $(CppFiles))" "0"
-	$(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
-	@cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
+	$(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' -MM $(CppFiles)>> Make.cpptemp
+	@cat Make.cpptemp  >> $(DependencyFile)
 	$(Delete) Make.cpptemp
-	$(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
-	@cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
+
+  ifeq "$(UseMPI)" "yes"
+	$(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CppFiles)>> Make.cpptemp
+	@cat Make.cpptemp  >> $(DependencyFile)
 	@$(Delete) Make.cpptemp
+  endif
+
 endif
 
 ifneq "$(words $(CFiles))" "0" 
-	$(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
-	@cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
+	$(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/'  -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
+	@cat Make.ctemp  >> $(DependencyFile)
 	$(Delete) Make.ctemp
-	$(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
-	@cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
+
+  ifeq "$(UseMPI)" "yes"
+	$(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
+	@cat Make.ctemp  >> $(DependencyFile)
 	@$(Delete) Make.ctemp
+  endif
+
 endif
 
 ifneq "$(words $(F90Files))" "0"
-	$(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
-	$(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
+	$(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
 	@cat Make.ftemp >> $(DependencyFile)
 	@$(Delete) Make.ftemp
+
+  ifeq "$(UseMPI)" "yes"
+	$(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
+	@cat Make.ftemp >> $(DependencyFile)
+	@$(Delete) Make.ftemp
+  endif
+
 endif
 
 # make lib
@@ -683,8 +717,6 @@ _installprogram:
 	$(InstallData) $(InstallFiles) $(MyInstallDir)
 endif	    
 
-_installprogram:
-	
 # make statistics
 _statisticsall :
 	@$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp