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 2190 by gezelter, Wed Apr 13 22:30:22 2005 UTC vs.
Revision 2456 by gezelter, Fri Nov 18 17:50:17 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 \
69 <        samples/water/dimer \
69 >        samples/water/dimer \
70          samples/water/spce \
71          samples/water/ssd \
72          samples/water/ssde \
73 +        samples/water/ssdrf \
74 +        samples/water/ssd-ion \
75          samples/water/tip3p_ice \
76          samples/water/tip4p \
77          samples/lipid \
78          samples/alkane \
79          samples/minimizer \
80          samples/metals \
81 +        samples/thermoIntegration/liquid \
82 +        samples/thermoIntegration/solid \
83 +        samples/dipole \
84 +        samples/shape \
85          samples/zcons \
86  
87   IncludeDirs = \
# Line 85 | Line 93 | Libraries = \
93          @MPI_LIB_DIR@
94  
95   Libraries = \
96 +        @LIBS@ \
97          @CGAL_LIBS@ \
98          @MPI_LIB@ \
99          @MPI_F90_LIB@
# Line 118 | Line 127 | BinDir            = $(DEV_ROOT)/bin
127   ParallelTargetDir = $(DEV_ROOT)/MPIobj
128   LibDir            = $(DEV_ROOT)/lib
129   MakeDir           = $(DEV_ROOT)/make
130 + MainMakefile      = $(MakeDir)/Makefile
131   BinDir            = $(DEV_ROOT)/bin
132   DocsDir           = $(DEV_ROOT)/docs
133   CurrentDir        = $(CURDIR)
# Line 325 | 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@
342   InstallData            = @INSTALL_DATA@
343   MkDir                  = @MKINSTALLDIRS@
344 < Delete                 = rm -fr
344 > Delete                 = rm -f
345   StaticArchiver         = @AR@
346   DynamicArchiver        = @CC@
347   FortranCompiler        = @FC@
# Line 445 | Line 456 | $(PackageTargetDir)/%.o : %.c
456          $(MkDir) $@
457  
458   # .c -> .o
459 < $(PackageTargetDir)/%.o : %.c
459 > $(PackageTargetDir)/%.o : %.c $(MainMakefile)
460          $(Print) $@
461          $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
462  
463 < $(PackageParallelTargetDir)/%.o : %.c
463 > $(PackageParallelTargetDir)/%.o : %.c $(MainMakefile)
464          $(Print) $@
465          $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@
466  
467   ifeq "$(UseMPI)" "yes"
468 < %.o : %.c
468 > %.o : %.c $(MainMakefile)
469          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
470          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
471   else
472 < %.o : %.c
472 > %.o : %.c $(MainMakefile)
473          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
474   endif
475  
476   # .cpp -> .o
477 < $(PackageTargetDir)/%.o : %.cpp
477 > $(PackageTargetDir)/%.o : %.cpp $(MainMakefile)
478          $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
479  
480 < $(PackageParallelTargetDir)/%.o : %.cpp
480 > $(PackageParallelTargetDir)/%.o : %.cpp $(MainMakefile)
481          $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@
482  
483   ifeq "$(UseMPI)" "yes"
484 < %.o : %.cpp
484 > %.o : %.cpp $(MainMakefile)
485          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
486          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
487   else
488 < %.o : %.cpp
488 > %.o : %.cpp $(MainMakefile)
489          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
490   endif
491  
492   # .f -> .o
493 < $(PackageTargetDir)/%.o : %.f
493 > $(PackageTargetDir)/%.o : %.f $(MainMakefile)
494          $(FortranCompiler) $(FortranOptions) -c $< -o $@
495  
496 < $(PackageParallelTargetDir)/%.o : %.f
496 > $(PackageParallelTargetDir)/%.o : %.f $(MainMakefile)
497          $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@
498  
499   ifeq "$(UseMPI)" "yes"
500 < %.o : %.f
500 > %.o : %.f $(MainMakefile)
501          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
502          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
503   else
504 < %.o : %.f
504 > %.o : %.f $(MainMakefile)
505          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
506   endif
507  
508   # .F90 -> .o
509 < $(PackageTargetDir)/%.o : %.F90
509 > $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
510          $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
511          if test -n "`ls *.$(ModSuffix)`"; then \
512            $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
513          fi
514  
515 < $(PackageParallelTargetDir)/%.o : %.F90
515 > $(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile)
516          $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
517          if test -n "`ls *.$(ModSuffix)`"; then \
518            $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
519          fi
520  
521   ifeq "$(UseMPI)" "yes"
522 < %.o : %.F90
522 > %.o : %.F90 $(MainMakefile)
523          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
524          if test -n "`ls *.$(ModSuffix)`"; then\
525            $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
# Line 520 | Line 531 | else
531          fi
532  
533   else
534 < %.o : %.F90
534 > %.o : %.F90 $(MainMakefile)
535          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
536          if test -n "`ls *.$(ModSuffix)`"; then\
537            $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
# Line 632 | Line 643 | do_create = $(call extract_objs,$(1))$(call create_arc
643   create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
644   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
645   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
646 + do_link = $(shell $(LN_S) $(1) $(2))
647  
648   $(CombinedStaticLib) : $(LibDir)/.stamp_UP
649          $(Print) create $@      
# Line 791 | Line 803 | _installall : _buildall _installdata
803   install : $(InstallListLoop)
804          $(Print) Done Install
805  
806 < _installall : _buildall _installdata
806 > _installall : _buildall _installdata _installlinks
807  
808   $(MyInstallDir) :
809          $(MkDir) $@
# Line 800 | Line 812 | endif      
812          $(Print) $(InstallFiles)
813   ifneq "$(words $(InstallFiles))" "0"
814          $(InstallCommand) $(InstallFiles) $(MyInstallDir)
815 + endif      
816 +
817 + _installlinks :  $(MyInstallDir)
818 +        $(Print) $(LinkTargets)
819 + ifneq "$(words $(LinkTargets))" "0"
820 +        @cd $(MyInstallDir)
821 +        $(foreach thisLink,$(LinkTargets),$(call do_link,$(Executable),$(thisLink)))
822   endif      
823  
824   # make statistics
# Line 812 | Line 831 | $(Executable).pure :
831          $(Print) Done statistics.
832  
833   # make pure
834 < $(Executable).pure :
835 <        $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
836 <        $(LibList) $(ObjectFiles) -o $@
834 > #$(Executable).pure :
835 > #       $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
836 > #       $(LibList) $(ObjectFiles) -o $@
837 > #
838 > #pure : $(Executable).pure
839  
819 – pure : $(Executable).pure
820 –
840   #make cvslog
841   cvslog:
842 <        $(DEV_ROOT)/scripts/cvs2cl.pl
842 >        $(DEV_ROOT)/scripts/cvs2cl
843  
844   # Execute
845   _runexe :

Diff Legend

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