--- trunk/OOPSE-4/make/Makefile.in 2004/10/22 22:53:40 1635 +++ trunk/OOPSE-4/make/Makefile.in 2004/12/20 20:50:56 1899 @@ -46,11 +46,10 @@ PackageLibs = \ UseTheForce \ brains \ io \ - integrators \ - minimizers \ constraints \ profiling \ restraints \ + minimizers \ #packages containing applications Applications = \ @@ -421,34 +420,34 @@ $(PackageTargetDir)/%.o : %.F90 # .F90 -> .o $(PackageTargetDir)/%.o : %.F90 $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@ - if test -f *.$(ModSuffix); then \ - $(Move) *.$(ModSuffix) $(PackageTargetDir);\ - fi + if test -n "`ls *.$(ModSuffix)`"; then\ + $(Move) -f "`ls *.$(ModSuffix)`" $(PackageTargetDir);\ + fi $(PackageParallelTargetDir)/%.o : %.F90 $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@ - if test -f *.$(ModSuffix); then \ - $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\ - fi + if test -n "`ls *.$(ModSuffix)`"; then\ + $(Move) -f "`ls *.$(ModSuffix)`" $(PackageTargetDir);\ + 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) -f "`ls *.$(ModSuffix)`" $(PackageTargetDir);\ + fi $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@ - if test -f *.$(ModSuffix); then \ - $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\ - fi + if test -n "`ls *.$(ModSuffix)`"; then\ + $(Move) -f "`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) -f "`ls *.$(ModSuffix)`" $(PackageTargetDir);\ + fi endif