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 1529 by tim, Wed Oct 6 18:18:47 2004 UTC vs.
Revision 1539 by tim, Wed Oct 6 22:20:47 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 75 | Line 89 | ParallelDeclare = -DIS_MPI
89   ForceParamDir   = @OOPSE_HOME@/share/forceFields/
90   SampleSimDir    = @OOPSE_HOME@/share/samples/
91   FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
92 + F90Declare      = -D__FORTRAN90
93   ParallelDeclare = -DIS_MPI
94   UseMPI          = @USE_MPI@
95 + ModuleCase      = @F90_MODULE_NAMES@
96 + ModSuffix       = @MOD@
97   LinkOptions = \
98          @F90LIBS@
99  
# Line 94 | Line 111 | ParallelLibDir    = $(DEV_ROOT)/MPIlib
111   TargetDir         = $(DEV_ROOT)/obj
112   ParallelTargetDir = $(DEV_ROOT)/MPIobj
113   LibDir            = $(DEV_ROOT)/lib
97 – ParallelLibDir    = $(DEV_ROOT)/MPIlib
114   MakeDir           = $(DEV_ROOT)/make
115   BinDir            = $(DEV_ROOT)/bin
116   DocsDir           = $(DEV_ROOT)/docs
# Line 256 | Line 272 | Ranlib                 = @RANLIB@
272   Yacc                   = @YACC@
273   Lex                    = @LEX@
274   Ranlib                 = @RANLIB@
275 <
275 > Doxygen                = @DOXYGEN@
276  
277   MakeOptions            = -k
278   MakeDependOptions      =
# Line 413 | Line 429 | $(LibDir)/%_UP.a : $(ObjectFiles)
429  
430   $(LibDir)/%_UP.a : $(ObjectFiles)
431          $(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles)
432 <        touch $(LibDir)/.stamp_UP
432 >        @touch $(LibDir)/.stamp_UP
433  
434   $(LibDir)/%_MPI.a: $(ParallelObjectFiles)
435          $(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles)
436 <        touch $(LibDir)/.stamp_MPI
436 >        @touch $(LibDir)/.stamp_MPI
437  
438   %_UP.a : $(ObjectFiles)
439          $(MAKE) $(MakeOptions) $(LibDir)/$@
# Line 469 | Line 485 | $(PackageTargetDir)/%_Skel.class : $(PackageTargetDir)
485  
486   %_Skel.class : %.class
487          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
488 +
489 + document :
490 +        $(Print) Generate Documentation for OOPSE-2.0
491 +        @cd $(DEV_ROOT)/src    
492 +        $(Doxygen) $(DEV_ROOT)/make/Doxyfile
493  
494   #GUN make funtions to merge the libraries
495   find_objs = $(shell $(StaticArchiver) -t $(1))
# Line 477 | Line 498 | $(CombinedStaticLib) : $(LibDir)/.stamp_UP
498   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
499   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
500  
501 < $(CombinedStaticLib) : $(LibDir)/.stamp_UP
501 > $(CombinedStaticLib) : $(LibDir)/.stamp_UP
502 >        $(Print) create $@      
503          $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
504          $(Ranlib) $(CombinedStaticLib)
505  
506   $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
507 +        $(Print) create $@
508          $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
509          $(Ranlib) $(CombinedParallelStaticLib)
510  
# Line 567 | Line 590 | $(DependencyFile) : $(DerivedSource)
590          $(Print) $@
591          @cd $(PackageSourceDir)
592  
570 –        @touch Make.ctemp
571 –        @touch Make.ctemp
572 –
593   ifneq "$(words $(CppFiles))" "0"
594 <        $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
595 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
596 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
594 >        $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
595 >        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
596 >        $(Delete) Make.cpptemp
597 >        $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
598 >        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
599 >        @$(Delete) Make.cpptemp
600   endif
601  
602   ifneq "$(words $(CFiles))" "0"
603 <        $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   > Make.ctemp
604 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
605 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
606 <
603 >        $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
604 >        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
605 >        $(Delete) Make.ctemp
606 >        $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
607 >        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
608 >        @$(Delete) Make.ctemp
609   endif
610  
611   ifneq "$(words $(F90Files))" "0"
612 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/obj/' -D__FORTRAN90  $(F90Files) > Make.ftemp
613 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/MPIobj/' -DIS_MPI -D__FORTRAN90  $(F90Files) >> Make.ftemp
614 <        cat Make.ftemp >> $(DependencyFile)
612 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
613 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
614 >        @cat Make.ftemp >> $(DependencyFile)
615 >        @$(Delete) Make.ftemp
616   endif
591 –        $(Delete) Make.cpptemp Make.ctemp Make.ftemp
617  
618   # make lib
619   lib    : $(PackageListLoop)
# Line 603 | Line 628 | _statisticsall :
628  
629   # make statistics
630   _statisticsall :
631 <        @$(Print) $(SourceFiles) >> $(DEV_ROOT)/files.tmp
631 >        @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
632  
633   statistics : $(PackageListLoop)
634          @$(List) $(DEV_ROOT)/files.tmp | xargs $(WordCount) $(WordCountOptions)

Diff Legend

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