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 2157 by gezelter, Mon Apr 11 16:14:05 2005 UTC vs.
Revision 2555 by gezelter, Thu Jan 12 20:01:48 2006 UTC

# Line 51 | Line 51 | PackageLibs = \
51          minimizers \
52          selection \
53          restraints \
54 <
54 >        lattice \
55 >        openbabel\
56 >        antlr\
57 >        mdParser
58   #packages containing applications
59   Applications = \
60          applications/oopse \
61          applications/dump2Xyz \
59 –        applications/simpleBuilder\
62          applications/staticProps \
63          applications/dynamicProps \
64 +        applications/simpleBuilder\
65 +        applications/nanoRodBuilder \
66 +        applications/atom2mdin
67  
68   Samples = \
69 +        samples/alkane \
70          samples/argon \
71 <        samples/water/dimer \
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 \
86          samples/water/ssde \
87 +        samples/water/ssdrf \
88 +        samples/water/ssd-ion \
89          samples/water/tip3p_ice \
90          samples/water/tip4p \
91 <        samples/lipid \
72 <        samples/alkane \
73 <        samples/minimizer \
74 <        samples/metals \
75 <        samples/zcons \
91 >        samples/zcons
92  
93   IncludeDirs = \
94 <        @MPI_INC_DIR@
94 >        @CGAL_INC_DIR@ \
95 >        @MPI_INC_DIR@
96  
97   LibraryDirs = \
98 +        @CGAL_LIB_DIR@ \
99          @MPI_LIB_DIR@
100  
101   Libraries = \
102 +        @LIBS@ \
103 +        @CGAL_LIBS@ \
104          @MPI_LIB@ \
105 <        @MPI_F90_LIB@
105 >        @MPI_F90_LIB@
106  
107   OopseHome       = @OOPSE_HOME@
108   ForceParamDir   = $(OopseHome)/share/forceFields
# Line 96 | Line 116 | LinkOptions = \
116   ModuleCase      = @F90_MODULE_NAMES@
117   ModSuffix       = @MOD@
118   LinkOptions = \
119 <        @F90LIBS@
119 >        @FCLIBS@
120  
121   ParallelLinkOptions = \
122 <        @F90LIBS@
122 >        @FCLIBS@
123  
124  
125   #---------------------------------------------------------------------------
# Line 113 | Line 133 | BinDir            = $(DEV_ROOT)/bin
133   ParallelTargetDir = $(DEV_ROOT)/MPIobj
134   LibDir            = $(DEV_ROOT)/lib
135   MakeDir           = $(DEV_ROOT)/make
136 + MainMakefile      = $(MakeDir)/Makefile
137   BinDir            = $(DEV_ROOT)/bin
138   DocsDir           = $(DEV_ROOT)/docs
139   CurrentDir        = $(CURDIR)
# Line 235 | Line 256 | tr = $(eval __t := $3)                                
256   [0-9] := 0 1 2 3 4 5 6 7 8 9 #
257   [A-F] := A B C D E F #
258  
259 < # Upper case and lower case functions.  Each function has a single
260 < # argument which is the text to alter
259 > # Figure out whether we have $(eval) or not (GNU Make 3.80 and above)
260 > # if we do not then we need to use the shell version of tr, and not the
261 > # faster tr function above:
262  
263 < uc = $(call tr,$([a-z]),$([A-Z]),$1)
264 < lc = $(call tr,$([A-Z]),$([a-z]),$1)
263 > __have_eval := $(false)
264 > __ignore := $(eval __have_eval := $(true))
265 >
266 > ifndef __have_eval
267 >  uc = $(shell echo $1 | tr "a-z" "A-Z")
268 >  lc = $(shell echo $1 | tr "A-Z" "a-z")
269 > else
270 >  uc = $(call tr,$([a-z]),$([A-Z]),$1)
271 >  lc = $(call tr,$([A-Z]),$([a-z]),$1)
272 > endif
273  
274   # OK, now we can actually use these functions to figure out the names
275   # of the module files:
# Line 311 | Line 341 | INSTALL                = @INSTALL@
341   CppCompiler            = @CXX@
342   Linker                 = @CXX@
343   MakeDepend             = makedepend
344 + LN_S                   = @LN_S@
345   INSTALL                = @INSTALL@
346 + EGREP                  = @EGREP@
347   InstallProgram         = @INSTALL_PROGRAM@
348   InstallScript          = @INSTALL_SCRIPT@
349   InstallData            = @INSTALL_DATA@
350   MkDir                  = @MKINSTALLDIRS@
351 < Delete                 = rm -fr
351 > Delete                 = rm -f
352   StaticArchiver         = @AR@
353   DynamicArchiver        = @CC@
354   FortranCompiler        = @FC@
323 – F90Compiler            = @F90@
355   JavaCompiler           = $(JAVA_HOME)/bin/javac
356   JavaArchiver           = $(JAVA_HOME)/bin/jar
357   JarSigner              = $(JAVA_HOME)/bin/jarsigner
# Line 346 | Line 377 | CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOP
377                           -sourcepath $(SourceDir)
378   COptions               = $(FrcDeclare) @CFLAGS@
379   CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
380 < CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
381 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
382 < FortranOptions         =
383 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
353 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
380 > CppOptions             = $(FrcDeclare) @CXXFLAGS@
381 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
382 > FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@
383 > FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclar) @FCFLAGS_SRCEXT@
384   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
385                           -sourcepath $(SourceDir) -deprecation
386   JavaRunOptions         = -classpath $(ClassPath)
# Line 395 | Line 425 | endif
425      InstallFiles             = $(Executable)
426    endif
427    InstallCommand           = $(InstallProgram)
428 +  ifneq "$(words $(LinkTargets))" "0"
429 +    MyLinkSource = $(patsubst %, $(MyInstallDir)/%,$(Main))
430 +    MyLinkTargets = $(patsubst %, $(MyInstallDir)/%,$(LinkTargets))
431 +  endif
432   endif
433  
434   ifneq "$(words $(ForcefieldFiles))" "0"
# Line 431 | Line 465 | $(PackageTargetDir)/%.o : %.c
465          $(MkDir) $@
466  
467   # .c -> .o
468 < $(PackageTargetDir)/%.o : %.c
468 > $(PackageTargetDir)/%.o : %.c $(MainMakefile)
469          $(Print) $@
470          $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
471  
472 < $(PackageParallelTargetDir)/%.o : %.c
472 > $(PackageParallelTargetDir)/%.o : %.c $(MainMakefile)
473          $(Print) $@
474          $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@
475  
476   ifeq "$(UseMPI)" "yes"
477 < %.o : %.c
477 > %.o : %.c $(MainMakefile)
478          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
479          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
480   else
481 < %.o : %.c
481 > %.o : %.c $(MainMakefile)
482          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
483   endif
484  
485   # .cpp -> .o
486 < $(PackageTargetDir)/%.o : %.cpp
486 > $(PackageTargetDir)/%.o : %.cpp $(MainMakefile)
487          $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
488  
489 < $(PackageParallelTargetDir)/%.o : %.cpp
489 > $(PackageParallelTargetDir)/%.o : %.cpp $(MainMakefile)
490          $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@
491  
492   ifeq "$(UseMPI)" "yes"
493 < %.o : %.cpp
493 > %.o : %.cpp $(MainMakefile)
494          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
495          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
496   else
497 < %.o : %.cpp
497 > %.o : %.cpp $(MainMakefile)
498          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
499   endif
500  
501   # .f -> .o
502 < $(PackageTargetDir)/%.o : %.f
502 > $(PackageTargetDir)/%.o : %.f $(MainMakefile)
503          $(FortranCompiler) $(FortranOptions) -c $< -o $@
504  
505 < $(PackageParallelTargetDir)/%.o : %.f
505 > $(PackageParallelTargetDir)/%.o : %.f $(MainMakefile)
506          $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@
507  
508   ifeq "$(UseMPI)" "yes"
509 < %.o : %.f
509 > %.o : %.f $(MainMakefile)
510          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
511          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
512   else
513 < %.o : %.f
513 > %.o : %.f $(MainMakefile)
514          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
515   endif
516  
517   # .F90 -> .o
518 < $(PackageTargetDir)/%.o : %.F90
519 <        $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
518 > $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
519 >        $(FortranCompiler) $(FortranOptions) $(IncludePath) -c $< -o $@
520          if test -n "`ls *.$(ModSuffix)`"; then \
521            $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
522          fi
523  
524 < $(PackageParallelTargetDir)/%.o : %.F90
525 <        $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
524 > $(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile)
525 >        $(FortranCompiler) $(FortranParallelOptions) $(IncludePath) -c $< -o $@
526          if test -n "`ls *.$(ModSuffix)`"; then \
527            $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
528          fi
529  
530   ifeq "$(UseMPI)" "yes"
531 < %.o : %.F90
531 > %.o : %.F90 $(MainMakefile)
532          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
533          if test -n "`ls *.$(ModSuffix)`"; then\
534            $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
# Line 506 | Line 540 | else
540          fi
541  
542   else
543 < %.o : %.F90
543 > %.o : %.F90 $(MainMakefile)
544          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
545          if test -n "`ls *.$(ModSuffix)`"; then\
546            $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
# Line 613 | Line 647 | find_objs = $(shell $(StaticArchiver) -t $(1))
647          $(Doxygen) $(DEV_ROOT)/make/Doxyfile
648  
649   #GUN make funtions to merge the libraries
650 < find_objs = $(shell $(StaticArchiver) -t $(1))
650 > find_objs = $(shell $(StaticArchiver) -t $(1) | $(EGREP) -v "SYMDEF")
651   extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
652   create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
653   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
654   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
655 + do_link = $(shell $(LN_S) $(1) $(2))
656 + all_objs = $(foreach thisLib,$(LibNames), $(call find_objs, $(thisLib)))
657 + all_parallel_objs = $(foreach thisLib,$(ParallelLibNames), $(call find_objs, $(thisLib)))
658 + all_lib_objs = $(patsubst %,$(TargetDir)/%,$(call all_objs))
659 + all_lib_parallel_objs = $(patsubst %,$(ParallelTargetDir)/%,$(call all_parallel_objs))
660  
661   $(CombinedStaticLib) : $(LibDir)/.stamp_UP
662 <        $(Print) create $@      
663 <        $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
662 >        $(Print) creating $@            
663 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_objs)
664          $(Ranlib) $(CombinedStaticLib)
665  
666   $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
667 <        $(Print) create $@
668 <        $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
667 >        $(Print) creating $@
668 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_parallel_objs)
669          $(Ranlib) $(CombinedParallelStaticLib)
670  
671   # Executable
672   $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir)
673 +        @echo $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir)
674          $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
675  
676   $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) $(BinDir)
# Line 777 | Line 817 | _installall : _buildall _installdata
817   install : $(InstallListLoop)
818          $(Print) Done Install
819  
820 < _installall : _buildall _installdata
820 > _installall : _buildall _installdata _installlinks
821  
822   $(MyInstallDir) :
823          $(MkDir) $@
# Line 788 | Line 828 | endif      
828          $(InstallCommand) $(InstallFiles) $(MyInstallDir)
829   endif      
830  
831 + _installlinks :  $(MyInstallDir)
832 + ifneq "$(words $(MyLinkTargets))" "0"
833 +        @cd $(MyInstallDir)
834 +        $(foreach thisLink,$(MyLinkTargets),$(call do_link,$(MyLinkSource),$(thisLink)))
835 + endif      
836 +
837   # make statistics
838   _statisticsall :
839          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
# Line 798 | Line 844 | $(Executable).pure :
844          $(Print) Done statistics.
845  
846   # make pure
847 < $(Executable).pure :
848 <        $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
849 <        $(LibList) $(ObjectFiles) -o $@
847 > #$(Executable).pure :
848 > #       $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
849 > #       $(LibList) $(ObjectFiles) -o $@
850 > #
851 > #pure : $(Executable).pure
852  
805 – pure : $(Executable).pure
806 –
853   #make cvslog
854   cvslog:
855 <        $(DEV_ROOT)/scripts/cvs2cl.pl
855 >        $(DEV_ROOT)/scripts/cvs2cl
856  
857   # Execute
858   _runexe :

Diff Legend

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