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 2470 by tim, Fri Dec 2 15:38:25 2005 UTC vs.
Revision 2960 by gezelter, Wed Jul 26 21:00:44 2006 UTC

# Line 52 | Line 52 | PackageLibs = \
52          selection \
53          restraints \
54          lattice \
55 +        hydrodynamics \
56          openbabel\
57          antlr\
58          mdParser
# Line 61 | Line 62 | Applications = \
62          applications/dump2Xyz \
63          applications/staticProps \
64          applications/dynamicProps \
65 <        applications/simpleBuilder\
65 >        applications/simpleBuilder \
66 >        applications/randomBuilder \
67          applications/nanoRodBuilder \
68 <        applications/atom2mdin
68 >        applications/nanoparticleBuilder \
69 >        applications/atom2mdin \
70 >        applications/hydrodynamics \
71 >        applications/utilities
72  
73 +
74   Samples = \
75 +        samples/alkane \
76          samples/argon \
77 +        samples/cutoff \
78 +        samples/dipole \
79 +        samples/gbljtest \
80 +        samples/lipid \
81 +        samples/metals/EAM \
82 +        samples/metals/EAM/nanoparticle \
83 +        samples/metals/EAM/nanorod \
84 +        samples/metals/Sutton-Chen \
85 +        samples/minimizer \
86 +        samples/shape \
87 +        samples/thermoIntegration/liquid \
88 +        samples/thermoIntegration/solid \
89          samples/water/dimer \
90          samples/water/spce \
91          samples/water/ssd \
# Line 75 | Line 94 | Samples = \
94          samples/water/ssd-ion \
95          samples/water/tip3p_ice \
96          samples/water/tip4p \
97 <        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 \
97 >        samples/zcons
98  
99   IncludeDirs = \
100 +        @MPI_INC_DIR@ \
101 +        @FFTW_INC_DIR@ \
102          @CGAL_INC_DIR@ \
103 <        @MPI_INC_DIR@
103 >        @ZLIB_INC_DIR@
104  
105   LibraryDirs = \
106 +        @MPI_LIB_DIR@ \
107 +        @FFTW_LIB_DIR@ \
108          @CGAL_LIB_DIR@ \
109 <        @MPI_LIB_DIR@
109 >        @ZLIB_LIB_DIR@
110  
111   Libraries = \
112          @LIBS@ \
98 –        @CGAL_LIBS@ \
113          @MPI_LIB@ \
114 <        @MPI_F90_LIB@
114 >        @MPI_F90_LIB@ \
115 >        @FFTW_LIBS@ \
116 >        @CGAL_LIBS@ \
117 >        @ZLIB@
118  
119   OopseHome       = @OOPSE_HOME@
120   ForceParamDir   = $(OopseHome)/share/forceFields
# Line 106 | Line 123 | ParallelDeclare = -DIS_MPI
123   DocDir          = $(OopseHome)/doc
124   FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
125   F90Declare      = -D__FORTRAN90
126 + UseSingle       = @USE_SINGLE_PRECISION@
127 + ifeq "$(UseSingle)" "yes"
128 + SingleDeclare   = -DSINGLE_PRECISION
129 + else
130 + SingleDeclare   =
131 + endif
132   ParallelDeclare = -DIS_MPI
133 + SinglePrecision = -DSINGLE_PRECISION
134   UseMPI          = @USE_MPI@
135   ModuleCase      = @F90_MODULE_NAMES@
136   ModSuffix       = @MOD@
137   LinkOptions = \
138 <        @F90LIBS@
138 >        @LDFLAGS@ \
139 >        @FCLIBS@ \
140 >        @CXXFLAGS@
141 >        
142  
143   ParallelLinkOptions = \
144 <        @F90LIBS@
144 >        @LDFLAGS@ \
145 >        @FCLIBS@ \
146 >        @CXXFLAGS@
147  
148  
149   #---------------------------------------------------------------------------
# Line 338 | Line 367 | InstallProgram         = @INSTALL_PROGRAM@
367   MakeDepend             = makedepend
368   LN_S                   = @LN_S@
369   INSTALL                = @INSTALL@
370 + EGREP                  = @EGREP@
371   InstallProgram         = @INSTALL_PROGRAM@
372   InstallScript          = @INSTALL_SCRIPT@
373   InstallData            = @INSTALL_DATA@
# Line 346 | Line 376 | F90Compiler            = @F90@
376   StaticArchiver         = @AR@
377   DynamicArchiver        = @CC@
378   FortranCompiler        = @FC@
349 – F90Compiler            = @F90@
379   JavaCompiler           = $(JAVA_HOME)/bin/javac
380   JavaArchiver           = $(JAVA_HOME)/bin/jar
381   JarSigner              = $(JAVA_HOME)/bin/jarsigner
# Line 370 | Line 399 | COptions               = $(FrcDeclare) @CFLAGS@
399   JniOptions             =
400   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
401                           -sourcepath $(SourceDir)
402 < COptions               = $(FrcDeclare) @CFLAGS@
403 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
404 < CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
405 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
406 < FortranOptions         =
407 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
408 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
402 > COptions               = $(FrcDeclare) $(SingleDeclare) @CFLAGS@
403 > CParallelOptions       = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CFLAGS@
404 > CppOptions             = $(FrcDeclare) $(SingleDeclare) @CXXFLAGS@
405 > CppParallelOptions     = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CXXFLAGS@
406 > ifeq "$(UseSingle)" "yes"
407 > FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @PREPDEFFLAG@$(SingleDeclare) @FCFLAGS_SRCEXT@
408 > FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(SingleDeclare) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@
409 > else
410 > FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@
411 > FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@
412 > endif
413   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
414                           -sourcepath $(SourceDir) -deprecation
415   JavaRunOptions         = -classpath $(ClassPath)
# Line 411 | Line 444 | endif
444    MyInstallDir             = $(SampleSimDir)/$(MySample)
445    InstallFiles             = $(SampleFiles)
446    InstallCommand           = $(InstallData)
447 + endif
448 +
449 + ifneq "$(words $(ScriptFiles))" "0"
450 +  MyInstallDir             = $(InstallBinDir)
451 +  InstallFiles             = $(ScriptFiles)
452 +  InstallCommand           = $(InstallProgram)
453   endif
454  
455   ifneq "$(words $(Main))" "0"
# Line 512 | Line 551 | $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
551  
552   # .F90 -> .o
553   $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
554 <        $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
554 >        $(FortranCompiler) $(FortranOptions) $(IncludePath) -c $< -o $@
555          if test -n "`ls *.$(ModSuffix)`"; then \
556            $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
557          fi
558  
559   $(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile)
560 <        $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
560 >        $(FortranCompiler) $(FortranParallelOptions) $(IncludePath) -c $< -o $@
561          if test -n "`ls *.$(ModSuffix)`"; then \
562            $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
563          fi
# Line 643 | Line 682 | find_objs = $(shell $(StaticArchiver) -t $(1))
682          $(Doxygen) $(DEV_ROOT)/make/Doxyfile
683  
684   #GUN make funtions to merge the libraries
685 < find_objs = $(shell $(StaticArchiver) -t $(1))
685 > find_objs = $(shell $(StaticArchiver) -t $(1) | $(EGREP) -v "SYMDEF")
686   extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
687   create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
688   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
689   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
690   do_link = $(shell $(LN_S) $(1) $(2))
691 + all_objs = $(foreach thisLib,$(LibNames), $(call find_objs, $(thisLib)))
692 + all_parallel_objs = $(foreach thisLib,$(ParallelLibNames), $(call find_objs, $(thisLib)))
693 + all_lib_objs = $(patsubst %,$(TargetDir)/%,$(call all_objs))
694 + all_lib_parallel_objs = $(patsubst %,$(ParallelTargetDir)/%,$(call all_parallel_objs))
695  
696   $(CombinedStaticLib) : $(LibDir)/.stamp_UP
697 <        $(Print) create $@      
698 <        $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
697 >        $(Print) creating $@            
698 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_objs)
699          $(Ranlib) $(CombinedStaticLib)
700  
701   $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
702 <        $(Print) create $@
703 <        $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
702 >        $(Print) creating $@
703 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_parallel_objs)
704          $(Ranlib) $(CombinedParallelStaticLib)
705  
706   # Executable
707 < $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir)
707 > $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
708 >        if test ! -d $(BinDir); then \
709 >                $(MkDir) $(BinDir) ;\
710 >        fi
711          $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
712  
713 < $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) $(BinDir)
713 > $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
714 >        if test ! -d $(BinDir); then \
715 >                $(MkDir) $(BinDir) ;\
716 >        fi
717          $(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@
718  
719   # Anything else is just copied from source to target

Diff Legend

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