--- trunk/OOPSE-3.0/make/Makefile.in	2006/04/25 22:30:26	2736
+++ trunk/OOPSE-3.0/make/Makefile.in	2006/05/16 20:38:23	2753
@@ -52,6 +52,7 @@ PackageLibs = \
 	selection \
 	restraints \
 	lattice \
+	hydrodynamics \
 	openbabel\
         antlr\
         mdParser
@@ -95,15 +96,18 @@ IncludeDirs = \
 	samples/zcons 
 
 IncludeDirs = \
+	@FFTW_INC_DIR@ \
 	@CGAL_INC_DIR@ \
 	@MPI_INC_DIR@ 
 
 LibraryDirs = \
+	@FFTW_LIB_DIR@ \
 	@CGAL_LIB_DIR@ \
 	@MPI_LIB_DIR@ 
 
 Libraries = \
 	@LIBS@ \
+	@FFTW_LIBS@ \
 	@CGAL_LIBS@ \
 	@MPI_LIB@ \
 	@MPI_F90_LIB@ 
@@ -120,10 +124,13 @@ LinkOptions = \
 ModuleCase      = @F90_MODULE_NAMES@
 ModSuffix       = @MOD@
 LinkOptions = \
+	@LDFLAGS@ \
 	@FCLIBS@ \
-	@CXXFLAGS@
+	@CXXFLAGS@ 
+        
 
 ParallelLinkOptions = \
+	@LDFLAGS@ \
 	@FCLIBS@ \
 	@CXXFLAGS@
 
@@ -381,10 +388,10 @@ COptions               = $(FrcDeclare) @CFLAGS@
 JniOptions             =
 RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
 			 -sourcepath $(SourceDir)
-COptions               = $(FrcDeclare) @CFLAGS@
-CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
-CppOptions             = $(FrcDeclare) @CXXFLAGS@
-CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
+COptions               = $(FrcDeclare) @CPPFLAGS@ @CFLAGS@
+CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CPPFLAGS@ @CFLAGS@
+CppOptions             = $(FrcDeclare) @CPPFLAGS@ @CXXFLAGS@
+CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CPPFLAGS@ @CXXFLAGS@
 FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@
 FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@ 
 JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \