--- trunk/OOPSE-3.0/make/Makefile.in	2005/02/07 20:31:50	1984
+++ trunk/OOPSE-3.0/make/Makefile.in	2005/03/22 16:38:37	2131
@@ -50,12 +50,15 @@ PackageLibs = \
 	constraints \
 	minimizers \
 	selection \
+	restraints \
 
 #packages containing applications
 Applications = \
 	applications/oopse \
 	applications/dump2Xyz \
         applications/simpleBuilder\
+	applications/staticProps \
+	applications/dynamicProps \
 
 Samples = \
 	samples/argon \
@@ -72,15 +75,12 @@ IncludeDirs = \
 	samples/zcons \
 
 IncludeDirs = \
-	@SPRNG_INC_DIR@ \
 	@MPI_INC_DIR@
 
 LibraryDirs = \
-	@SPRNG_LIB_DIR@ \
 	@MPI_LIB_DIR@ 
 
 Libraries = \
-	@SPRNG_LIB@ \
 	@MPI_LIB@ \
 	@MPI_F90_LIB@
 
@@ -216,9 +216,11 @@ ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))
 #if Main is defined, do not build library. It may not be true sometimes
 ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))" "0"
   DependencyFile    = $(PackageSourceDir)/Makedepend
-  ifneq "$(Main)" ""
+  ifneq "$(words $(Main))" "0"
     Executable             = $(BinDir)/$(Main)
-    ParallelExecutable     = $(BinDir)/$(Main)_MPI
+    ifeq "$(BuiltParallelExe)" "1"
+      ParallelExecutable     = $(BinDir)/$(Main)_MPI
+    endif
   else
     SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.so
     StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.a
@@ -256,6 +258,7 @@ InstallData            = @INSTALL_DATA@
 MakeDepend             = makedepend
 INSTALL                = @INSTALL@
 InstallProgram         = @INSTALL_PROGRAM@
+InstallScript          = @INSTALL_SCRIPT@
 InstallData            = @INSTALL_DATA@
 MkDir                  = @MKINSTALLDIRS@
 Delete                 = rm -fr
@@ -625,25 +628,26 @@ _cleanall :
 	$(Print) Done clean.	
 
 _cleanall :
-	$(Delete) $(ObjectFiles) $(ParallelObjectFiles)
+	$(Delete) \
+		$(ObjectFiles) \
+		$(ParallelObjectFiles) \
+		$(JarFile) \
+		$(SharedLibrary) \
+		$(StaticLibrary) \
+		$(ParallelSharedLibrary) \
+		$(ParallelStaticLibrary) \
+		$(CombinedStaticLib) \
+		$(CombinedParallelStaticLib)
 
 # make distclean
 distclean : $(PackageListLoop)
 	$(Print) Done clean.	
 
-_distcleanall :
-	$(Delete) $(ObjectFiles) \
-	          $(ParallelObjectFiles) \
-		        $(JarFile) \
-	          $(SharedLibrary) \
-	          $(StaticLibrary) \
-	          $(ParallelSharedLibrary) \
-	          $(ParallelStaticLibrary) \
-	          $(Executable) \
+_distcleanall : _cleanall
+	$(Delete) $(Executable) \
 	          $(ParallelExecutable) \
 	          $(DependencyFile) 
 
-
 # make depend
 depend : $(PackageListLoop)
 	$(Print) Done dependencies.
@@ -719,7 +723,7 @@ ifneq "$(words $(InstallFiles))" "0"
 _installdata :  $(MyInstallDir)
 	$(Print) $(InstallFiles) 
 ifneq "$(words $(InstallFiles))" "0"
-	$(InstallData) $(InstallFiles) $(MyInstallDir)
+	$(InstallCommand) $(InstallFiles) $(MyInstallDir)
 endif	    
 
 # make statistics