ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/make/Makefile.in
(Generate patch)

Comparing trunk/OOPSE-2.0/make/Makefile.in (file contents):
Revision 1529 by tim, Wed Oct 6 18:18:47 2004 UTC vs.
Revision 1546 by tim, Fri Oct 8 23:15:07 2004 UTC

# Line 58 | Line 58 | IncludeDirs = \
58          applications/dump2Xyz \
59          applications/simpleBuilder
60  
61 + Samples = \
62 +        samples/argon \
63 +        samples/water/dimer \
64 +        samples/water/spce \
65 +        samples/water/ssd \
66 +        samples/water/ssde \
67 +        samples/water/tip3p_ice \
68 +        samples/water/tip4p \
69 +        samples/lipid \
70 +        samples/alkane \
71 +        samples/minimizer \
72 +        samples/metals \
73 +        samples/zcons \
74 +
75   IncludeDirs = \
76          @SPRNG_INC_DIR@ \
77          @MPI_INC_DIR@
# Line 72 | 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
96   UseMPI          = @USE_MPI@
97 + ModuleCase      = @F90_MODULE_NAMES@
98 + ModSuffix       = @MOD@
99   LinkOptions = \
100          @F90LIBS@
101  
# Line 94 | Line 113 | ParallelLibDir    = $(DEV_ROOT)/MPIlib
113   TargetDir         = $(DEV_ROOT)/obj
114   ParallelTargetDir = $(DEV_ROOT)/MPIobj
115   LibDir            = $(DEV_ROOT)/lib
97 – ParallelLibDir    = $(DEV_ROOT)/MPIlib
116   MakeDir           = $(DEV_ROOT)/make
117   BinDir            = $(DEV_ROOT)/bin
118   DocsDir           = $(DEV_ROOT)/docs
# Line 207 | Line 225 | endif
225      ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.a
226    endif
227   endif
228 +
229   #
230   # Misc
231   #
# Line 237 | 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 256 | Line 275 | Ranlib                 = @RANLIB@
275   Yacc                   = @YACC@
276   Lex                    = @LEX@
277   Ranlib                 = @RANLIB@
278 + Doxygen                = @DOXYGEN@
279  
260 –
280   MakeOptions            = -k
281   MakeDependOptions      =
282   StaticArchiverOptions  = rc
# Line 294 | 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 +  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
# Line 413 | Line 471 | $(LibDir)/%_UP.a : $(ObjectFiles)
471  
472   $(LibDir)/%_UP.a : $(ObjectFiles)
473          $(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles)
474 <        touch $(LibDir)/.stamp_UP
474 >        @touch $(LibDir)/.stamp_UP
475  
476   $(LibDir)/%_MPI.a: $(ParallelObjectFiles)
477          $(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles)
478 <        touch $(LibDir)/.stamp_MPI
478 >        @touch $(LibDir)/.stamp_MPI
479  
480   %_UP.a : $(ObjectFiles)
481          $(MAKE) $(MakeOptions) $(LibDir)/$@
# Line 469 | Line 527 | $(PackageTargetDir)/%_Skel.class : $(PackageTargetDir)
527  
528   %_Skel.class : %.class
529          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
530 +
531 + document :
532 +        $(Print) Generate Documentation for OOPSE-2.0
533 +        @cd $(DEV_ROOT)/src    
534 +        $(Doxygen) $(DEV_ROOT)/make/Doxyfile
535  
536   #GUN make funtions to merge the libraries
537   find_objs = $(shell $(StaticArchiver) -t $(1))
# Line 477 | Line 540 | $(CombinedStaticLib) : $(LibDir)/.stamp_UP
540   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
541   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
542  
543 < $(CombinedStaticLib) : $(LibDir)/.stamp_UP
543 > $(CombinedStaticLib) : $(LibDir)/.stamp_UP
544 >        $(Print) create $@      
545          $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
546          $(Ranlib) $(CombinedStaticLib)
547  
548   $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
549 +        $(Print) create $@
550          $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
551          $(Ranlib) $(CombinedParallelStaticLib)
552  
# Line 503 | Line 568 | ifeq "$(UseMPI)" "yes"
568  
569   _all : _buildall
570  
571 + _buildall :
572   ifeq "$(UseMPI)" "yes"
573   _buildall : \
574          $(DependencyFile) \
# Line 566 | Line 632 | $(DependencyFile) : $(DerivedSource)
632   $(DependencyFile) : $(DerivedSource)
633          $(Print) $@
634          @cd $(PackageSourceDir)
569 –
570 –        @touch Make.ctemp
571 –        @touch Make.ctemp
635  
636   ifneq "$(words $(CppFiles))" "0"
637 <        $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
638 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
639 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
637 >        $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
638 >        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
639 >        $(Delete) Make.cpptemp
640 >        $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
641 >        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
642 >        @$(Delete) Make.cpptemp
643   endif
644  
645   ifneq "$(words $(CFiles))" "0"
646 <        $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   > Make.ctemp
647 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
648 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
649 <
646 >        $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
647 >        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
648 >        $(Delete) Make.ctemp
649 >        $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
650 >        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
651 >        @$(Delete) Make.ctemp
652   endif
653  
654   ifneq "$(words $(F90Files))" "0"
655 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/obj/' -D__FORTRAN90  $(F90Files) > Make.ftemp
656 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/MPIobj/' -DIS_MPI -D__FORTRAN90  $(F90Files) >> Make.ftemp
657 <        cat Make.ftemp >> $(DependencyFile)
655 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
656 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
657 >        @cat Make.ftemp >> $(DependencyFile)
658 >        @$(Delete) Make.ftemp
659   endif
591 –        $(Delete) Make.cpptemp Make.ctemp Make.ftemp
660  
661   # make lib
662   lib    : $(PackageListLoop)
# Line 601 | Line 669 | jarsign : $(JarFile)
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) $(SourceFiles) >> $(DEV_ROOT)/files.tmp
692 >        @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
693  
694   statistics : $(PackageListLoop)
695          @$(List) $(DEV_ROOT)/files.tmp | xargs $(WordCount) $(WordCountOptions)

Diff Legend

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