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 2101 by chrisfen, Thu Mar 10 15:10:24 2005 UTC vs.
Revision 2131 by tim, Tue Mar 22 16:38:37 2005 UTC

# 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 720 | 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