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

Comparing trunk/OOPSE-4/make/Makefile.in (file contents):
Revision 2217 by gezelter, Fri Apr 29 19:16:27 2005 UTC vs.
Revision 2457 by tim, Fri Nov 18 20:17:14 2005 UTC

# Line 52 | Line 52 | PackageLibs = \
52          selection \
53          restraints \
54          lattice \
55 +        openbabel
56  
57   #packages containing applications
58   Applications = \
# Line 61 | Line 62 | Applications = \
62          applications/dynamicProps \
63          applications/simpleBuilder\
64          applications/nanoRodBuilder \
65 +        applications/atom2mdin
66  
67   Samples = \
68          samples/argon \
# Line 91 | Line 93 | Libraries = \
93          @MPI_LIB_DIR@
94  
95   Libraries = \
96 +        @LIBS@ \
97          @CGAL_LIBS@ \
98          @MPI_LIB@ \
99          @MPI_F90_LIB@
# Line 332 | Line 335 | INSTALL                = @INSTALL@
335   CppCompiler            = @CXX@
336   Linker                 = @CXX@
337   MakeDepend             = makedepend
338 + LN_S                   = @LN_S@
339   INSTALL                = @INSTALL@
340   InstallProgram         = @INSTALL_PROGRAM@
341   InstallScript          = @INSTALL_SCRIPT@
# Line 416 | Line 420 | endif
420      InstallFiles             = $(Executable)
421    endif
422    InstallCommand           = $(InstallProgram)
423 +  ifneq "$(words $(LinkTargets))" "0"
424 +    MyLinkSource = $(patsubst %, $(MyInstallDir)/%,$(Main))
425 +    MyLinkTargets = $(patsubst %, $(MyInstallDir)/%,$(LinkTargets))
426 +  endif
427   endif
428  
429   ifneq "$(words $(ForcefieldFiles))" "0"
# Line 639 | Line 647 | do_create = $(call extract_objs,$(1))$(call create_arc
647   create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
648   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
649   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
650 + do_link = $(shell $(LN_S) $(1) $(2))
651  
652   $(CombinedStaticLib) : $(LibDir)/.stamp_UP
653          $(Print) create $@      
# Line 798 | Line 807 | _installall : _buildall _installdata
807   install : $(InstallListLoop)
808          $(Print) Done Install
809  
810 < _installall : _buildall _installdata
810 > _installall : _buildall _installdata _installlinks
811  
812   $(MyInstallDir) :
813          $(MkDir) $@
# Line 809 | Line 818 | endif      
818          $(InstallCommand) $(InstallFiles) $(MyInstallDir)
819   endif      
820  
821 + _installlinks :  $(MyInstallDir)
822 + ifneq "$(words $(MyLinkTargets))" "0"
823 +        @cd $(MyInstallDir)
824 +        $(foreach thisLink,$(MyLinkTargets),$(call do_link,$(MyLinkSource),$(thisLink)))
825 + endif      
826 +
827   # make statistics
828   _statisticsall :
829          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
# Line 819 | Line 834 | $(Executable).pure :
834          $(Print) Done statistics.
835  
836   # make pure
837 < $(Executable).pure :
838 <        $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
839 <        $(LibList) $(ObjectFiles) -o $@
837 > #$(Executable).pure :
838 > #       $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
839 > #       $(LibList) $(ObjectFiles) -o $@
840 > #
841 > #pure : $(Executable).pure
842  
826 – pure : $(Executable).pure
827 –
843   #make cvslog
844   cvslog:
845          $(DEV_ROOT)/scripts/cvs2cl

Diff Legend

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