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

Comparing trunk/OOPSE-3.0/make/Makefile.in (file contents):
Revision 2217 by gezelter, Fri Apr 29 19:16:27 2005 UTC vs.
Revision 2470 by tim, Fri Dec 2 15:38:25 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 91 | Line 94 | Libraries = \
94          @MPI_LIB_DIR@
95  
96   Libraries = \
97 +        @LIBS@ \
98          @CGAL_LIBS@ \
99          @MPI_LIB@ \
100          @MPI_F90_LIB@
# Line 332 | Line 336 | INSTALL                = @INSTALL@
336   CppCompiler            = @CXX@
337   Linker                 = @CXX@
338   MakeDepend             = makedepend
339 + LN_S                   = @LN_S@
340   INSTALL                = @INSTALL@
341   InstallProgram         = @INSTALL_PROGRAM@
342   InstallScript          = @INSTALL_SCRIPT@
# Line 416 | Line 421 | endif
421      InstallFiles             = $(Executable)
422    endif
423    InstallCommand           = $(InstallProgram)
424 +  ifneq "$(words $(LinkTargets))" "0"
425 +    MyLinkSource = $(patsubst %, $(MyInstallDir)/%,$(Main))
426 +    MyLinkTargets = $(patsubst %, $(MyInstallDir)/%,$(LinkTargets))
427 +  endif
428   endif
429  
430   ifneq "$(words $(ForcefieldFiles))" "0"
# Line 639 | Line 648 | do_create = $(call extract_objs,$(1))$(call create_arc
648   create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
649   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
650   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
651 + do_link = $(shell $(LN_S) $(1) $(2))
652  
653   $(CombinedStaticLib) : $(LibDir)/.stamp_UP
654          $(Print) create $@      
# Line 798 | Line 808 | _installall : _buildall _installdata
808   install : $(InstallListLoop)
809          $(Print) Done Install
810  
811 < _installall : _buildall _installdata
811 > _installall : _buildall _installdata _installlinks
812  
813   $(MyInstallDir) :
814          $(MkDir) $@
# Line 807 | Line 817 | endif      
817          $(Print) $(InstallFiles)
818   ifneq "$(words $(InstallFiles))" "0"
819          $(InstallCommand) $(InstallFiles) $(MyInstallDir)
820 + endif      
821 +
822 + _installlinks :  $(MyInstallDir)
823 + ifneq "$(words $(MyLinkTargets))" "0"
824 +        @cd $(MyInstallDir)
825 +        $(foreach thisLink,$(MyLinkTargets),$(call do_link,$(MyLinkSource),$(thisLink)))
826   endif      
827  
828   # make statistics
# Line 819 | Line 835 | $(Executable).pure :
835          $(Print) Done statistics.
836  
837   # make pure
838 < $(Executable).pure :
839 <        $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
840 <        $(LibList) $(ObjectFiles) -o $@
838 > #$(Executable).pure :
839 > #       $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
840 > #       $(LibList) $(ObjectFiles) -o $@
841 > #
842 > #pure : $(Executable).pure
843  
826 – pure : $(Executable).pure
827 –
844   #make cvslog
845   cvslog:
846          $(DEV_ROOT)/scripts/cvs2cl

Diff Legend

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