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

Comparing:
trunk/OOPSE-3.0/make/Makefile.in (file contents), Revision 1715 by chrisfen, Fri Nov 5 21:04:12 2004 UTC vs.
branches/new_design/OOPSE-3.0/make/Makefile.in (file contents), Revision 1914 by tim, Tue Jan 11 15:46:22 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 <        constraints \
50 <        profiling \
51 <        restraints \
52 <        minimizers \
49 >        integrators\
50  
51   #packages containing applications
52   Applications = \
# Line 246 | Line 243 | Move                   = mv
243   #
244   #---------------------------------------------------------------------------
245   Print                  = @echo
246 < Move                   = mv
246 > Move                   = mv -f
247   Copy                   = cp
248   CCompiler              = @CC@
249   CppCompiler            = @CXX@
# Line 420 | Line 417 | $(PackageTargetDir)/%.o : %.F90
417   # .F90 -> .o
418   $(PackageTargetDir)/%.o : %.F90
419          $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
420 <        if test -f *.$(ModSuffix); then \
421 <          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
420 >        if test -n "`ls *.$(ModSuffix)`"; then \
421 >          $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
422          fi
423  
424   $(PackageParallelTargetDir)/%.o : %.F90
425          $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
426 <        if test -f *.$(ModSuffix); then \
427 <          $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
426 >        if test -n "`ls *.$(ModSuffix)`"; then \
427 >          $(Move) "`ls *.$(ModSuffix)`" (PackageParallelTargetDir);\
428          fi
429  
430   ifeq "$(UseMPI)" "yes"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines