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 2199 by gezelter, Thu Apr 14 21:41:56 2005 UTC vs.
Revision 2754 by gezelter, Wed May 17 03:03:03 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 +        @ZLIB_INC_DIR@ \
100 +        @FFTW_INC_DIR@ \
101          @CGAL_INC_DIR@ \
102          @MPI_INC_DIR@
103  
104   LibraryDirs = \
105 +        @ZLIB_LIB_DIR@ \
106 +        @FFTW_LIB_DIR@ \
107          @CGAL_LIB_DIR@ \
108          @MPI_LIB_DIR@
109  
110   Libraries = \
111 +        @LIBS@ \
112 +        @ZLIB@ \
113 +        @FFTW_LIBS@ \
114          @CGAL_LIBS@ \
115          @MPI_LIB@ \
116          @MPI_F90_LIB@
# Line 101 | Line 127 | LinkOptions = \
127   ModuleCase      = @F90_MODULE_NAMES@
128   ModSuffix       = @MOD@
129   LinkOptions = \
130 <        @F90LIBS@
130 >        @LDFLAGS@ \
131 >        @FCLIBS@ \
132 >        @CXXFLAGS@
133 >        
134  
135   ParallelLinkOptions = \
136 <        @F90LIBS@
136 >        @LDFLAGS@ \
137 >        @FCLIBS@ \
138 >        @CXXFLAGS@
139  
140  
141   #---------------------------------------------------------------------------
# Line 118 | Line 149 | BinDir            = $(DEV_ROOT)/bin
149   ParallelTargetDir = $(DEV_ROOT)/MPIobj
150   LibDir            = $(DEV_ROOT)/lib
151   MakeDir           = $(DEV_ROOT)/make
152 + MainMakefile      = $(MakeDir)/Makefile
153   BinDir            = $(DEV_ROOT)/bin
154   DocsDir           = $(DEV_ROOT)/docs
155   CurrentDir        = $(CURDIR)
# Line 325 | Line 357 | INSTALL                = @INSTALL@
357   CppCompiler            = @CXX@
358   Linker                 = @CXX@
359   MakeDepend             = makedepend
360 + LN_S                   = @LN_S@
361   INSTALL                = @INSTALL@
362 + EGREP                  = @EGREP@
363   InstallProgram         = @INSTALL_PROGRAM@
364   InstallScript          = @INSTALL_SCRIPT@
365   InstallData            = @INSTALL_DATA@
366   MkDir                  = @MKINSTALLDIRS@
367 < Delete                 = rm -fr
367 > Delete                 = rm -f
368   StaticArchiver         = @AR@
369   DynamicArchiver        = @CC@
370   FortranCompiler        = @FC@
337 – F90Compiler            = @F90@
371   JavaCompiler           = $(JAVA_HOME)/bin/javac
372   JavaArchiver           = $(JAVA_HOME)/bin/jar
373   JarSigner              = $(JAVA_HOME)/bin/jarsigner
# Line 358 | Line 391 | COptions               = $(FrcDeclare) @CFLAGS@
391   JniOptions             =
392   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
393                           -sourcepath $(SourceDir)
394 < COptions               = $(FrcDeclare) @CFLAGS@
395 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
396 < CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
397 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
398 < FortranOptions         =
399 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
367 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
394 > COptions               = $(FrcDeclare) @CPPFLAGS@ @CFLAGS@
395 > CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CPPFLAGS@ @CFLAGS@
396 > CppOptions             = $(FrcDeclare) @CPPFLAGS@ @CXXFLAGS@
397 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CPPFLAGS@ @CXXFLAGS@
398 > FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@
399 > FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@
400   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
401                           -sourcepath $(SourceDir) -deprecation
402   JavaRunOptions         = -classpath $(ClassPath)
# Line 409 | Line 441 | endif
441      InstallFiles             = $(Executable)
442    endif
443    InstallCommand           = $(InstallProgram)
444 +  ifneq "$(words $(LinkTargets))" "0"
445 +    MyLinkSource = $(patsubst %, $(MyInstallDir)/%,$(Main))
446 +    MyLinkTargets = $(patsubst %, $(MyInstallDir)/%,$(LinkTargets))
447 +  endif
448   endif
449  
450   ifneq "$(words $(ForcefieldFiles))" "0"
# Line 445 | Line 481 | $(PackageTargetDir)/%.o : %.c
481          $(MkDir) $@
482  
483   # .c -> .o
484 < $(PackageTargetDir)/%.o : %.c
484 > $(PackageTargetDir)/%.o : %.c $(MainMakefile)
485          $(Print) $@
486          $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
487  
488 < $(PackageParallelTargetDir)/%.o : %.c
488 > $(PackageParallelTargetDir)/%.o : %.c $(MainMakefile)
489          $(Print) $@
490          $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@
491  
492   ifeq "$(UseMPI)" "yes"
493 < %.o : %.c
493 > %.o : %.c $(MainMakefile)
494          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
495          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
496   else
497 < %.o : %.c
497 > %.o : %.c $(MainMakefile)
498          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
499   endif
500  
501   # .cpp -> .o
502 < $(PackageTargetDir)/%.o : %.cpp
502 > $(PackageTargetDir)/%.o : %.cpp $(MainMakefile)
503          $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
504  
505 < $(PackageParallelTargetDir)/%.o : %.cpp
505 > $(PackageParallelTargetDir)/%.o : %.cpp $(MainMakefile)
506          $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@
507  
508   ifeq "$(UseMPI)" "yes"
509 < %.o : %.cpp
509 > %.o : %.cpp $(MainMakefile)
510          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
511          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
512   else
513 < %.o : %.cpp
513 > %.o : %.cpp $(MainMakefile)
514          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
515   endif
516  
517   # .f -> .o
518 < $(PackageTargetDir)/%.o : %.f
518 > $(PackageTargetDir)/%.o : %.f $(MainMakefile)
519          $(FortranCompiler) $(FortranOptions) -c $< -o $@
520  
521 < $(PackageParallelTargetDir)/%.o : %.f
521 > $(PackageParallelTargetDir)/%.o : %.f $(MainMakefile)
522          $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@
523  
524   ifeq "$(UseMPI)" "yes"
525 < %.o : %.f
525 > %.o : %.f $(MainMakefile)
526          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
527          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
528   else
529 < %.o : %.f
529 > %.o : %.f $(MainMakefile)
530          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
531   endif
532  
533   # .F90 -> .o
534 < $(PackageTargetDir)/%.o : %.F90
535 <        $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
534 > $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
535 >        $(FortranCompiler) $(FortranOptions) $(IncludePath) -c $< -o $@
536          if test -n "`ls *.$(ModSuffix)`"; then \
537            $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
538          fi
539  
540 < $(PackageParallelTargetDir)/%.o : %.F90
541 <        $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
540 > $(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile)
541 >        $(FortranCompiler) $(FortranParallelOptions) $(IncludePath) -c $< -o $@
542          if test -n "`ls *.$(ModSuffix)`"; then \
543            $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
544          fi
545  
546   ifeq "$(UseMPI)" "yes"
547 < %.o : %.F90
547 > %.o : %.F90 $(MainMakefile)
548          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
549          if test -n "`ls *.$(ModSuffix)`"; then\
550            $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
# Line 520 | Line 556 | else
556          fi
557  
558   else
559 < %.o : %.F90
559 > %.o : %.F90 $(MainMakefile)
560          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
561          if test -n "`ls *.$(ModSuffix)`"; then\
562            $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
# Line 627 | Line 663 | find_objs = $(shell $(StaticArchiver) -t $(1))
663          $(Doxygen) $(DEV_ROOT)/make/Doxyfile
664  
665   #GUN make funtions to merge the libraries
666 < find_objs = $(shell $(StaticArchiver) -t $(1))
666 > find_objs = $(shell $(StaticArchiver) -t $(1) | $(EGREP) -v "SYMDEF")
667   extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
668   create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
669   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
670   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
671 + do_link = $(shell $(LN_S) $(1) $(2))
672 + all_objs = $(foreach thisLib,$(LibNames), $(call find_objs, $(thisLib)))
673 + all_parallel_objs = $(foreach thisLib,$(ParallelLibNames), $(call find_objs, $(thisLib)))
674 + all_lib_objs = $(patsubst %,$(TargetDir)/%,$(call all_objs))
675 + all_lib_parallel_objs = $(patsubst %,$(ParallelTargetDir)/%,$(call all_parallel_objs))
676  
677   $(CombinedStaticLib) : $(LibDir)/.stamp_UP
678 <        $(Print) create $@      
679 <        $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
678 >        $(Print) creating $@            
679 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_objs)
680          $(Ranlib) $(CombinedStaticLib)
681  
682   $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
683 <        $(Print) create $@
684 <        $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
683 >        $(Print) creating $@
684 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_parallel_objs)
685          $(Ranlib) $(CombinedParallelStaticLib)
686  
687   # Executable
688 < $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir)
688 > $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
689 >        if test ! -d $(BinDir); then \
690 >                $(MkDir) $(BinDir) ;\
691 >        fi
692          $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
693  
694 < $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) $(BinDir)
694 > $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
695 >        if test ! -d $(BinDir); then \
696 >                $(MkDir) $(BinDir) ;\
697 >        fi
698          $(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@
699  
700   # Anything else is just copied from source to target
# Line 791 | Line 838 | _installall : _buildall _installdata
838   install : $(InstallListLoop)
839          $(Print) Done Install
840  
841 < _installall : _buildall _installdata
841 > _installall : _buildall _installdata _installlinks
842  
843   $(MyInstallDir) :
844          $(MkDir) $@
# Line 802 | Line 849 | endif      
849          $(InstallCommand) $(InstallFiles) $(MyInstallDir)
850   endif      
851  
852 + _installlinks :  $(MyInstallDir)
853 + ifneq "$(words $(MyLinkTargets))" "0"
854 +        @cd $(MyInstallDir)
855 +        $(foreach thisLink,$(MyLinkTargets),$(call do_link,$(MyLinkSource),$(thisLink)))
856 + endif      
857 +
858   # make statistics
859   _statisticsall :
860          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
# Line 812 | Line 865 | $(Executable).pure :
865          $(Print) Done statistics.
866  
867   # make pure
868 < $(Executable).pure :
869 <        $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
870 <        $(LibList) $(ObjectFiles) -o $@
868 > #$(Executable).pure :
869 > #       $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
870 > #       $(LibList) $(ObjectFiles) -o $@
871 > #
872 > #pure : $(Executable).pure
873  
819 – pure : $(Executable).pure
820 –
874   #make cvslog
875   cvslog:
876          $(DEV_ROOT)/scripts/cvs2cl

Diff Legend

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