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 2736 by chuckv, Tue Apr 25 22:30:26 2006 UTC

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

Diff Legend

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