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 1522 by gezelter, Mon Oct 4 16:24:39 2004 UTC vs.
Revision 1535 by gezelter, Wed Oct 6 21:22:43 2004 UTC

# Line 34 | Line 34 | IS_UNIX=1
34   #
35   #---------------------------------------------------------------------------
36   IS_UNIX=1
37 < #packages to be made
38 < Packages = \
37 >
38 > #packages containing libraries
39 > PackageLibs = \
40          utils \
41          math \
42          types \
# Line 50 | Line 51 | Packages = \
51          constraints \
52          profiling \
53          restraints \
54 +
55 + #packages containing applications
56 + Applications = \
57          applications/oopse \
58          applications/dump2Xyz \
59 <        applications/simpleBuilder \
59 >        applications/simpleBuilder
60  
61 < #packages contain libraries
62 < PackageLibs = \
63 <        utils \
64 <        math \
65 <        types \
66 <        primitives \
67 <        visitors \
68 <        UseTheForce/DarkSide \
69 <        UseTheForce \
70 <        brains \
71 <        io \
72 <        integrators \
73 <        minimizers \
70 <        constraints \
71 <        profiling \
72 <        restraints \
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@ \
# Line 81 | Line 82 | Libraries = \
82  
83   Libraries = \
84          @SPRNG_LIB@ \
85 <        @MPI_LIB@
85 >        @MPI_LIB@ \
86 >        @MPI_F90_LIB@
87  
86 – LinkOptions = \
87 –        @F90LIBS@
88 –
88   OopseHome       = @OOPSE_HOME@
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  
100 + ParallelLinkOptions = \
101 +        @F90LIBS@
102  
103 +
104   #---------------------------------------------------------------------------
105   #
106   #  Directories
# Line 107 | Line 115 | CurrentDir        = $(CURDIR)
115   BinDir            = $(DEV_ROOT)/bin
116   DocsDir           = $(DEV_ROOT)/docs
117   CurrentDir        = $(CURDIR)
118 + CombinedStaticLib = $(LibDir)/libOOPSE.a
119 + CombinedParallelStaticLib = $(LibDir)/libOOPSE_MPI.a
120  
121   ifdef Source
122   #get the relative path of current package to source directory
# Line 121 | Line 131 | PackageList              = $(Packages) $(JavaPackages)
131   PackageParallelTargetDir = $(ParallelTargetDir)
132   JavaMainClass            = $(subst /,.,$(Package)).$(Main)
133   else
134 < PackageList              = $(Packages) $(JavaPackages)
134 > PackageList              = $(PackageLibs) $(JavaPackages) $(Applications)
135   endif
136  
137   PackageListLoop          = $(patsubst %,$(SourceDir)/%/.loop,$(PackageList))
# Line 172 | Line 182 | ObjectFiles            = $(CFiles:%.c=        $(Packag
182   JniHeaders             = $(JniSource:%.java=  $(PackageSourceDir)/%.h)
183   ObjectFiles            = $(CFiles:%.c=        $(PackageTargetDir)/%.o)\
184                           $(CppFiles:%.cpp=    $(PackageTargetDir)/%.o)\
185 <                                     $(FortranFiles:%.f=  $(PackageTargetDir)/%.o)\
186 <                                     $(F90Files:%.F90=    $(PackageTargetDir)/%.o)\
187 <                                     $(LexFiles:%.l=      $(PackageTargetDir)/%.o)\
188 <                                     $(YaccFiles:%.y=     $(PackageTargetDir)/%.o)
185 >                         $(FortranFiles:%.f=  $(PackageTargetDir)/%.o)\
186 >                         $(F90Files:%.F90=    $(PackageTargetDir)/%.o)\
187 >                         $(LexFiles:%.l=      $(PackageTargetDir)/%.o)\
188 >                         $(YaccFiles:%.y=     $(PackageTargetDir)/%.o)
189   ParallelObjectFiles    = $(CFiles:%.c=        $(PackageParallelTargetDir)/%.o)\
190 <                                     $(CppFiles:%.cpp=    $(PackageParallelTargetDir)/%.o)\
191 <                                     $(FortranFiles:%.f=  $(PackageParallelTargetDir)/%.o)\
192 <                                     $(F90Files:%.F90=    $(PackageParallelTargetDir)/%.o)\
193 <                                     $(LexFiles:%.l=      $(PackageParallelTargetDir)/%.o)\
194 <                                     $(YaccFiles:%.y=     $(PackageParallelTargetDir)/%.o)
190 >                         $(CppFiles:%.cpp=    $(PackageParallelTargetDir)/%.o)\
191 >                         $(FortranFiles:%.f=  $(PackageParallelTargetDir)/%.o)\
192 >                         $(F90Files:%.F90=    $(PackageParallelTargetDir)/%.o)\
193 >                         $(LexFiles:%.l=      $(PackageParallelTargetDir)/%.o)\
194 >                         $(YaccFiles:%.y=     $(PackageParallelTargetDir)/%.o)
195  
196   DerivedSource          = $(YaccFiles:%.y=    %.h) \
197 <                               $(YaccFiles:%.y=    %.c) \
198 <                               $(LexFiles:%.l=     %.c)
197 >                         $(YaccFiles:%.y=    %.c) \
198 >                         $(LexFiles:%.l=     %.c)
199  
200   DerivedCFiles          = $(YaccFiles:%.y=    %.c) \
201 <                               $(LexFiles:%.l=     %.c)
201 >                         $(LexFiles:%.l=     %.c)
202  
203   OtherTargetFiles       = $(OtherSourceFiles:%=$(PackageTargetDir)/%)
204  
# Line 207 | Line 217 | ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))
217      Executable             = $(BinDir)/$(Main)
218      ParallelExecutable     = $(BinDir)/$(Main)_MPI
219    else
220 <    SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package))).so
221 <    StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package))).a
220 >    SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.so
221 >    StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.a
222      ParallelSharedLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.so
223      ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.a
224    endif
# Line 220 | Line 230 | LocalLibs        = $(subst /,,$(patsubst %, oopse_%, $
230   JavaPackageNames = $(subst /,.,$(JavaPackages))
231   IncludePath      = -I$(SourceDir) $(IncludeDirs:%=-I%)
232   LibDirs          = -L$(LibDir)    $(LibraryDirs:%=-L%)
233 < LocalLibs        = $(subst /,,$(patsubst %, oopse_%, $(PackageLibs)))
233 > LocalLibs        = $(subst /,,$(patsubst %, oopse_%_UP, $(PackageLibs)))
234   ParallelLocalLibs= $(subst /,,$(patsubst %, oopse_%_MPI, $(PackageLibs)))
235   LibList          = $(LocalLibs:%=-l%) $(Libraries)
236 < ParallelLibList  = $(LocalLibs:%=-l%) $(Libraries)
236 > LibNames         = $(LocalLibs:%=$(LibDir)/lib%.a)
237 > ParallelLibList  = $(ParallelLocalLibs:%=-l%) $(Libraries)
238 > ParallelLibNames = $(ParallelLocalLibs:%=$(LibDir)/lib%.a)
239  
240  
241   #---------------------------------------------------------------------------
# Line 259 | Line 271 | Lex                    = @LEX@
271   List                   = cat
272   Yacc                   = @YACC@
273   Lex                    = @LEX@
274 + Ranlib                 = @RANLIB@
275  
276  
277   MakeOptions            = -k
# Line 275 | Line 288 | F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDI
288   CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
289   FortranOptions         =
290   F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir)
291 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
291 > F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
292   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
293                           -sourcepath $(SourceDir) -deprecation
294   JavaRunOptions         = -classpath $(ClassPath)
# Line 318 | Line 331 | $(PackageTargetDir)/%.o : %.c
331          $(Print) $@
332          $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
333  
334 + $(PackageParallelTargetDir)/%.o : %.c
335 +        $(Print) $@
336 +        $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@
337 +
338 + ifeq "$(UseMPI)" "yes"
339   %.o : %.c
340          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
341 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
342 + else
343 + %.o : %.c
344 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
345 + endif
346  
347   # .cpp -> .o
348   $(PackageTargetDir)/%.o : %.cpp
349          $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
350  
351 + $(PackageParallelTargetDir)/%.o : %.cpp
352 +        $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@
353 +
354 + ifeq "$(UseMPI)" "yes"
355   %.o : %.cpp
356          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
357 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
358 + else
359 + %.o : %.cpp
360 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
361 + endif
362  
363   # .f -> .o
364   $(PackageTargetDir)/%.o : %.f
365          $(FortranCompiler) $(FortranOptions) -c $< -o $@
366  
367 + $(PackageParallelTargetDir)/%.o : %.f
368 +        $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@
369 +
370 + ifeq "$(UseMPI)" "yes"
371   %.o : %.f
372          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
373 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
374 + else
375 + %.o : %.f
376 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
377 + endif
378  
379   # .F90 -> .o
380   $(PackageTargetDir)/%.o : %.F90
381 <        $(F90Compiler) $(F90Options) -c $< -o $@
381 >        $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
382  
383 + $(PackageParallelTargetDir)/%.o : %.F90
384 +        $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
385 +
386 + ifeq "$(UseMPI)" "yes"
387   %.o : %.F90
388          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
389 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
390 + else
391 + %.o : %.F90
392 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
393 + endif
394  
395 +
396   # .java -> .class
397   $(PackageTargetDir)/%.class : $(PackageSourceDir)/%.java
398          $(JavaCompiler) $(JavaCompilerOptions) $<
# Line 375 | Line 426 | $(LibDir)/%.a : $(ObjectFiles)
426          @$(Lex) -o$@ $?
427  
428   # .o -> .a
429 < $(LibDir)/%.a : $(ObjectFiles)
429 >
430 > $(LibDir)/%_UP.a : $(ObjectFiles)
431          $(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles)
432 +        @touch $(LibDir)/.stamp_UP
433  
434 < %.a : $(ObjectFiles)
382 <        $(MAKE) $(MakeOptions) $(LibDir)/$@
383 <
384 < $(LibDir)/%_MPI.a : $(ParallelObjectFiles)
434 > $(LibDir)/%_MPI.a: $(ParallelObjectFiles)
435          $(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles)
436 +        @touch $(LibDir)/.stamp_MPI
437  
438 + %_UP.a : $(ObjectFiles)
439 +        $(MAKE) $(MakeOptions) $(LibDir)/$@
440 +
441   %_MPI.a : $(ParallelObjectFiles)
442          $(MAKE) $(MakeOptions) $(LibDir)/$@
443  
444   # .o -> .so
445 < $(LibDir)/%.so : $(ObjectFiles)
445 > $(LibDir)/%_UP.so : $(ObjectFiles)
446          $(DynamicArchiver) $(ObjectFiles) $(DynamicArchiverOptions) -o $@
447  
394 – %.so : $(ObjectFiles)
395 –        $(MAKE) $(MakeOptions) $(LibDir)/$@
396 –
448   $(LibDir)/%_MPI.so : $(ParallelObjectFiles)
449          $(DynamicArchiver) $(ParallelObjectFiles) $(DynamicArchiverOptions) -o $@
450  
451 + %_UP.so : $(ObjectFiles)
452 +        $(MAKE) $(MakeOptions) $(LibDir)/$@
453 +
454   %_MPI.so : $(ParallelObjectFiles)
455          $(MAKE) $(MakeOptions) $(LibDir)/$@
456  
# Line 432 | Line 486 | $(PackageTargetDir)/%_Skel.class : $(PackageTargetDir)
486   %_Skel.class : %.class
487          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
488  
489 + #GUN make funtions to merge the libraries
490 + find_objs = $(shell $(StaticArchiver) -t $(1))
491 + extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
492 + create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
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
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 +
506   # Executable
507 < $(Executable) : $(ObjectFiles)
508 <        $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@
507 > $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
508 >        $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(CombinedStaticLib) $(Libraries) -o $@
509  
510 < $(ParallelExecutable) : $(ParallelObjectFiles)
511 <        $(Linker) $(LinkOptions) $(LibDirs) $(ParallelLibList) $(ParallelObjectFiles) -o $@
510 > $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
511 >        $(Linker) $(ParallelObjectFiles) $(ParallelLinkOptions) $(LibDirs) $(CombinedParallelStaticLib) $(Libraries) -o $@
512  
513   # Anything else is just copied from source to target
514   $(PackageTargetDir)/% : $(PackageSourceDir)/%
# Line 450 | Line 521 | _buildall : \
521  
522   _all : _buildall
523  
524 + ifeq "$(UseMPI)" "yes"
525   _buildall : \
526          $(DependencyFile) \
527          $(PackageTargetDir) \
528          $(ObjectFiles) \
529 +        $(ParallelObjectFiles) \
530          $(JavaClassFiles) \
531          $(RmiStubFiles) \
532          $(RmiSkeletonFiles) \
533          $(OtherTargetFiles) \
461 –        $(SharedLibrary) \
534          $(StaticLibrary) \
535 +        $(ParallelStaticLibrary) \
536          $(JarFile) \
537 <        $(Executable)
538 <        
537 >        $(Executable) \
538 >        $(ParallelExecutable)
539 > else
540 > _buildall : \
541 >        $(DependencyFile) \
542 >        $(PackageTargetDir) \
543 >        $(ObjectFiles) \
544 >        $(JavaClassFiles) \
545 >        $(RmiStubFiles) \
546 >        $(RmiSkeletonFiles) \
547 >        $(OtherTargetFiles) \
548 >        $(StaticLibrary) \
549 >        $(JarFile) \
550 >        $(Executable)
551 > endif
552  
553 +
554   # make clean
555   clean : $(PackageListLoop)
556          $(Print) Done clean.    
# Line 478 | Line 565 | _distcleanall :
565   _distcleanall :
566          $(Delete) $(ObjectFiles) \
567                    $(ParallelObjectFiles) \
568 <                  $(JarFile) \
568 >                        $(JarFile) \
569                    $(SharedLibrary) \
570                    $(StaticLibrary) \
571                    $(ParallelSharedLibrary) \
572                    $(ParallelStaticLibrary) \
573                    $(Executable) \
574                    $(ParallelExecutable) \
575 <                  $(DependencyFile)
575 >                  $(DependencyFile)
576  
577  
578   # make depend
# Line 498 | Line 585 | $(DependencyFile) : $(DerivedSource)
585          $(Print) $@
586          @cd $(PackageSourceDir)
587  
501 –        touch Make.ctemp
502 –        touch Make.ctemp
503 –
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__F90  *.F90 > Make.ftemp
608 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/MPIobj/' -DIS_MPI -D__F90  *.F90 >> 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
522 –        $(Delete) Make.cpptemp Make.ctemp Make.ftemp
612  
613   # make lib
614   lib    : $(PackageListLoop)
# Line 534 | 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)
# Line 548 | Line 637 | pure : $(Executable).pure
637  
638   pure : $(Executable).pure
639  
640 + #make cvslog
641 + cvslog:
642 +        $(DEV_ROOT)/scripts/cvs2cl.pl
643 +
644   # Execute
645   _runexe :
646          $(Executable) $(RunParameters)

Diff Legend

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