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

Comparing trunk/OOPSE-3.0/make/Makefile.in (file contents):
Revision 2470 by tim, Fri Dec 2 15:38:25 2005 UTC vs.
Revision 2547 by gezelter, Wed Jan 11 23:06:08 2006 UTC

# Line 79 | Line 79 | Samples = \
79          samples/alkane \
80          samples/minimizer \
81          samples/metals \
82 +        samples/metals/EAM \
83 +        samples/metals/EAM/nanoparticle \
84 +        samples/metals/EAM/nanorod \
85 +        samples/metals/Sutton-Chen \
86          samples/thermoIntegration/liquid \
87          samples/thermoIntegration/solid \
88          samples/dipole \
# Line 111 | Line 115 | LinkOptions = \
115   ModuleCase      = @F90_MODULE_NAMES@
116   ModSuffix       = @MOD@
117   LinkOptions = \
118 <        @F90LIBS@
118 >        @FCLIBS@
119  
120   ParallelLinkOptions = \
121 <        @F90LIBS@
121 >        @FCLIBS@
122  
123  
124   #---------------------------------------------------------------------------
# Line 338 | Line 342 | InstallProgram         = @INSTALL_PROGRAM@
342   MakeDepend             = makedepend
343   LN_S                   = @LN_S@
344   INSTALL                = @INSTALL@
345 + EGREP                  = @EGREP@
346   InstallProgram         = @INSTALL_PROGRAM@
347   InstallScript          = @INSTALL_SCRIPT@
348   InstallData            = @INSTALL_DATA@
# Line 346 | Line 351 | F90Compiler            = @F90@
351   StaticArchiver         = @AR@
352   DynamicArchiver        = @CC@
353   FortranCompiler        = @FC@
349 – F90Compiler            = @F90@
354   JavaCompiler           = $(JAVA_HOME)/bin/javac
355   JavaArchiver           = $(JAVA_HOME)/bin/jar
356   JarSigner              = $(JAVA_HOME)/bin/jarsigner
# Line 372 | Line 376 | CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOP
376                           -sourcepath $(SourceDir)
377   COptions               = $(FrcDeclare) @CFLAGS@
378   CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
379 < CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
380 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
381 < FortranOptions         =
382 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
379 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
379 > CppOptions             = $(FrcDeclare) @CXXFLAGS@
380 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
381 > FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@
382 > FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclar) @FCFLAGS_SRCEXT@
383   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
384                           -sourcepath $(SourceDir) -deprecation
385   JavaRunOptions         = -classpath $(ClassPath)
# Line 512 | Line 515 | $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
515  
516   # .F90 -> .o
517   $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
518 <        $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
518 >        $(FortranCompiler) $(FortranOptions) $(IncludePath) -c $< -o $@
519          if test -n "`ls *.$(ModSuffix)`"; then \
520            $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
521          fi
522  
523   $(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile)
524 <        $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
524 >        $(FortranCompiler) $(FortranParallelOptions) $(IncludePath) -c $< -o $@
525          if test -n "`ls *.$(ModSuffix)`"; then \
526            $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
527          fi
# Line 643 | Line 646 | find_objs = $(shell $(StaticArchiver) -t $(1))
646          $(Doxygen) $(DEV_ROOT)/make/Doxyfile
647  
648   #GUN make funtions to merge the libraries
649 < find_objs = $(shell $(StaticArchiver) -t $(1))
649 > find_objs = $(shell $(StaticArchiver) -t $(1) | $(EGREP) -v "SYMDEF")
650   extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
651   create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
652   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
653   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
654   do_link = $(shell $(LN_S) $(1) $(2))
655 + all_objs = $(foreach thisLib,$(LibNames), $(call find_objs, $(thisLib)))
656 + all_parallel_objs = $(foreach thisLib,$(ParallelLibNames), $(call find_objs, $(thisLib)))
657 + all_lib_objs = $(patsubst %,$(TargetDir)/%,$(call all_objs))
658 + all_lib_parallel_objs = $(patsubst %,$(ParallelTargetDir)/%,$(call all_parallel_objs))
659  
660   $(CombinedStaticLib) : $(LibDir)/.stamp_UP
661 <        $(Print) create $@      
662 <        $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
661 >        $(Print) creating $@            
662 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_objs)
663          $(Ranlib) $(CombinedStaticLib)
664  
665   $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
666 <        $(Print) create $@
667 <        $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
666 >        $(Print) creating $@
667 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_parallel_objs)
668          $(Ranlib) $(CombinedParallelStaticLib)
669  
670   # Executable

Diff Legend

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