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 1530 by tim, Wed Oct 6 18:53:05 2004 UTC vs.
Revision 1544 by tim, Fri Oct 8 22:10:22 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 74 | 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
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             = $(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
# Line 470 | 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 505 | Line 564 | ifeq "$(UseMPI)" "yes"
564  
565   _all : _buildall
566  
567 + _buildall :
568   ifeq "$(UseMPI)" "yes"
569   _buildall : \
570          $(DependencyFile) \
# Line 569 | Line 629 | $(DependencyFile) : $(DerivedSource)
629          $(Print) $@
630          @cd $(PackageSourceDir)
631  
572 –        @touch Make.ctemp
573 –        @touch Make.ctemp
574 –
632   ifneq "$(words $(CppFiles))" "0"
633 <        $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
634 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
635 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
633 >        $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
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
639   endif
640  
641   ifneq "$(words $(CFiles))" "0"
642 <        $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   > Make.ctemp
643 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
644 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
645 <
642 >        $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
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
648   endif
649  
650   ifneq "$(words $(F90Files))" "0"
651 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/obj/' -D__FORTRAN90  $(F90Files) > Make.ftemp
652 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/MPIobj/' -DIS_MPI -D__FORTRAN90  $(F90Files) >> Make.ftemp
653 <        cat Make.ftemp >> $(DependencyFile)
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
593 –        $(Delete) Make.cpptemp Make.ctemp Make.ftemp
656  
657   # make lib
658   lib    : $(PackageListLoop)
# Line 603 | 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 + _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