--- trunk/OOPSE-4/make/Makefile.in	2005/02/14 23:26:25	2023
+++ trunk/OOPSE-4/make/Makefile.in	2005/03/21 19:22:55	2126
@@ -50,6 +50,7 @@ PackageLibs = \
 	constraints \
 	minimizers \
 	selection \
+	restraints \
 
 #packages containing applications
 Applications = \
@@ -74,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@
 
@@ -218,7 +216,7 @@ 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
   else
@@ -258,6 +256,7 @@ InstallData            = @INSTALL_DATA@
 MakeDepend             = makedepend
 INSTALL                = @INSTALL@
 InstallProgram         = @INSTALL_PROGRAM@
+InstallScript          = @INSTALL_SCRIPT@
 InstallData            = @INSTALL_DATA@
 MkDir                  = @MKINSTALLDIRS@
 Delete                 = rm -fr
@@ -279,8 +278,6 @@ Ps                     = @PS@
 Lex                    = @LEX@
 Ranlib                 = @RANLIB@
 Doxygen                = @DOXYGEN@
-Ps                     = @PS@
-PsType                 = @PSTYPE@
 
 MakeOptions            = -k
 MakeDependOptions      = 
@@ -290,7 +287,7 @@ COptions               = $(FrcDeclare) @CFLAGS@ -DPS=$
 JniOptions             =
 RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
 			 -sourcepath $(SourceDir)
-COptions               = $(FrcDeclare) @CFLAGS@ -DPS=$(Ps) -DPSTYPE=$(PsType)
+COptions               = $(FrcDeclare) @CFLAGS@
 CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
 CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
 CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
@@ -629,25 +626,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.
@@ -723,7 +721,7 @@ ifneq "$(words $(InstallFiles))" "0"
 _installdata :  $(MyInstallDir)
 	$(Print) $(InstallFiles) 
 ifneq "$(words $(InstallFiles))" "0"
-	$(InstallData) $(InstallFiles) $(MyInstallDir)
+	$(InstallCommand) $(InstallFiles) $(MyInstallDir)
 endif	    
 
 # make statistics