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 2444 by tim, Wed Nov 16 21:20:50 2005 UTC vs.
Revision 2531 by tim, Fri Dec 30 15:32:55 2005 UTC

# Line 52 | Line 52 | PackageLibs = \
52          selection \
53          restraints \
54          lattice \
55 <        openbabel
56 <
55 >        openbabel\
56 >        antlr\
57 >        mdParser
58   #packages containing applications
59   Applications = \
60          applications/oopse \
# Line 62 | Line 63 | Applications = \
63          applications/dynamicProps \
64          applications/simpleBuilder\
65          applications/nanoRodBuilder \
66 <        applications/mdinConverter
66 >        applications/atom2mdin
67  
68   Samples = \
69          samples/argon \
# Line 78 | 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 335 | Line 340 | INSTALL                = @INSTALL@
340   CppCompiler            = @CXX@
341   Linker                 = @CXX@
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 419 | Line 426 | endif
426      InstallFiles             = $(Executable)
427    endif
428    InstallCommand           = $(InstallProgram)
429 +  ifneq "$(words $(LinkTargets))" "0"
430 +    MyLinkSource = $(patsubst %, $(MyInstallDir)/%,$(Main))
431 +    MyLinkTargets = $(patsubst %, $(MyInstallDir)/%,$(LinkTargets))
432 +  endif
433   endif
434  
435   ifneq "$(words $(ForcefieldFiles))" "0"
# Line 637 | 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
# Line 801 | Line 817 | _installall : _buildall _installdata
817   install : $(InstallListLoop)
818          $(Print) Done Install
819  
820 < _installall : _buildall _installdata
820 > _installall : _buildall _installdata _installlinks
821  
822   $(MyInstallDir) :
823          $(MkDir) $@
# Line 812 | Line 828 | endif      
828          $(InstallCommand) $(InstallFiles) $(MyInstallDir)
829   endif      
830  
831 + _installlinks :  $(MyInstallDir)
832 + ifneq "$(words $(MyLinkTargets))" "0"
833 +        @cd $(MyInstallDir)
834 +        $(foreach thisLink,$(MyLinkTargets),$(call do_link,$(MyLinkSource),$(thisLink)))
835 + endif      
836 +
837   # make statistics
838   _statisticsall :
839          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines