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 2474 by gezelter, Fri Dec 2 20:10:30 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 653 | Line 657 | all_lib_parallel_objs = $(patsubst %,$(TargetDir)/%,$(
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 %,$(TargetDir)/%,$(call all_parallel_objs))
660 > all_lib_parallel_objs = $(patsubst %,$(ParallelTargetDir)/%,$(call all_parallel_objs))
661  
662   $(CombinedStaticLib) : $(LibDir)/.stamp_UP
663          $(Print) creating $@            

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines