--- trunk/OOPSE-2.0/make/Makefile.in	2005/12/02 20:10:30	2474
+++ trunk/OOPSE-2.0/make/Makefile.in	2006/01/12 20:01:48	2555
@@ -66,7 +66,20 @@ Samples = \
 	applications/atom2mdin
 
 Samples = \
+	samples/alkane \
 	samples/argon \
+	samples/cutoff \
+	samples/dipole \
+	samples/gbljtest \
+	samples/lipid \
+	samples/metals/EAM \
+	samples/metals/EAM/nanoparticle \
+	samples/metals/EAM/nanorod \
+	samples/metals/Sutton-Chen \
+	samples/minimizer \
+	samples/shape \
+	samples/thermoIntegration/liquid \
+	samples/thermoIntegration/solid \
         samples/water/dimer \
 	samples/water/spce \
 	samples/water/ssd \
@@ -75,15 +88,7 @@ Samples = \
 	samples/water/ssd-ion \
 	samples/water/tip3p_ice \
 	samples/water/tip4p \
-	samples/lipid \
-	samples/alkane \
-	samples/minimizer \
-	samples/metals \
-	samples/thermoIntegration/liquid \
-	samples/thermoIntegration/solid \
-	samples/dipole \
-        samples/shape \
-	samples/zcons \
+	samples/zcons 
 
 IncludeDirs = \
 	@CGAL_INC_DIR@ \
@@ -111,10 +116,10 @@ LinkOptions = \
 ModuleCase      = @F90_MODULE_NAMES@
 ModSuffix       = @MOD@
 LinkOptions = \
-	@F90LIBS@ 
+	@FCLIBS@ 
 
 ParallelLinkOptions = \
-	@F90LIBS@ 
+	@FCLIBS@ 
 
 
 #---------------------------------------------------------------------------
@@ -347,7 +352,6 @@ F90Compiler            = @F90@
 StaticArchiver         = @AR@
 DynamicArchiver        = @CC@
 FortranCompiler        = @FC@
-F90Compiler            = @F90@
 JavaCompiler           = $(JAVA_HOME)/bin/javac
 JavaArchiver           = $(JAVA_HOME)/bin/jar
 JarSigner              = $(JAVA_HOME)/bin/jarsigner
@@ -373,11 +377,10 @@ CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOP
 			 -sourcepath $(SourceDir)
 COptions               = $(FrcDeclare) @CFLAGS@
 CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
-CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
-CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
-FortranOptions         =
-F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) 
-F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
+CppOptions             = $(FrcDeclare) @CXXFLAGS@
+CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
+FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@
+FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclar) @FCFLAGS_SRCEXT@ 
 JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
 			 -sourcepath $(SourceDir) -deprecation
 JavaRunOptions         = -classpath $(ClassPath) 
@@ -513,13 +516,13 @@ $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
 
 # .F90 -> .o
 $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
-	$(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
+	$(FortranCompiler) $(FortranOptions) $(IncludePath) -c $< -o $@
 	if test -n "`ls *.$(ModSuffix)`"; then \
 	  $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
 	fi
 
 $(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile)
-	$(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
+	$(FortranCompiler) $(FortranParallelOptions) $(IncludePath) -c $< -o $@
 	if test -n "`ls *.$(ModSuffix)`"; then \
 	  $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
 	fi
@@ -653,7 +656,7 @@ all_lib_parallel_objs = $(patsubst %,$(TargetDir)/%,$(
 all_objs = $(foreach thisLib,$(LibNames), $(call find_objs, $(thisLib)))
 all_parallel_objs = $(foreach thisLib,$(ParallelLibNames), $(call find_objs, $(thisLib)))
 all_lib_objs = $(patsubst %,$(TargetDir)/%,$(call all_objs))
-all_lib_parallel_objs = $(patsubst %,$(TargetDir)/%,$(call all_parallel_objs))
+all_lib_parallel_objs = $(patsubst %,$(ParallelTargetDir)/%,$(call all_parallel_objs))
 
 $(CombinedStaticLib) : $(LibDir)/.stamp_UP
 	$(Print) creating $@     	
@@ -667,6 +670,7 @@ $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(
 
 # Executable
 $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir)
+	@echo $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir)
 	$(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
 
 $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) $(BinDir)