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 1715 by chrisfen, Fri Nov 5 21:04:12 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 652 | Line 651 | ifneq "$(words $(CppFiles))" "0"
651          @cd $(PackageSourceDir)
652  
653   ifneq "$(words $(CppFiles))" "0"
654 <        $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
655 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
654 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' -MM $(CppFiles)>> Make.cpptemp
655 >        @cat Make.cpptemp  >> $(DependencyFile)
656          $(Delete) Make.cpptemp
657  
658    ifeq "$(UseMPI)" "yes"
659 <        $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
660 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
659 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CppFiles)>> Make.cpptemp
660 >        @cat Make.cpptemp  >> $(DependencyFile)
661          @$(Delete) Make.cpptemp
662    endif
663  
664   endif
665  
666   ifneq "$(words $(CFiles))" "0"
667 <        $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
668 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
667 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/'  -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
668 >        @cat Make.ctemp  >> $(DependencyFile)
669          $(Delete) Make.ctemp
670  
671    ifeq "$(UseMPI)" "yes"
672 <        $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
673 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
672 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
673 >        @cat Make.ctemp  >> $(DependencyFile)
674          @$(Delete) Make.ctemp
675    endif
676  
677   endif
678  
679   ifneq "$(words $(F90Files))" "0"
680 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
680 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
681          @cat Make.ftemp >> $(DependencyFile)
682          @$(Delete) Make.ftemp
683  
684    ifeq "$(UseMPI)" "yes"
685 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
685 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
686          @cat Make.ftemp >> $(DependencyFile)
687          @$(Delete) Make.ftemp
688    endif

Diff Legend

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