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

Comparing trunk/OOPSE-4/make/Makefile.in (file contents):
Revision 1940 by gezelter, Thu Jan 13 21:56:58 2005 UTC vs.
Revision 2081 by gezelter, Fri Mar 4 15:29:03 2005 UTC

# Line 49 | Line 49 | PackageLibs = \
49          integrators\
50          constraints \
51          minimizers \
52 +        selection \
53  
54   #packages containing applications
55   Applications = \
56          applications/oopse \
57          applications/dump2Xyz \
58          applications/simpleBuilder\
59 +        applications/staticProps \
60 +        applications/dynamicProps \
61  
62   Samples = \
63          samples/argon \
# Line 71 | Line 74 | IncludeDirs = \
74          samples/zcons \
75  
76   IncludeDirs = \
74        @SPRNG_INC_DIR@ \
77          @MPI_INC_DIR@
78  
79   LibraryDirs = \
78        @SPRNG_LIB_DIR@ \
80          @MPI_LIB_DIR@
81  
82   Libraries = \
82        @SPRNG_LIB@ \
83          @MPI_LIB@ \
84          @MPI_F90_LIB@
85  
# Line 123 | Line 123 | Package          = $(subst $(shell cd $(SourceDir); pw
123   # /home/maul/gezelter/src/code/src/UseTheForce/Darkside --> UseTheForce/Darkside
124   #Package          = $(shell echo $(CurrentDir) | sed -e 's/^.*\/src\/\(.*\)/\1/g')
125   #use shell script to get the absolute path and then rip it off from $(CurrentDir)
126 < Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
126 > #Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
127 > # REMINDER: We are now using the Package line in each subdir makefile.
128 > # This avoids the strange path problem and the subshell
129  
130   PackageList              = $(Package)
131   PackageSourceDir         = $(SourceDir)/$(Package)
# Line 622 | Line 624 | _cleanall :
624          $(Print) Done clean.    
625  
626   _cleanall :
627 <        $(Delete) $(ObjectFiles) $(ParallelObjectFiles)
627 >        $(Delete) \
628 >                $(ObjectFiles) \
629 >                $(ParallelObjectFiles) \
630 >                $(JarFile) \
631 >                $(SharedLibrary) \
632 >                $(StaticLibrary) \
633 >                $(ParallelSharedLibrary) \
634 >                $(ParallelStaticLibrary) \
635 >                $(CombinedStaticLib) \
636 >                $(CombinedParallelStaticLib)
637  
638   # make distclean
639   distclean : $(PackageListLoop)
640          $(Print) Done clean.    
641  
642 < _distcleanall :
643 <        $(Delete) $(ObjectFiles) \
633 <                  $(ParallelObjectFiles) \
634 <                        $(JarFile) \
635 <                  $(SharedLibrary) \
636 <                  $(StaticLibrary) \
637 <                  $(ParallelSharedLibrary) \
638 <                  $(ParallelStaticLibrary) \
639 <                  $(Executable) \
642 > _distcleanall : _cleanall
643 >        $(Delete) $(Executable) \
644                    $(ParallelExecutable) \
645                    $(DependencyFile)
646  
643
647   # make depend
648   depend : $(PackageListLoop)
649          $(Print) Done dependencies.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines