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 1933 by tim, Wed Jan 12 23:18:54 2005 UTC vs.
Revision 2101 by chrisfen, Thu Mar 10 15:10:24 2005 UTC

# Line 49 | Line 49 | PackageLibs = \
49          integrators\
50          constraints \
51          minimizers \
52 +        selection \
53 +        restraints \
54  
55   #packages containing applications
56   Applications = \
57          applications/oopse \
58          applications/dump2Xyz \
59          applications/simpleBuilder\
60 +        applications/staticProps \
61 +        applications/dynamicProps \
62  
63   Samples = \
64          samples/argon \
# Line 71 | Line 75 | IncludeDirs = \
75          samples/zcons \
76  
77   IncludeDirs = \
74 –        @SPRNG_INC_DIR@ \
78          @MPI_INC_DIR@
79  
80   LibraryDirs = \
78 –        @SPRNG_LIB_DIR@ \
81          @MPI_LIB_DIR@
82  
83   Libraries = \
82 –        @SPRNG_LIB@ \
84          @MPI_LIB@ \
85          @MPI_F90_LIB@
86  
# Line 123 | Line 124 | Package          = $(subst $(shell cd $(SourceDir); pw
124   # /home/maul/gezelter/src/code/src/UseTheForce/Darkside --> UseTheForce/Darkside
125   #Package          = $(shell echo $(CurrentDir) | sed -e 's/^.*\/src\/\(.*\)/\1/g')
126   #use shell script to get the absolute path and then rip it off from $(CurrentDir)
127 < Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
127 > #Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
128 > # REMINDER: We are now using the Package line in each subdir makefile.
129 > # This avoids the strange path problem and the subshell
130  
131   PackageList              = $(Package)
132   PackageSourceDir         = $(SourceDir)/$(Package)
# Line 254 | Line 257 | MkDir                = @MKINSTALLDIRS@
257   INSTALL                = @INSTALL@
258   InstallProgram         = @INSTALL_PROGRAM@
259   InstallData            = @INSTALL_DATA@
260 < MkDir                = @MKINSTALLDIRS@
260 > MkDir                  = @MKINSTALLDIRS@
261   Delete                 = rm -fr
262   StaticArchiver         = @AR@
263   DynamicArchiver        = @CC@
# Line 285 | Line 288 | CppOptions             = $(FrcDeclare) @CXXFLAGS@
288                           -sourcepath $(SourceDir)
289   COptions               = $(FrcDeclare) @CFLAGS@
290   CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
291 < CppOptions             = $(FrcDeclare) @CXXFLAGS@
292 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
291 > CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
292 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
293   FortranOptions         =
294   F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
295   F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
# Line 364 | Line 367 | $(PackageTargetDir) :
367  
368   # Create target directory
369   $(PackageTargetDir) :
370 <        $(MakeDir) $@
370 >        $(MkDir) $@
371  
372 + $(BinDir) :
373 +        $(MkDir) $@
374 +
375   # .c -> .o
376   $(PackageTargetDir)/%.o : %.c
377          $(Print) $@
# Line 447 | Line 453 | else
453          if test -n "`ls *.$(ModSuffix)`"; then\
454            $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
455          fi
450 –
456   endif
457  
458  
# Line 567 | Line 572 | $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
572          $(Ranlib) $(CombinedParallelStaticLib)
573  
574   # Executable
575 < $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
576 <        $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(CombinedStaticLib) $(Libraries) -o $@
575 > $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir)
576 >        $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
577  
578 < $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
579 <        $(Linker) $(ParallelObjectFiles) $(ParallelLinkOptions) $(LibDirs) $(CombinedParallelStaticLib) $(Libraries) -o $@
578 > $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) $(BinDir)
579 >        $(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@
580  
581   # Anything else is just copied from source to target
582   $(PackageTargetDir)/% : $(PackageSourceDir)/%
# Line 620 | Line 625 | _cleanall :
625          $(Print) Done clean.    
626  
627   _cleanall :
628 <        $(Delete) $(ObjectFiles) $(ParallelObjectFiles)
628 >        $(Delete) \
629 >                $(ObjectFiles) \
630 >                $(ParallelObjectFiles) \
631 >                $(JarFile) \
632 >                $(SharedLibrary) \
633 >                $(StaticLibrary) \
634 >                $(ParallelSharedLibrary) \
635 >                $(ParallelStaticLibrary) \
636 >                $(CombinedStaticLib) \
637 >                $(CombinedParallelStaticLib)
638  
639   # make distclean
640   distclean : $(PackageListLoop)
641          $(Print) Done clean.    
642  
643 < _distcleanall :
644 <        $(Delete) $(ObjectFiles) \
631 <                  $(ParallelObjectFiles) \
632 <                        $(JarFile) \
633 <                  $(SharedLibrary) \
634 <                  $(StaticLibrary) \
635 <                  $(ParallelSharedLibrary) \
636 <                  $(ParallelStaticLibrary) \
637 <                  $(Executable) \
643 > _distcleanall : _cleanall
644 >        $(Delete) $(Executable) \
645                    $(ParallelExecutable) \
646                    $(DependencyFile)
647  
641 –
648   # make depend
649   depend : $(PackageListLoop)
650          $(Print) Done dependencies.

Diff Legend

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