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 2470 by tim, Fri Dec 2 15:38:25 2005 UTC vs.
Revision 2531 by tim, Fri Dec 30 15:32:55 2005 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 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 643 | Line 648 | find_objs = $(shell $(StaticArchiver) -t $(1))
648          $(Doxygen) $(DEV_ROOT)/make/Doxyfile
649  
650   #GUN make funtions to merge the libraries
651 < find_objs = $(shell $(StaticArchiver) -t $(1))
651 > find_objs = $(shell $(StaticArchiver) -t $(1) | $(EGREP) -v "SYMDEF")
652   extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
653   create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
654   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
655   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
656   do_link = $(shell $(LN_S) $(1) $(2))
657 + all_objs = $(foreach thisLib,$(LibNames), $(call find_objs, $(thisLib)))
658 + all_parallel_objs = $(foreach thisLib,$(ParallelLibNames), $(call find_objs, $(thisLib)))
659 + all_lib_objs = $(patsubst %,$(TargetDir)/%,$(call all_objs))
660 + all_lib_parallel_objs = $(patsubst %,$(ParallelTargetDir)/%,$(call all_parallel_objs))
661  
662   $(CombinedStaticLib) : $(LibDir)/.stamp_UP
663 <        $(Print) create $@      
664 <        $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
663 >        $(Print) creating $@            
664 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_objs)
665          $(Ranlib) $(CombinedStaticLib)
666  
667   $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
668 <        $(Print) create $@
669 <        $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
668 >        $(Print) creating $@
669 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_parallel_objs)
670          $(Ranlib) $(CombinedParallelStaticLib)
671  
672   # Executable

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines