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 1535 by gezelter, Wed Oct 6 21:22:43 2004 UTC vs.
Revision 1545 by tim, Fri Oct 8 22:51:06 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   = @OOPSE_HOME@/share/forceFields
90 > SampleSimDir    = @OOPSE_HOME@/share/samples
91 > InstallBinDir   = @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 272 | Line 275 | Ranlib                 = @RANLIB@
275   Yacc                   = @YACC@
276   Lex                    = @LEX@
277   Ranlib                 = @RANLIB@
278 <
278 > Doxygen                = @DOXYGEN@
279  
280   MakeOptions            = -k
281   MakeDependOptions      =
# Line 310 | Line 313 | Space                  = $(Empty) $(Empty)
313  
314   Empty                  =
315   Space                  = $(Empty) $(Empty)
316 +
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 + InstallFiles             = $(Executable) $(ParallelExecutable)
334 + InstallCommand           = $(InstallProgram)
335 + endif
336 +
337 + ifneq "$(words $(ForcefieldFiles))" "0"
338 + MyInstallDir             = $(ForceParamDir)
339 + InstallFiles             = $(ForcefieldFiles)
340 + InstallCommand           = $(InstallData)
341 + endif
342 +
343 + ifneq "$(words $(InstallFiles))" "0"
344 +  InstallList            =
345 + else
346 +  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(DEV_ROOT)/forceFields $(patsubst %, $(SourceDir)/%,$(Applications))
347 + endif
348 +
349 + InstallListLoop          = $(patsubst %,$(SourceDir)/%/.install,$(PackageList))  $(patsubst %,%/.install,$(InstallList))
350 +
351  
352  
353   #---------------------------------------------------------------------------
# Line 486 | Line 524 | $(PackageTargetDir)/%_Skel.class : $(PackageTargetDir)
524   %_Skel.class : %.class
525          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
526  
527 + document :
528 +        $(Print) Generate Documentation for OOPSE-2.0
529 +        @cd $(DEV_ROOT)/src    
530 +        $(Doxygen) $(DEV_ROOT)/make/Doxyfile
531 +
532   #GUN make funtions to merge the libraries
533   find_objs = $(shell $(StaticArchiver) -t $(1))
534   extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
# Line 521 | Line 564 | ifeq "$(UseMPI)" "yes"
564  
565   _all : _buildall
566  
567 + _buildall :
568   ifeq "$(UseMPI)" "yes"
569   _buildall : \
570          $(DependencyFile) \
# Line 587 | Line 631 | ifneq "$(words $(CppFiles))" "0"
631  
632   ifneq "$(words $(CppFiles))" "0"
633          $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
634 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
634 >        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
635          $(Delete) Make.cpptemp
636          $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
637 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
638 <        $(Delete) Make.cpptemp
637 >        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
638 >        @$(Delete) Make.cpptemp
639   endif
640  
641   ifneq "$(words $(CFiles))" "0"
642          $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
643 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
643 >        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
644          $(Delete) Make.ctemp
645          $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
646 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
647 <        $(Delete) Make.ctemp
646 >        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
647 >        @$(Delete) Make.ctemp
648   endif
649  
650   ifneq "$(words $(F90Files))" "0"
651 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare)  $(F90Files) > Make.ftemp
652 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare)  $(F90Files) >> Make.ftemp
653 <        cat Make.ftemp >> $(DependencyFile)
654 <        $(Delete) Make.ftemp
651 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
652 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
653 >        @cat Make.ftemp >> $(DependencyFile)
654 >        @$(Delete) Make.ftemp
655   endif
656  
657   # make lib
# Line 621 | Line 665 | jarsign : $(JarFile)
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   # make statistics
687   _statisticsall :
688          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp

Diff Legend

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