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 2101 by chrisfen, Thu Mar 10 15:10:24 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 \
51 >        minimizers \
52 >        selection \
53          restraints \
54  
55   #packages containing applications
56   Applications = \
57          applications/oopse \
58          applications/dump2Xyz \
59 <        applications/simpleBuilder
59 >        applications/simpleBuilder\
60 >        applications/staticProps \
61 >        applications/dynamicProps \
62  
63 + Samples = \
64 +        samples/argon \
65 +        samples/water/dimer \
66 +        samples/water/spce \
67 +        samples/water/ssd \
68 +        samples/water/ssde \
69 +        samples/water/tip3p_ice \
70 +        samples/water/tip4p \
71 +        samples/lipid \
72 +        samples/alkane \
73 +        samples/minimizer \
74 +        samples/metals \
75 +        samples/zcons \
76 +
77   IncludeDirs = \
62 –        @SPRNG_INC_DIR@ \
78          @MPI_INC_DIR@
79  
80   LibraryDirs = \
66 –        @SPRNG_LIB_DIR@ \
81          @MPI_LIB_DIR@
82  
83   Libraries = \
70 –        @SPRNG_LIB@ \
84          @MPI_LIB@ \
85          @MPI_F90_LIB@
86  
87   OopseHome       = @OOPSE_HOME@
88 < ForceParamDir   = @OOPSE_HOME@/share/forceFields/
89 < SampleSimDir    = @OOPSE_HOME@/share/samples/
88 > ForceParamDir   = $(OopseHome)/share/forceFields
89 > SampleSimDir    = $(OopseHome)/share/samples
90 > InstallBinDir   = $(OopseHome)/bin
91 > DocDir          = $(OopseHome)/doc
92   FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
93 + F90Declare      = -D__FORTRAN90
94   ParallelDeclare = -DIS_MPI
95   UseMPI          = @USE_MPI@
96 + ModuleCase      = @F90_MODULE_NAMES@
97 + ModSuffix       = @MOD@
98   LinkOptions = \
99          @F90LIBS@
100  
# Line 94 | Line 112 | ParallelLibDir    = $(DEV_ROOT)/MPIlib
112   TargetDir         = $(DEV_ROOT)/obj
113   ParallelTargetDir = $(DEV_ROOT)/MPIobj
114   LibDir            = $(DEV_ROOT)/lib
97 – ParallelLibDir    = $(DEV_ROOT)/MPIlib
115   MakeDir           = $(DEV_ROOT)/make
116   BinDir            = $(DEV_ROOT)/bin
117   DocsDir           = $(DEV_ROOT)/docs
# Line 107 | Line 124 | Package          = $(subst $(shell cd $(SourceDir); pw
124   # /home/maul/gezelter/src/code/src/UseTheForce/Darkside --> UseTheForce/Darkside
125   #Package          = $(shell echo $(CurrentDir) | sed -e 's/^.*\/src\/\(.*\)/\1/g')
126   #use shell script to get the absolute path and then rip it off from $(CurrentDir)
127 < Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
127 > #Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
128 > # REMINDER: We are now using the Package line in each subdir makefile.
129 > # This avoids the strange path problem and the subshell
130  
131   PackageList              = $(Package)
132   PackageSourceDir         = $(SourceDir)/$(Package)
# Line 207 | Line 226 | endif
226      ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.a
227    endif
228   endif
229 +
230   #
231   # Misc
232   #
# Line 228 | Line 248 | Move                   = mv
248   #
249   #---------------------------------------------------------------------------
250   Print                  = @echo
251 < Move                   = mv
251 > Move                   = mv -f
252   Copy                   = cp
253   CCompiler              = @CC@
254   CppCompiler            = @CXX@
255   Linker                 = @CXX@
256   MakeDepend             = makedepend
257 < Install                = @INSTALL@
257 > INSTALL                = @INSTALL@
258   InstallProgram         = @INSTALL_PROGRAM@
259   InstallData            = @INSTALL_DATA@
260 < MakeDir                = @MKINSTALLDIRS@
260 > MkDir                  = @MKINSTALLDIRS@
261   Delete                 = rm -fr
262   StaticArchiver         = @AR@
263   DynamicArchiver        = @CC@
# Line 256 | Line 276 | Ranlib                 = @RANLIB@
276   Yacc                   = @YACC@
277   Lex                    = @LEX@
278   Ranlib                 = @RANLIB@
279 + Doxygen                = @DOXYGEN@
280  
260 –
281   MakeOptions            = -k
282   MakeDependOptions      =
283   StaticArchiverOptions  = rc
# Line 266 | Line 286 | COptions               = $(FrcDeclare)
286   JniOptions             =
287   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
288                           -sourcepath $(SourceDir)
289 < COptions               = $(FrcDeclare)
290 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
291 < CppOptions             = $(FrcDeclare)
292 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
289 > COptions               = $(FrcDeclare) @CFLAGS@
290 > CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
291 > CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
292 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
293   FortranOptions         =
294 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir)
295 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
294 > F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
295 > F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
296   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
297                           -sourcepath $(SourceDir) -deprecation
298   JavaRunOptions         = -classpath $(ClassPath)
# Line 298 | Line 318 | Space                  = $(Empty) $(Empty)
318  
319   #---------------------------------------------------------------------------
320   #
321 + #  Install
322 + #
323 + #---------------------------------------------------------------------------
324 +
325 + ifneq "$(words $(SampleFiles))" "0"
326 +  MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
327 +  MyInstallDir             = $(SampleSimDir)/$(MySample)
328 +  InstallFiles             = $(SampleFiles)
329 +  InstallCommand           = $(InstallData)
330 + endif
331 +
332 + ifneq "$(words $(Main))" "0"
333 +  MyInstallDir             = $(InstallBinDir)
334 +  ifeq "$(UseMPI)" "yes"
335 +    InstallFiles             = $(Executable) $(ParallelExecutable)
336 +  else
337 +    InstallFiles             = $(Executable)
338 +  endif
339 +  InstallCommand           = $(InstallProgram)
340 + endif
341 +
342 + ifneq "$(words $(ForcefieldFiles))" "0"
343 +  MyInstallDir             = $(ForceParamDir)
344 +  InstallFiles             = $(ForcefieldFiles)
345 +  InstallCommand           = $(InstallData)
346 + endif
347 +
348 + ifneq "$(words $(InstallFiles))" "0"
349 +  InstallList            =
350 + else
351 +  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(DEV_ROOT)/forceFields $(patsubst %, $(SourceDir)/%,$(Applications))
352 + endif
353 +
354 + InstallListLoop          = $(patsubst %,$(SourceDir)/%/.install,$(PackageList))  $(patsubst %,%/.install,$(InstallList))
355 +
356 +
357 +
358 + #---------------------------------------------------------------------------
359 + #
360   # Rules
361   #
362   #---------------------------------------------------------------------------
# Line 308 | Line 367 | $(PackageTargetDir) :
367  
368   # Create target directory
369   $(PackageTargetDir) :
370 <        $(MakeDir) $@
370 >        $(MkDir) $@
371  
372 + $(BinDir) :
373 +        $(MkDir) $@
374 +
375   # .c -> .o
376   $(PackageTargetDir)/%.o : %.c
377          $(Print) $@
# Line 363 | Line 425 | $(PackageTargetDir)/%.o : %.F90
425   # .F90 -> .o
426   $(PackageTargetDir)/%.o : %.F90
427          $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
428 +        if test -n "`ls *.$(ModSuffix)`"; then \
429 +          $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
430 +        fi
431  
432   $(PackageParallelTargetDir)/%.o : %.F90
433          $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
434 +        if test -n "`ls *.$(ModSuffix)`"; then \
435 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
436 +        fi
437  
438   ifeq "$(UseMPI)" "yes"
439   %.o : %.F90
440          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
441 +        if test -n "`ls *.$(ModSuffix)`"; then\
442 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
443 +        fi
444 +
445          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
446 +        if test -n "`ls *.$(ModSuffix)`"; then\
447 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
448 +        fi
449 +
450   else
451   %.o : %.F90
452          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
453 +        if test -n "`ls *.$(ModSuffix)`"; then\
454 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
455 +        fi
456   endif
457  
458  
# Line 413 | Line 492 | $(LibDir)/%_UP.a : $(ObjectFiles)
492  
493   $(LibDir)/%_UP.a : $(ObjectFiles)
494          $(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles)
495 <        touch $(LibDir)/.stamp_UP
495 >        @touch $(LibDir)/.stamp_UP
496  
497   $(LibDir)/%_MPI.a: $(ParallelObjectFiles)
498          $(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles)
499 <        touch $(LibDir)/.stamp_MPI
499 >        @touch $(LibDir)/.stamp_MPI
500  
501   %_UP.a : $(ObjectFiles)
502          $(MAKE) $(MakeOptions) $(LibDir)/$@
# Line 470 | Line 549 | $(PackageTargetDir)/%_Skel.class : $(PackageTargetDir)
549   %_Skel.class : %.class
550          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
551  
552 + document :
553 +        $(Print) Generate Documentation for OOPSE-2.0
554 +        @cd $(DEV_ROOT)/src    
555 +        $(Doxygen) $(DEV_ROOT)/make/Doxyfile
556 +
557   #GUN make funtions to merge the libraries
558   find_objs = $(shell $(StaticArchiver) -t $(1))
559   extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
# Line 477 | Line 561 | $(CombinedStaticLib) : $(LibDir)/.stamp_UP
561   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
562   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
563  
564 < $(CombinedStaticLib) : $(LibDir)/.stamp_UP
564 > $(CombinedStaticLib) : $(LibDir)/.stamp_UP
565 >        $(Print) create $@      
566          $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
567          $(Ranlib) $(CombinedStaticLib)
568  
569   $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
570 +        $(Print) create $@
571          $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
572          $(Ranlib) $(CombinedParallelStaticLib)
573  
574   # Executable
575 < $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
576 <        $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(CombinedStaticLib) $(Libraries) -o $@
575 > $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir)
576 >        $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
577  
578 < $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
579 <        $(Linker) $(ParallelObjectFiles) $(ParallelLinkOptions) $(LibDirs) $(CombinedParallelStaticLib) $(Libraries) -o $@
578 > $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) $(BinDir)
579 >        $(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@
580  
581   # Anything else is just copied from source to target
582   $(PackageTargetDir)/% : $(PackageSourceDir)/%
# Line 503 | Line 589 | ifeq "$(UseMPI)" "yes"
589  
590   _all : _buildall
591  
592 + _buildall :
593   ifeq "$(UseMPI)" "yes"
594   _buildall : \
595          $(DependencyFile) \
# Line 538 | Line 625 | _cleanall :
625          $(Print) Done clean.    
626  
627   _cleanall :
628 <        $(Delete) $(ObjectFiles) $(ParallelObjectFiles)
628 >        $(Delete) \
629 >                $(ObjectFiles) \
630 >                $(ParallelObjectFiles) \
631 >                $(JarFile) \
632 >                $(SharedLibrary) \
633 >                $(StaticLibrary) \
634 >                $(ParallelSharedLibrary) \
635 >                $(ParallelStaticLibrary) \
636 >                $(CombinedStaticLib) \
637 >                $(CombinedParallelStaticLib)
638  
639   # make distclean
640   distclean : $(PackageListLoop)
641          $(Print) Done clean.    
642  
643 < _distcleanall :
644 <        $(Delete) $(ObjectFiles) \
549 <                  $(ParallelObjectFiles) \
550 <                        $(JarFile) \
551 <                  $(SharedLibrary) \
552 <                  $(StaticLibrary) \
553 <                  $(ParallelSharedLibrary) \
554 <                  $(ParallelStaticLibrary) \
555 <                  $(Executable) \
643 > _distcleanall : _cleanall
644 >        $(Delete) $(Executable) \
645                    $(ParallelExecutable) \
646                    $(DependencyFile)
647  
559 –
648   # make depend
649   depend : $(PackageListLoop)
650          $(Print) Done dependencies.
# Line 567 | Line 655 | $(DependencyFile) : $(DerivedSource)
655          $(Print) $@
656          @cd $(PackageSourceDir)
657  
570 –        @touch Make.ctemp
571 –        @touch Make.ctemp
572 –
658   ifneq "$(words $(CppFiles))" "0"
659 <        $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
660 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
661 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
659 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' -MM $(CppFiles)>> Make.cpptemp
660 >        @cat Make.cpptemp  >> $(DependencyFile)
661 >        $(Delete) Make.cpptemp
662 >
663 >  ifeq "$(UseMPI)" "yes"
664 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CppFiles)>> Make.cpptemp
665 >        @cat Make.cpptemp  >> $(DependencyFile)
666 >        @$(Delete) Make.cpptemp
667 >  endif
668 >
669   endif
670  
671   ifneq "$(words $(CFiles))" "0"
672 <        $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   > Make.ctemp
673 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
674 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
672 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/'  -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
673 >        @cat Make.ctemp  >> $(DependencyFile)
674 >        $(Delete) Make.ctemp
675  
676 +  ifeq "$(UseMPI)" "yes"
677 +        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
678 +        @cat Make.ctemp  >> $(DependencyFile)
679 +        @$(Delete) Make.ctemp
680 +  endif
681 +
682   endif
683  
684   ifneq "$(words $(F90Files))" "0"
685 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/obj/' -D__FORTRAN90  $(F90Files) > Make.ftemp
686 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/MPIobj/' -DIS_MPI -D__FORTRAN90  $(F90Files) >> Make.ftemp
687 <        cat Make.ftemp >> $(DependencyFile)
685 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
686 >        @cat Make.ftemp >> $(DependencyFile)
687 >        @$(Delete) Make.ftemp
688 >
689 >  ifeq "$(UseMPI)" "yes"
690 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
691 >        @cat Make.ftemp >> $(DependencyFile)
692 >        @$(Delete) Make.ftemp
693 >  endif
694 >
695   endif
591 –        $(Delete) Make.cpptemp Make.ctemp Make.ftemp
696  
697   # make lib
698   lib    : $(PackageListLoop)
# Line 601 | Line 705 | jarsign : $(JarFile)
705   jarsign : $(JarFile)
706          $(JarSigner) -keystore GeoSoftKeystore $(JarFile) myself
707  
708 + #make install
709 + %.install :
710 +        @$(MAKE) $(MakeOptions) -C $(subst .install,,$@) _installall    
711 +
712 + install : $(InstallListLoop)
713 +        $(Print) Done Install
714 +
715 + _installall : _buildall _installdata
716 +
717 + $(MyInstallDir) :
718 +        $(MkDir) $@
719 +
720 + _installdata :  $(MyInstallDir)
721 +        $(Print) $(InstallFiles)
722 + ifneq "$(words $(InstallFiles))" "0"
723 +        $(InstallData) $(InstallFiles) $(MyInstallDir)
724 + endif      
725 +
726   # make statistics
727   _statisticsall :
728 <        @$(Print) $(SourceFiles) >> $(DEV_ROOT)/files.tmp
728 >        @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
729  
730   statistics : $(PackageListLoop)
731          @$(List) $(DEV_ROOT)/files.tmp | xargs $(WordCount) $(WordCountOptions)

Diff Legend

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