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 1552 by gezelter, Mon Oct 11 15:43:16 2004 UTC vs.
Revision 1557 by tim, Mon Oct 11 21:13:46 2004 UTC

# Line 290 | Line 290 | F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDI
290   CppOptions             = $(FrcDeclare)
291   CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
292   FortranOptions         =
293 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir)
294 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
293 > F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
294 > F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
295   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
296                           -sourcepath $(SourceDir) -deprecation
297   JavaRunOptions         = -classpath $(ClassPath)
# Line 421 | Line 421 | $(PackageTargetDir)/%.o : %.F90
421   # .F90 -> .o
422   $(PackageTargetDir)/%.o : %.F90
423          $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
424 +        if test -f *.$(ModSuffix); then \
425 +          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
426 +        fi
427  
428   $(PackageParallelTargetDir)/%.o : %.F90
429          $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
430 +        if test -f *.$(ModSuffix); then \
431 +          $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
432 +        fi
433  
434   ifeq "$(UseMPI)" "yes"
435   %.o : %.F90
436          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
437 +        if test -f *.$(ModSuffix); then \
438 +          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
439 +        fi
440 +
441          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
442 +        if test -f *.$(ModSuffix); then \
443 +          $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
444 +        fi
445 +
446   else
447   %.o : %.F90
448          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
449 +        if test -f *.$(ModSuffix); then \
450 +          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
451 +        fi
452 +
453   endif
454  
455  
# Line 634 | Line 652 | ifneq "$(words $(CppFiles))" "0"
652          @cd $(PackageSourceDir)
653  
654   ifneq "$(words $(CppFiles))" "0"
655 <        $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
656 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
655 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' -MM $(CppFiles)>> Make.cpptemp
656 >        @cat Make.cpptemp  >> $(DependencyFile)
657          $(Delete) Make.cpptemp
658 <        $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
659 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
658 >
659 >  ifeq "$(UseMPI)" "yes"
660 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CppFiles)>> Make.cpptemp
661 >        @cat Make.cpptemp  >> $(DependencyFile)
662          @$(Delete) Make.cpptemp
663 +  endif
664 +
665   endif
666  
667   ifneq "$(words $(CFiles))" "0"
668 <        $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
669 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
668 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/'  -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
669 >        @cat Make.ctemp  >> $(DependencyFile)
670          $(Delete) Make.ctemp
671 <        $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
672 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
671 >
672 >  ifeq "$(UseMPI)" "yes"
673 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
674 >        @cat Make.ctemp  >> $(DependencyFile)
675          @$(Delete) Make.ctemp
676 +  endif
677 +
678   endif
679  
680   ifneq "$(words $(F90Files))" "0"
681 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
656 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
681 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
682          @cat Make.ftemp >> $(DependencyFile)
683          @$(Delete) Make.ftemp
684 +
685 +  ifeq "$(UseMPI)" "yes"
686 +        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
687 +        @cat Make.ftemp >> $(DependencyFile)
688 +        @$(Delete) Make.ftemp
689 +  endif
690 +
691   endif
692  
693   # make lib

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines