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 2190 by gezelter, Wed Apr 13 22:30:22 2005 UTC vs.
Revision 2753 by gezelter, Tue May 16 20:38:23 2006 UTC

# Line 52 | Line 52 | PackageLibs = \
52          selection \
53          restraints \
54          lattice \
55 <
55 >        hydrodynamics \
56 >        openbabel\
57 >        antlr\
58 >        mdParser
59   #packages containing applications
60   Applications = \
61          applications/oopse \
62          applications/dump2Xyz \
63          applications/staticProps \
64          applications/dynamicProps \
65 <        applications/simpleBuilder\
65 >        applications/simpleBuilder \
66 >        applications/randomBuilder \
67          applications/nanoRodBuilder \
68 +        applications/nanoparticleBuilder \
69 +        applications/atom2mdin \
70 +        applications/hydrodynamics
71  
72 +
73   Samples = \
74 +        samples/alkane \
75          samples/argon \
76 <        samples/water/dimer \
76 >        samples/cutoff \
77 >        samples/dipole \
78 >        samples/gbljtest \
79 >        samples/lipid \
80 >        samples/metals/EAM \
81 >        samples/metals/EAM/nanoparticle \
82 >        samples/metals/EAM/nanorod \
83 >        samples/metals/Sutton-Chen \
84 >        samples/minimizer \
85 >        samples/shape \
86 >        samples/thermoIntegration/liquid \
87 >        samples/thermoIntegration/solid \
88 >        samples/water/dimer \
89          samples/water/spce \
90          samples/water/ssd \
91          samples/water/ssde \
92 +        samples/water/ssdrf \
93 +        samples/water/ssd-ion \
94          samples/water/tip3p_ice \
95          samples/water/tip4p \
96 <        samples/lipid \
74 <        samples/alkane \
75 <        samples/minimizer \
76 <        samples/metals \
77 <        samples/zcons \
96 >        samples/zcons
97  
98   IncludeDirs = \
99 +        @FFTW_INC_DIR@ \
100          @CGAL_INC_DIR@ \
101          @MPI_INC_DIR@
102  
103   LibraryDirs = \
104 +        @FFTW_LIB_DIR@ \
105          @CGAL_LIB_DIR@ \
106          @MPI_LIB_DIR@
107  
108   Libraries = \
109 +        @LIBS@ \
110 +        @FFTW_LIBS@ \
111          @CGAL_LIBS@ \
112          @MPI_LIB@ \
113          @MPI_F90_LIB@
# Line 101 | Line 124 | LinkOptions = \
124   ModuleCase      = @F90_MODULE_NAMES@
125   ModSuffix       = @MOD@
126   LinkOptions = \
127 <        @F90LIBS@
127 >        @LDFLAGS@ \
128 >        @FCLIBS@ \
129 >        @CXXFLAGS@
130 >        
131  
132   ParallelLinkOptions = \
133 <        @F90LIBS@
133 >        @LDFLAGS@ \
134 >        @FCLIBS@ \
135 >        @CXXFLAGS@
136  
137  
138   #---------------------------------------------------------------------------
# Line 118 | Line 146 | BinDir            = $(DEV_ROOT)/bin
146   ParallelTargetDir = $(DEV_ROOT)/MPIobj
147   LibDir            = $(DEV_ROOT)/lib
148   MakeDir           = $(DEV_ROOT)/make
149 + MainMakefile      = $(MakeDir)/Makefile
150   BinDir            = $(DEV_ROOT)/bin
151   DocsDir           = $(DEV_ROOT)/docs
152   CurrentDir        = $(CURDIR)
# Line 325 | Line 354 | INSTALL                = @INSTALL@
354   CppCompiler            = @CXX@
355   Linker                 = @CXX@
356   MakeDepend             = makedepend
357 + LN_S                   = @LN_S@
358   INSTALL                = @INSTALL@
359 + EGREP                  = @EGREP@
360   InstallProgram         = @INSTALL_PROGRAM@
361   InstallScript          = @INSTALL_SCRIPT@
362   InstallData            = @INSTALL_DATA@
363   MkDir                  = @MKINSTALLDIRS@
364 < Delete                 = rm -fr
364 > Delete                 = rm -f
365   StaticArchiver         = @AR@
366   DynamicArchiver        = @CC@
367   FortranCompiler        = @FC@
337 – F90Compiler            = @F90@
368   JavaCompiler           = $(JAVA_HOME)/bin/javac
369   JavaArchiver           = $(JAVA_HOME)/bin/jar
370   JarSigner              = $(JAVA_HOME)/bin/jarsigner
# Line 358 | Line 388 | COptions               = $(FrcDeclare) @CFLAGS@
388   JniOptions             =
389   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
390                           -sourcepath $(SourceDir)
391 < COptions               = $(FrcDeclare) @CFLAGS@
392 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
393 < CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
394 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
395 < FortranOptions         =
396 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
367 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
391 > COptions               = $(FrcDeclare) @CPPFLAGS@ @CFLAGS@
392 > CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CPPFLAGS@ @CFLAGS@
393 > CppOptions             = $(FrcDeclare) @CPPFLAGS@ @CXXFLAGS@
394 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CPPFLAGS@ @CXXFLAGS@
395 > FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@
396 > FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@
397   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
398                           -sourcepath $(SourceDir) -deprecation
399   JavaRunOptions         = -classpath $(ClassPath)
# Line 409 | Line 438 | endif
438      InstallFiles             = $(Executable)
439    endif
440    InstallCommand           = $(InstallProgram)
441 +  ifneq "$(words $(LinkTargets))" "0"
442 +    MyLinkSource = $(patsubst %, $(MyInstallDir)/%,$(Main))
443 +    MyLinkTargets = $(patsubst %, $(MyInstallDir)/%,$(LinkTargets))
444 +  endif
445   endif
446  
447   ifneq "$(words $(ForcefieldFiles))" "0"
# Line 445 | Line 478 | $(PackageTargetDir)/%.o : %.c
478          $(MkDir) $@
479  
480   # .c -> .o
481 < $(PackageTargetDir)/%.o : %.c
481 > $(PackageTargetDir)/%.o : %.c $(MainMakefile)
482          $(Print) $@
483          $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
484  
485 < $(PackageParallelTargetDir)/%.o : %.c
485 > $(PackageParallelTargetDir)/%.o : %.c $(MainMakefile)
486          $(Print) $@
487          $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@
488  
489   ifeq "$(UseMPI)" "yes"
490 < %.o : %.c
490 > %.o : %.c $(MainMakefile)
491          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
492          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
493   else
494 < %.o : %.c
494 > %.o : %.c $(MainMakefile)
495          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
496   endif
497  
498   # .cpp -> .o
499 < $(PackageTargetDir)/%.o : %.cpp
499 > $(PackageTargetDir)/%.o : %.cpp $(MainMakefile)
500          $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
501  
502 < $(PackageParallelTargetDir)/%.o : %.cpp
502 > $(PackageParallelTargetDir)/%.o : %.cpp $(MainMakefile)
503          $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@
504  
505   ifeq "$(UseMPI)" "yes"
506 < %.o : %.cpp
506 > %.o : %.cpp $(MainMakefile)
507          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
508          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
509   else
510 < %.o : %.cpp
510 > %.o : %.cpp $(MainMakefile)
511          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
512   endif
513  
514   # .f -> .o
515 < $(PackageTargetDir)/%.o : %.f
515 > $(PackageTargetDir)/%.o : %.f $(MainMakefile)
516          $(FortranCompiler) $(FortranOptions) -c $< -o $@
517  
518 < $(PackageParallelTargetDir)/%.o : %.f
518 > $(PackageParallelTargetDir)/%.o : %.f $(MainMakefile)
519          $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@
520  
521   ifeq "$(UseMPI)" "yes"
522 < %.o : %.f
522 > %.o : %.f $(MainMakefile)
523          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
524          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
525   else
526 < %.o : %.f
526 > %.o : %.f $(MainMakefile)
527          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
528   endif
529  
530   # .F90 -> .o
531 < $(PackageTargetDir)/%.o : %.F90
532 <        $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
531 > $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
532 >        $(FortranCompiler) $(FortranOptions) $(IncludePath) -c $< -o $@
533          if test -n "`ls *.$(ModSuffix)`"; then \
534            $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
535          fi
536  
537 < $(PackageParallelTargetDir)/%.o : %.F90
538 <        $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
537 > $(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile)
538 >        $(FortranCompiler) $(FortranParallelOptions) $(IncludePath) -c $< -o $@
539          if test -n "`ls *.$(ModSuffix)`"; then \
540            $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
541          fi
542  
543   ifeq "$(UseMPI)" "yes"
544 < %.o : %.F90
544 > %.o : %.F90 $(MainMakefile)
545          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
546          if test -n "`ls *.$(ModSuffix)`"; then\
547            $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
# Line 520 | Line 553 | else
553          fi
554  
555   else
556 < %.o : %.F90
556 > %.o : %.F90 $(MainMakefile)
557          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
558          if test -n "`ls *.$(ModSuffix)`"; then\
559            $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
# Line 627 | Line 660 | find_objs = $(shell $(StaticArchiver) -t $(1))
660          $(Doxygen) $(DEV_ROOT)/make/Doxyfile
661  
662   #GUN make funtions to merge the libraries
663 < find_objs = $(shell $(StaticArchiver) -t $(1))
663 > find_objs = $(shell $(StaticArchiver) -t $(1) | $(EGREP) -v "SYMDEF")
664   extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
665   create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
666   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
667   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
668 + do_link = $(shell $(LN_S) $(1) $(2))
669 + all_objs = $(foreach thisLib,$(LibNames), $(call find_objs, $(thisLib)))
670 + all_parallel_objs = $(foreach thisLib,$(ParallelLibNames), $(call find_objs, $(thisLib)))
671 + all_lib_objs = $(patsubst %,$(TargetDir)/%,$(call all_objs))
672 + all_lib_parallel_objs = $(patsubst %,$(ParallelTargetDir)/%,$(call all_parallel_objs))
673  
674   $(CombinedStaticLib) : $(LibDir)/.stamp_UP
675 <        $(Print) create $@      
676 <        $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
675 >        $(Print) creating $@            
676 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_objs)
677          $(Ranlib) $(CombinedStaticLib)
678  
679   $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
680 <        $(Print) create $@
681 <        $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
680 >        $(Print) creating $@
681 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_parallel_objs)
682          $(Ranlib) $(CombinedParallelStaticLib)
683  
684   # Executable
685 < $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir)
685 > $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
686 >        if test ! -d $(BinDir); then \
687 >                $(MkDir) $(BinDir) ;\
688 >        fi
689          $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
690  
691 < $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) $(BinDir)
691 > $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
692 >        if test ! -d $(BinDir); then \
693 >                $(MkDir) $(BinDir) ;\
694 >        fi
695          $(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@
696  
697   # Anything else is just copied from source to target
# Line 791 | Line 835 | _installall : _buildall _installdata
835   install : $(InstallListLoop)
836          $(Print) Done Install
837  
838 < _installall : _buildall _installdata
838 > _installall : _buildall _installdata _installlinks
839  
840   $(MyInstallDir) :
841          $(MkDir) $@
# Line 802 | Line 846 | endif      
846          $(InstallCommand) $(InstallFiles) $(MyInstallDir)
847   endif      
848  
849 + _installlinks :  $(MyInstallDir)
850 + ifneq "$(words $(MyLinkTargets))" "0"
851 +        @cd $(MyInstallDir)
852 +        $(foreach thisLink,$(MyLinkTargets),$(call do_link,$(MyLinkSource),$(thisLink)))
853 + endif      
854 +
855   # make statistics
856   _statisticsall :
857          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
# Line 812 | Line 862 | $(Executable).pure :
862          $(Print) Done statistics.
863  
864   # make pure
865 < $(Executable).pure :
866 <        $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
867 <        $(LibList) $(ObjectFiles) -o $@
865 > #$(Executable).pure :
866 > #       $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
867 > #       $(LibList) $(ObjectFiles) -o $@
868 > #
869 > #pure : $(Executable).pure
870  
819 – pure : $(Executable).pure
820 –
871   #make cvslog
872   cvslog:
873 <        $(DEV_ROOT)/scripts/cvs2cl.pl
873 >        $(DEV_ROOT)/scripts/cvs2cl
874  
875   # Execute
876   _runexe :

Diff Legend

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