ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/make/Makefile.in
(Generate patch)

Comparing trunk/OOPSE-2.0/make/Makefile.in (file contents):
Revision 2067 by gezelter, Tue Mar 1 15:44:45 2005 UTC vs.
Revision 2531 by tim, Fri Dec 30 15:32:55 2005 UTC

# Line 50 | Line 50 | PackageLibs = \
50          constraints \
51          minimizers \
52          selection \
53 <
53 >        restraints \
54 >        lattice \
55 >        openbabel\
56 >        antlr\
57 >        mdParser
58   #packages containing applications
59   Applications = \
60          applications/oopse \
61          applications/dump2Xyz \
58 –        applications/simpleBuilder\
62          applications/staticProps \
63          applications/dynamicProps \
64 +        applications/simpleBuilder\
65 +        applications/nanoRodBuilder \
66 +        applications/atom2mdin
67  
68   Samples = \
69          samples/argon \
70 <        samples/water/dimer \
70 >        samples/water/dimer \
71          samples/water/spce \
72          samples/water/ssd \
73          samples/water/ssde \
74 +        samples/water/ssdrf \
75 +        samples/water/ssd-ion \
76          samples/water/tip3p_ice \
77          samples/water/tip4p \
78          samples/lipid \
79          samples/alkane \
80          samples/minimizer \
81          samples/metals \
82 +        samples/metals/EAM \
83 +        samples/metals/EAM/nanoparticle \
84 +        samples/metals/EAM/nanorod \
85 +        samples/metals/Sutton-Chen \
86 +        samples/thermoIntegration/liquid \
87 +        samples/thermoIntegration/solid \
88 +        samples/dipole \
89 +        samples/shape \
90          samples/zcons \
91  
92   IncludeDirs = \
93 <        @SPRNG_INC_DIR@ \
94 <        @MPI_INC_DIR@
93 >        @CGAL_INC_DIR@ \
94 >        @MPI_INC_DIR@
95  
96   LibraryDirs = \
97 <        @SPRNG_LIB_DIR@ \
97 >        @CGAL_LIB_DIR@ \
98          @MPI_LIB_DIR@
99  
100   Libraries = \
101 <        @SPRNG_LIB@ \
101 >        @LIBS@ \
102 >        @CGAL_LIBS@ \
103          @MPI_LIB@ \
104 <        @MPI_F90_LIB@
104 >        @MPI_F90_LIB@
105  
106   OopseHome       = @OOPSE_HOME@
107   ForceParamDir   = $(OopseHome)/share/forceFields
# Line 115 | Line 132 | BinDir            = $(DEV_ROOT)/bin
132   ParallelTargetDir = $(DEV_ROOT)/MPIobj
133   LibDir            = $(DEV_ROOT)/lib
134   MakeDir           = $(DEV_ROOT)/make
135 + MainMakefile      = $(MakeDir)/Makefile
136   BinDir            = $(DEV_ROOT)/bin
137   DocsDir           = $(DEV_ROOT)/docs
138   CurrentDir        = $(CURDIR)
# Line 207 | Line 225 | ThirdPartyJarsTmp = $(patsubst %,$(LibDir)/%,$(JavaLib
225  
226   OtherTargetFiles       = $(OtherSourceFiles:%=$(PackageTargetDir)/%)
227  
228 + ###########################################################################
229 + #
230 + # Figure out the names of the module files based on some work done by
231 + # configure.  The tr function below is from John Graham-Cumming
232 + # (http://www.jgc.org).
233 + #
234 + # The tr function.   Has three arguments:
235 + #
236 + # $1   The list of characters to translate from
237 + # $2   The list of characters to translate to
238 + # $3   The text to translate
239 + #
240 + # For example, $(call tr,A B C,1 2 3,CAPITAL) becomes 21PIT1L.
241 +
242 + tr = $(eval __t := $3)                                                    \
243 +     $(foreach c,                                                         \
244 +         $(join $(addsuffix :,$1),$2),                                    \
245 +         $(eval __t :=                                                    \
246 +             $(subst $(word 1,$(subst :, ,$c)),$(word 2,$(subst :, ,$c)), \
247 +                 $(__t))))$(__t)
248 +
249 + # Common character classes for use with the tr function.  Each of
250 + # these is actually a variable declaration and must be wrapped with
251 + # $() or ${} to be used.
252 +
253 + [A-Z] := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z #
254 + [a-z] := a b c d e f g h i j k l m n o p q r s t u v w x y z #
255 + [0-9] := 0 1 2 3 4 5 6 7 8 9 #
256 + [A-F] := A B C D E F #
257 +
258 + # Figure out whether we have $(eval) or not (GNU Make 3.80 and above)
259 + # if we do not then we need to use the shell version of tr, and not the
260 + # faster tr function above:
261 +
262 + __have_eval := $(false)
263 + __ignore := $(eval __have_eval := $(true))
264 +
265 + ifndef __have_eval
266 +  uc = $(shell echo $1 | tr "a-z" "A-Z")
267 +  lc = $(shell echo $1 | tr "A-Z" "a-z")
268 + else
269 +  uc = $(call tr,$([a-z]),$([A-Z]),$1)
270 +  lc = $(call tr,$([A-Z]),$([a-z]),$1)
271 + endif
272 +
273 + # OK, now we can actually use these functions to figure out the names
274 + # of the module files:
275 +
276 + ifneq "$(words $(Modules))" "0"
277 + ifeq "$(ModuleCase)" "UPPER"
278 +  MODULES = $(call uc,$(Modules))
279 + else
280 +  ifeq "$(ModuleCase)" "lower"
281 +    MODULES = $(call lc,$(Modules))
282 +  else
283 +    MODULES = $(Modules)
284 +  endif
285 + endif
286 +  ModuleFiles = $(MODULES:%= $(PackageTargetDir)/%.$(ModSuffix))
287 +  ParallelModuleFiles = $(MODULES:%= $(PackageParallelTargetDir)/%.$(ModSuffix))
288 + endif
289 + #
290 + ###########################################################################
291 +
292   ThirdPartyJarsTmp = $(patsubst %,$(LibDir)/%,$(JavaLibraries))
293   ThirdPartyJars    = $(subst $(Space),$(X),$(ThirdPartyJarsTmp))
294  
# Line 218 | Line 300 | ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))
300   #if Main is defined, do not build library. It may not be true sometimes
301   ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))" "0"
302    DependencyFile    = $(PackageSourceDir)/Makedepend
303 <  ifneq "$(Main)" ""
303 >  ifneq "$(words $(Main))" "0"
304      Executable             = $(BinDir)/$(Main)
305 <    ParallelExecutable     = $(BinDir)/$(Main)_MPI
305 >    ifeq "$(BuiltParallelExe)" "1"
306 >      ParallelExecutable     = $(BinDir)/$(Main)_MPI
307 >    endif
308    else
309      SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.so
310      StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.a
# Line 256 | Line 340 | INSTALL                = @INSTALL@
340   CppCompiler            = @CXX@
341   Linker                 = @CXX@
342   MakeDepend             = makedepend
343 + LN_S                   = @LN_S@
344   INSTALL                = @INSTALL@
345 + EGREP                  = @EGREP@
346   InstallProgram         = @INSTALL_PROGRAM@
347 + InstallScript          = @INSTALL_SCRIPT@
348   InstallData            = @INSTALL_DATA@
349   MkDir                  = @MKINSTALLDIRS@
350 < Delete                 = rm -fr
350 > Delete                 = rm -f
351   StaticArchiver         = @AR@
352   DynamicArchiver        = @CC@
353   FortranCompiler        = @FC@
# Line 339 | Line 426 | endif
426      InstallFiles             = $(Executable)
427    endif
428    InstallCommand           = $(InstallProgram)
429 +  ifneq "$(words $(LinkTargets))" "0"
430 +    MyLinkSource = $(patsubst %, $(MyInstallDir)/%,$(Main))
431 +    MyLinkTargets = $(patsubst %, $(MyInstallDir)/%,$(LinkTargets))
432 +  endif
433   endif
434  
435   ifneq "$(words $(ForcefieldFiles))" "0"
# Line 375 | Line 466 | $(PackageTargetDir)/%.o : %.c
466          $(MkDir) $@
467  
468   # .c -> .o
469 < $(PackageTargetDir)/%.o : %.c
469 > $(PackageTargetDir)/%.o : %.c $(MainMakefile)
470          $(Print) $@
471          $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
472  
473 < $(PackageParallelTargetDir)/%.o : %.c
473 > $(PackageParallelTargetDir)/%.o : %.c $(MainMakefile)
474          $(Print) $@
475          $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@
476  
477   ifeq "$(UseMPI)" "yes"
478 < %.o : %.c
478 > %.o : %.c $(MainMakefile)
479          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
480          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
481   else
482 < %.o : %.c
482 > %.o : %.c $(MainMakefile)
483          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
484   endif
485  
486   # .cpp -> .o
487 < $(PackageTargetDir)/%.o : %.cpp
487 > $(PackageTargetDir)/%.o : %.cpp $(MainMakefile)
488          $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
489  
490 < $(PackageParallelTargetDir)/%.o : %.cpp
490 > $(PackageParallelTargetDir)/%.o : %.cpp $(MainMakefile)
491          $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@
492  
493   ifeq "$(UseMPI)" "yes"
494 < %.o : %.cpp
494 > %.o : %.cpp $(MainMakefile)
495          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
496          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
497   else
498 < %.o : %.cpp
498 > %.o : %.cpp $(MainMakefile)
499          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
500   endif
501  
502   # .f -> .o
503 < $(PackageTargetDir)/%.o : %.f
503 > $(PackageTargetDir)/%.o : %.f $(MainMakefile)
504          $(FortranCompiler) $(FortranOptions) -c $< -o $@
505  
506 < $(PackageParallelTargetDir)/%.o : %.f
506 > $(PackageParallelTargetDir)/%.o : %.f $(MainMakefile)
507          $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@
508  
509   ifeq "$(UseMPI)" "yes"
510 < %.o : %.f
510 > %.o : %.f $(MainMakefile)
511          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
512          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
513   else
514 < %.o : %.f
514 > %.o : %.f $(MainMakefile)
515          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
516   endif
517  
518   # .F90 -> .o
519 < $(PackageTargetDir)/%.o : %.F90
519 > $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
520          $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
521          if test -n "`ls *.$(ModSuffix)`"; then \
522            $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
523          fi
524  
525 < $(PackageParallelTargetDir)/%.o : %.F90
525 > $(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile)
526          $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
527          if test -n "`ls *.$(ModSuffix)`"; then \
528            $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
529          fi
530  
531   ifeq "$(UseMPI)" "yes"
532 < %.o : %.F90
532 > %.o : %.F90 $(MainMakefile)
533          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
534          if test -n "`ls *.$(ModSuffix)`"; then\
535            $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
# Line 450 | Line 541 | else
541          fi
542  
543   else
544 < %.o : %.F90
544 > %.o : %.F90 $(MainMakefile)
545          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
546          if test -n "`ls *.$(ModSuffix)`"; then\
547            $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
# Line 557 | Line 648 | find_objs = $(shell $(StaticArchiver) -t $(1))
648          $(Doxygen) $(DEV_ROOT)/make/Doxyfile
649  
650   #GUN make funtions to merge the libraries
651 < find_objs = $(shell $(StaticArchiver) -t $(1))
651 > find_objs = $(shell $(StaticArchiver) -t $(1) | $(EGREP) -v "SYMDEF")
652   extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
653   create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
654   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
655   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
656 + do_link = $(shell $(LN_S) $(1) $(2))
657 + all_objs = $(foreach thisLib,$(LibNames), $(call find_objs, $(thisLib)))
658 + all_parallel_objs = $(foreach thisLib,$(ParallelLibNames), $(call find_objs, $(thisLib)))
659 + all_lib_objs = $(patsubst %,$(TargetDir)/%,$(call all_objs))
660 + all_lib_parallel_objs = $(patsubst %,$(ParallelTargetDir)/%,$(call all_parallel_objs))
661  
662   $(CombinedStaticLib) : $(LibDir)/.stamp_UP
663 <        $(Print) create $@      
664 <        $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
663 >        $(Print) creating $@            
664 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_objs)
665          $(Ranlib) $(CombinedStaticLib)
666  
667   $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
668 <        $(Print) create $@
669 <        $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
668 >        $(Print) creating $@
669 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_parallel_objs)
670          $(Ranlib) $(CombinedParallelStaticLib)
671  
672   # Executable
# Line 621 | Line 717 | endif
717          $(Executable)
718   endif
719  
720 + echo : $(PackageListLoop)
721 +        $(Print) Done echo.
722  
723 + _echoall :
724 +        $(Print) $(Modules)
725 +
726   # make clean
727   clean : $(PackageListLoop)
728          $(Print) Done clean.    
# Line 629 | Line 730 | _cleanall :
730   _cleanall :
731          $(Delete) \
732                  $(ObjectFiles) \
733 +                $(ModuleFiles) \
734                  $(ParallelObjectFiles) \
735 +                $(ParallelModuleFiles) \
736                  $(JarFile) \
737                  $(SharedLibrary) \
738                  $(StaticLibrary) \
# Line 714 | 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 722 | Line 825 | ifneq "$(words $(InstallFiles))" "0"
825   _installdata :  $(MyInstallDir)
826          $(Print) $(InstallFiles)
827   ifneq "$(words $(InstallFiles))" "0"
828 <        $(InstallData) $(InstallFiles) $(MyInstallDir)
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 735 | 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  
742 – pure : $(Executable).pure
743 –
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