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 1554 by tim, Mon Oct 11 18:40:22 2004 UTC vs.
Revision 1557 by tim, Mon Oct 11 21:13:46 2004 UTC

# Line 652 | 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  
659    ifeq "$(UseMPI)" "yes"
660 <        $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
661 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
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  
672    ifeq "$(UseMPI)" "yes"
673 <        $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
674 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
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
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) -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines