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 1984 by tim, Mon Feb 7 20:31:50 2005 UTC vs.
Revision 2131 by tim, Tue Mar 22 16:38:37 2005 UTC

# Line 50 | Line 50 | PackageLibs = \
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 72 | Line 75 | IncludeDirs = \
75          samples/zcons \
76  
77   IncludeDirs = \
75        @SPRNG_INC_DIR@ \
78          @MPI_INC_DIR@
79  
80   LibraryDirs = \
79        @SPRNG_LIB_DIR@ \
81          @MPI_LIB_DIR@
82  
83   Libraries = \
83        @SPRNG_LIB@ \
84          @MPI_LIB@ \
85          @MPI_F90_LIB@
86  
# Line 216 | Line 216 | ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))
216   #if Main is defined, do not build library. It may not be true sometimes
217   ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))" "0"
218    DependencyFile    = $(PackageSourceDir)/Makedepend
219 <  ifneq "$(Main)" ""
219 >  ifneq "$(words $(Main))" "0"
220      Executable             = $(BinDir)/$(Main)
221 <    ParallelExecutable     = $(BinDir)/$(Main)_MPI
221 >    ifeq "$(BuiltParallelExe)" "1"
222 >      ParallelExecutable     = $(BinDir)/$(Main)_MPI
223 >    endif
224    else
225      SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.so
226      StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.a
# Line 256 | Line 258 | InstallData            = @INSTALL_DATA@
258   MakeDepend             = makedepend
259   INSTALL                = @INSTALL@
260   InstallProgram         = @INSTALL_PROGRAM@
261 + InstallScript          = @INSTALL_SCRIPT@
262   InstallData            = @INSTALL_DATA@
263   MkDir                  = @MKINSTALLDIRS@
264   Delete                 = rm -fr
# Line 625 | Line 628 | _cleanall :
628          $(Print) Done clean.    
629  
630   _cleanall :
631 <        $(Delete) $(ObjectFiles) $(ParallelObjectFiles)
631 >        $(Delete) \
632 >                $(ObjectFiles) \
633 >                $(ParallelObjectFiles) \
634 >                $(JarFile) \
635 >                $(SharedLibrary) \
636 >                $(StaticLibrary) \
637 >                $(ParallelSharedLibrary) \
638 >                $(ParallelStaticLibrary) \
639 >                $(CombinedStaticLib) \
640 >                $(CombinedParallelStaticLib)
641  
642   # make distclean
643   distclean : $(PackageListLoop)
644          $(Print) Done clean.    
645  
646 < _distcleanall :
647 <        $(Delete) $(ObjectFiles) \
636 <                  $(ParallelObjectFiles) \
637 <                        $(JarFile) \
638 <                  $(SharedLibrary) \
639 <                  $(StaticLibrary) \
640 <                  $(ParallelSharedLibrary) \
641 <                  $(ParallelStaticLibrary) \
642 <                  $(Executable) \
646 > _distcleanall : _cleanall
647 >        $(Delete) $(Executable) \
648                    $(ParallelExecutable) \
649                    $(DependencyFile)
650  
646
651   # make depend
652   depend : $(PackageListLoop)
653          $(Print) Done dependencies.
# Line 719 | Line 723 | ifneq "$(words $(InstallFiles))" "0"
723   _installdata :  $(MyInstallDir)
724          $(Print) $(InstallFiles)
725   ifneq "$(words $(InstallFiles))" "0"
726 <        $(InstallData) $(InstallFiles) $(MyInstallDir)
726 >        $(InstallCommand) $(InstallFiles) $(MyInstallDir)
727   endif      
728  
729   # make statistics

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines