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 1539 by tim, Wed Oct 6 22:20:47 2004 UTC vs.
Revision 1552 by gezelter, Mon Oct 11 15:43:16 2004 UTC

# Line 86 | Line 86 | ForceParamDir   = @OOPSE_HOME@/share/forceFields/
86          @MPI_F90_LIB@
87  
88   OopseHome       = @OOPSE_HOME@
89 < ForceParamDir   = @OOPSE_HOME@/share/forceFields/
90 < SampleSimDir    = @OOPSE_HOME@/share/samples/
89 > ForceParamDir   = $(OopseHome)/share/forceFields
90 > SampleSimDir    = $(OopseHome)/share/samples
91 > InstallBinDir   = $(OopseHome)/bin
92 > DocDir          = $(OopseHome)/doc
93   FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
94   F90Declare      = -D__FORTRAN90
95   ParallelDeclare = -DIS_MPI
# Line 223 | Line 225 | endif
225      ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.a
226    endif
227   endif
228 +
229   #
230   # Misc
231   #
# Line 250 | Line 253 | Install                = @INSTALL@
253   CppCompiler            = @CXX@
254   Linker                 = @CXX@
255   MakeDepend             = makedepend
256 < Install                = @INSTALL@
256 > INSTALL                = @INSTALL@
257   InstallProgram         = @INSTALL_PROGRAM@
258   InstallData            = @INSTALL_DATA@
259 < MakeDir                = @MKINSTALLDIRS@
259 > MkDir                = @MKINSTALLDIRS@
260   Delete                 = rm -fr
261   StaticArchiver         = @AR@
262   DynamicArchiver        = @CC@
# Line 314 | Line 317 | Space                  = $(Empty) $(Empty)
317  
318   #---------------------------------------------------------------------------
319   #
320 + #  Install
321 + #
322 + #---------------------------------------------------------------------------
323 +
324 + ifneq "$(words $(SampleFiles))" "0"
325 +  MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
326 +  MyInstallDir             = $(SampleSimDir)/$(MySample)
327 +  InstallFiles             = $(SampleFiles)
328 +  InstallCommand           = $(InstallData)
329 + endif
330 +
331 + ifneq "$(words $(Main))" "0"
332 +  MyInstallDir             = $(InstallBinDir)
333 +  ifeq "$(UseMPI)" "yes"
334 +    InstallFiles             = $(Executable) $(ParallelExecutable)
335 +  else
336 +    InstallFiles             = $(Executable)
337 +  endif
338 +  InstallCommand           = $(InstallProgram)
339 + endif
340 +
341 + ifneq "$(words $(ForcefieldFiles))" "0"
342 +  MyInstallDir             = $(ForceParamDir)
343 +  InstallFiles             = $(ForcefieldFiles)
344 +  InstallCommand           = $(InstallData)
345 + endif
346 +
347 + ifneq "$(words $(InstallFiles))" "0"
348 +  InstallList            =
349 + else
350 +  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(DEV_ROOT)/forceFields $(patsubst %, $(SourceDir)/%,$(Applications))
351 + endif
352 +
353 + InstallListLoop          = $(patsubst %,$(SourceDir)/%/.install,$(PackageList))  $(patsubst %,%/.install,$(InstallList))
354 +
355 +
356 +
357 + #---------------------------------------------------------------------------
358 + #
359   # Rules
360   #
361   #---------------------------------------------------------------------------
# Line 526 | Line 568 | ifeq "$(UseMPI)" "yes"
568  
569   _all : _buildall
570  
571 + _buildall :
572   ifeq "$(UseMPI)" "yes"
573   _buildall : \
574          $(DependencyFile) \
# Line 625 | Line 668 | jarsign : $(JarFile)
668  
669   jarsign : $(JarFile)
670          $(JarSigner) -keystore GeoSoftKeystore $(JarFile) myself
671 +
672 + #make install
673 + %.install :
674 +        @$(MAKE) $(MakeOptions) -C $(subst .install,,$@) _installall    
675  
676 + install : $(InstallListLoop)
677 +        $(Print) Done Install
678 +
679 + _installall : _buildall _installdata
680 +
681 + $(MyInstallDir) :
682 +        $(MkDir) $@
683 +
684 + _installdata :  $(MyInstallDir)
685 +        $(Print) $(InstallFiles)
686 + ifneq "$(words $(InstallFiles))" "0"
687 +        $(InstallData) $(InstallFiles) $(MyInstallDir)
688 + endif      
689 +        
690   # make statistics
691   _statisticsall :
692          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines