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 1553 by tim, Mon Oct 11 18:01:51 2004 UTC

# Line 86 | Line 86 | ForceParamDir   = @OOPSE_HOME@/share/forceFields/
86          @MPI_F90_LIB@
87  
88   OopseHome       = @OOPSE_HOME@
89 < ForceParamDir   = @OOPSE_HOME@/share/forceFields/
90 < SampleSimDir    = @OOPSE_HOME@/share/samples/
91 < BinDir          = @OOPSE_HOME@/bin
92 < DocDir          = @OOPSE_HOME@/doc
89 > ForceParamDir   = $(OopseHome)/share/forceFields
90 > SampleSimDir    = $(OopseHome)/share/samples
91 > InstallBinDir   = $(OopseHome)/bin
92 > DocDir          = $(OopseHome)/doc
93   FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
94   F90Declare      = -D__FORTRAN90
95   ParallelDeclare = -DIS_MPI
# Line 253 | Line 253 | Install                = @INSTALL@
253   CppCompiler            = @CXX@
254   Linker                 = @CXX@
255   MakeDepend             = makedepend
256 < Install                = @INSTALL@
256 > INSTALL                = @INSTALL@
257   InstallProgram         = @INSTALL_PROGRAM@
258   InstallData            = @INSTALL_DATA@
259   MkDir                = @MKINSTALLDIRS@
# Line 322 | Line 322 | MySample                 = $(subst $(shell cd $(DEV_RO
322   #---------------------------------------------------------------------------
323  
324   ifneq "$(words $(SampleFiles))" "0"
325 < MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
326 < MyInstallDir             = $(SampleSimDir)/$(MySample)
327 < InstallFiles             = $(SampleFiles)
328 < InstallCommand           = $(InstallData)
325 >  MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
326 >  MyInstallDir             = $(SampleSimDir)/$(MySample)
327 >  InstallFiles             = $(SampleFiles)
328 >  InstallCommand           = $(InstallData)
329   endif
330  
331   ifneq "$(words $(Main))" "0"
332 < MyInstallDir             = $(BinDir)/
333 < InstallFiles             = $(Executable) $(ParallelExecutable)
334 < InstallCommand           = $(InstallProgram)
332 >  MyInstallDir             = $(InstallBinDir)
333 >  ifeq "$(UseMPI)" "yes"
334 >    InstallFiles             = $(Executable) $(ParallelExecutable)
335 >  else
336 >    InstallFiles             = $(Executable)
337 >  endif
338 >  InstallCommand           = $(InstallProgram)
339   endif
340  
341 < ifneq "$(words $(ForcefiledFiles))" "0"
342 < MyInstallDir             = $(ForceParamDir)
343 < InstallFiles             = $(ForcefiledFiles)/
344 < InstallCommand           = $(InstallData)
341 > ifneq "$(words $(ForcefieldFiles))" "0"
342 >  MyInstallDir             = $(ForceParamDir)
343 >  InstallFiles             = $(ForcefieldFiles)
344 >  InstallCommand           = $(InstallData)
345   endif
346  
347   ifneq "$(words $(InstallFiles))" "0"
348    InstallList            =
349   else
350 <  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(patsubst %, $(DEV_ROOT)/%,$(Forcefield)) $(patsubst %, $(SourceDir)/%,$(Applications))
350 >  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(DEV_ROOT)/forceFields $(patsubst %, $(SourceDir)/%,$(Applications))
351   endif
352  
353   InstallListLoop          = $(patsubst %,$(SourceDir)/%/.install,$(PackageList))  $(patsubst %,%/.install,$(InstallList))
# Line 417 | Line 421 | $(PackageTargetDir)/%.o : %.F90
421   # .F90 -> .o
422   $(PackageTargetDir)/%.o : %.F90
423          $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
424 +        if test -f *.$(ModSuffix); then \
425 +          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
426 +        fi
427  
428   $(PackageParallelTargetDir)/%.o : %.F90
429          $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
430 +        if test -f *.$(ModSuffix); then \
431 +          $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
432 +        fi
433  
434   ifeq "$(UseMPI)" "yes"
435   %.o : %.F90
436          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
437 +        if test -f *.$(ModSuffix); then \
438 +          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
439 +        fi
440 +
441          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
442 +        if test -f *.$(ModSuffix); then \
443 +          $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
444 +        fi
445 +
446   else
447   %.o : %.F90
448          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
449 +        if test -f *.$(ModSuffix); then \
450 +          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
451 +        fi
452 +
453   endif
454  
455  
# Line 682 | Line 704 | endif      
704   ifneq "$(words $(InstallFiles))" "0"
705          $(InstallData) $(InstallFiles) $(MyInstallDir)
706   endif      
685 –
686 – _installprogram:
707          
708   # make statistics
709   _statisticsall :

Diff Legend

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