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

Comparing:
trunk/OOPSE-3.0/make/Makefile.in (file contents), Revision 1545 by tim, Fri Oct 8 22:51:06 2004 UTC vs.
branches/new_design/OOPSE-3.0/make/Makefile.in (file contents), Revision 1779 by tim, Wed Nov 24 18:20:15 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 \
51 –        constraints \
52 –        profiling \
53 –        restraints \
48  
49   #packages containing applications
50   Applications = \
# Line 86 | Line 80 | ForceParamDir   = @OOPSE_HOME@/share/forceFields
80          @MPI_F90_LIB@
81  
82   OopseHome       = @OOPSE_HOME@
83 < ForceParamDir   = @OOPSE_HOME@/share/forceFields
84 < SampleSimDir    = @OOPSE_HOME@/share/samples
85 < InstallBinDir   = @OOPSE_HOME@/bin
86 < DocDir          = @OOPSE_HOME@/doc
83 > ForceParamDir   = $(OopseHome)/share/forceFields
84 > SampleSimDir    = $(OopseHome)/share/samples
85 > InstallBinDir   = $(OopseHome)/bin
86 > DocDir          = $(OopseHome)/doc
87   FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
88   F90Declare      = -D__FORTRAN90
89   ParallelDeclare = -DIS_MPI
# Line 253 | Line 247 | Install                = @INSTALL@
247   CppCompiler            = @CXX@
248   Linker                 = @CXX@
249   MakeDepend             = makedepend
250 < Install                = @INSTALL@
250 > INSTALL                = @INSTALL@
251   InstallProgram         = @INSTALL_PROGRAM@
252   InstallData            = @INSTALL_DATA@
253   MkDir                = @MKINSTALLDIRS@
# Line 285 | Line 279 | COptions               = $(FrcDeclare)
279   JniOptions             =
280   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
281                           -sourcepath $(SourceDir)
282 < COptions               = $(FrcDeclare)
283 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
284 < CppOptions             = $(FrcDeclare)
285 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
282 > COptions               = $(FrcDeclare) @CFLAGS@
283 > CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
284 > CppOptions             = $(FrcDeclare) @CXXFLAGS@
285 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
286   FortranOptions         =
287 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir)
288 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
287 > F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
288 > F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
289   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
290                           -sourcepath $(SourceDir) -deprecation
291   JavaRunOptions         = -classpath $(ClassPath)
# Line 322 | Line 316 | MySample                 = $(subst $(shell cd $(DEV_RO
316   #---------------------------------------------------------------------------
317  
318   ifneq "$(words $(SampleFiles))" "0"
319 < MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
320 < MyInstallDir             = $(SampleSimDir)/$(MySample)
321 < InstallFiles             = $(SampleFiles)
322 < InstallCommand           = $(InstallData)
319 >  MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
320 >  MyInstallDir             = $(SampleSimDir)/$(MySample)
321 >  InstallFiles             = $(SampleFiles)
322 >  InstallCommand           = $(InstallData)
323   endif
324  
325   ifneq "$(words $(Main))" "0"
326 < MyInstallDir             = $(InstallBinDir)
327 < InstallFiles             = $(Executable) $(ParallelExecutable)
328 < InstallCommand           = $(InstallProgram)
326 >  MyInstallDir             = $(InstallBinDir)
327 >  ifeq "$(UseMPI)" "yes"
328 >    InstallFiles             = $(Executable) $(ParallelExecutable)
329 >  else
330 >    InstallFiles             = $(Executable)
331 >  endif
332 >  InstallCommand           = $(InstallProgram)
333   endif
334  
335   ifneq "$(words $(ForcefieldFiles))" "0"
336 < MyInstallDir             = $(ForceParamDir)
337 < InstallFiles             = $(ForcefieldFiles)
338 < InstallCommand           = $(InstallData)
336 >  MyInstallDir             = $(ForceParamDir)
337 >  InstallFiles             = $(ForcefieldFiles)
338 >  InstallCommand           = $(InstallData)
339   endif
340  
341   ifneq "$(words $(InstallFiles))" "0"
# Line 417 | Line 415 | $(PackageTargetDir)/%.o : %.F90
415   # .F90 -> .o
416   $(PackageTargetDir)/%.o : %.F90
417          $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
418 +        if test -f *.$(ModSuffix); then \
419 +          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
420 +        fi
421  
422   $(PackageParallelTargetDir)/%.o : %.F90
423          $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
424 +        if test -f *.$(ModSuffix); then \
425 +          $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
426 +        fi
427  
428   ifeq "$(UseMPI)" "yes"
429   %.o : %.F90
430          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
431 +        if test -f *.$(ModSuffix); then \
432 +          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
433 +        fi
434 +
435          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
436 +        if test -f *.$(ModSuffix); then \
437 +          $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
438 +        fi
439 +
440   else
441   %.o : %.F90
442          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
443 +        if test -f *.$(ModSuffix); then \
444 +          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
445 +        fi
446 +
447   endif
448  
449  
# Line 630 | Line 646 | ifneq "$(words $(CppFiles))" "0"
646          @cd $(PackageSourceDir)
647  
648   ifneq "$(words $(CppFiles))" "0"
649 <        $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
650 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
649 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' -MM $(CppFiles)>> Make.cpptemp
650 >        @cat Make.cpptemp  >> $(DependencyFile)
651          $(Delete) Make.cpptemp
652 <        $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
653 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
652 >
653 >  ifeq "$(UseMPI)" "yes"
654 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CppFiles)>> Make.cpptemp
655 >        @cat Make.cpptemp  >> $(DependencyFile)
656          @$(Delete) Make.cpptemp
657 +  endif
658 +
659   endif
660  
661   ifneq "$(words $(CFiles))" "0"
662 <        $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
663 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
662 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/'  -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
663 >        @cat Make.ctemp  >> $(DependencyFile)
664          $(Delete) Make.ctemp
665 <        $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
666 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
665 >
666 >  ifeq "$(UseMPI)" "yes"
667 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
668 >        @cat Make.ctemp  >> $(DependencyFile)
669          @$(Delete) Make.ctemp
670 +  endif
671 +
672   endif
673  
674   ifneq "$(words $(F90Files))" "0"
675 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
652 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
675 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
676          @cat Make.ftemp >> $(DependencyFile)
677          @$(Delete) Make.ftemp
678 +
679 +  ifeq "$(UseMPI)" "yes"
680 +        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
681 +        @cat Make.ftemp >> $(DependencyFile)
682 +        @$(Delete) Make.ftemp
683 +  endif
684 +
685   endif
686  
687   # make lib

Diff Legend

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