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 2199 by gezelter, Thu Apr 14 21:41:56 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 <
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 \
70 <        samples/water/dimer \
70 >        samples/water/dimer \
71          samples/water/spce \
72          samples/water/ssd \
73          samples/water/ssde \
74 +        samples/water/ssdrf \
75 +        samples/water/ssd-ion \
76          samples/water/tip3p_ice \
77          samples/water/tip4p \
78          samples/lipid \
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 \
89 +        samples/shape \
90          samples/zcons \
91  
92   IncludeDirs = \
# Line 85 | Line 98 | Libraries = \
98          @MPI_LIB_DIR@
99  
100   Libraries = \
101 +        @LIBS@ \
102          @CGAL_LIBS@ \
103          @MPI_LIB@ \
104          @MPI_F90_LIB@
# Line 118 | Line 132 | BinDir            = $(DEV_ROOT)/bin
132   ParallelTargetDir = $(DEV_ROOT)/MPIobj
133   LibDir            = $(DEV_ROOT)/lib
134   MakeDir           = $(DEV_ROOT)/make
135 + MainMakefile      = $(MakeDir)/Makefile
136   BinDir            = $(DEV_ROOT)/bin
137   DocsDir           = $(DEV_ROOT)/docs
138   CurrentDir        = $(CURDIR)
# Line 325 | 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@
349   MkDir                  = @MKINSTALLDIRS@
350 < Delete                 = rm -fr
350 > Delete                 = rm -f
351   StaticArchiver         = @AR@
352   DynamicArchiver        = @CC@
353   FortranCompiler        = @FC@
# Line 409 | 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 445 | Line 466 | $(PackageTargetDir)/%.o : %.c
466          $(MkDir) $@
467  
468   # .c -> .o
469 < $(PackageTargetDir)/%.o : %.c
469 > $(PackageTargetDir)/%.o : %.c $(MainMakefile)
470          $(Print) $@
471          $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
472  
473 < $(PackageParallelTargetDir)/%.o : %.c
473 > $(PackageParallelTargetDir)/%.o : %.c $(MainMakefile)
474          $(Print) $@
475          $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@
476  
477   ifeq "$(UseMPI)" "yes"
478 < %.o : %.c
478 > %.o : %.c $(MainMakefile)
479          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
480          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
481   else
482 < %.o : %.c
482 > %.o : %.c $(MainMakefile)
483          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
484   endif
485  
486   # .cpp -> .o
487 < $(PackageTargetDir)/%.o : %.cpp
487 > $(PackageTargetDir)/%.o : %.cpp $(MainMakefile)
488          $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
489  
490 < $(PackageParallelTargetDir)/%.o : %.cpp
490 > $(PackageParallelTargetDir)/%.o : %.cpp $(MainMakefile)
491          $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@
492  
493   ifeq "$(UseMPI)" "yes"
494 < %.o : %.cpp
494 > %.o : %.cpp $(MainMakefile)
495          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
496          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
497   else
498 < %.o : %.cpp
498 > %.o : %.cpp $(MainMakefile)
499          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
500   endif
501  
502   # .f -> .o
503 < $(PackageTargetDir)/%.o : %.f
503 > $(PackageTargetDir)/%.o : %.f $(MainMakefile)
504          $(FortranCompiler) $(FortranOptions) -c $< -o $@
505  
506 < $(PackageParallelTargetDir)/%.o : %.f
506 > $(PackageParallelTargetDir)/%.o : %.f $(MainMakefile)
507          $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@
508  
509   ifeq "$(UseMPI)" "yes"
510 < %.o : %.f
510 > %.o : %.f $(MainMakefile)
511          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
512          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
513   else
514 < %.o : %.f
514 > %.o : %.f $(MainMakefile)
515          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
516   endif
517  
518   # .F90 -> .o
519 < $(PackageTargetDir)/%.o : %.F90
519 > $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
520          $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
521          if test -n "`ls *.$(ModSuffix)`"; then \
522            $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
523          fi
524  
525 < $(PackageParallelTargetDir)/%.o : %.F90
525 > $(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile)
526          $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
527          if test -n "`ls *.$(ModSuffix)`"; then \
528            $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
529          fi
530  
531   ifeq "$(UseMPI)" "yes"
532 < %.o : %.F90
532 > %.o : %.F90 $(MainMakefile)
533          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
534          if test -n "`ls *.$(ModSuffix)`"; then\
535            $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
# Line 520 | Line 541 | else
541          fi
542  
543   else
544 < %.o : %.F90
544 > %.o : %.F90 $(MainMakefile)
545          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
546          if test -n "`ls *.$(ModSuffix)`"; then\
547            $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
# Line 627 | 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 791 | 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 802 | 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
# Line 812 | Line 844 | $(Executable).pure :
844          $(Print) Done statistics.
845  
846   # make pure
847 < $(Executable).pure :
848 <        $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
849 <        $(LibList) $(ObjectFiles) -o $@
847 > #$(Executable).pure :
848 > #       $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
849 > #       $(LibList) $(ObjectFiles) -o $@
850 > #
851 > #pure : $(Executable).pure
852  
819 – pure : $(Executable).pure
820 –
853   #make cvslog
854   cvslog:
855          $(DEV_ROOT)/scripts/cvs2cl

Diff Legend

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