--- trunk/OOPSE-4/make/Makefile.in	2004/10/06 18:18:47	1529
+++ trunk/OOPSE-4/make/Makefile.in	2004/10/06 21:22:43	1535
@@ -58,6 +58,20 @@ IncludeDirs = \
 	applications/dump2Xyz \
 	applications/simpleBuilder
 
+Samples = \
+	samples/argon \
+	samples/water/dimer \
+	samples/water/spce \
+	samples/water/ssd \
+	samples/water/ssde \
+	samples/water/tip3p_ice \
+	samples/water/tip4p \
+	samples/lipid \
+	samples/alkane \
+	samples/minimizer \
+	samples/metals \
+	samples/zcons \
+
 IncludeDirs = \
 	@SPRNG_INC_DIR@ \
 	@MPI_INC_DIR@
@@ -75,8 +89,11 @@ ParallelDeclare = -DIS_MPI
 ForceParamDir   = @OOPSE_HOME@/share/forceFields/
 SampleSimDir    = @OOPSE_HOME@/share/samples/
 FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
+F90Declare      = -D__FORTRAN90
 ParallelDeclare = -DIS_MPI
 UseMPI          = @USE_MPI@
+ModuleCase      = @F90_MODULE_NAMES@
+ModSuffix       = @MOD@
 LinkOptions = \
 	@F90LIBS@ 
 
@@ -94,7 +111,6 @@ ParallelLibDir    = $(DEV_ROOT)/MPIlib
 TargetDir         = $(DEV_ROOT)/obj
 ParallelTargetDir = $(DEV_ROOT)/MPIobj
 LibDir            = $(DEV_ROOT)/lib
-ParallelLibDir    = $(DEV_ROOT)/MPIlib
 MakeDir           = $(DEV_ROOT)/make
 BinDir            = $(DEV_ROOT)/bin
 DocsDir           = $(DEV_ROOT)/docs
@@ -413,11 +429,11 @@ $(LibDir)/%_UP.a : $(ObjectFiles)
 
 $(LibDir)/%_UP.a : $(ObjectFiles)
 	$(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles)
-	touch $(LibDir)/.stamp_UP
+	@touch $(LibDir)/.stamp_UP
 
 $(LibDir)/%_MPI.a: $(ParallelObjectFiles)
 	$(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles)
-	touch $(LibDir)/.stamp_MPI
+	@touch $(LibDir)/.stamp_MPI
 
 %_UP.a : $(ObjectFiles)
 	$(MAKE) $(MakeOptions) $(LibDir)/$@
@@ -477,11 +493,13 @@ $(CombinedStaticLib) : $(LibDir)/.stamp_UP 
 remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
 do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
 
-$(CombinedStaticLib) : $(LibDir)/.stamp_UP 
+$(CombinedStaticLib) : $(LibDir)/.stamp_UP
+	$(Print) create $@     	
 	$(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
 	$(Ranlib) $(CombinedStaticLib)
 
 $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
+	$(Print) create $@
 	$(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
 	$(Ranlib) $(CombinedParallelStaticLib)
 
@@ -566,29 +584,31 @@ $(DependencyFile) : $(DerivedSource)
 $(DependencyFile) : $(DerivedSource)
 	$(Print) $@ 
 	@cd $(PackageSourceDir)
-
-	@touch Make.ctemp
-	@touch Make.ctemp
 
 ifneq "$(words $(CppFiles))" "0"
-	$(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
-	cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
-	cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
+	$(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
+	cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
+	$(Delete) Make.cpptemp
+	$(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
+	cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
+	$(Delete) Make.cpptemp
 endif
 
 ifneq "$(words $(CFiles))" "0" 
-	$(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   > Make.ctemp
-	cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
-	cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
-
+	$(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
+	cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
+	$(Delete) Make.ctemp
+	$(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
+	cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
+	$(Delete) Make.ctemp
 endif
 
 ifneq "$(words $(F90Files))" "0"
-	$(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
+	$(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare)  $(F90Files) > Make.ftemp
+	$(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare)  $(F90Files) >> Make.ftemp
 	cat Make.ftemp >> $(DependencyFile)
+	$(Delete) Make.ftemp
 endif
-	$(Delete) Make.cpptemp Make.ctemp Make.ftemp
 
 # make lib
 lib    : $(PackageListLoop)
@@ -603,7 +623,7 @@ _statisticsall :
 
 # make statistics
 _statisticsall :
-	@$(Print) $(SourceFiles) >> $(DEV_ROOT)/files.tmp
+	@$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
 
 statistics : $(PackageListLoop)
 	@$(List) $(DEV_ROOT)/files.tmp | xargs $(WordCount) $(WordCountOptions)