--- trunk/OOPSE-3.0/make/Makefile.in 2006/02/02 02:57:01 2580 +++ trunk/OOPSE-3.0/make/Makefile.in 2006/05/16 02:06:37 2752 @@ -52,6 +52,7 @@ PackageLibs = \ selection \ restraints \ lattice \ + hydrodynamics \ openbabel\ antlr\ mdParser @@ -61,10 +62,14 @@ Applications = \ applications/dump2Xyz \ applications/staticProps \ applications/dynamicProps \ - applications/simpleBuilder\ + applications/simpleBuilder \ + applications/randomBuilder \ applications/nanoRodBuilder \ - applications/atom2mdin + applications/nanoparticleBuilder \ + applications/atom2mdin \ + applications/hydrodynamics + Samples = \ samples/alkane \ samples/argon \ @@ -116,10 +121,13 @@ LinkOptions = \ ModuleCase = @F90_MODULE_NAMES@ ModSuffix = @MOD@ LinkOptions = \ + @LDFLAGS@ \ @FCLIBS@ \ - @CXXFLAGS@ + @CXXFLAGS@ + ParallelLinkOptions = \ + @LDFLAGS@ \ @FCLIBS@ \ @CXXFLAGS@ @@ -377,12 +385,12 @@ 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@$(ParallelDeclar) @FCFLAGS_SRCEXT@ +FortranParallelOptions = @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@ JavaCompilerOptions = -d $(TargetDir) -classpath $(ClassPath) \ -sourcepath $(SourceDir) -deprecation JavaRunOptions = -classpath $(ClassPath)