--- trunk/OOPSE-3.0/make/Makefile.in	2004/10/22 22:53:40	1635
+++ trunk/OOPSE-3.0/make/Makefile.in	2005/01/13 21:48:09	1938
@@ -38,25 +38,23 @@ PackageLibs = \
 #packages containing libraries
 PackageLibs = \
 	utils \
+	visitors \
 	math \
 	types \
 	primitives \
-	visitors \
 	UseTheForce/DarkSide \
 	UseTheForce \
 	brains \
 	io \
-	integrators \
-	minimizers \
+	integrators\
 	constraints \
-	profiling \
-	restraints \
+	minimizers \
 
 #packages containing applications
 Applications = \
 	applications/oopse \
 	applications/dump2Xyz \
-	applications/simpleBuilder
+        applications/simpleBuilder\
 
 Samples = \
 	samples/argon \
@@ -247,7 +245,7 @@ Move                   = mv
 #
 #---------------------------------------------------------------------------
 Print                  = @echo
-Move                   = mv
+Move                   = mv -f
 Copy                   = cp
 CCompiler              = @CC@
 CppCompiler            = @CXX@
@@ -256,7 +254,7 @@ MkDir                = @MKINSTALLDIRS@
 INSTALL                = @INSTALL@
 InstallProgram         = @INSTALL_PROGRAM@
 InstallData            = @INSTALL_DATA@
-MkDir                = @MKINSTALLDIRS@
+MkDir                  = @MKINSTALLDIRS@
 Delete                 = rm -fr
 StaticArchiver         = @AR@
 DynamicArchiver        = @CC@
@@ -366,8 +364,11 @@ $(PackageTargetDir) :
 
 # Create target directory
 $(PackageTargetDir) :
-	$(MakeDir) $@
+	$(MkDir) $@
 
+$(BinDir) :
+	$(MkDir) $@
+
 # .c -> .o
 $(PackageTargetDir)/%.o : %.c
 	$(Print) $@
@@ -421,35 +422,34 @@ $(PackageTargetDir)/%.o : %.F90
 # .F90 -> .o
 $(PackageTargetDir)/%.o : %.F90
 	$(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
-	if test -f *.$(ModSuffix); then \
-	  $(Move) *.$(ModSuffix) $(PackageTargetDir);\
+	if test -n "`ls *.$(ModSuffix)`"; then \
+	  $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
 	fi
 
 $(PackageParallelTargetDir)/%.o : %.F90
 	$(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
-	if test -f *.$(ModSuffix); then \
-	  $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
+	if test -n "`ls *.$(ModSuffix)`"; then \
+	  $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
 	fi
 
 ifeq "$(UseMPI)" "yes"
 %.o : %.F90
 	$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
-	if test -f *.$(ModSuffix); then \
-	  $(Move) *.$(ModSuffix) $(PackageTargetDir);\
-	fi
+	if test -n "`ls *.$(ModSuffix)`"; then\
+          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
+        fi
 
 	$(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
-	if test -f *.$(ModSuffix); then \
-	  $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
+	if test -n "`ls *.$(ModSuffix)`"; then\
+	  $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
 	fi
 
 else
 %.o : %.F90
 	$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
-	if test -f *.$(ModSuffix); then \
-	  $(Move) *.$(ModSuffix) $(PackageTargetDir);\
-	fi
-
+	if test -n "`ls *.$(ModSuffix)`"; then\
+          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
+        fi
 endif
 
 
@@ -569,11 +569,11 @@ $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
 	$(Ranlib) $(CombinedParallelStaticLib)
 
 # Executable
-$(Executable) : $(CombinedStaticLib) $(ObjectFiles)
-	$(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(CombinedStaticLib) $(Libraries) -o $@
+$(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir)
+	$(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
 
-$(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
-	$(Linker) $(ParallelObjectFiles) $(ParallelLinkOptions) $(LibDirs) $(CombinedParallelStaticLib) $(Libraries) -o $@
+$(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) $(BinDir)
+	$(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@
 
 # Anything else is just copied from source to target
 $(PackageTargetDir)/% : $(PackageSourceDir)/%
@@ -718,7 +718,7 @@ endif	    
 ifneq "$(words $(InstallFiles))" "0"
 	$(InstallData) $(InstallFiles) $(MyInstallDir)
 endif	    
-	
+
 # make statistics
 _statisticsall :
 	@$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp