--- trunk/OOPSE-3.0/make/Makefile.in	2006/05/16 02:06:37	2752
+++ trunk/OOPSE-3.0/make/Makefile.in	2006/07/26 21:45:19	2964
@@ -67,7 +67,8 @@ Applications = \
 	applications/nanoRodBuilder \
 	applications/nanoparticleBuilder \
 	applications/atom2mdin \
-	applications/hydrodynamics
+	applications/hydrodynamics \
+	applications/utilities
 
 
 Samples = \
@@ -82,7 +83,6 @@ Samples = \
 	samples/metals/EAM/nanorod \
 	samples/metals/Sutton-Chen \
 	samples/minimizer \
-	samples/shape \
 	samples/thermoIntegration/liquid \
 	samples/thermoIntegration/solid \
         samples/water/dimer \
@@ -96,18 +96,24 @@ IncludeDirs = \
 	samples/zcons 
 
 IncludeDirs = \
+	@MPI_INC_DIR@ \
+	@FFTW_INC_DIR@ \
 	@CGAL_INC_DIR@ \
-	@MPI_INC_DIR@ 
+	@ZLIB_INC_DIR@ 
 
 LibraryDirs = \
+	@MPI_LIB_DIR@ \
+	@FFTW_LIB_DIR@ \
 	@CGAL_LIB_DIR@ \
-	@MPI_LIB_DIR@ 
+	@ZLIB_LIB_DIR@ 
 
 Libraries = \
 	@LIBS@ \
-	@CGAL_LIBS@ \
 	@MPI_LIB@ \
-	@MPI_F90_LIB@ 
+	@MPI_F90_LIB@ \
+	@FFTW_LIBS@ \
+	@CGAL_LIBS@ \
+	@ZLIB@ 
 
 OopseHome       = @OOPSE_HOME@
 ForceParamDir   = $(OopseHome)/share/forceFields
@@ -116,7 +122,14 @@ ParallelDeclare = -DIS_MPI
 DocDir          = $(OopseHome)/doc
 FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
 F90Declare      = -D__FORTRAN90
+UseSingle       = @USE_SINGLE_PRECISION@
+ifeq "$(UseSingle)" "yes"
+SingleDeclare   = -DSINGLE_PRECISION
+else
+SingleDeclare   = 
+endif
 ParallelDeclare = -DIS_MPI
+SinglePrecision = -DSINGLE_PRECISION
 UseMPI          = @USE_MPI@
 ModuleCase      = @F90_MODULE_NAMES@
 ModSuffix       = @MOD@
@@ -385,12 +398,17 @@ COptions               = $(FrcDeclare) @CPPFLAGS@ @CFL
 JniOptions             =
 RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
 			 -sourcepath $(SourceDir)
-COptions               = $(FrcDeclare) @CPPFLAGS@ @CFLAGS@
-CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CPPFLAGS@ @CFLAGS@
-CppOptions             = $(FrcDeclare) @CPPFLAGS@ @CXXFLAGS@
-CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CPPFLAGS@ @CXXFLAGS@
+COptions               = $(FrcDeclare) $(SingleDeclare) @CFLAGS@
+CParallelOptions       = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CFLAGS@
+CppOptions             = $(FrcDeclare) $(SingleDeclare) @CXXFLAGS@
+CppParallelOptions     = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CXXFLAGS@
+ifeq "$(UseSingle)" "yes"
+FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @PREPDEFFLAG@$(SingleDeclare) @FCFLAGS_SRCEXT@
+FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(SingleDeclare) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@ 
+else
 FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@
 FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@ 
+endif
 JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
 			 -sourcepath $(SourceDir) -deprecation
 JavaRunOptions         = -classpath $(ClassPath) 
@@ -425,6 +443,12 @@ endif
   MyInstallDir             = $(SampleSimDir)/$(MySample)
   InstallFiles             = $(SampleFiles)
   InstallCommand           = $(InstallData)
+endif
+
+ifneq "$(words $(ScriptFiles))" "0"
+  MyInstallDir             = $(InstallBinDir)
+  InstallFiles             = $(ScriptFiles)
+  InstallCommand           = $(InstallProgram)
 endif
 
 ifneq "$(words $(Main))" "0"