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

Diff Legend

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