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 2159 by gezelter, Mon Apr 11 19:49:43 2005 UTC vs.
Revision 2470 by tim, Fri Dec 2 15:38:25 2005 UTC

# Line 51 | Line 51 | PackageLibs = \
51          minimizers \
52          selection \
53          restraints \
54 <
54 >        lattice \
55 >        openbabel\
56 >        antlr\
57 >        mdParser
58   #packages containing applications
59   Applications = \
60          applications/oopse \
61          applications/dump2Xyz \
59 –        applications/simpleBuilder\
62          applications/staticProps \
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/thermoIntegration/liquid \
83 +        samples/thermoIntegration/solid \
84 +        samples/dipole \
85 +        samples/shape \
86          samples/zcons \
87  
88   IncludeDirs = \
89 <        @MPI_INC_DIR@
89 >        @CGAL_INC_DIR@ \
90 >        @MPI_INC_DIR@
91  
92   LibraryDirs = \
93 +        @CGAL_LIB_DIR@ \
94          @MPI_LIB_DIR@
95  
96   Libraries = \
97 +        @LIBS@ \
98 +        @CGAL_LIBS@ \
99          @MPI_LIB@ \
100 <        @MPI_F90_LIB@
100 >        @MPI_F90_LIB@
101  
102   OopseHome       = @OOPSE_HOME@
103   ForceParamDir   = $(OopseHome)/share/forceFields
# Line 113 | Line 128 | BinDir            = $(DEV_ROOT)/bin
128   ParallelTargetDir = $(DEV_ROOT)/MPIobj
129   LibDir            = $(DEV_ROOT)/lib
130   MakeDir           = $(DEV_ROOT)/make
131 + MainMakefile      = $(MakeDir)/Makefile
132   BinDir            = $(DEV_ROOT)/bin
133   DocsDir           = $(DEV_ROOT)/docs
134   CurrentDir        = $(CURDIR)
# Line 320 | 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@
343   InstallData            = @INSTALL_DATA@
344   MkDir                  = @MKINSTALLDIRS@
345 < Delete                 = rm -fr
345 > Delete                 = rm -f
346   StaticArchiver         = @AR@
347   DynamicArchiver        = @CC@
348   FortranCompiler        = @FC@
# Line 404 | 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 440 | Line 461 | $(PackageTargetDir)/%.o : %.c
461          $(MkDir) $@
462  
463   # .c -> .o
464 < $(PackageTargetDir)/%.o : %.c
464 > $(PackageTargetDir)/%.o : %.c $(MainMakefile)
465          $(Print) $@
466          $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
467  
468 < $(PackageParallelTargetDir)/%.o : %.c
468 > $(PackageParallelTargetDir)/%.o : %.c $(MainMakefile)
469          $(Print) $@
470          $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@
471  
472   ifeq "$(UseMPI)" "yes"
473 < %.o : %.c
473 > %.o : %.c $(MainMakefile)
474          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
475          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
476   else
477 < %.o : %.c
477 > %.o : %.c $(MainMakefile)
478          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
479   endif
480  
481   # .cpp -> .o
482 < $(PackageTargetDir)/%.o : %.cpp
482 > $(PackageTargetDir)/%.o : %.cpp $(MainMakefile)
483          $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
484  
485 < $(PackageParallelTargetDir)/%.o : %.cpp
485 > $(PackageParallelTargetDir)/%.o : %.cpp $(MainMakefile)
486          $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@
487  
488   ifeq "$(UseMPI)" "yes"
489 < %.o : %.cpp
489 > %.o : %.cpp $(MainMakefile)
490          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
491          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
492   else
493 < %.o : %.cpp
493 > %.o : %.cpp $(MainMakefile)
494          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
495   endif
496  
497   # .f -> .o
498 < $(PackageTargetDir)/%.o : %.f
498 > $(PackageTargetDir)/%.o : %.f $(MainMakefile)
499          $(FortranCompiler) $(FortranOptions) -c $< -o $@
500  
501 < $(PackageParallelTargetDir)/%.o : %.f
501 > $(PackageParallelTargetDir)/%.o : %.f $(MainMakefile)
502          $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@
503  
504   ifeq "$(UseMPI)" "yes"
505 < %.o : %.f
505 > %.o : %.f $(MainMakefile)
506          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
507          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
508   else
509 < %.o : %.f
509 > %.o : %.f $(MainMakefile)
510          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
511   endif
512  
513   # .F90 -> .o
514 < $(PackageTargetDir)/%.o : %.F90
514 > $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
515          $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
516          if test -n "`ls *.$(ModSuffix)`"; then \
517            $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
518          fi
519  
520 < $(PackageParallelTargetDir)/%.o : %.F90
520 > $(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile)
521          $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
522          if test -n "`ls *.$(ModSuffix)`"; then \
523            $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
524          fi
525  
526   ifeq "$(UseMPI)" "yes"
527 < %.o : %.F90
527 > %.o : %.F90 $(MainMakefile)
528          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
529          if test -n "`ls *.$(ModSuffix)`"; then\
530            $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
# Line 515 | Line 536 | else
536          fi
537  
538   else
539 < %.o : %.F90
539 > %.o : %.F90 $(MainMakefile)
540          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
541          if test -n "`ls *.$(ModSuffix)`"; then\
542            $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
# Line 627 | 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 786 | 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 797 | Line 819 | endif      
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
829   _statisticsall :
830          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
# Line 807 | 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  
814 – pure : $(Executable).pure
815 –
844   #make cvslog
845   cvslog:
846 <        $(DEV_ROOT)/scripts/cvs2cl.pl
846 >        $(DEV_ROOT)/scripts/cvs2cl
847  
848   # Execute
849   _runexe :

Diff Legend

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