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 1544 by tim, Fri Oct 8 22:10:22 2004 UTC

# Line 88 | Line 88 | FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
88   OopseHome       = @OOPSE_HOME@
89   ForceParamDir   = @OOPSE_HOME@/share/forceFields/
90   SampleSimDir    = @OOPSE_HOME@/share/samples/
91 + BinDir          = @OOPSE_HOME@/bin
92 + DocDir          = @OOPSE_HOME@/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 253 | Line 256 | MakeDir                = @MKINSTALLDIRS@
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             = $(BinDir)/
333 + InstallFiles             = $(Executable) $(ParallelExecutable)
334 + InstallCommand           = $(InstallProgram)
335 + endif
336 +
337 + ifneq "$(words $(ForcefiledFiles))" "0"
338 + MyInstallDir             = $(ForceParamDir)
339 + InstallFiles             = $(ForcefiledFiles)/
340 + InstallCommand           = $(InstallData)
341 + endif
342 +
343 + ifneq "$(words $(InstallFiles))" "0"
344 +  InstallList            =
345 + else
346 +  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(patsubst %, $(DEV_ROOT)/%,$(Forcefield)) $(patsubst %, $(SourceDir)/%,$(Applications))
347 + endif
348 +
349 + InstallListLoop          = $(patsubst %,$(SourceDir)/%/.install,$(PackageList))  $(patsubst %,%/.install,$(InstallList))
350 +
351 +
352 +
353 + #---------------------------------------------------------------------------
354 + #
355   # Rules
356   #
357   #---------------------------------------------------------------------------
# Line 526 | Line 564 | ifeq "$(UseMPI)" "yes"
564  
565   _all : _buildall
566  
567 + _buildall :
568   ifeq "$(UseMPI)" "yes"
569   _buildall : \
570          $(DependencyFile) \
# Line 625 | Line 664 | jarsign : $(JarFile)
664  
665   jarsign : $(JarFile)
666          $(JarSigner) -keystore GeoSoftKeystore $(JarFile) myself
667 +
668 + #make install
669 + %.install :
670 +        @$(MAKE) $(MakeOptions) -C $(subst .install,,$@) _installall    
671 +
672 + install : $(InstallListLoop)
673 +        $(Print) Done Install
674  
675 + _installall : _buildall _installdata
676 +
677 + $(MyInstallDir) :
678 +        $(MkDir) $@
679 +
680 + _installdata :  $(MyInstallDir)
681 +        $(Print) $(InstallFiles)
682 + ifneq "$(words $(InstallFiles))" "0"
683 +        $(InstallData) $(InstallFiles) $(MyInstallDir)
684 + endif      
685 +
686 + _installprogram:
687 +        
688   # make statistics
689   _statisticsall :
690          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp

Diff Legend

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