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 2316 by gezelter, Tue Sep 20 22:13:44 2005 UTC vs.
Revision 2474 by gezelter, Fri Dec 2 20:10:30 2005 UTC

# Line 52 | Line 52 | PackageLibs = \
52          selection \
53          restraints \
54          lattice \
55 <
55 >        openbabel\
56 >        antlr\
57 >        mdParser
58   #packages containing applications
59   Applications = \
60          applications/oopse \
# Line 61 | Line 63 | Applications = \
63          applications/dynamicProps \
64          applications/simpleBuilder\
65          applications/nanoRodBuilder \
66 +        applications/atom2mdin
67  
68   Samples = \
69          samples/argon \
# Line 333 | Line 336 | INSTALL                = @INSTALL@
336   CppCompiler            = @CXX@
337   Linker                 = @CXX@
338   MakeDepend             = makedepend
339 + LN_S                   = @LN_S@
340   INSTALL                = @INSTALL@
341 + EGREP                  = @EGREP@
342   InstallProgram         = @INSTALL_PROGRAM@
343   InstallScript          = @INSTALL_SCRIPT@
344   InstallData            = @INSTALL_DATA@
# Line 417 | Line 422 | endif
422      InstallFiles             = $(Executable)
423    endif
424    InstallCommand           = $(InstallProgram)
425 +  ifneq "$(words $(LinkTargets))" "0"
426 +    MyLinkSource = $(patsubst %, $(MyInstallDir)/%,$(Main))
427 +    MyLinkTargets = $(patsubst %, $(MyInstallDir)/%,$(LinkTargets))
428 +  endif
429   endif
430  
431   ifneq "$(words $(ForcefieldFiles))" "0"
# Line 635 | Line 644 | find_objs = $(shell $(StaticArchiver) -t $(1))
644          $(Doxygen) $(DEV_ROOT)/make/Doxyfile
645  
646   #GUN make funtions to merge the libraries
647 < find_objs = $(shell $(StaticArchiver) -t $(1))
647 > find_objs = $(shell $(StaticArchiver) -t $(1) | $(EGREP) -v "SYMDEF")
648   extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
649   create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
650   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
651   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
652 + do_link = $(shell $(LN_S) $(1) $(2))
653 + all_objs = $(foreach thisLib,$(LibNames), $(call find_objs, $(thisLib)))
654 + all_parallel_objs = $(foreach thisLib,$(ParallelLibNames), $(call find_objs, $(thisLib)))
655 + all_lib_objs = $(patsubst %,$(TargetDir)/%,$(call all_objs))
656 + all_lib_parallel_objs = $(patsubst %,$(TargetDir)/%,$(call all_parallel_objs))
657  
658   $(CombinedStaticLib) : $(LibDir)/.stamp_UP
659 <        $(Print) create $@      
660 <        $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
659 >        $(Print) creating $@            
660 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_objs)
661          $(Ranlib) $(CombinedStaticLib)
662  
663   $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
664 <        $(Print) create $@
665 <        $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
664 >        $(Print) creating $@
665 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_parallel_objs)
666          $(Ranlib) $(CombinedParallelStaticLib)
667  
668   # Executable
# Line 799 | Line 813 | _installall : _buildall _installdata
813   install : $(InstallListLoop)
814          $(Print) Done Install
815  
816 < _installall : _buildall _installdata
816 > _installall : _buildall _installdata _installlinks
817  
818   $(MyInstallDir) :
819          $(MkDir) $@
# Line 810 | Line 824 | endif      
824          $(InstallCommand) $(InstallFiles) $(MyInstallDir)
825   endif      
826  
827 + _installlinks :  $(MyInstallDir)
828 + ifneq "$(words $(MyLinkTargets))" "0"
829 +        @cd $(MyInstallDir)
830 +        $(foreach thisLink,$(MyLinkTargets),$(call do_link,$(MyLinkSource),$(thisLink)))
831 + endif      
832 +
833   # make statistics
834   _statisticsall :
835          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
# Line 820 | Line 840 | $(Executable).pure :
840          $(Print) Done statistics.
841  
842   # make pure
843 < $(Executable).pure :
844 <        $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
845 <        $(LibList) $(ObjectFiles) -o $@
843 > #$(Executable).pure :
844 > #       $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
845 > #       $(LibList) $(ObjectFiles) -o $@
846 > #
847 > #pure : $(Executable).pure
848  
827 – pure : $(Executable).pure
828 –
849   #make cvslog
850   cvslog:
851          $(DEV_ROOT)/scripts/cvs2cl

Diff Legend

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