ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/make/Makefile.in
(Generate patch)

Comparing trunk/OOPSE-2.0/make/Makefile.in (file contents):
Revision 1715 by chrisfen, Fri Nov 5 21:04:12 2004 UTC vs.
Revision 1936 by tim, Thu Jan 13 18:26:02 2005 UTC

# Line 38 | Line 38 | PackageLibs = \
38   #packages containing libraries
39   PackageLibs = \
40          utils \
41 +        visitors \
42          math \
43          types \
44          primitives \
44        visitors \
45          UseTheForce/DarkSide \
46          UseTheForce \
47          brains \
48          io \
49 +        integrators\
50          constraints \
50        profiling \
51        restraints \
51          minimizers \
52  
53   #packages containing applications
54   Applications = \
55          applications/oopse \
56          applications/dump2Xyz \
57 <        applications/simpleBuilder
57 >        applications/simpleBuilder\
58  
59   Samples = \
60          samples/argon \
# Line 246 | Line 245 | Move                   = mv
245   #
246   #---------------------------------------------------------------------------
247   Print                  = @echo
248 < Move                   = mv
248 > Move                   = mv -f
249   Copy                   = cp
250   CCompiler              = @CC@
251   CppCompiler            = @CXX@
# Line 420 | Line 419 | $(PackageTargetDir)/%.o : %.F90
419   # .F90 -> .o
420   $(PackageTargetDir)/%.o : %.F90
421          $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
422 <        if test -f *.$(ModSuffix); then \
423 <          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
422 >        if test -n "`ls *.$(ModSuffix)`"; then \
423 >          $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
424          fi
425  
426   $(PackageParallelTargetDir)/%.o : %.F90
427          $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
428 <        if test -f *.$(ModSuffix); then \
429 <          $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
428 >        if test -n "`ls *.$(ModSuffix)`"; then \
429 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
430          fi
431  
432   ifeq "$(UseMPI)" "yes"
433   %.o : %.F90
434          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
435 <        if test -f *.$(ModSuffix); then \
436 <          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
437 <        fi
435 >        if test -n "`ls *.$(ModSuffix)`"; then\
436 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
437 >        fi
438  
439          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
440 <        if test -f *.$(ModSuffix); then \
441 <          $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
440 >        if test -n "`ls *.$(ModSuffix)`"; then\
441 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
442          fi
443  
444   else
445   %.o : %.F90
446          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
447 <        if test -f *.$(ModSuffix); then \
448 <          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
449 <        fi
447 >        if test -n "`ls *.$(ModSuffix)`"; then\
448 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
449 >        fi
450  
451   endif
452  
# Line 569 | Line 568 | $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
568  
569   # Executable
570   $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
571 <        $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(CombinedStaticLib) $(Libraries) -o $@
571 >        $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
572  
573   $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
574 <        $(Linker) $(ParallelObjectFiles) $(ParallelLinkOptions) $(LibDirs) $(CombinedParallelStaticLib) $(Libraries) -o $@
574 >        $(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@
575  
576   # Anything else is just copied from source to target
577   $(PackageTargetDir)/% : $(PackageSourceDir)/%
# Line 717 | Line 716 | endif      
716   ifneq "$(words $(InstallFiles))" "0"
717          $(InstallData) $(InstallFiles) $(MyInstallDir)
718   endif      
719 <        
719 >
720   # make statistics
721   _statisticsall :
722          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines