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 1932 by tim, Wed Jan 12 23:17:02 2005 UTC vs.
Revision 2682 by chuckv, Mon Apr 3 15:37:43 2006 UTC

# Line 49 | Line 49 | PackageLibs = \
49          integrators\
50          constraints \
51          minimizers \
52 <
52 >        selection \
53 >        restraints \
54 >        lattice \
55 >        openbabel\
56 >        antlr\
57 >        mdParser
58   #packages containing applications
59   Applications = \
60          applications/oopse \
61          applications/dump2Xyz \
62 <        applications/simpleBuilder\
62 >        applications/staticProps \
63 >        applications/dynamicProps \
64 >        applications/simpleBuilder \
65 >        applications/nanoRodBuilder \
66 >        applications/nanoparticleBuilder \
67 >        applications/atom2mdin \
68 >        applications/hydrodynamics
69  
70 +
71   Samples = \
72 +        samples/alkane \
73          samples/argon \
74 <        samples/water/dimer \
74 >        samples/cutoff \
75 >        samples/dipole \
76 >        samples/gbljtest \
77 >        samples/lipid \
78 >        samples/metals/EAM \
79 >        samples/metals/EAM/nanoparticle \
80 >        samples/metals/EAM/nanorod \
81 >        samples/metals/Sutton-Chen \
82 >        samples/minimizer \
83 >        samples/shape \
84 >        samples/thermoIntegration/liquid \
85 >        samples/thermoIntegration/solid \
86 >        samples/water/dimer \
87          samples/water/spce \
88          samples/water/ssd \
89          samples/water/ssde \
90 +        samples/water/ssdrf \
91 +        samples/water/ssd-ion \
92          samples/water/tip3p_ice \
93          samples/water/tip4p \
94 <        samples/lipid \
68 <        samples/alkane \
69 <        samples/minimizer \
70 <        samples/metals \
71 <        samples/zcons \
94 >        samples/zcons
95  
96   IncludeDirs = \
97 <        @SPRNG_INC_DIR@ \
98 <        @MPI_INC_DIR@
97 >        @CGAL_INC_DIR@ \
98 >        @MPI_INC_DIR@
99  
100   LibraryDirs = \
101 <        @SPRNG_LIB_DIR@ \
101 >        @CGAL_LIB_DIR@ \
102          @MPI_LIB_DIR@
103  
104   Libraries = \
105 <        @SPRNG_LIB@ \
105 >        @LIBS@ \
106 >        @CGAL_LIBS@ \
107          @MPI_LIB@ \
108 <        @MPI_F90_LIB@
108 >        @MPI_F90_LIB@
109  
110   OopseHome       = @OOPSE_HOME@
111   ForceParamDir   = $(OopseHome)/share/forceFields
# Line 95 | Line 119 | LinkOptions = \
119   ModuleCase      = @F90_MODULE_NAMES@
120   ModSuffix       = @MOD@
121   LinkOptions = \
122 <        @F90LIBS@
122 >        @FCLIBS@ \
123 >        @CXXFLAGS@
124  
125   ParallelLinkOptions = \
126 <        @F90LIBS@
126 >        @FCLIBS@ \
127 >        @CXXFLAGS@
128  
129  
130   #---------------------------------------------------------------------------
# Line 112 | Line 138 | BinDir            = $(DEV_ROOT)/bin
138   ParallelTargetDir = $(DEV_ROOT)/MPIobj
139   LibDir            = $(DEV_ROOT)/lib
140   MakeDir           = $(DEV_ROOT)/make
141 + MainMakefile      = $(MakeDir)/Makefile
142   BinDir            = $(DEV_ROOT)/bin
143   DocsDir           = $(DEV_ROOT)/docs
144   CurrentDir        = $(CURDIR)
# Line 123 | Line 150 | Package          = $(subst $(shell cd $(SourceDir); pw
150   # /home/maul/gezelter/src/code/src/UseTheForce/Darkside --> UseTheForce/Darkside
151   #Package          = $(shell echo $(CurrentDir) | sed -e 's/^.*\/src\/\(.*\)/\1/g')
152   #use shell script to get the absolute path and then rip it off from $(CurrentDir)
153 < Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
153 > #Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
154 > # REMINDER: We are now using the Package line in each subdir makefile.
155 > # This avoids the strange path problem and the subshell
156  
157   PackageList              = $(Package)
158   PackageSourceDir         = $(SourceDir)/$(Package)
# Line 201 | Line 230 | OtherTargetFiles       = $(OtherSourceFiles:%=$(Packag
230                           $(LexFiles:%.l=     %.c)
231  
232   OtherTargetFiles       = $(OtherSourceFiles:%=$(PackageTargetDir)/%)
233 +
234 + ###########################################################################
235 + #
236 + # Figure out the names of the module files based on some work done by
237 + # configure.  The tr function below is from John Graham-Cumming
238 + # (http://www.jgc.org).
239 + #
240 + # The tr function.   Has three arguments:
241 + #
242 + # $1   The list of characters to translate from
243 + # $2   The list of characters to translate to
244 + # $3   The text to translate
245 + #
246 + # For example, $(call tr,A B C,1 2 3,CAPITAL) becomes 21PIT1L.
247  
248 + tr = $(eval __t := $3)                                                    \
249 +     $(foreach c,                                                         \
250 +         $(join $(addsuffix :,$1),$2),                                    \
251 +         $(eval __t :=                                                    \
252 +             $(subst $(word 1,$(subst :, ,$c)),$(word 2,$(subst :, ,$c)), \
253 +                 $(__t))))$(__t)
254 +
255 + # Common character classes for use with the tr function.  Each of
256 + # these is actually a variable declaration and must be wrapped with
257 + # $() or ${} to be used.
258 +
259 + [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 #
260 + [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 #
261 + [0-9] := 0 1 2 3 4 5 6 7 8 9 #
262 + [A-F] := A B C D E F #
263 +
264 + # Figure out whether we have $(eval) or not (GNU Make 3.80 and above)
265 + # if we do not then we need to use the shell version of tr, and not the
266 + # faster tr function above:
267 +
268 + __have_eval := $(false)
269 + __ignore := $(eval __have_eval := $(true))
270 +
271 + ifndef __have_eval
272 +  uc = $(shell echo $1 | tr "a-z" "A-Z")
273 +  lc = $(shell echo $1 | tr "A-Z" "a-z")
274 + else
275 +  uc = $(call tr,$([a-z]),$([A-Z]),$1)
276 +  lc = $(call tr,$([A-Z]),$([a-z]),$1)
277 + endif
278 +
279 + # OK, now we can actually use these functions to figure out the names
280 + # of the module files:
281 +
282 + ifneq "$(words $(Modules))" "0"
283 + ifeq "$(ModuleCase)" "UPPER"
284 +  MODULES = $(call uc,$(Modules))
285 + else
286 +  ifeq "$(ModuleCase)" "lower"
287 +    MODULES = $(call lc,$(Modules))
288 +  else
289 +    MODULES = $(Modules)
290 +  endif
291 + endif
292 +  ModuleFiles = $(MODULES:%= $(PackageTargetDir)/%.$(ModSuffix))
293 +  ParallelModuleFiles = $(MODULES:%= $(PackageParallelTargetDir)/%.$(ModSuffix))
294 + endif
295 + #
296 + ###########################################################################
297 +
298   ThirdPartyJarsTmp = $(patsubst %,$(LibDir)/%,$(JavaLibraries))
299   ThirdPartyJars    = $(subst $(Space),$(X),$(ThirdPartyJarsTmp))
300  
# Line 213 | Line 306 | ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))
306   #if Main is defined, do not build library. It may not be true sometimes
307   ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))" "0"
308    DependencyFile    = $(PackageSourceDir)/Makedepend
309 <  ifneq "$(Main)" ""
309 >  ifneq "$(words $(Main))" "0"
310      Executable             = $(BinDir)/$(Main)
311 <    ParallelExecutable     = $(BinDir)/$(Main)_MPI
311 >    ifeq "$(BuiltParallelExe)" "1"
312 >      ParallelExecutable     = $(BinDir)/$(Main)_MPI
313 >    endif
314    else
315      SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.so
316      StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.a
# Line 251 | Line 346 | INSTALL                = @INSTALL@
346   CppCompiler            = @CXX@
347   Linker                 = @CXX@
348   MakeDepend             = makedepend
349 + LN_S                   = @LN_S@
350   INSTALL                = @INSTALL@
351 + EGREP                  = @EGREP@
352   InstallProgram         = @INSTALL_PROGRAM@
353 + InstallScript          = @INSTALL_SCRIPT@
354   InstallData            = @INSTALL_DATA@
355 < MkDir                = @MKINSTALLDIRS@
356 < Delete                 = rm -fr
355 > MkDir                  = @MKINSTALLDIRS@
356 > Delete                 = rm -f
357   StaticArchiver         = @AR@
358   DynamicArchiver        = @CC@
359   FortranCompiler        = @FC@
262 – F90Compiler            = @F90@
360   JavaCompiler           = $(JAVA_HOME)/bin/javac
361   JavaArchiver           = $(JAVA_HOME)/bin/jar
362   JarSigner              = $(JAVA_HOME)/bin/jarsigner
# Line 287 | Line 384 | FortranOptions         =
384   CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
385   CppOptions             = $(FrcDeclare) @CXXFLAGS@
386   CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
387 < FortranOptions         =
388 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
292 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
387 > FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@
388 > FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@
389   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
390                           -sourcepath $(SourceDir) -deprecation
391   JavaRunOptions         = -classpath $(ClassPath)
# Line 334 | Line 430 | endif
430      InstallFiles             = $(Executable)
431    endif
432    InstallCommand           = $(InstallProgram)
433 +  ifneq "$(words $(LinkTargets))" "0"
434 +    MyLinkSource = $(patsubst %, $(MyInstallDir)/%,$(Main))
435 +    MyLinkTargets = $(patsubst %, $(MyInstallDir)/%,$(LinkTargets))
436 +  endif
437   endif
438  
439   ifneq "$(words $(ForcefieldFiles))" "0"
# Line 364 | Line 464 | $(PackageTargetDir) :
464  
465   # Create target directory
466   $(PackageTargetDir) :
467 <        $(MakeDir) $@
467 >        $(MkDir) $@
468  
469 + $(BinDir) :
470 +        $(MkDir) $@
471 +
472   # .c -> .o
473 < $(PackageTargetDir)/%.o : %.c
473 > $(PackageTargetDir)/%.o : %.c $(MainMakefile)
474          $(Print) $@
475          $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
476  
477 < $(PackageParallelTargetDir)/%.o : %.c
477 > $(PackageParallelTargetDir)/%.o : %.c $(MainMakefile)
478          $(Print) $@
479          $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@
480  
481   ifeq "$(UseMPI)" "yes"
482 < %.o : %.c
482 > %.o : %.c $(MainMakefile)
483          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
484          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
485   else
486 < %.o : %.c
486 > %.o : %.c $(MainMakefile)
487          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
488   endif
489  
490   # .cpp -> .o
491 < $(PackageTargetDir)/%.o : %.cpp
491 > $(PackageTargetDir)/%.o : %.cpp $(MainMakefile)
492          $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
493  
494 < $(PackageParallelTargetDir)/%.o : %.cpp
494 > $(PackageParallelTargetDir)/%.o : %.cpp $(MainMakefile)
495          $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@
496  
497   ifeq "$(UseMPI)" "yes"
498 < %.o : %.cpp
498 > %.o : %.cpp $(MainMakefile)
499          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
500          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
501   else
502 < %.o : %.cpp
502 > %.o : %.cpp $(MainMakefile)
503          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
504   endif
505  
506   # .f -> .o
507 < $(PackageTargetDir)/%.o : %.f
507 > $(PackageTargetDir)/%.o : %.f $(MainMakefile)
508          $(FortranCompiler) $(FortranOptions) -c $< -o $@
509  
510 < $(PackageParallelTargetDir)/%.o : %.f
510 > $(PackageParallelTargetDir)/%.o : %.f $(MainMakefile)
511          $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@
512  
513   ifeq "$(UseMPI)" "yes"
514 < %.o : %.f
514 > %.o : %.f $(MainMakefile)
515          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
516          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
517   else
518 < %.o : %.f
518 > %.o : %.f $(MainMakefile)
519          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
520   endif
521  
522   # .F90 -> .o
523 < $(PackageTargetDir)/%.o : %.F90
524 <        $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
523 > $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
524 >        $(FortranCompiler) $(FortranOptions) $(IncludePath) -c $< -o $@
525          if test -n "`ls *.$(ModSuffix)`"; then \
526            $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
527          fi
528  
529 < $(PackageParallelTargetDir)/%.o : %.F90
530 <        $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
529 > $(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile)
530 >        $(FortranCompiler) $(FortranParallelOptions) $(IncludePath) -c $< -o $@
531          if test -n "`ls *.$(ModSuffix)`"; then \
532            $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
533          fi
534  
535   ifeq "$(UseMPI)" "yes"
536 < %.o : %.F90
536 > %.o : %.F90 $(MainMakefile)
537          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
538          if test -n "`ls *.$(ModSuffix)`"; then\
539            $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
540          fi
541  
542          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
543 <        if test -n "`ls *.$(ModSuffix)`"; then\
544 <          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
545 <        fi
543 >        if test -n "`ls *.$(ModSuffix)`"; then\
544 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
545 >        fi
546  
547   else
548 < %.o : %.F90
548 > %.o : %.F90 $(MainMakefile)
549          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
550          if test -n "`ls *.$(ModSuffix)`"; then\
551            $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
552          fi
450 –
553   endif
554  
555  
# Line 550 | Line 652 | find_objs = $(shell $(StaticArchiver) -t $(1))
652          $(Doxygen) $(DEV_ROOT)/make/Doxyfile
653  
654   #GUN make funtions to merge the libraries
655 < find_objs = $(shell $(StaticArchiver) -t $(1))
655 > find_objs = $(shell $(StaticArchiver) -t $(1) | $(EGREP) -v "SYMDEF")
656   extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
657   create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
658   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
659   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
660 + do_link = $(shell $(LN_S) $(1) $(2))
661 + all_objs = $(foreach thisLib,$(LibNames), $(call find_objs, $(thisLib)))
662 + all_parallel_objs = $(foreach thisLib,$(ParallelLibNames), $(call find_objs, $(thisLib)))
663 + all_lib_objs = $(patsubst %,$(TargetDir)/%,$(call all_objs))
664 + all_lib_parallel_objs = $(patsubst %,$(ParallelTargetDir)/%,$(call all_parallel_objs))
665  
666   $(CombinedStaticLib) : $(LibDir)/.stamp_UP
667 <        $(Print) create $@      
668 <        $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
667 >        $(Print) creating $@            
668 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_objs)
669          $(Ranlib) $(CombinedStaticLib)
670  
671   $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
672 <        $(Print) create $@
673 <        $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
672 >        $(Print) creating $@
673 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_parallel_objs)
674          $(Ranlib) $(CombinedParallelStaticLib)
675  
676   # Executable
677   $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
678 <        $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(CombinedStaticLib) $(Libraries) -o $@
678 >        if test ! -d $(BinDir); then \
679 >                $(MkDir) $(BinDir) ;\
680 >        fi
681 >        $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
682  
683   $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
684 <        $(Linker) $(ParallelObjectFiles) $(ParallelLinkOptions) $(LibDirs) $(CombinedParallelStaticLib) $(Libraries) -o $@
684 >        if test ! -d $(BinDir); then \
685 >                $(MkDir) $(BinDir) ;\
686 >        fi
687 >        $(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@
688  
689   # Anything else is just copied from source to target
690   $(PackageTargetDir)/% : $(PackageSourceDir)/%
# Line 614 | Line 727 | endif
727          $(Executable)
728   endif
729  
730 + echo : $(PackageListLoop)
731 +        $(Print) Done echo.
732  
733 + _echoall :
734 +        $(Print) $(Modules)
735 +
736   # make clean
737   clean : $(PackageListLoop)
738          $(Print) Done clean.    
739  
740   _cleanall :
741 <        $(Delete) $(ObjectFiles) $(ParallelObjectFiles)
741 >        $(Delete) \
742 >                $(ObjectFiles) \
743 >                $(ModuleFiles) \
744 >                $(ParallelObjectFiles) \
745 >                $(ParallelModuleFiles) \
746 >                $(JarFile) \
747 >                $(SharedLibrary) \
748 >                $(StaticLibrary) \
749 >                $(ParallelSharedLibrary) \
750 >                $(ParallelStaticLibrary) \
751 >                $(CombinedStaticLib) \
752 >                $(CombinedParallelStaticLib)
753  
754   # make distclean
755   distclean : $(PackageListLoop)
756          $(Print) Done clean.    
757  
758 < _distcleanall :
759 <        $(Delete) $(ObjectFiles) \
631 <                  $(ParallelObjectFiles) \
632 <                        $(JarFile) \
633 <                  $(SharedLibrary) \
634 <                  $(StaticLibrary) \
635 <                  $(ParallelSharedLibrary) \
636 <                  $(ParallelStaticLibrary) \
637 <                  $(Executable) \
758 > _distcleanall : _cleanall
759 >        $(Delete) $(Executable) \
760                    $(ParallelExecutable) \
761                    $(DependencyFile)
762  
641 –
763   # make depend
764   depend : $(PackageListLoop)
765          $(Print) Done dependencies.
# Line 706 | Line 827 | _installall : _buildall _installdata
827   install : $(InstallListLoop)
828          $(Print) Done Install
829  
830 < _installall : _buildall _installdata
830 > _installall : _buildall _installdata _installlinks
831  
832   $(MyInstallDir) :
833          $(MkDir) $@
# Line 714 | Line 835 | ifneq "$(words $(InstallFiles))" "0"
835   _installdata :  $(MyInstallDir)
836          $(Print) $(InstallFiles)
837   ifneq "$(words $(InstallFiles))" "0"
838 <        $(InstallData) $(InstallFiles) $(MyInstallDir)
838 >        $(InstallCommand) $(InstallFiles) $(MyInstallDir)
839   endif      
840  
841 + _installlinks :  $(MyInstallDir)
842 + ifneq "$(words $(MyLinkTargets))" "0"
843 +        @cd $(MyInstallDir)
844 +        $(foreach thisLink,$(MyLinkTargets),$(call do_link,$(MyLinkSource),$(thisLink)))
845 + endif      
846 +
847   # make statistics
848   _statisticsall :
849          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
# Line 727 | Line 854 | $(Executable).pure :
854          $(Print) Done statistics.
855  
856   # make pure
857 < $(Executable).pure :
858 <        $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
859 <        $(LibList) $(ObjectFiles) -o $@
857 > #$(Executable).pure :
858 > #       $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
859 > #       $(LibList) $(ObjectFiles) -o $@
860 > #
861 > #pure : $(Executable).pure
862  
734 – pure : $(Executable).pure
735 –
863   #make cvslog
864   cvslog:
865 <        $(DEV_ROOT)/scripts/cvs2cl.pl
865 >        $(DEV_ROOT)/scripts/cvs2cl
866  
867   # Execute
868   _runexe :

Diff Legend

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