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 2455 by tim, Fri Nov 18 16:38:34 2005 UTC vs.
Revision 2752 by gezelter, Tue May 16 02:06:37 2006 UTC

# Line 52 | Line 52 | PackageLibs = \
52          selection \
53          restraints \
54          lattice \
55 <        openbabel
56 <
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/atom2mdin
68 >        applications/nanoparticleBuilder \
69 >        applications/atom2mdin \
70 >        applications/hydrodynamics
71  
72 +
73   Samples = \
74 +        samples/alkane \
75          samples/argon \
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 \
# Line 74 | Line 93 | Samples = \
93          samples/water/ssd-ion \
94          samples/water/tip3p_ice \
95          samples/water/tip4p \
96 <        samples/lipid \
78 <        samples/alkane \
79 <        samples/minimizer \
80 <        samples/metals \
81 <        samples/thermoIntegration/liquid \
82 <        samples/thermoIntegration/solid \
83 <        samples/dipole \
84 <        samples/shape \
85 <        samples/zcons \
96 >        samples/zcons
97  
98   IncludeDirs = \
99          @CGAL_INC_DIR@ \
# Line 110 | Line 121 | LinkOptions = \
121   ModuleCase      = @F90_MODULE_NAMES@
122   ModSuffix       = @MOD@
123   LinkOptions = \
124 <        @F90LIBS@
124 >        @LDFLAGS@ \
125 >        @FCLIBS@ \
126 >        @CXXFLAGS@
127 >        
128  
129   ParallelLinkOptions = \
130 <        @F90LIBS@
130 >        @LDFLAGS@ \
131 >        @FCLIBS@ \
132 >        @CXXFLAGS@
133  
134  
135   #---------------------------------------------------------------------------
# Line 335 | Line 351 | INSTALL                = @INSTALL@
351   CppCompiler            = @CXX@
352   Linker                 = @CXX@
353   MakeDepend             = makedepend
354 + LN_S                   = @LN_S@
355   INSTALL                = @INSTALL@
356 + EGREP                  = @EGREP@
357   InstallProgram         = @INSTALL_PROGRAM@
358   InstallScript          = @INSTALL_SCRIPT@
359   InstallData            = @INSTALL_DATA@
# Line 344 | Line 362 | F90Compiler            = @F90@
362   StaticArchiver         = @AR@
363   DynamicArchiver        = @CC@
364   FortranCompiler        = @FC@
347 – F90Compiler            = @F90@
365   JavaCompiler           = $(JAVA_HOME)/bin/javac
366   JavaArchiver           = $(JAVA_HOME)/bin/jar
367   JarSigner              = $(JAVA_HOME)/bin/jarsigner
# Line 368 | Line 385 | COptions               = $(FrcDeclare) @CFLAGS@
385   JniOptions             =
386   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
387                           -sourcepath $(SourceDir)
388 < COptions               = $(FrcDeclare) @CFLAGS@
389 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
390 < CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
391 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
392 < FortranOptions         =
393 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
377 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
388 > COptions               = $(FrcDeclare) @CPPFLAGS@ @CFLAGS@
389 > CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CPPFLAGS@ @CFLAGS@
390 > CppOptions             = $(FrcDeclare) @CPPFLAGS@ @CXXFLAGS@
391 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CPPFLAGS@ @CXXFLAGS@
392 > FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@
393 > FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@
394   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
395                           -sourcepath $(SourceDir) -deprecation
396   JavaRunOptions         = -classpath $(ClassPath)
# Line 419 | Line 435 | endif
435      InstallFiles             = $(Executable)
436    endif
437    InstallCommand           = $(InstallProgram)
438 +  ifneq "$(words $(LinkTargets))" "0"
439 +    MyLinkSource = $(patsubst %, $(MyInstallDir)/%,$(Main))
440 +    MyLinkTargets = $(patsubst %, $(MyInstallDir)/%,$(LinkTargets))
441 +  endif
442   endif
443  
444   ifneq "$(words $(ForcefieldFiles))" "0"
# Line 506 | Line 526 | $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
526  
527   # .F90 -> .o
528   $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
529 <        $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
529 >        $(FortranCompiler) $(FortranOptions) $(IncludePath) -c $< -o $@
530          if test -n "`ls *.$(ModSuffix)`"; then \
531            $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
532          fi
533  
534   $(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile)
535 <        $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
535 >        $(FortranCompiler) $(FortranParallelOptions) $(IncludePath) -c $< -o $@
536          if test -n "`ls *.$(ModSuffix)`"; then \
537            $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
538          fi
# Line 637 | Line 657 | find_objs = $(shell $(StaticArchiver) -t $(1))
657          $(Doxygen) $(DEV_ROOT)/make/Doxyfile
658  
659   #GUN make funtions to merge the libraries
660 < find_objs = $(shell $(StaticArchiver) -t $(1))
660 > find_objs = $(shell $(StaticArchiver) -t $(1) | $(EGREP) -v "SYMDEF")
661   extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
662   create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
663   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
664   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
665 + do_link = $(shell $(LN_S) $(1) $(2))
666 + all_objs = $(foreach thisLib,$(LibNames), $(call find_objs, $(thisLib)))
667 + all_parallel_objs = $(foreach thisLib,$(ParallelLibNames), $(call find_objs, $(thisLib)))
668 + all_lib_objs = $(patsubst %,$(TargetDir)/%,$(call all_objs))
669 + all_lib_parallel_objs = $(patsubst %,$(ParallelTargetDir)/%,$(call all_parallel_objs))
670  
671   $(CombinedStaticLib) : $(LibDir)/.stamp_UP
672 <        $(Print) create $@      
673 <        $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
672 >        $(Print) creating $@            
673 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_objs)
674          $(Ranlib) $(CombinedStaticLib)
675  
676   $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
677 <        $(Print) create $@
678 <        $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
677 >        $(Print) creating $@
678 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_parallel_objs)
679          $(Ranlib) $(CombinedParallelStaticLib)
680  
681   # Executable
682 < $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir)
682 > $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
683 >        if test ! -d $(BinDir); then \
684 >                $(MkDir) $(BinDir) ;\
685 >        fi
686          $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
687  
688 < $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) $(BinDir)
688 > $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
689 >        if test ! -d $(BinDir); then \
690 >                $(MkDir) $(BinDir) ;\
691 >        fi
692          $(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@
693  
694   # Anything else is just copied from source to target
# Line 801 | Line 832 | _installall : _buildall _installdata
832   install : $(InstallListLoop)
833          $(Print) Done Install
834  
835 < _installall : _buildall _installdata
835 > _installall : _buildall _installdata _installlinks
836  
837   $(MyInstallDir) :
838          $(MkDir) $@
# Line 812 | Line 843 | endif      
843          $(InstallCommand) $(InstallFiles) $(MyInstallDir)
844   endif      
845  
846 + _installlinks :  $(MyInstallDir)
847 + ifneq "$(words $(MyLinkTargets))" "0"
848 +        @cd $(MyInstallDir)
849 +        $(foreach thisLink,$(MyLinkTargets),$(call do_link,$(MyLinkSource),$(thisLink)))
850 + endif      
851 +
852   # make statistics
853   _statisticsall :
854          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp

Diff Legend

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