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

Comparing trunk/OOPSE-3.0/make/Makefile.in (file contents):
Revision 1529 by tim, Wed Oct 6 18:18:47 2004 UTC vs.
Revision 1932 by tim, Wed Jan 12 23:17:02 2005 UTC

# Line 38 | Line 38 | PackageLibs = \
38   #packages containing libraries
39   PackageLibs = \
40          utils \
41 +        visitors \
42          math \
43          types \
44          primitives \
44 –        visitors \
45          UseTheForce/DarkSide \
46          UseTheForce \
47          brains \
48          io \
49 <        integrators \
50 <        minimizers \
49 >        integrators\
50          constraints \
51 <        profiling \
53 <        restraints \
51 >        minimizers \
52  
53   #packages containing applications
54   Applications = \
55          applications/oopse \
56          applications/dump2Xyz \
57 <        applications/simpleBuilder
57 >        applications/simpleBuilder\
58  
59 + Samples = \
60 +        samples/argon \
61 +        samples/water/dimer \
62 +        samples/water/spce \
63 +        samples/water/ssd \
64 +        samples/water/ssde \
65 +        samples/water/tip3p_ice \
66 +        samples/water/tip4p \
67 +        samples/lipid \
68 +        samples/alkane \
69 +        samples/minimizer \
70 +        samples/metals \
71 +        samples/zcons \
72 +
73   IncludeDirs = \
74          @SPRNG_INC_DIR@ \
75          @MPI_INC_DIR@
# Line 72 | Line 84 | ForceParamDir   = @OOPSE_HOME@/share/forceFields/
84          @MPI_F90_LIB@
85  
86   OopseHome       = @OOPSE_HOME@
87 < ForceParamDir   = @OOPSE_HOME@/share/forceFields/
88 < SampleSimDir    = @OOPSE_HOME@/share/samples/
87 > ForceParamDir   = $(OopseHome)/share/forceFields
88 > SampleSimDir    = $(OopseHome)/share/samples
89 > InstallBinDir   = $(OopseHome)/bin
90 > DocDir          = $(OopseHome)/doc
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 207 | Line 223 | endif
223      ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.a
224    endif
225   endif
226 +
227   #
228   # Misc
229   #
# Line 228 | Line 245 | Move                   = mv
245   #
246   #---------------------------------------------------------------------------
247   Print                  = @echo
248 < Move                   = mv
248 > Move                   = mv -f
249   Copy                   = cp
250   CCompiler              = @CC@
251   CppCompiler            = @CXX@
252   Linker                 = @CXX@
253   MakeDepend             = makedepend
254 < Install                = @INSTALL@
254 > INSTALL                = @INSTALL@
255   InstallProgram         = @INSTALL_PROGRAM@
256   InstallData            = @INSTALL_DATA@
257 < MakeDir                = @MKINSTALLDIRS@
257 > MkDir                = @MKINSTALLDIRS@
258   Delete                 = rm -fr
259   StaticArchiver         = @AR@
260   DynamicArchiver        = @CC@
# Line 256 | Line 273 | Ranlib                 = @RANLIB@
273   Yacc                   = @YACC@
274   Lex                    = @LEX@
275   Ranlib                 = @RANLIB@
276 + Doxygen                = @DOXYGEN@
277  
260 –
278   MakeOptions            = -k
279   MakeDependOptions      =
280   StaticArchiverOptions  = rc
# Line 266 | Line 283 | COptions               = $(FrcDeclare)
283   JniOptions             =
284   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
285                           -sourcepath $(SourceDir)
286 < COptions               = $(FrcDeclare)
287 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
288 < CppOptions             = $(FrcDeclare)
289 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
286 > COptions               = $(FrcDeclare) @CFLAGS@
287 > CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
288 > CppOptions             = $(FrcDeclare) @CXXFLAGS@
289 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
290   FortranOptions         =
291 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir)
292 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
291 > F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
292 > F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
293   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
294                           -sourcepath $(SourceDir) -deprecation
295   JavaRunOptions         = -classpath $(ClassPath)
# Line 294 | Line 311 | Space                  = $(Empty) $(Empty)
311  
312   Empty                  =
313   Space                  = $(Empty) $(Empty)
314 +
315 +
316 + #---------------------------------------------------------------------------
317 + #
318 + #  Install
319 + #
320 + #---------------------------------------------------------------------------
321 +
322 + ifneq "$(words $(SampleFiles))" "0"
323 +  MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
324 +  MyInstallDir             = $(SampleSimDir)/$(MySample)
325 +  InstallFiles             = $(SampleFiles)
326 +  InstallCommand           = $(InstallData)
327 + endif
328 +
329 + ifneq "$(words $(Main))" "0"
330 +  MyInstallDir             = $(InstallBinDir)
331 +  ifeq "$(UseMPI)" "yes"
332 +    InstallFiles             = $(Executable) $(ParallelExecutable)
333 +  else
334 +    InstallFiles             = $(Executable)
335 +  endif
336 +  InstallCommand           = $(InstallProgram)
337 + endif
338 +
339 + ifneq "$(words $(ForcefieldFiles))" "0"
340 +  MyInstallDir             = $(ForceParamDir)
341 +  InstallFiles             = $(ForcefieldFiles)
342 +  InstallCommand           = $(InstallData)
343 + endif
344 +
345 + ifneq "$(words $(InstallFiles))" "0"
346 +  InstallList            =
347 + else
348 +  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(DEV_ROOT)/forceFields $(patsubst %, $(SourceDir)/%,$(Applications))
349 + endif
350 +
351 + InstallListLoop          = $(patsubst %,$(SourceDir)/%/.install,$(PackageList))  $(patsubst %,%/.install,$(InstallList))
352 +
353  
354  
355   #---------------------------------------------------------------------------
# Line 363 | Line 419 | $(PackageTargetDir)/%.o : %.F90
419   # .F90 -> .o
420   $(PackageTargetDir)/%.o : %.F90
421          $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
422 +        if test -n "`ls *.$(ModSuffix)`"; then \
423 +          $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
424 +        fi
425  
426   $(PackageParallelTargetDir)/%.o : %.F90
427          $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
428 +        if test -n "`ls *.$(ModSuffix)`"; then \
429 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
430 +        fi
431  
432   ifeq "$(UseMPI)" "yes"
433   %.o : %.F90
434          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
435 +        if test -n "`ls *.$(ModSuffix)`"; then\
436 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
437 +        fi
438 +
439          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
440 +        if test -n "`ls *.$(ModSuffix)`"; then\
441 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
442 +        fi
443 +
444   else
445   %.o : %.F90
446          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
447 +        if test -n "`ls *.$(ModSuffix)`"; then\
448 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
449 +        fi
450 +
451   endif
452  
453  
# Line 413 | Line 487 | $(LibDir)/%_UP.a : $(ObjectFiles)
487  
488   $(LibDir)/%_UP.a : $(ObjectFiles)
489          $(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles)
490 <        touch $(LibDir)/.stamp_UP
490 >        @touch $(LibDir)/.stamp_UP
491  
492   $(LibDir)/%_MPI.a: $(ParallelObjectFiles)
493          $(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles)
494 <        touch $(LibDir)/.stamp_MPI
494 >        @touch $(LibDir)/.stamp_MPI
495  
496   %_UP.a : $(ObjectFiles)
497          $(MAKE) $(MakeOptions) $(LibDir)/$@
# Line 470 | Line 544 | $(PackageTargetDir)/%_Skel.class : $(PackageTargetDir)
544   %_Skel.class : %.class
545          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
546  
547 + document :
548 +        $(Print) Generate Documentation for OOPSE-2.0
549 +        @cd $(DEV_ROOT)/src    
550 +        $(Doxygen) $(DEV_ROOT)/make/Doxyfile
551 +
552   #GUN make funtions to merge the libraries
553   find_objs = $(shell $(StaticArchiver) -t $(1))
554   extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
# Line 477 | Line 556 | $(CombinedStaticLib) : $(LibDir)/.stamp_UP
556   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
557   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
558  
559 < $(CombinedStaticLib) : $(LibDir)/.stamp_UP
559 > $(CombinedStaticLib) : $(LibDir)/.stamp_UP
560 >        $(Print) create $@      
561          $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
562          $(Ranlib) $(CombinedStaticLib)
563  
564   $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
565 +        $(Print) create $@
566          $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
567          $(Ranlib) $(CombinedParallelStaticLib)
568  
# Line 503 | Line 584 | ifeq "$(UseMPI)" "yes"
584  
585   _all : _buildall
586  
587 + _buildall :
588   ifeq "$(UseMPI)" "yes"
589   _buildall : \
590          $(DependencyFile) \
# Line 567 | Line 649 | $(DependencyFile) : $(DerivedSource)
649          $(Print) $@
650          @cd $(PackageSourceDir)
651  
570 –        @touch Make.ctemp
571 –        @touch Make.ctemp
572 –
652   ifneq "$(words $(CppFiles))" "0"
653 <        $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
654 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
655 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
653 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' -MM $(CppFiles)>> Make.cpptemp
654 >        @cat Make.cpptemp  >> $(DependencyFile)
655 >        $(Delete) Make.cpptemp
656 >
657 >  ifeq "$(UseMPI)" "yes"
658 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CppFiles)>> Make.cpptemp
659 >        @cat Make.cpptemp  >> $(DependencyFile)
660 >        @$(Delete) Make.cpptemp
661 >  endif
662 >
663   endif
664  
665   ifneq "$(words $(CFiles))" "0"
666 <        $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   > Make.ctemp
667 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
668 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
666 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/'  -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
667 >        @cat Make.ctemp  >> $(DependencyFile)
668 >        $(Delete) Make.ctemp
669  
670 +  ifeq "$(UseMPI)" "yes"
671 +        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
672 +        @cat Make.ctemp  >> $(DependencyFile)
673 +        @$(Delete) Make.ctemp
674 +  endif
675 +
676   endif
677  
678   ifneq "$(words $(F90Files))" "0"
679 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/obj/' -D__FORTRAN90  $(F90Files) > Make.ftemp
680 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/MPIobj/' -DIS_MPI -D__FORTRAN90  $(F90Files) >> Make.ftemp
681 <        cat Make.ftemp >> $(DependencyFile)
679 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
680 >        @cat Make.ftemp >> $(DependencyFile)
681 >        @$(Delete) Make.ftemp
682 >
683 >  ifeq "$(UseMPI)" "yes"
684 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
685 >        @cat Make.ftemp >> $(DependencyFile)
686 >        @$(Delete) Make.ftemp
687 >  endif
688 >
689   endif
591 –        $(Delete) Make.cpptemp Make.ctemp Make.ftemp
690  
691   # make lib
692   lib    : $(PackageListLoop)
# Line 601 | Line 699 | jarsign : $(JarFile)
699   jarsign : $(JarFile)
700          $(JarSigner) -keystore GeoSoftKeystore $(JarFile) myself
701  
702 + #make install
703 + %.install :
704 +        @$(MAKE) $(MakeOptions) -C $(subst .install,,$@) _installall    
705 +
706 + install : $(InstallListLoop)
707 +        $(Print) Done Install
708 +
709 + _installall : _buildall _installdata
710 +
711 + $(MyInstallDir) :
712 +        $(MkDir) $@
713 +
714 + _installdata :  $(MyInstallDir)
715 +        $(Print) $(InstallFiles)
716 + ifneq "$(words $(InstallFiles))" "0"
717 +        $(InstallData) $(InstallFiles) $(MyInstallDir)
718 + endif      
719 +
720   # make statistics
721   _statisticsall :
722 <        @$(Print) $(SourceFiles) >> $(DEV_ROOT)/files.tmp
722 >        @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
723  
724   statistics : $(PackageListLoop)
725          @$(List) $(DEV_ROOT)/files.tmp | xargs $(WordCount) $(WordCountOptions)

Diff Legend

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