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 2580 by gezelter, Thu Feb 2 02:57:01 2006 UTC

# Line 66 | Line 66 | Samples = \
66          applications/atom2mdin
67  
68   Samples = \
69 +        samples/alkane \
70          samples/argon \
71 +        samples/cutoff \
72 +        samples/dipole \
73 +        samples/gbljtest \
74 +        samples/lipid \
75 +        samples/metals/EAM \
76 +        samples/metals/EAM/nanoparticle \
77 +        samples/metals/EAM/nanorod \
78 +        samples/metals/Sutton-Chen \
79 +        samples/minimizer \
80 +        samples/shape \
81 +        samples/thermoIntegration/liquid \
82 +        samples/thermoIntegration/solid \
83          samples/water/dimer \
84          samples/water/spce \
85          samples/water/ssd \
# Line 75 | Line 88 | Samples = \
88          samples/water/ssd-ion \
89          samples/water/tip3p_ice \
90          samples/water/tip4p \
91 <        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 \
91 >        samples/zcons
92  
93   IncludeDirs = \
94          @CGAL_INC_DIR@ \
# Line 111 | Line 116 | LinkOptions = \
116   ModuleCase      = @F90_MODULE_NAMES@
117   ModSuffix       = @MOD@
118   LinkOptions = \
119 <        @F90LIBS@
119 >        @FCLIBS@ \
120 >        @CXXFLAGS@
121  
122   ParallelLinkOptions = \
123 <        @F90LIBS@
123 >        @FCLIBS@ \
124 >        @CXXFLAGS@
125  
126  
127   #---------------------------------------------------------------------------
# Line 338 | Line 345 | InstallProgram         = @INSTALL_PROGRAM@
345   MakeDepend             = makedepend
346   LN_S                   = @LN_S@
347   INSTALL                = @INSTALL@
348 + EGREP                  = @EGREP@
349   InstallProgram         = @INSTALL_PROGRAM@
350   InstallScript          = @INSTALL_SCRIPT@
351   InstallData            = @INSTALL_DATA@
# Line 346 | Line 354 | F90Compiler            = @F90@
354   StaticArchiver         = @AR@
355   DynamicArchiver        = @CC@
356   FortranCompiler        = @FC@
349 – F90Compiler            = @F90@
357   JavaCompiler           = $(JAVA_HOME)/bin/javac
358   JavaArchiver           = $(JAVA_HOME)/bin/jar
359   JarSigner              = $(JAVA_HOME)/bin/jarsigner
# Line 372 | Line 379 | CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOP
379                           -sourcepath $(SourceDir)
380   COptions               = $(FrcDeclare) @CFLAGS@
381   CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
382 < CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
383 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
384 < FortranOptions         =
385 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
379 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
382 > CppOptions             = $(FrcDeclare) @CXXFLAGS@
383 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
384 > FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@
385 > FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclar) @FCFLAGS_SRCEXT@
386   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
387                           -sourcepath $(SourceDir) -deprecation
388   JavaRunOptions         = -classpath $(ClassPath)
# Line 512 | Line 518 | $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
518  
519   # .F90 -> .o
520   $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
521 <        $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
521 >        $(FortranCompiler) $(FortranOptions) $(IncludePath) -c $< -o $@
522          if test -n "`ls *.$(ModSuffix)`"; then \
523            $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
524          fi
525  
526   $(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile)
527 <        $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
527 >        $(FortranCompiler) $(FortranParallelOptions) $(IncludePath) -c $< -o $@
528          if test -n "`ls *.$(ModSuffix)`"; then \
529            $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
530          fi
# Line 643 | Line 649 | find_objs = $(shell $(StaticArchiver) -t $(1))
649          $(Doxygen) $(DEV_ROOT)/make/Doxyfile
650  
651   #GUN make funtions to merge the libraries
652 < find_objs = $(shell $(StaticArchiver) -t $(1))
652 > find_objs = $(shell $(StaticArchiver) -t $(1) | $(EGREP) -v "SYMDEF")
653   extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
654   create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
655   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
656   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
657   do_link = $(shell $(LN_S) $(1) $(2))
658 + all_objs = $(foreach thisLib,$(LibNames), $(call find_objs, $(thisLib)))
659 + all_parallel_objs = $(foreach thisLib,$(ParallelLibNames), $(call find_objs, $(thisLib)))
660 + all_lib_objs = $(patsubst %,$(TargetDir)/%,$(call all_objs))
661 + all_lib_parallel_objs = $(patsubst %,$(ParallelTargetDir)/%,$(call all_parallel_objs))
662  
663   $(CombinedStaticLib) : $(LibDir)/.stamp_UP
664 <        $(Print) create $@      
665 <        $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
664 >        $(Print) creating $@            
665 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_objs)
666          $(Ranlib) $(CombinedStaticLib)
667  
668   $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
669 <        $(Print) create $@
670 <        $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
669 >        $(Print) creating $@
670 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_parallel_objs)
671          $(Ranlib) $(CombinedParallelStaticLib)
672  
673   # Executable
674 < $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir)
674 > $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
675 >        if test ! -d $(BinDir); then \
676 >                $(MkDir) $(BinDir) ;\
677 >        fi
678          $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
679  
680 < $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) $(BinDir)
680 > $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
681 >        if test ! -d $(BinDir); then \
682 >                $(MkDir) $(BinDir) ;\
683 >        fi
684          $(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@
685  
686   # Anything else is just copied from source to target

Diff Legend

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