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

Diff Legend

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