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 1553 by tim, Mon Oct 11 18:01:51 2004 UTC vs.
Revision 1712 by tim, Thu Nov 4 20:55:01 2004 UTC

# Line 41 | Line 41 | PackageLibs = \
41          math \
42          types \
43          primitives \
44 –        visitors \
44          UseTheForce/DarkSide \
45          UseTheForce \
46          brains \
47          io \
49 –        integrators \
50 –        minimizers \
48          constraints \
49          profiling \
50          restraints \
# Line 285 | Line 282 | COptions               = $(FrcDeclare)
282   JniOptions             =
283   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
284                           -sourcepath $(SourceDir)
285 < COptions               = $(FrcDeclare)
286 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
287 < CppOptions             = $(FrcDeclare)
288 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
285 > COptions               = $(FrcDeclare) @CFLAGS@
286 > CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
287 > CppOptions             = $(FrcDeclare) @CXXFLAGS@
288 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
289   FortranOptions         =
290 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir)
291 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
290 > F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
291 > F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
292   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
293                           -sourcepath $(SourceDir) -deprecation
294   JavaRunOptions         = -classpath $(ClassPath)
# Line 652 | Line 649 | ifneq "$(words $(CppFiles))" "0"
649          @cd $(PackageSourceDir)
650  
651   ifneq "$(words $(CppFiles))" "0"
652 <        $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
653 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
652 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' -MM $(CppFiles)>> Make.cpptemp
653 >        @cat Make.cpptemp  >> $(DependencyFile)
654          $(Delete) Make.cpptemp
655 <        $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
656 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
655 >
656 >  ifeq "$(UseMPI)" "yes"
657 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CppFiles)>> Make.cpptemp
658 >        @cat Make.cpptemp  >> $(DependencyFile)
659          @$(Delete) Make.cpptemp
660 +  endif
661 +
662   endif
663  
664   ifneq "$(words $(CFiles))" "0"
665 <        $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
666 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
665 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/'  -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
666 >        @cat Make.ctemp  >> $(DependencyFile)
667          $(Delete) Make.ctemp
668 <        $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
669 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
668 >
669 >  ifeq "$(UseMPI)" "yes"
670 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
671 >        @cat Make.ctemp  >> $(DependencyFile)
672          @$(Delete) Make.ctemp
673 +  endif
674 +
675   endif
676  
677   ifneq "$(words $(F90Files))" "0"
678 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
674 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
678 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
679          @cat Make.ftemp >> $(DependencyFile)
680          @$(Delete) Make.ftemp
681 +
682 +  ifeq "$(UseMPI)" "yes"
683 +        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
684 +        @cat Make.ftemp >> $(DependencyFile)
685 +        @$(Delete) Make.ftemp
686 +  endif
687 +
688   endif
689  
690   # make lib

Diff Legend

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