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

Comparing trunk/OOPSE-3.0/make/Makefile.in (file contents):
Revision 1557 by tim, Mon Oct 11 21:13:46 2004 UTC vs.
Revision 1899 by chuckv, Mon Dec 20 20:50:56 2004 UTC

# Line 46 | Line 46 | PackageLibs = \
46          UseTheForce \
47          brains \
48          io \
49        integrators \
50        minimizers \
49          constraints \
50          profiling \
51          restraints \
52 +        minimizers \
53  
54   #packages containing applications
55   Applications = \
# Line 285 | Line 284 | COptions               = $(FrcDeclare)
284   JniOptions             =
285   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
286                           -sourcepath $(SourceDir)
287 < COptions               = $(FrcDeclare)
288 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
289 < CppOptions             = $(FrcDeclare)
290 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
287 > COptions               = $(FrcDeclare) @CFLAGS@
288 > CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
289 > CppOptions             = $(FrcDeclare) @CXXFLAGS@
290 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
291   FortranOptions         =
292   F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
293   F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
# Line 421 | Line 420 | $(PackageTargetDir)/%.o : %.F90
420   # .F90 -> .o
421   $(PackageTargetDir)/%.o : %.F90
422          $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
423 <        if test -f *.$(ModSuffix); then \
424 <          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
425 <        fi
423 >        if test -n "`ls *.$(ModSuffix)`"; then\
424 >          $(Move) -f "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
425 >        fi
426  
427   $(PackageParallelTargetDir)/%.o : %.F90
428          $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
429 <        if test -f *.$(ModSuffix); then \
430 <          $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
431 <        fi
429 >        if test -n "`ls *.$(ModSuffix)`"; then\
430 >          $(Move) -f "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
431 >        fi
432  
433   ifeq "$(UseMPI)" "yes"
434   %.o : %.F90
435          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
436 <        if test -f *.$(ModSuffix); then \
437 <          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
438 <        fi
436 >        if test -n "`ls *.$(ModSuffix)`"; then\
437 >          $(Move) -f "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
438 >        fi
439  
440          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
441 <        if test -f *.$(ModSuffix); then \
442 <          $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
443 <        fi
441 >        if test -n "`ls *.$(ModSuffix)`"; then\
442 >          $(Move) -f "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
443 >        fi
444  
445   else
446   %.o : %.F90
447          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
448 <        if test -f *.$(ModSuffix); then \
449 <          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
450 <        fi
448 >        if test -n "`ls *.$(ModSuffix)`"; then\
449 >          $(Move) -f "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
450 >        fi
451  
452   endif
453  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines