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 1544 by tim, Fri Oct 8 22:10: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 86 | Line 85 | ForceParamDir   = @OOPSE_HOME@/share/forceFields/
85          @MPI_F90_LIB@
86  
87   OopseHome       = @OOPSE_HOME@
88 < ForceParamDir   = @OOPSE_HOME@/share/forceFields/
89 < SampleSimDir    = @OOPSE_HOME@/share/samples/
90 < BinDir          = @OOPSE_HOME@/bin
91 < DocDir          = @OOPSE_HOME@/doc
88 > ForceParamDir   = $(OopseHome)/share/forceFields
89 > SampleSimDir    = $(OopseHome)/share/samples
90 > InstallBinDir   = $(OopseHome)/bin
91 > DocDir          = $(OopseHome)/doc
92   FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
93   F90Declare      = -D__FORTRAN90
94   ParallelDeclare = -DIS_MPI
# Line 253 | Line 252 | Install                = @INSTALL@
252   CppCompiler            = @CXX@
253   Linker                 = @CXX@
254   MakeDepend             = makedepend
255 < Install                = @INSTALL@
255 > INSTALL                = @INSTALL@
256   InstallProgram         = @INSTALL_PROGRAM@
257   InstallData            = @INSTALL_DATA@
258   MkDir                = @MKINSTALLDIRS@
# 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) -module $(TargetDir)
293 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
292 > F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
293 > F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
294   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
295                           -sourcepath $(SourceDir) -deprecation
296   JavaRunOptions         = -classpath $(ClassPath)
# Line 322 | Line 321 | MySample                 = $(subst $(shell cd $(DEV_RO
321   #---------------------------------------------------------------------------
322  
323   ifneq "$(words $(SampleFiles))" "0"
324 < MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
325 < MyInstallDir             = $(SampleSimDir)/$(MySample)
326 < InstallFiles             = $(SampleFiles)
327 < InstallCommand           = $(InstallData)
324 >  MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
325 >  MyInstallDir             = $(SampleSimDir)/$(MySample)
326 >  InstallFiles             = $(SampleFiles)
327 >  InstallCommand           = $(InstallData)
328   endif
329  
330   ifneq "$(words $(Main))" "0"
331 < MyInstallDir             = $(BinDir)/
332 < InstallFiles             = $(Executable) $(ParallelExecutable)
333 < InstallCommand           = $(InstallProgram)
331 >  MyInstallDir             = $(InstallBinDir)
332 >  ifeq "$(UseMPI)" "yes"
333 >    InstallFiles             = $(Executable) $(ParallelExecutable)
334 >  else
335 >    InstallFiles             = $(Executable)
336 >  endif
337 >  InstallCommand           = $(InstallProgram)
338   endif
339  
340 < ifneq "$(words $(ForcefiledFiles))" "0"
341 < MyInstallDir             = $(ForceParamDir)
342 < InstallFiles             = $(ForcefiledFiles)/
343 < InstallCommand           = $(InstallData)
340 > ifneq "$(words $(ForcefieldFiles))" "0"
341 >  MyInstallDir             = $(ForceParamDir)
342 >  InstallFiles             = $(ForcefieldFiles)
343 >  InstallCommand           = $(InstallData)
344   endif
345  
346   ifneq "$(words $(InstallFiles))" "0"
347    InstallList            =
348   else
349 <  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(patsubst %, $(DEV_ROOT)/%,$(Forcefield)) $(patsubst %, $(SourceDir)/%,$(Applications))
349 >  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(DEV_ROOT)/forceFields $(patsubst %, $(SourceDir)/%,$(Applications))
350   endif
351  
352   InstallListLoop          = $(patsubst %,$(SourceDir)/%/.install,$(PackageList))  $(patsubst %,%/.install,$(InstallList))
# Line 417 | Line 420 | $(PackageTargetDir)/%.o : %.F90
420   # .F90 -> .o
421   $(PackageTargetDir)/%.o : %.F90
422          $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
423 +        if test -f *.$(ModSuffix); then \
424 +          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
425 +        fi
426  
427   $(PackageParallelTargetDir)/%.o : %.F90
428          $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
429 +        if test -f *.$(ModSuffix); then \
430 +          $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
431 +        fi
432  
433   ifeq "$(UseMPI)" "yes"
434   %.o : %.F90
435          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
436 +        if test -f *.$(ModSuffix); then \
437 +          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
438 +        fi
439 +
440          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
441 +        if test -f *.$(ModSuffix); then \
442 +          $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
443 +        fi
444 +
445   else
446   %.o : %.F90
447          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
448 +        if test -f *.$(ModSuffix); then \
449 +          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
450 +        fi
451 +
452   endif
453  
454  
# Line 630 | 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 <        $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
658 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
657 >
658 >  ifeq "$(UseMPI)" "yes"
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 <        $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
671 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
670 >
671 >  ifeq "$(UseMPI)" "yes"
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
652 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(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) -MM -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
686 +        @cat Make.ftemp >> $(DependencyFile)
687 +        @$(Delete) Make.ftemp
688 +  endif
689 +
690   endif
691  
692   # make lib
# Line 682 | Line 717 | endif      
717   ifneq "$(words $(InstallFiles))" "0"
718          $(InstallData) $(InstallFiles) $(MyInstallDir)
719   endif      
685 –
686 – _installprogram:
720          
721   # make statistics
722   _statisticsall :

Diff Legend

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