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 2550 by tim, Thu Jan 12 15:22:34 2006 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 \
81 >        samples/metals/EAM \
82 >        samples/metals/EAM/nanoparticle \
83 >        samples/metals/EAM/nanorod \
84 >        samples/metals/Sutton-Chen \
85 >        samples/thermoIntegration/liquid \
86 >        samples/thermoIntegration/solid \
87 >        samples/dipole \
88 >        samples/shape \
89          samples/zcons \
90  
91   IncludeDirs = \
# Line 85 | Line 97 | Libraries = \
97          @MPI_LIB_DIR@
98  
99   Libraries = \
100 +        @LIBS@ \
101          @CGAL_LIBS@ \
102          @MPI_LIB@ \
103          @MPI_F90_LIB@
# Line 101 | Line 114 | LinkOptions = \
114   ModuleCase      = @F90_MODULE_NAMES@
115   ModSuffix       = @MOD@
116   LinkOptions = \
117 <        @F90LIBS@
117 >        @FCLIBS@
118  
119   ParallelLinkOptions = \
120 <        @F90LIBS@
120 >        @FCLIBS@
121  
122  
123   #---------------------------------------------------------------------------
# Line 118 | Line 131 | BinDir            = $(DEV_ROOT)/bin
131   ParallelTargetDir = $(DEV_ROOT)/MPIobj
132   LibDir            = $(DEV_ROOT)/lib
133   MakeDir           = $(DEV_ROOT)/make
134 + MainMakefile      = $(MakeDir)/Makefile
135   BinDir            = $(DEV_ROOT)/bin
136   DocsDir           = $(DEV_ROOT)/docs
137   CurrentDir        = $(CURDIR)
# Line 325 | Line 339 | INSTALL                = @INSTALL@
339   CppCompiler            = @CXX@
340   Linker                 = @CXX@
341   MakeDepend             = makedepend
342 + LN_S                   = @LN_S@
343   INSTALL                = @INSTALL@
344 + EGREP                  = @EGREP@
345   InstallProgram         = @INSTALL_PROGRAM@
346   InstallScript          = @INSTALL_SCRIPT@
347   InstallData            = @INSTALL_DATA@
348   MkDir                  = @MKINSTALLDIRS@
349 < Delete                 = rm -fr
349 > Delete                 = rm -f
350   StaticArchiver         = @AR@
351   DynamicArchiver        = @CC@
352   FortranCompiler        = @FC@
337 – F90Compiler            = @F90@
353   JavaCompiler           = $(JAVA_HOME)/bin/javac
354   JavaArchiver           = $(JAVA_HOME)/bin/jar
355   JarSigner              = $(JAVA_HOME)/bin/jarsigner
# Line 360 | Line 375 | CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOP
375                           -sourcepath $(SourceDir)
376   COptions               = $(FrcDeclare) @CFLAGS@
377   CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
378 < CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
379 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
380 < FortranOptions         =
381 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
367 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
378 > CppOptions             = $(FrcDeclare) @CXXFLAGS@
379 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
380 > FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@
381 > FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclar) @FCFLAGS_SRCEXT@
382   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
383                           -sourcepath $(SourceDir) -deprecation
384   JavaRunOptions         = -classpath $(ClassPath)
# Line 409 | Line 423 | endif
423      InstallFiles             = $(Executable)
424    endif
425    InstallCommand           = $(InstallProgram)
426 +  ifneq "$(words $(LinkTargets))" "0"
427 +    MyLinkSource = $(patsubst %, $(MyInstallDir)/%,$(Main))
428 +    MyLinkTargets = $(patsubst %, $(MyInstallDir)/%,$(LinkTargets))
429 +  endif
430   endif
431  
432   ifneq "$(words $(ForcefieldFiles))" "0"
# Line 445 | Line 463 | $(PackageTargetDir)/%.o : %.c
463          $(MkDir) $@
464  
465   # .c -> .o
466 < $(PackageTargetDir)/%.o : %.c
466 > $(PackageTargetDir)/%.o : %.c $(MainMakefile)
467          $(Print) $@
468          $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
469  
470 < $(PackageParallelTargetDir)/%.o : %.c
470 > $(PackageParallelTargetDir)/%.o : %.c $(MainMakefile)
471          $(Print) $@
472          $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@
473  
474   ifeq "$(UseMPI)" "yes"
475 < %.o : %.c
475 > %.o : %.c $(MainMakefile)
476          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
477          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
478   else
479 < %.o : %.c
479 > %.o : %.c $(MainMakefile)
480          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
481   endif
482  
483   # .cpp -> .o
484 < $(PackageTargetDir)/%.o : %.cpp
484 > $(PackageTargetDir)/%.o : %.cpp $(MainMakefile)
485          $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
486  
487 < $(PackageParallelTargetDir)/%.o : %.cpp
487 > $(PackageParallelTargetDir)/%.o : %.cpp $(MainMakefile)
488          $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@
489  
490   ifeq "$(UseMPI)" "yes"
491 < %.o : %.cpp
491 > %.o : %.cpp $(MainMakefile)
492          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
493          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
494   else
495 < %.o : %.cpp
495 > %.o : %.cpp $(MainMakefile)
496          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
497   endif
498  
499   # .f -> .o
500 < $(PackageTargetDir)/%.o : %.f
500 > $(PackageTargetDir)/%.o : %.f $(MainMakefile)
501          $(FortranCompiler) $(FortranOptions) -c $< -o $@
502  
503 < $(PackageParallelTargetDir)/%.o : %.f
503 > $(PackageParallelTargetDir)/%.o : %.f $(MainMakefile)
504          $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@
505  
506   ifeq "$(UseMPI)" "yes"
507 < %.o : %.f
507 > %.o : %.f $(MainMakefile)
508          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
509          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
510   else
511 < %.o : %.f
511 > %.o : %.f $(MainMakefile)
512          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
513   endif
514  
515   # .F90 -> .o
516 < $(PackageTargetDir)/%.o : %.F90
517 <        $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
516 > $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
517 >        $(FortranCompiler) $(FortranOptions) $(IncludePath) -c $< -o $@
518          if test -n "`ls *.$(ModSuffix)`"; then \
519            $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
520          fi
521  
522 < $(PackageParallelTargetDir)/%.o : %.F90
523 <        $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
522 > $(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile)
523 >        $(FortranCompiler) $(FortranParallelOptions) $(IncludePath) -c $< -o $@
524          if test -n "`ls *.$(ModSuffix)`"; then \
525            $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
526          fi
527  
528   ifeq "$(UseMPI)" "yes"
529 < %.o : %.F90
529 > %.o : %.F90 $(MainMakefile)
530          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
531          if test -n "`ls *.$(ModSuffix)`"; then\
532            $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
# Line 520 | Line 538 | else
538          fi
539  
540   else
541 < %.o : %.F90
541 > %.o : %.F90 $(MainMakefile)
542          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
543          if test -n "`ls *.$(ModSuffix)`"; then\
544            $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
# Line 627 | Line 645 | find_objs = $(shell $(StaticArchiver) -t $(1))
645          $(Doxygen) $(DEV_ROOT)/make/Doxyfile
646  
647   #GUN make funtions to merge the libraries
648 < find_objs = $(shell $(StaticArchiver) -t $(1))
648 > find_objs = $(shell $(StaticArchiver) -t $(1) | $(EGREP) -v "SYMDEF")
649   extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
650   create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
651   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
652   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
653 + do_link = $(shell $(LN_S) $(1) $(2))
654 + all_objs = $(foreach thisLib,$(LibNames), $(call find_objs, $(thisLib)))
655 + all_parallel_objs = $(foreach thisLib,$(ParallelLibNames), $(call find_objs, $(thisLib)))
656 + all_lib_objs = $(patsubst %,$(TargetDir)/%,$(call all_objs))
657 + all_lib_parallel_objs = $(patsubst %,$(ParallelTargetDir)/%,$(call all_parallel_objs))
658  
659   $(CombinedStaticLib) : $(LibDir)/.stamp_UP
660 <        $(Print) create $@      
661 <        $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
660 >        $(Print) creating $@            
661 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_objs)
662          $(Ranlib) $(CombinedStaticLib)
663  
664   $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
665 <        $(Print) create $@
666 <        $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
665 >        $(Print) creating $@
666 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_parallel_objs)
667          $(Ranlib) $(CombinedParallelStaticLib)
668  
669   # Executable
# Line 791 | Line 814 | _installall : _buildall _installdata
814   install : $(InstallListLoop)
815          $(Print) Done Install
816  
817 < _installall : _buildall _installdata
817 > _installall : _buildall _installdata _installlinks
818  
819   $(MyInstallDir) :
820          $(MkDir) $@
# Line 802 | Line 825 | endif      
825          $(InstallCommand) $(InstallFiles) $(MyInstallDir)
826   endif      
827  
828 + _installlinks :  $(MyInstallDir)
829 + ifneq "$(words $(MyLinkTargets))" "0"
830 +        @cd $(MyInstallDir)
831 +        $(foreach thisLink,$(MyLinkTargets),$(call do_link,$(MyLinkSource),$(thisLink)))
832 + endif      
833 +
834   # make statistics
835   _statisticsall :
836          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
# Line 812 | Line 841 | $(Executable).pure :
841          $(Print) Done statistics.
842  
843   # make pure
844 < $(Executable).pure :
845 <        $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
846 <        $(LibList) $(ObjectFiles) -o $@
844 > #$(Executable).pure :
845 > #       $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
846 > #       $(LibList) $(ObjectFiles) -o $@
847 > #
848 > #pure : $(Executable).pure
849  
819 – pure : $(Executable).pure
820 –
850   #make cvslog
851   cvslog:
852          $(DEV_ROOT)/scripts/cvs2cl

Diff Legend

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