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 1554 by tim, Mon Oct 11 18:40:22 2004 UTC vs.
Revision 2164 by chuckv, Mon Apr 11 21:37:30 2005 UTC

# Line 38 | Line 38 | PackageLibs = \
38   #packages containing libraries
39   PackageLibs = \
40          utils \
41 +        visitors \
42          math \
43          types \
44          primitives \
44 –        visitors \
45          UseTheForce/DarkSide \
46          UseTheForce \
47          brains \
48          io \
49 <        integrators \
50 <        minimizers \
49 >        integrators\
50          constraints \
51 <        profiling \
51 >        minimizers \
52 >        selection \
53          restraints \
54  
55   #packages containing applications
56   Applications = \
57          applications/oopse \
58          applications/dump2Xyz \
59 <        applications/simpleBuilder
59 >        applications/simpleBuilder\
60 >        applications/staticProps \
61 >        applications/dynamicProps \
62 >        applications/nanoRodBuilder \
63  
64   Samples = \
65          samples/argon \
# Line 73 | Line 76 | IncludeDirs = \
76          samples/zcons \
77  
78   IncludeDirs = \
76 –        @SPRNG_INC_DIR@ \
79          @MPI_INC_DIR@
80  
81   LibraryDirs = \
80 –        @SPRNG_LIB_DIR@ \
82          @MPI_LIB_DIR@
83  
84   Libraries = \
84 –        @SPRNG_LIB@ \
85          @MPI_LIB@ \
86          @MPI_F90_LIB@
87  
# Line 125 | Line 125 | Package          = $(subst $(shell cd $(SourceDir); pw
125   # /home/maul/gezelter/src/code/src/UseTheForce/Darkside --> UseTheForce/Darkside
126   #Package          = $(shell echo $(CurrentDir) | sed -e 's/^.*\/src\/\(.*\)/\1/g')
127   #use shell script to get the absolute path and then rip it off from $(CurrentDir)
128 < Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
128 > #Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
129 > # REMINDER: We are now using the Package line in each subdir makefile.
130 > # This avoids the strange path problem and the subshell
131  
132   PackageList              = $(Package)
133   PackageSourceDir         = $(SourceDir)/$(Package)
# Line 204 | Line 206 | ThirdPartyJarsTmp = $(patsubst %,$(LibDir)/%,$(JavaLib
206  
207   OtherTargetFiles       = $(OtherSourceFiles:%=$(PackageTargetDir)/%)
208  
209 + ###########################################################################
210 + #
211 + # Figure out the names of the module files based on some work done by
212 + # configure.  The tr function below is from John Graham-Cumming
213 + # (http://www.jgc.org).
214 + #
215 + # The tr function.   Has three arguments:
216 + #
217 + # $1   The list of characters to translate from
218 + # $2   The list of characters to translate to
219 + # $3   The text to translate
220 + #
221 + # For example, $(call tr,A B C,1 2 3,CAPITAL) becomes 21PIT1L.
222 +
223 + tr = $(eval __t := $3)                                                    \
224 +     $(foreach c,                                                         \
225 +         $(join $(addsuffix :,$1),$2),                                    \
226 +         $(eval __t :=                                                    \
227 +             $(subst $(word 1,$(subst :, ,$c)),$(word 2,$(subst :, ,$c)), \
228 +                 $(__t))))$(__t)
229 +
230 + # Common character classes for use with the tr function.  Each of
231 + # these is actually a variable declaration and must be wrapped with
232 + # $() or ${} to be used.
233 +
234 + [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 #
235 + [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 #
236 + [0-9] := 0 1 2 3 4 5 6 7 8 9 #
237 + [A-F] := A B C D E F #
238 +
239 + # Figure out whether we have $(eval) or not (GNU Make 3.80 and above)
240 + # if we do not then we need to use the shell version of tr, and not the
241 + # faster tr function above:
242 +
243 + __have_eval := $(false)
244 + __ignore := $(eval __have_eval := $(true))
245 +
246 + ifndef __have_eval
247 +  uc = $(shell echo $1 | tr "a-z" "A-Z")
248 +  lc = $(shell echo $1 | tr "A-Z" "a-z")
249 + else
250 +  uc = $(call tr,$([a-z]),$([A-Z]),$1)
251 +  lc = $(call tr,$([A-Z]),$([a-z]),$1)
252 + endif
253 +
254 + # OK, now we can actually use these functions to figure out the names
255 + # of the module files:
256 +
257 + ifneq "$(words $(Modules))" "0"
258 + ifeq "$(ModuleCase)" "UPPER"
259 +  MODULES = $(call uc,$(Modules))
260 + else
261 +  ifeq "$(ModuleCase)" "lower"
262 +    MODULES = $(call lc,$(Modules))
263 +  else
264 +    MODULES = $(Modules)
265 +  endif
266 + endif
267 +  ModuleFiles = $(MODULES:%= $(PackageTargetDir)/%.$(ModSuffix))
268 +  ParallelModuleFiles = $(MODULES:%= $(PackageParallelTargetDir)/%.$(ModSuffix))
269 + endif
270 + #
271 + ###########################################################################
272 +
273   ThirdPartyJarsTmp = $(patsubst %,$(LibDir)/%,$(JavaLibraries))
274   ThirdPartyJars    = $(subst $(Space),$(X),$(ThirdPartyJarsTmp))
275  
# Line 215 | Line 281 | ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))
281   #if Main is defined, do not build library. It may not be true sometimes
282   ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))" "0"
283    DependencyFile    = $(PackageSourceDir)/Makedepend
284 <  ifneq "$(Main)" ""
284 >  ifneq "$(words $(Main))" "0"
285      Executable             = $(BinDir)/$(Main)
286 <    ParallelExecutable     = $(BinDir)/$(Main)_MPI
286 >    ifeq "$(BuiltParallelExe)" "1"
287 >      ParallelExecutable     = $(BinDir)/$(Main)_MPI
288 >    endif
289    else
290      SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.so
291      StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.a
# Line 247 | Line 315 | Move                   = mv
315   #
316   #---------------------------------------------------------------------------
317   Print                  = @echo
318 < Move                   = mv
318 > Move                   = mv -f
319   Copy                   = cp
320   CCompiler              = @CC@
321   CppCompiler            = @CXX@
# Line 255 | Line 323 | InstallData            = @INSTALL_DATA@
323   MakeDepend             = makedepend
324   INSTALL                = @INSTALL@
325   InstallProgram         = @INSTALL_PROGRAM@
326 + InstallScript          = @INSTALL_SCRIPT@
327   InstallData            = @INSTALL_DATA@
328 < MkDir                = @MKINSTALLDIRS@
328 > MkDir                  = @MKINSTALLDIRS@
329   Delete                 = rm -fr
330   StaticArchiver         = @AR@
331   DynamicArchiver        = @CC@
# Line 285 | Line 354 | COptions               = $(FrcDeclare)
354   JniOptions             =
355   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
356                           -sourcepath $(SourceDir)
357 < COptions               = $(FrcDeclare)
358 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
359 < CppOptions             = $(FrcDeclare)
360 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
357 > COptions               = $(FrcDeclare) @CFLAGS@
358 > CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
359 > CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
360 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
361   FortranOptions         =
362   F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
363   F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
# Line 366 | Line 435 | $(PackageTargetDir) :
435  
436   # Create target directory
437   $(PackageTargetDir) :
438 <        $(MakeDir) $@
438 >        $(MkDir) $@
439  
440 + $(BinDir) :
441 +        $(MkDir) $@
442 +
443   # .c -> .o
444   $(PackageTargetDir)/%.o : %.c
445          $(Print) $@
# Line 421 | Line 493 | $(PackageTargetDir)/%.o : %.F90
493   # .F90 -> .o
494   $(PackageTargetDir)/%.o : %.F90
495          $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
496 <        if test -f *.$(ModSuffix); then \
497 <          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
496 >        if test -n "`ls *.$(ModSuffix)`"; then \
497 >          $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
498          fi
499  
500   $(PackageParallelTargetDir)/%.o : %.F90
501          $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
502 <        if test -f *.$(ModSuffix); then \
503 <          $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
502 >        if test -n "`ls *.$(ModSuffix)`"; then \
503 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
504          fi
505  
506   ifeq "$(UseMPI)" "yes"
507   %.o : %.F90
508          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
509 <        if test -f *.$(ModSuffix); then \
510 <          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
511 <        fi
509 >        if test -n "`ls *.$(ModSuffix)`"; then\
510 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
511 >        fi
512  
513          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
514 <        if test -f *.$(ModSuffix); then \
515 <          $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
514 >        if test -n "`ls *.$(ModSuffix)`"; then\
515 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
516          fi
517  
518   else
519   %.o : %.F90
520          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
521 <        if test -f *.$(ModSuffix); then \
522 <          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
523 <        fi
452 <
521 >        if test -n "`ls *.$(ModSuffix)`"; then\
522 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
523 >        fi
524   endif
525  
526  
# Line 569 | Line 640 | $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
640          $(Ranlib) $(CombinedParallelStaticLib)
641  
642   # Executable
643 < $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
644 <        $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(CombinedStaticLib) $(Libraries) -o $@
643 > $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir)
644 >        $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
645  
646 < $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
647 <        $(Linker) $(ParallelObjectFiles) $(ParallelLinkOptions) $(LibDirs) $(CombinedParallelStaticLib) $(Libraries) -o $@
646 > $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) $(BinDir)
647 >        $(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@
648  
649   # Anything else is just copied from source to target
650   $(PackageTargetDir)/% : $(PackageSourceDir)/%
# Line 616 | Line 687 | endif
687          $(Executable)
688   endif
689  
690 + echo : $(PackageListLoop)
691 +        $(Print) Done echo.
692  
693 + _echoall :
694 +        $(Print) $(Modules)
695 +
696   # make clean
697   clean : $(PackageListLoop)
698          $(Print) Done clean.    
699  
700   _cleanall :
701 <        $(Delete) $(ObjectFiles) $(ParallelObjectFiles)
701 >        $(Delete) \
702 >                $(ObjectFiles) \
703 >                $(ModuleFiles) \
704 >                $(ParallelObjectFiles) \
705 >                $(ParallelModuleFiles) \
706 >                $(JarFile) \
707 >                $(SharedLibrary) \
708 >                $(StaticLibrary) \
709 >                $(ParallelSharedLibrary) \
710 >                $(ParallelStaticLibrary) \
711 >                $(CombinedStaticLib) \
712 >                $(CombinedParallelStaticLib)
713  
714   # make distclean
715   distclean : $(PackageListLoop)
716          $(Print) Done clean.    
717  
718 < _distcleanall :
719 <        $(Delete) $(ObjectFiles) \
633 <                  $(ParallelObjectFiles) \
634 <                        $(JarFile) \
635 <                  $(SharedLibrary) \
636 <                  $(StaticLibrary) \
637 <                  $(ParallelSharedLibrary) \
638 <                  $(ParallelStaticLibrary) \
639 <                  $(Executable) \
718 > _distcleanall : _cleanall
719 >        $(Delete) $(Executable) \
720                    $(ParallelExecutable) \
721                    $(DependencyFile)
722  
643 –
723   # make depend
724   depend : $(PackageListLoop)
725          $(Print) Done dependencies.
# Line 652 | Line 731 | ifneq "$(words $(CppFiles))" "0"
731          @cd $(PackageSourceDir)
732  
733   ifneq "$(words $(CppFiles))" "0"
734 <        $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
735 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
734 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' -MM $(CppFiles)>> Make.cpptemp
735 >        @cat Make.cpptemp  >> $(DependencyFile)
736          $(Delete) Make.cpptemp
737  
738    ifeq "$(UseMPI)" "yes"
739 <        $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
740 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
739 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CppFiles)>> Make.cpptemp
740 >        @cat Make.cpptemp  >> $(DependencyFile)
741          @$(Delete) Make.cpptemp
742    endif
743  
744   endif
745  
746   ifneq "$(words $(CFiles))" "0"
747 <        $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
748 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
747 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/'  -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
748 >        @cat Make.ctemp  >> $(DependencyFile)
749          $(Delete) Make.ctemp
750  
751    ifeq "$(UseMPI)" "yes"
752 <        $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
753 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
752 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
753 >        @cat Make.ctemp  >> $(DependencyFile)
754          @$(Delete) Make.ctemp
755    endif
756  
757   endif
758  
759   ifneq "$(words $(F90Files))" "0"
760 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
760 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
761          @cat Make.ftemp >> $(DependencyFile)
762          @$(Delete) Make.ftemp
763  
764    ifeq "$(UseMPI)" "yes"
765 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
765 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
766          @cat Make.ftemp >> $(DependencyFile)
767          @$(Delete) Make.ftemp
768    endif
# Line 716 | Line 795 | ifneq "$(words $(InstallFiles))" "0"
795   _installdata :  $(MyInstallDir)
796          $(Print) $(InstallFiles)
797   ifneq "$(words $(InstallFiles))" "0"
798 <        $(InstallData) $(InstallFiles) $(MyInstallDir)
798 >        $(InstallCommand) $(InstallFiles) $(MyInstallDir)
799   endif      
800 <        
800 >
801   # make statistics
802   _statisticsall :
803          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp

Diff Legend

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