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 1524 by tim, Tue Oct 5 14:14:46 2004 UTC vs.
Revision 2964 by gezelter, Wed Jul 26 21:45:19 2006 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 +        visitors \
42          math \
43          types \
44          primitives \
43 –        visitors \
45          UseTheForce/DarkSide \
46          UseTheForce \
47          brains \
48          io \
49 <        integrators \
49 <        minimizers \
49 >        integrators\
50          constraints \
51 <        profiling \
51 >        minimizers \
52 >        selection \
53          restraints \
54 +        lattice \
55 +        hydrodynamics \
56 +        openbabel\
57 +        antlr\
58 +        mdParser
59 + #packages containing applications
60 + Applications = \
61          applications/oopse \
62          applications/dump2Xyz \
63 +        applications/staticProps \
64 +        applications/dynamicProps \
65          applications/simpleBuilder \
66 +        applications/randomBuilder \
67 +        applications/nanoRodBuilder \
68 +        applications/nanoparticleBuilder \
69 +        applications/atom2mdin \
70 +        applications/hydrodynamics \
71 +        applications/utilities
72  
57 – #packages contain libraries
58 – PackageLibs = \
59 –        utils \
60 –        math \
61 –        types \
62 –        primitives \
63 –        visitors \
64 –        UseTheForce/DarkSide \
65 –        UseTheForce \
66 –        brains \
67 –        io \
68 –        integrators \
69 –        minimizers \
70 –        constraints \
71 –        profiling \
72 –        restraints \
73  
74 + Samples = \
75 +        samples/alkane \
76 +        samples/argon \
77 +        samples/cutoff \
78 +        samples/dipole \
79 +        samples/gbljtest \
80 +        samples/lipid \
81 +        samples/metals/EAM \
82 +        samples/metals/EAM/nanoparticle \
83 +        samples/metals/EAM/nanorod \
84 +        samples/metals/Sutton-Chen \
85 +        samples/minimizer \
86 +        samples/thermoIntegration/liquid \
87 +        samples/thermoIntegration/solid \
88 +        samples/water/dimer \
89 +        samples/water/spce \
90 +        samples/water/ssd \
91 +        samples/water/ssde \
92 +        samples/water/ssdrf \
93 +        samples/water/ssd-ion \
94 +        samples/water/tip3p_ice \
95 +        samples/water/tip4p \
96 +        samples/zcons
97 +
98   IncludeDirs = \
99 <        @SPRNG_INC_DIR@ \
100 <        @MPI_INC_DIR@
99 >        @MPI_INC_DIR@ \
100 >        @FFTW_INC_DIR@ \
101 >        @CGAL_INC_DIR@ \
102 >        @ZLIB_INC_DIR@
103  
104   LibraryDirs = \
105 <        @SPRNG_LIB_DIR@ \
106 <        @MPI_LIB_DIR@
105 >        @MPI_LIB_DIR@ \
106 >        @FFTW_LIB_DIR@ \
107 >        @CGAL_LIB_DIR@ \
108 >        @ZLIB_LIB_DIR@
109  
110   Libraries = \
111 <        @SPRNG_LIB@ \
112 <        @MPI_LIB@
111 >        @LIBS@ \
112 >        @MPI_LIB@ \
113 >        @MPI_F90_LIB@ \
114 >        @FFTW_LIBS@ \
115 >        @CGAL_LIBS@ \
116 >        @ZLIB@
117  
86 – LinkOptions = \
87 –        @F90LIBS@
88 –
118   OopseHome       = @OOPSE_HOME@
119 < ForceParamDir   = @OOPSE_HOME@/share/forceFields/
120 < SampleSimDir    = @OOPSE_HOME@/share/samples/
119 > ForceParamDir   = $(OopseHome)/share/forceFields
120 > SampleSimDir    = $(OopseHome)/share/samples
121 > InstallBinDir   = $(OopseHome)/bin
122 > DocDir          = $(OopseHome)/doc
123   FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
124 + F90Declare      = -D__FORTRAN90
125 + UseSingle       = @USE_SINGLE_PRECISION@
126 + ifeq "$(UseSingle)" "yes"
127 + SingleDeclare   = -DSINGLE_PRECISION
128 + else
129 + SingleDeclare   =
130 + endif
131   ParallelDeclare = -DIS_MPI
132 + SinglePrecision = -DSINGLE_PRECISION
133 + UseMPI          = @USE_MPI@
134 + ModuleCase      = @F90_MODULE_NAMES@
135 + ModSuffix       = @MOD@
136 + LinkOptions = \
137 +        @LDFLAGS@ \
138 +        @FCLIBS@ \
139 +        @CXXFLAGS@
140 +        
141  
142 + ParallelLinkOptions = \
143 +        @LDFLAGS@ \
144 +        @FCLIBS@ \
145 +        @CXXFLAGS@
146  
147 +
148   #---------------------------------------------------------------------------
149   #
150   #  Directories
# Line 104 | Line 156 | BinDir            = $(DEV_ROOT)/bin
156   ParallelTargetDir = $(DEV_ROOT)/MPIobj
157   LibDir            = $(DEV_ROOT)/lib
158   MakeDir           = $(DEV_ROOT)/make
159 + MainMakefile      = $(MakeDir)/Makefile
160   BinDir            = $(DEV_ROOT)/bin
161   DocsDir           = $(DEV_ROOT)/docs
162   CurrentDir        = $(CURDIR)
163 + CombinedStaticLib = $(LibDir)/libOOPSE.a
164 + CombinedParallelStaticLib = $(LibDir)/libOOPSE_MPI.a
165  
166   ifdef Source
167   #get the relative path of current package to source directory
168   # /home/maul/gezelter/src/code/src/UseTheForce/Darkside --> UseTheForce/Darkside
169   #Package          = $(shell echo $(CurrentDir) | sed -e 's/^.*\/src\/\(.*\)/\1/g')
170   #use shell script to get the absolute path and then rip it off from $(CurrentDir)
171 < Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
171 > #Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
172 > # REMINDER: We are now using the Package line in each subdir makefile.
173 > # This avoids the strange path problem and the subshell
174  
175   PackageList              = $(Package)
176   PackageSourceDir         = $(SourceDir)/$(Package)
# Line 121 | Line 178 | PackageList              = $(Packages) $(JavaPackages)
178   PackageParallelTargetDir = $(ParallelTargetDir)
179   JavaMainClass            = $(subst /,.,$(Package)).$(Main)
180   else
181 < PackageList              = $(Packages) $(JavaPackages)
181 > PackageList              = $(PackageLibs) $(JavaPackages) $(Applications)
182   endif
183  
184   PackageListLoop          = $(patsubst %,$(SourceDir)/%/.loop,$(PackageList))
# Line 172 | Line 229 | ObjectFiles            = $(CFiles:%.c=        $(Packag
229   JniHeaders             = $(JniSource:%.java=  $(PackageSourceDir)/%.h)
230   ObjectFiles            = $(CFiles:%.c=        $(PackageTargetDir)/%.o)\
231                           $(CppFiles:%.cpp=    $(PackageTargetDir)/%.o)\
232 <                                     $(FortranFiles:%.f=  $(PackageTargetDir)/%.o)\
233 <                                     $(F90Files:%.F90=    $(PackageTargetDir)/%.o)\
234 <                                     $(LexFiles:%.l=      $(PackageTargetDir)/%.o)\
235 <                                     $(YaccFiles:%.y=     $(PackageTargetDir)/%.o)
232 >                         $(FortranFiles:%.f=  $(PackageTargetDir)/%.o)\
233 >                         $(F90Files:%.F90=    $(PackageTargetDir)/%.o)\
234 >                         $(LexFiles:%.l=      $(PackageTargetDir)/%.o)\
235 >                         $(YaccFiles:%.y=     $(PackageTargetDir)/%.o)
236   ParallelObjectFiles    = $(CFiles:%.c=        $(PackageParallelTargetDir)/%.o)\
237 <                                     $(CppFiles:%.cpp=    $(PackageParallelTargetDir)/%.o)\
238 <                                     $(FortranFiles:%.f=  $(PackageParallelTargetDir)/%.o)\
239 <                                     $(F90Files:%.F90=    $(PackageParallelTargetDir)/%.o)\
240 <                                     $(LexFiles:%.l=      $(PackageParallelTargetDir)/%.o)\
241 <                                     $(YaccFiles:%.y=     $(PackageParallelTargetDir)/%.o)
237 >                         $(CppFiles:%.cpp=    $(PackageParallelTargetDir)/%.o)\
238 >                         $(FortranFiles:%.f=  $(PackageParallelTargetDir)/%.o)\
239 >                         $(F90Files:%.F90=    $(PackageParallelTargetDir)/%.o)\
240 >                         $(LexFiles:%.l=      $(PackageParallelTargetDir)/%.o)\
241 >                         $(YaccFiles:%.y=     $(PackageParallelTargetDir)/%.o)
242  
243   DerivedSource          = $(YaccFiles:%.y=    %.h) \
244 <                               $(YaccFiles:%.y=    %.c) \
245 <                               $(LexFiles:%.l=     %.c)
244 >                         $(YaccFiles:%.y=    %.c) \
245 >                         $(LexFiles:%.l=     %.c)
246  
247   DerivedCFiles          = $(YaccFiles:%.y=    %.c) \
248 <                               $(LexFiles:%.l=     %.c)
248 >                         $(LexFiles:%.l=     %.c)
249  
250   OtherTargetFiles       = $(OtherSourceFiles:%=$(PackageTargetDir)/%)
251 +
252 + ###########################################################################
253 + #
254 + # Figure out the names of the module files based on some work done by
255 + # configure.  The tr function below is from John Graham-Cumming
256 + # (http://www.jgc.org).
257 + #
258 + # The tr function.   Has three arguments:
259 + #
260 + # $1   The list of characters to translate from
261 + # $2   The list of characters to translate to
262 + # $3   The text to translate
263 + #
264 + # For example, $(call tr,A B C,1 2 3,CAPITAL) becomes 21PIT1L.
265  
266 + tr = $(eval __t := $3)                                                    \
267 +     $(foreach c,                                                         \
268 +         $(join $(addsuffix :,$1),$2),                                    \
269 +         $(eval __t :=                                                    \
270 +             $(subst $(word 1,$(subst :, ,$c)),$(word 2,$(subst :, ,$c)), \
271 +                 $(__t))))$(__t)
272 +
273 + # Common character classes for use with the tr function.  Each of
274 + # these is actually a variable declaration and must be wrapped with
275 + # $() or ${} to be used.
276 +
277 + [A-Z] := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z #
278 + [a-z] := a b c d e f g h i j k l m n o p q r s t u v w x y z #
279 + [0-9] := 0 1 2 3 4 5 6 7 8 9 #
280 + [A-F] := A B C D E F #
281 +
282 + # Figure out whether we have $(eval) or not (GNU Make 3.80 and above)
283 + # if we do not then we need to use the shell version of tr, and not the
284 + # faster tr function above:
285 +
286 + __have_eval := $(false)
287 + __ignore := $(eval __have_eval := $(true))
288 +
289 + ifndef __have_eval
290 +  uc = $(shell echo $1 | tr "a-z" "A-Z")
291 +  lc = $(shell echo $1 | tr "A-Z" "a-z")
292 + else
293 +  uc = $(call tr,$([a-z]),$([A-Z]),$1)
294 +  lc = $(call tr,$([A-Z]),$([a-z]),$1)
295 + endif
296 +
297 + # OK, now we can actually use these functions to figure out the names
298 + # of the module files:
299 +
300 + ifneq "$(words $(Modules))" "0"
301 + ifeq "$(ModuleCase)" "UPPER"
302 +  MODULES = $(call uc,$(Modules))
303 + else
304 +  ifeq "$(ModuleCase)" "lower"
305 +    MODULES = $(call lc,$(Modules))
306 +  else
307 +    MODULES = $(Modules)
308 +  endif
309 + endif
310 +  ModuleFiles = $(MODULES:%= $(PackageTargetDir)/%.$(ModSuffix))
311 +  ParallelModuleFiles = $(MODULES:%= $(PackageParallelTargetDir)/%.$(ModSuffix))
312 + endif
313 + #
314 + ###########################################################################
315 +
316   ThirdPartyJarsTmp = $(patsubst %,$(LibDir)/%,$(JavaLibraries))
317   ThirdPartyJars    = $(subst $(Space),$(X),$(ThirdPartyJarsTmp))
318  
# Line 203 | Line 324 | ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))
324   #if Main is defined, do not build library. It may not be true sometimes
325   ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))" "0"
326    DependencyFile    = $(PackageSourceDir)/Makedepend
327 <  ifneq "$(Main)" ""
327 >  ifneq "$(words $(Main))" "0"
328      Executable             = $(BinDir)/$(Main)
329 <    ParallelExecutable     = $(BinDir)/$(Main)_MPI
329 >    ifeq "$(BuiltParallelExe)" "1"
330 >      ParallelExecutable     = $(BinDir)/$(Main)_MPI
331 >    endif
332    else
333 <    SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package))).so
334 <    StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package))).a
333 >    SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.so
334 >    StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.a
335      ParallelSharedLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.so
336      ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.a
337    endif
338   endif
339 +
340   #
341   # Misc
342   #
# Line 220 | Line 344 | LocalLibs        = $(subst /,,$(patsubst %, oopse_%, $
344   JavaPackageNames = $(subst /,.,$(JavaPackages))
345   IncludePath      = -I$(SourceDir) $(IncludeDirs:%=-I%)
346   LibDirs          = -L$(LibDir)    $(LibraryDirs:%=-L%)
347 < LocalLibs        = $(subst /,,$(patsubst %, oopse_%, $(PackageLibs)))
347 > LocalLibs        = $(subst /,,$(patsubst %, oopse_%_UP, $(PackageLibs)))
348   ParallelLocalLibs= $(subst /,,$(patsubst %, oopse_%_MPI, $(PackageLibs)))
349   LibList          = $(LocalLibs:%=-l%) $(Libraries)
350 < ParallelLibList  = $(LocalLibs:%=-l%) $(Libraries)
350 > LibNames         = $(LocalLibs:%=$(LibDir)/lib%.a)
351 > ParallelLibList  = $(ParallelLocalLibs:%=-l%) $(Libraries)
352 > ParallelLibNames = $(ParallelLocalLibs:%=$(LibDir)/lib%.a)
353  
354  
355   #---------------------------------------------------------------------------
# Line 232 | Line 358 | Move                   = mv
358   #
359   #---------------------------------------------------------------------------
360   Print                  = @echo
361 < Move                   = mv
361 > Move                   = mv -f
362   Copy                   = cp
363   CCompiler              = @CC@
364   CppCompiler            = @CXX@
365   Linker                 = @CXX@
366   MakeDepend             = makedepend
367 < Install                = @INSTALL@
367 > LN_S                   = @LN_S@
368 > INSTALL                = @INSTALL@
369 > EGREP                  = @EGREP@
370   InstallProgram         = @INSTALL_PROGRAM@
371 + InstallScript          = @INSTALL_SCRIPT@
372   InstallData            = @INSTALL_DATA@
373 < MakeDir                = @MKINSTALLDIRS@
374 < Delete                 = rm -fr
373 > MkDir                  = @MKINSTALLDIRS@
374 > Delete                 = rm -f
375   StaticArchiver         = @AR@
376   DynamicArchiver        = @CC@
377   FortranCompiler        = @FC@
249 – F90Compiler            = @F90@
378   JavaCompiler           = $(JAVA_HOME)/bin/javac
379   JavaArchiver           = $(JAVA_HOME)/bin/jar
380   JarSigner              = $(JAVA_HOME)/bin/jarsigner
# Line 259 | Line 387 | Lex                    = @LEX@
387   List                   = cat
388   Yacc                   = @YACC@
389   Lex                    = @LEX@
390 + Ranlib                 = @RANLIB@
391 + Doxygen                = @DOXYGEN@
392  
263 –
393   MakeOptions            = -k
394   MakeDependOptions      =
395   StaticArchiverOptions  = rc
# Line 269 | Line 398 | COptions               = $(FrcDeclare)
398   JniOptions             =
399   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
400                           -sourcepath $(SourceDir)
401 < COptions               = $(FrcDeclare)
402 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
403 < CppOptions             = $(FrcDeclare)
404 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
405 < FortranOptions         =
406 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir)
407 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
401 > COptions               = $(FrcDeclare) $(SingleDeclare) @CFLAGS@
402 > CParallelOptions       = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CFLAGS@
403 > CppOptions             = $(FrcDeclare) $(SingleDeclare) @CXXFLAGS@
404 > CppParallelOptions     = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CXXFLAGS@
405 > ifeq "$(UseSingle)" "yes"
406 > FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @PREPDEFFLAG@$(SingleDeclare) @FCFLAGS_SRCEXT@
407 > FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(SingleDeclare) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@
408 > else
409 > FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@
410 > FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@
411 > endif
412   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
413                           -sourcepath $(SourceDir) -deprecation
414   JavaRunOptions         = -classpath $(ClassPath)
# Line 301 | Line 434 | Space                  = $(Empty) $(Empty)
434  
435   #---------------------------------------------------------------------------
436   #
437 + #  Install
438 + #
439 + #---------------------------------------------------------------------------
440 +
441 + ifneq "$(words $(SampleFiles))" "0"
442 +  MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
443 +  MyInstallDir             = $(SampleSimDir)/$(MySample)
444 +  InstallFiles             = $(SampleFiles)
445 +  InstallCommand           = $(InstallData)
446 + endif
447 +
448 + ifneq "$(words $(ScriptFiles))" "0"
449 +  MyInstallDir             = $(InstallBinDir)
450 +  InstallFiles             = $(ScriptFiles)
451 +  InstallCommand           = $(InstallProgram)
452 + endif
453 +
454 + ifneq "$(words $(Main))" "0"
455 +  MyInstallDir             = $(InstallBinDir)
456 +  ifeq "$(UseMPI)" "yes"
457 +    InstallFiles             = $(Executable) $(ParallelExecutable)
458 +  else
459 +    InstallFiles             = $(Executable)
460 +  endif
461 +  InstallCommand           = $(InstallProgram)
462 +  ifneq "$(words $(LinkTargets))" "0"
463 +    MyLinkSource = $(patsubst %, $(MyInstallDir)/%,$(Main))
464 +    MyLinkTargets = $(patsubst %, $(MyInstallDir)/%,$(LinkTargets))
465 +  endif
466 + endif
467 +
468 + ifneq "$(words $(ForcefieldFiles))" "0"
469 +  MyInstallDir             = $(ForceParamDir)
470 +  InstallFiles             = $(ForcefieldFiles)
471 +  InstallCommand           = $(InstallData)
472 + endif
473 +
474 + ifneq "$(words $(InstallFiles))" "0"
475 +  InstallList            =
476 + else
477 +  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(DEV_ROOT)/forceFields $(patsubst %, $(SourceDir)/%,$(Applications))
478 + endif
479 +
480 + InstallListLoop          = $(patsubst %,$(SourceDir)/%/.install,$(PackageList))  $(patsubst %,%/.install,$(InstallList))
481 +
482 +
483 +
484 + #---------------------------------------------------------------------------
485 + #
486   # Rules
487   #
488   #---------------------------------------------------------------------------
# Line 311 | Line 493 | $(PackageTargetDir) :
493  
494   # Create target directory
495   $(PackageTargetDir) :
496 <        $(MakeDir) $@
496 >        $(MkDir) $@
497  
498 + $(BinDir) :
499 +        $(MkDir) $@
500 +
501   # .c -> .o
502 < $(PackageTargetDir)/%.o : %.c
502 > $(PackageTargetDir)/%.o : %.c $(MainMakefile)
503          $(Print) $@
504          $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
505  
506 < %.o : %.c
506 > $(PackageParallelTargetDir)/%.o : %.c $(MainMakefile)
507 >        $(Print) $@
508 >        $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@
509 >
510 > ifeq "$(UseMPI)" "yes"
511 > %.o : %.c $(MainMakefile)
512          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
513 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
514 + else
515 + %.o : %.c $(MainMakefile)
516 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
517 + endif
518  
519   # .cpp -> .o
520 < $(PackageTargetDir)/%.o : %.cpp
520 > $(PackageTargetDir)/%.o : %.cpp $(MainMakefile)
521          $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
522  
523 < %.o : %.cpp
523 > $(PackageParallelTargetDir)/%.o : %.cpp $(MainMakefile)
524 >        $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@
525 >
526 > ifeq "$(UseMPI)" "yes"
527 > %.o : %.cpp $(MainMakefile)
528          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
529 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
530 + else
531 + %.o : %.cpp $(MainMakefile)
532 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
533 + endif
534  
535   # .f -> .o
536 < $(PackageTargetDir)/%.o : %.f
536 > $(PackageTargetDir)/%.o : %.f $(MainMakefile)
537          $(FortranCompiler) $(FortranOptions) -c $< -o $@
538  
539 < %.o : %.f
539 > $(PackageParallelTargetDir)/%.o : %.f $(MainMakefile)
540 >        $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@
541 >
542 > ifeq "$(UseMPI)" "yes"
543 > %.o : %.f $(MainMakefile)
544          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
545 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
546 + else
547 + %.o : %.f $(MainMakefile)
548 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
549 + endif
550  
551   # .F90 -> .o
552 < $(PackageTargetDir)/%.o : %.F90
553 <        $(F90Compiler) $(F90Options) -c $< -o $@
552 > $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
553 >        $(FortranCompiler) $(FortranOptions) $(IncludePath) -c $< -o $@
554 >        if test -n "`ls *.$(ModSuffix)`"; then \
555 >          $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
556 >        fi
557  
558 < %.o : %.F90
558 > $(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile)
559 >        $(FortranCompiler) $(FortranParallelOptions) $(IncludePath) -c $< -o $@
560 >        if test -n "`ls *.$(ModSuffix)`"; then \
561 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
562 >        fi
563 >
564 > ifeq "$(UseMPI)" "yes"
565 > %.o : %.F90 $(MainMakefile)
566          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
567 +        if test -n "`ls *.$(ModSuffix)`"; then\
568 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
569 +        fi
570  
571 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
572 +        if test -n "`ls *.$(ModSuffix)`"; then\
573 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
574 +        fi
575 +
576 + else
577 + %.o : %.F90 $(MainMakefile)
578 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
579 +        if test -n "`ls *.$(ModSuffix)`"; then\
580 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
581 +        fi
582 + endif
583 +
584 +
585   # .java -> .class
586   $(PackageTargetDir)/%.class : $(PackageSourceDir)/%.java
587          $(JavaCompiler) $(JavaCompilerOptions) $<
# Line 375 | Line 615 | $(LibDir)/%.a : $(ObjectFiles)
615          @$(Lex) -o$@ $?
616  
617   # .o -> .a
618 < $(LibDir)/%.a : $(ObjectFiles)
618 >
619 > $(LibDir)/%_UP.a : $(ObjectFiles)
620          $(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles)
621 +        @touch $(LibDir)/.stamp_UP
622  
623 < %.a : $(ObjectFiles)
382 <        $(MAKE) $(MakeOptions) $(LibDir)/$@
383 <
384 < $(LibDir)/%_MPI.a : $(ParallelObjectFiles)
623 > $(LibDir)/%_MPI.a: $(ParallelObjectFiles)
624          $(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles)
625 +        @touch $(LibDir)/.stamp_MPI
626  
627 + %_UP.a : $(ObjectFiles)
628 +        $(MAKE) $(MakeOptions) $(LibDir)/$@
629 +
630   %_MPI.a : $(ParallelObjectFiles)
631          $(MAKE) $(MakeOptions) $(LibDir)/$@
632  
633   # .o -> .so
634 < $(LibDir)/%.so : $(ObjectFiles)
634 > $(LibDir)/%_UP.so : $(ObjectFiles)
635          $(DynamicArchiver) $(ObjectFiles) $(DynamicArchiverOptions) -o $@
636  
394 – %.so : $(ObjectFiles)
395 –        $(MAKE) $(MakeOptions) $(LibDir)/$@
396 –
637   $(LibDir)/%_MPI.so : $(ParallelObjectFiles)
638          $(DynamicArchiver) $(ParallelObjectFiles) $(DynamicArchiverOptions) -o $@
639  
640 + %_UP.so : $(ObjectFiles)
641 +        $(MAKE) $(MakeOptions) $(LibDir)/$@
642 +
643   %_MPI.so : $(ParallelObjectFiles)
644          $(MAKE) $(MakeOptions) $(LibDir)/$@
645  
# Line 432 | Line 675 | $(PackageTargetDir)/%_Skel.class : $(PackageTargetDir)
675   %_Skel.class : %.class
676          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
677  
678 + document :
679 +        $(Print) Generate Documentation for OOPSE-2.0
680 +        @cd $(DEV_ROOT)/src    
681 +        $(Doxygen) $(DEV_ROOT)/make/Doxyfile
682 +
683 + #GUN make funtions to merge the libraries
684 + find_objs = $(shell $(StaticArchiver) -t $(1) | $(EGREP) -v "SYMDEF")
685 + extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
686 + create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
687 + remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
688 + do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
689 + do_link = $(shell $(LN_S) $(1) $(2))
690 + all_objs = $(foreach thisLib,$(LibNames), $(call find_objs, $(thisLib)))
691 + all_parallel_objs = $(foreach thisLib,$(ParallelLibNames), $(call find_objs, $(thisLib)))
692 + all_lib_objs = $(patsubst %,$(TargetDir)/%,$(call all_objs))
693 + all_lib_parallel_objs = $(patsubst %,$(ParallelTargetDir)/%,$(call all_parallel_objs))
694 +
695 + $(CombinedStaticLib) : $(LibDir)/.stamp_UP
696 +        $(Print) creating $@            
697 +        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_objs)
698 +        $(Ranlib) $(CombinedStaticLib)
699 +
700 + $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
701 +        $(Print) creating $@
702 +        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_parallel_objs)
703 +        $(Ranlib) $(CombinedParallelStaticLib)
704 +
705   # Executable
706 < $(Executable) : $(ObjectFiles)
707 <        $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@
706 > $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
707 >        if test ! -d $(BinDir); then \
708 >                $(MkDir) $(BinDir) ;\
709 >        fi
710 >        $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
711  
712 < $(ParallelExecutable) : $(ParallelObjectFiles)
713 <        $(Linker) $(LinkOptions) $(LibDirs) $(ParallelLibList) $(ParallelObjectFiles) -o $@
712 > $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
713 >        if test ! -d $(BinDir); then \
714 >                $(MkDir) $(BinDir) ;\
715 >        fi
716 >        $(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@
717  
718   # Anything else is just copied from source to target
719   $(PackageTargetDir)/% : $(PackageSourceDir)/%
# Line 450 | Line 726 | _buildall : \
726  
727   _all : _buildall
728  
729 + _buildall :
730 + ifeq "$(UseMPI)" "yes"
731   _buildall : \
732          $(DependencyFile) \
733          $(PackageTargetDir) \
734          $(ObjectFiles) \
735 +        $(ParallelObjectFiles) \
736          $(JavaClassFiles) \
737          $(RmiStubFiles) \
738          $(RmiSkeletonFiles) \
739          $(OtherTargetFiles) \
461 –        $(SharedLibrary) \
740          $(StaticLibrary) \
741 +        $(ParallelStaticLibrary) \
742          $(JarFile) \
743 <        $(Executable)
744 <        
743 >        $(Executable) \
744 >        $(ParallelExecutable)
745 > else
746 > _buildall : \
747 >        $(DependencyFile) \
748 >        $(PackageTargetDir) \
749 >        $(ObjectFiles) \
750 >        $(JavaClassFiles) \
751 >        $(RmiStubFiles) \
752 >        $(RmiSkeletonFiles) \
753 >        $(OtherTargetFiles) \
754 >        $(StaticLibrary) \
755 >        $(JarFile) \
756 >        $(Executable)
757 > endif
758  
759 + echo : $(PackageListLoop)
760 +        $(Print) Done echo.
761 +
762 + _echoall :
763 +        $(Print) $(Modules)
764 +
765   # make clean
766   clean : $(PackageListLoop)
767          $(Print) Done clean.    
768  
769   _cleanall :
770 <        $(Delete) $(ObjectFiles) $(ParallelObjectFiles)
770 >        $(Delete) \
771 >                $(ObjectFiles) \
772 >                $(ModuleFiles) \
773 >                $(ParallelObjectFiles) \
774 >                $(ParallelModuleFiles) \
775 >                $(JarFile) \
776 >                $(SharedLibrary) \
777 >                $(StaticLibrary) \
778 >                $(ParallelSharedLibrary) \
779 >                $(ParallelStaticLibrary) \
780 >                $(CombinedStaticLib) \
781 >                $(CombinedParallelStaticLib)
782  
783   # make distclean
784   distclean : $(PackageListLoop)
785          $(Print) Done clean.    
786  
787 < _distcleanall :
788 <        $(Delete) $(ObjectFiles) \
480 <                  $(ParallelObjectFiles) \
481 <                        $(JarFile) \
482 <                  $(SharedLibrary) \
483 <                  $(StaticLibrary) \
484 <                  $(ParallelSharedLibrary) \
485 <                  $(ParallelStaticLibrary) \
486 <                  $(Executable) \
787 > _distcleanall : _cleanall
788 >        $(Delete) $(Executable) \
789                    $(ParallelExecutable) \
790                    $(DependencyFile)
791  
490 –
792   # make depend
793   depend : $(PackageListLoop)
794          $(Print) Done dependencies.
# Line 498 | Line 799 | $(DependencyFile) : $(DerivedSource)
799          $(Print) $@
800          @cd $(PackageSourceDir)
801  
501 –        @touch Make.ctemp
502 –        @touch Make.ctemp
503 –
802   ifneq "$(words $(CppFiles))" "0"
803 <        $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
804 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
805 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
803 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' -MM $(CppFiles)>> Make.cpptemp
804 >        @cat Make.cpptemp  >> $(DependencyFile)
805 >        $(Delete) Make.cpptemp
806 >
807 >  ifeq "$(UseMPI)" "yes"
808 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CppFiles)>> Make.cpptemp
809 >        @cat Make.cpptemp  >> $(DependencyFile)
810 >        @$(Delete) Make.cpptemp
811 >  endif
812 >
813   endif
814  
815   ifneq "$(words $(CFiles))" "0"
816 <        $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   > Make.ctemp
817 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
818 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
816 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/'  -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
817 >        @cat Make.ctemp  >> $(DependencyFile)
818 >        $(Delete) Make.ctemp
819  
820 +  ifeq "$(UseMPI)" "yes"
821 +        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
822 +        @cat Make.ctemp  >> $(DependencyFile)
823 +        @$(Delete) Make.ctemp
824 +  endif
825 +
826   endif
827  
828   ifneq "$(words $(F90Files))" "0"
829 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/obj/' -D__FORTRAN90  $(F90Files) > Make.ftemp
830 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/MPIobj/' -DIS_MPI -D__FORTRAN90  $(F90Files) >> Make.ftemp
831 <        cat Make.ftemp >> $(DependencyFile)
829 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
830 >        @cat Make.ftemp >> $(DependencyFile)
831 >        @$(Delete) Make.ftemp
832 >
833 >  ifeq "$(UseMPI)" "yes"
834 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
835 >        @cat Make.ftemp >> $(DependencyFile)
836 >        @$(Delete) Make.ftemp
837 >  endif
838 >
839   endif
522 –        $(Delete) Make.cpptemp Make.ctemp Make.ftemp
840  
841   # make lib
842   lib    : $(PackageListLoop)
# Line 532 | Line 849 | jarsign : $(JarFile)
849   jarsign : $(JarFile)
850          $(JarSigner) -keystore GeoSoftKeystore $(JarFile) myself
851  
852 + #make install
853 + %.install :
854 +        @$(MAKE) $(MakeOptions) -C $(subst .install,,$@) _installall    
855 +
856 + install : $(InstallListLoop)
857 +        $(Print) Done Install
858 +
859 + _installall : _buildall _installdata _installlinks
860 +
861 + $(MyInstallDir) :
862 +        $(MkDir) $@
863 +
864 + _installdata :  $(MyInstallDir)
865 +        $(Print) $(InstallFiles)
866 + ifneq "$(words $(InstallFiles))" "0"
867 +        $(InstallCommand) $(InstallFiles) $(MyInstallDir)
868 + endif      
869 +
870 + _installlinks :  $(MyInstallDir)
871 + ifneq "$(words $(MyLinkTargets))" "0"
872 +        @cd $(MyInstallDir)
873 +        $(foreach thisLink,$(MyLinkTargets),$(call do_link,$(MyLinkSource),$(thisLink)))
874 + endif      
875 +
876   # make statistics
877   _statisticsall :
878 <        @$(Print) $(SourceFiles) >> $(DEV_ROOT)/files.tmp
878 >        @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
879  
880   statistics : $(PackageListLoop)
881          @$(List) $(DEV_ROOT)/files.tmp | xargs $(WordCount) $(WordCountOptions)
# Line 542 | Line 883 | $(Executable).pure :
883          $(Print) Done statistics.
884  
885   # make pure
886 < $(Executable).pure :
887 <        $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
888 <        $(LibList) $(ObjectFiles) -o $@
886 > #$(Executable).pure :
887 > #       $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
888 > #       $(LibList) $(ObjectFiles) -o $@
889 > #
890 > #pure : $(Executable).pure
891  
549 – pure : $(Executable).pure
550 –
892   #make cvslog
893   cvslog:
894 <        $(DEV_ROOT)/scripts/cvs2cl.pl
894 >        $(DEV_ROOT)/scripts/cvs2cl
895  
896   # Execute
897   _runexe :

Diff Legend

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