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 1535 by gezelter, Wed Oct 6 21:22:43 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 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 477 | Line 493 | $(CombinedStaticLib) : $(LibDir)/.stamp_UP
493   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
494   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
495  
496 < $(CombinedStaticLib) : $(LibDir)/.stamp_UP
496 > $(CombinedStaticLib) : $(LibDir)/.stamp_UP
497 >        $(Print) create $@      
498          $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
499          $(Ranlib) $(CombinedStaticLib)
500  
501   $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
502 +        $(Print) create $@
503          $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
504          $(Ranlib) $(CombinedParallelStaticLib)
505  
# Line 566 | Line 584 | $(DependencyFile) : $(DerivedSource)
584   $(DependencyFile) : $(DerivedSource)
585          $(Print) $@
586          @cd $(PackageSourceDir)
569 –
570 –        @touch Make.ctemp
571 –        @touch Make.ctemp
587  
588   ifneq "$(words $(CppFiles))" "0"
589 <        $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
590 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
591 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
589 >        $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
590 >        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
591 >        $(Delete) Make.cpptemp
592 >        $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
593 >        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
594 >        $(Delete) Make.cpptemp
595   endif
596  
597   ifneq "$(words $(CFiles))" "0"
598 <        $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   > Make.ctemp
599 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
600 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
601 <
598 >        $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
599 >        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
600 >        $(Delete) Make.ctemp
601 >        $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
602 >        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
603 >        $(Delete) Make.ctemp
604   endif
605  
606   ifneq "$(words $(F90Files))" "0"
607 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/obj/' -D__FORTRAN90  $(F90Files) > Make.ftemp
608 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/MPIobj/' -DIS_MPI -D__FORTRAN90  $(F90Files) >> Make.ftemp
607 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare)  $(F90Files) > Make.ftemp
608 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare)  $(F90Files) >> Make.ftemp
609          cat Make.ftemp >> $(DependencyFile)
610 +        $(Delete) Make.ftemp
611   endif
591 –        $(Delete) Make.cpptemp Make.ctemp Make.ftemp
612  
613   # make lib
614   lib    : $(PackageListLoop)
# Line 603 | Line 623 | _statisticsall :
623  
624   # make statistics
625   _statisticsall :
626 <        @$(Print) $(SourceFiles) >> $(DEV_ROOT)/files.tmp
626 >        @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
627  
628   statistics : $(PackageListLoop)
629          @$(List) $(DEV_ROOT)/files.tmp | xargs $(WordCount) $(WordCountOptions)

Diff Legend

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