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 1508 by gezelter, Wed Sep 29 17:56:08 2004 UTC vs.
Revision 2760 by tim, Fri May 19 15:11:27 2006 UTC

# Line 33 | Line 33
33   #  $<      - Current dependency
34   #
35   #---------------------------------------------------------------------------
36 + IS_UNIX=1
37  
38 < Packages = \
39 <        utils \
40 <        math \
41 <        types \
42 <        primitives \
43 <        visitors \
44 <        UseTheForce/DarkSide \
45 <        UseTheForce \
46 <        brains \
47 <        io \
48 <        integrators \
49 <        minimizers \
50 <        constraints \
51 <        profiling \
52 <        restraints \
53 <        applications \
38 > #packages containing libraries
39 > PackageLibs = \
40 >        utils \
41 >        visitors \
42 >        math \
43 >        types \
44 >        primitives \
45 >        UseTheForce/DarkSide \
46 >        UseTheForce \
47 >        brains \
48 >        io \
49 >        integrators\
50 >        constraints \
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  
72 +
73 + Samples = \
74 +        samples/alkane \
75 +        samples/argon \
76 +        samples/cutoff \
77 +        samples/dipole \
78 +        samples/gbljtest \
79 +        samples/lipid \
80 +        samples/metals/EAM \
81 +        samples/metals/EAM/nanoparticle \
82 +        samples/metals/EAM/nanorod \
83 +        samples/metals/Sutton-Chen \
84 +        samples/minimizer \
85 +        samples/shape \
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 +        @MPI_INC_DIR@ \
100 +        @FFTW_INC_DIR@ \
101 +        @CGAL_INC_DIR@ \
102 +        @ZLIB_INC_DIR@
103 +
104 + LibraryDirs = \
105 +        @MPI_LIB_DIR@ \
106 +        @FFTW_LIB_DIR@ \
107 +        @CGAL_LIB_DIR@ \
108 +        @ZLIB_LIB_DIR@
109 +
110 + Libraries = \
111 +        @LIBS@ \
112 +        @MPI_LIB@ \
113 +        @MPI_F90_LIB@ \
114 +        @FFTW_LIBS@ \
115 +        @CGAL_LIBS@ \
116 +        @ZLIB@
117 +
118 + OopseHome       = @OOPSE_HOME@
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
151   #
152   #---------------------------------------------------------------------------
153  
60 srcdir = @srcdir@
154   SourceDir         = $(DEV_ROOT)/src
155   TargetDir         = $(DEV_ROOT)/obj
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 < Package                  = $(subst $(SourceDir)/,,$(CurrentDir))
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))
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)
177   PackageTargetDir         = $(TargetDir)
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))
184 > PackageListLoop          = $(patsubst %,$(SourceDir)/%/.loop,$(PackageList))
185  
186 < JRE              = $(JAVA_HOME)/jre/lib/rt.jar
186 > JRE                      = $(JAVA_HOME)/jre/lib/rt.jar
187  
188   ifdef IS_UNIX
189   X = :
# Line 108 | Line 211 | SourceFiles            = $(JavaFiles:%.java=  $(Packag
211                                        $(YaccFiles) $(CorbaFiles), \
212                                        $(Source))
213   ManifestFile           = $(PackageSourceDir)/Manifest
111 SourceFiles            = $(JavaFiles:%.java=  $(PackageSourceDir)/%.java)\
112                         $(CppFiles:%.cpp=    $(PackageSourceDir)/%.cpp)\
113                         $(CFiles:%.c=        $(PackageSourceDir)/%.c)\
114                         $(FortranFiles:%.f=  $(PackageSourceDir)/%.f)\
115                         $(F90Files:%.F90=    $(PackageSourceDir)/%.F90)\
116                         $(LexFiles:%.l=      $(PackageSourceDir)/%.l)\
117                         $(YaccFiles:%.y=     $(PackageSourceDir)/%.y)\
214  
215 + SourceFiles            = $(JavaFiles)\
216 +                         $(CppFiles)\
217 +                         $(CFiles)\
218 +                         $(FortranFiles)\
219 +                         $(F90Files)\
220 +                         $(LexFiles)\
221 +                         $(YaccFiles)
222  
223   # Target
224   JavaClassFiles         = $(JavaFiles:%.java=  $(PackageTargetDir)/%.class)
# Line 125 | Line 228 | ObjectFiles            = $(CFiles:%.c=        $(Packag
228   JniClassFiles          = $(JniSource:%.java=  $(PackageTargetDir)/%.class)
229   JniHeaders             = $(JniSource:%.java=  $(PackageSourceDir)/%.h)
230   ObjectFiles            = $(CFiles:%.c=        $(PackageTargetDir)/%.o)\
231 <                         $(CppFiles:%.cpp=    $(PackageTargetDir)/%.o)\
231 >                         $(CppFiles:%.cpp=    $(PackageTargetDir)/%.o)\
232                           $(FortranFiles:%.f=  $(PackageTargetDir)/%.o)\
233                           $(F90Files:%.F90=    $(PackageTargetDir)/%.o)\
234                           $(LexFiles:%.l=      $(PackageTargetDir)/%.o)\
# Line 145 | Line 248 | OtherTargetFiles       = $(OtherSourceFiles:%=$(Packag
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 157 | 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)" ""
328 <    Executable        = $(BinDir)/$(Main)
329 <    ParallelExecutable     = $(BinDir)/$(Main)_MPI
327 >  ifneq "$(words $(Main))" "0"
328 >    Executable             = $(BinDir)/$(Main)
329 >    ifeq "$(BuiltParallelExe)" "1"
330 >      ParallelExecutable     = $(BinDir)/$(Main)_MPI
331 >    endif
332    else
333 <    SharedLibrary     = $(LibDir)/lib$(subst /,,$(Package)).so
334 <    StaticLibrary     = $(LibDir)/lib$(subst /,,$(Package)).a
335 <    ParallelSharedLibrary  = $(LibDir)/lib$(subst /,,$(Package))_MPI.so
336 <    ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(Package))_MPI.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 174 | Line 344 | LocalLibs        = $(subst /,,$(Packages))
344   JavaPackageNames = $(subst /,.,$(JavaPackages))
345   IncludePath      = -I$(SourceDir) $(IncludeDirs:%=-I%)
346   LibDirs          = -L$(LibDir)    $(LibraryDirs:%=-L%)
347 < LocalLibs        = $(subst /,,$(Packages))
348 < LibList          = $(LocalLibs:%=-l%) $(Libraries:%=-l%)
347 > LocalLibs        = $(subst /,,$(patsubst %, oopse_%_UP, $(PackageLibs)))
348 > ParallelLocalLibs= $(subst /,,$(patsubst %, oopse_%_MPI, $(PackageLibs)))
349 > LibList          = $(LocalLibs:%=-l%) $(Libraries)
350 > LibNames         = $(LocalLibs:%=$(LibDir)/lib%.a)
351 > ParallelLibList  = $(ParallelLocalLibs:%=-l%) $(Libraries)
352 > ParallelLibNames = $(ParallelLocalLibs:%=$(LibDir)/lib%.a)
353  
354  
355   #---------------------------------------------------------------------------
# Line 184 | 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@
201 F90Compiler            = @F90@
378   JavaCompiler           = $(JAVA_HOME)/bin/javac
379   JavaArchiver           = $(JAVA_HOME)/bin/jar
380   JarSigner              = $(JAVA_HOME)/bin/jarsigner
# Line 211 | Line 387 | Lex                    = @LEX@
387   List                   = cat
388   Yacc                   = @YACC@
389   Lex                    = @LEX@
390 + Ranlib                 = @RANLIB@
391 + Doxygen                = @DOXYGEN@
392  
393 <
216 < MakeOptions            = -k -s
393 > MakeOptions            = -k
394   MakeDependOptions      =
395   StaticArchiverOptions  = rc
396   DynamicArchiverOptions = -shared
# Line 221 | Line 398 | FortranOptions         =
398   JniOptions             =
399   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
400                           -sourcepath $(SourceDir)
401 < FortranOptions         =
402 < F90Options             =  -I$(SourceDir) -module $(TargetDir)
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 248 | 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 $(Main))" "0"
449 +  MyInstallDir             = $(InstallBinDir)
450 +  ifeq "$(UseMPI)" "yes"
451 +    InstallFiles             = $(Executable) $(ParallelExecutable)
452 +  else
453 +    InstallFiles             = $(Executable)
454 +  endif
455 +  InstallCommand           = $(InstallProgram)
456 +  ifneq "$(words $(LinkTargets))" "0"
457 +    MyLinkSource = $(patsubst %, $(MyInstallDir)/%,$(Main))
458 +    MyLinkTargets = $(patsubst %, $(MyInstallDir)/%,$(LinkTargets))
459 +  endif
460 + endif
461 +
462 + ifneq "$(words $(ForcefieldFiles))" "0"
463 +  MyInstallDir             = $(ForceParamDir)
464 +  InstallFiles             = $(ForcefieldFiles)
465 +  InstallCommand           = $(InstallData)
466 + endif
467 +
468 + ifneq "$(words $(InstallFiles))" "0"
469 +  InstallList            =
470 + else
471 +  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(DEV_ROOT)/forceFields $(patsubst %, $(SourceDir)/%,$(Applications))
472 + endif
473 +
474 + InstallListLoop          = $(patsubst %,$(SourceDir)/%/.install,$(PackageList))  $(patsubst %,%/.install,$(InstallList))
475 +
476 +
477 +
478 + #---------------------------------------------------------------------------
479 + #
480   # Rules
481   #
482   #---------------------------------------------------------------------------
# Line 258 | Line 487 | $(PackageTargetDir) :
487  
488   # Create target directory
489   $(PackageTargetDir) :
490 <        $(MakeDir) $@
490 >        $(MkDir) $@
491  
492 + $(BinDir) :
493 +        $(MkDir) $@
494 +
495   # .c -> .o
496 < $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.c
496 > $(PackageTargetDir)/%.o : %.c $(MainMakefile)
497          $(Print) $@
498 <        $(Print) $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
267 <        @$(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
498 >        $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
499  
500 < %.o : $(PackageSourceDir)/%.c
500 > $(PackageParallelTargetDir)/%.o : %.c $(MainMakefile)
501 >        $(Print) $@
502 >        $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@
503 >
504 > ifeq "$(UseMPI)" "yes"
505 > %.o : %.c $(MainMakefile)
506          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
507 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
508 + else
509 + %.o : %.c $(MainMakefile)
510 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
511 + endif
512  
513   # .cpp -> .o
514 < $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.cpp
274 <        $(Print) $@
275 <        $(Print) $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
514 > $(PackageTargetDir)/%.o : %.cpp $(MainMakefile)
515          $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
516  
517 < %.o : $(PackageSourceDir)/%.cpp
517 > $(PackageParallelTargetDir)/%.o : %.cpp $(MainMakefile)
518 >        $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@
519 >
520 > ifeq "$(UseMPI)" "yes"
521 > %.o : %.cpp $(MainMakefile)
522          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
523 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
524 + else
525 + %.o : %.cpp $(MainMakefile)
526 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
527 + endif
528  
529   # .f -> .o
530 < $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.f
531 <        $(Print) $@
284 <        $(Print) $(FortranCompiler) $(FortranOptions) -c $< -o $@
285 <        @$(FortranCompiler) $(FortranOptions) -c $< -o $@
530 > $(PackageTargetDir)/%.o : %.f $(MainMakefile)
531 >        $(FortranCompiler) $(FortranOptions) -c $< -o $@
532  
533 < %.o : $(PackageSourceDir)/%.f
533 > $(PackageParallelTargetDir)/%.o : %.f $(MainMakefile)
534 >        $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@
535 >
536 > ifeq "$(UseMPI)" "yes"
537 > %.o : %.f $(MainMakefile)
538          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
539 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
540 + else
541 + %.o : %.f $(MainMakefile)
542 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
543 + endif
544  
545   # .F90 -> .o
546 < $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.F90
547 <        $(Print) $@
548 <        $(Print) $(F90Compiler) $(F90Options) -c $< -o $@
549 <        @$(F90Compiler) $(F90Options) -c $< -o $@
546 > $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
547 >        $(FortranCompiler) $(FortranOptions) $(IncludePath) -c $< -o $@
548 >        if test -n "`ls *.$(ModSuffix)`"; then \
549 >          $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
550 >        fi
551  
552 < %.o : $(PackageSourceDir)/%.F90
552 > $(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile)
553 >        $(FortranCompiler) $(FortranParallelOptions) $(IncludePath) -c $< -o $@
554 >        if test -n "`ls *.$(ModSuffix)`"; then \
555 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
556 >        fi
557 >
558 > ifeq "$(UseMPI)" "yes"
559 > %.o : %.F90 $(MainMakefile)
560          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
561 +        if test -n "`ls *.$(ModSuffix)`"; then\
562 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
563 +        fi
564  
565 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
566 +        if test -n "`ls *.$(ModSuffix)`"; then\
567 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
568 +        fi
569 +
570 + else
571 + %.o : %.F90 $(MainMakefile)
572 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
573 +        if test -n "`ls *.$(ModSuffix)`"; then\
574 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
575 +        fi
576 + endif
577 +
578 +
579   # .java -> .class
580   $(PackageTargetDir)/%.class : $(PackageSourceDir)/%.java
581 <        $(Print) $@
302 <        $(Print) $(JavaCompiler) $(JavaCompilerOptions) $<
303 <        @$(JavaCompiler) $(JavaCompilerOptions) $<
581 >        $(JavaCompiler) $(JavaCompilerOptions) $<
582  
583   %.class : $(PackageSourceDir)/%.java
584          @$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
585  
586   # .class -> .h
587   $(PackageSourceDir)/%.h : $(PackageTargetDir)/%.class
310        $(Print) $@
311        $(Print) $(JniCompiler) $(JniOptions) $(JavaPackageName).$*
588          $(JniCompiler) $(JniOptions) $(JavaPackageName).$*
589  
590   %.h : %.class
591          $(MAKE) $(MakeOptions) $(PackageSourceDir)/$@
592  
593   #.y -> .h
594 < $(PackageSourceDir)/%.h : $(PackageSourceDir)/%.y
595 <        $(Print) $@
320 <        $(Print) @$(Yacc) -d $?
321 <        @$(Yacc) -d  $?
594 > %.h : %.y
595 >        $(Yacc) -d  $?
596          @$(Move) y.tab.h $*.h
597          @$(Delete) y.tab.c
598  
599   #.y -> .c
600 < $(PackageSourceDir)/%.c : $(PackageSourceDir)/%.y
601 <        $(Print) $@
328 <        $(Print) $(Yacc) -d $?
329 <        @$(Yacc) -d  $?
600 > %.c : %.y
601 >        $(Yacc) -d  $?
602          @$(Move) y.tab.c $*.c
603          @$(Delete) y.tab.h
604  
605   # .l -> .c
606 < $(PackageSourceDir)/%.c : $(PackageSourceDir)/%.l
606 > %.c : %.l
607          $(Print) $@
608          $(Print) $(Lex) -o$@ $?
609          @$(Lex) -o$@ $?
610  
611   # .o -> .a
340 $(LibDir)/%.a : $(ObjectFiles)
341        $(Print) $@
342        $(Print) $(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles)
343        @$(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles)
612  
613 < %.a : $(ObjectFiles)
614 <        $(MAKE) $(MakeOptions) $(LibDir)/$@
613 > $(LibDir)/%_UP.a : $(ObjectFiles)
614 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles)
615 >        @touch $(LibDir)/.stamp_UP
616  
617 < $(LibDir)/%_MPI.a : $(ParallelObjectFiles)
618 <        $(Print) $@
619 <        $(Print) $(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles)
351 <        @$(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles)
617 > $(LibDir)/%_MPI.a: $(ParallelObjectFiles)
618 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles)
619 >        @touch $(LibDir)/.stamp_MPI
620  
621 + %_UP.a : $(ObjectFiles)
622 +        $(MAKE) $(MakeOptions) $(LibDir)/$@
623 +
624   %_MPI.a : $(ParallelObjectFiles)
625          $(MAKE) $(MakeOptions) $(LibDir)/$@
626  
627   # .o -> .so
628 < $(LibDir)/%.so : $(ObjectFiles)
358 <        $(Print) $@    
359 <        $(Print) $(DynamicArchiver) $(ObjectFiles) $(DynamicArchiverOptions) -o $@
628 > $(LibDir)/%_UP.so : $(ObjectFiles)
629          $(DynamicArchiver) $(ObjectFiles) $(DynamicArchiverOptions) -o $@
630  
362 %.so : $(ObjectFiles)
363        $(MAKE) $(MakeOptions) $(LibDir)/$@
364
631   $(LibDir)/%_MPI.so : $(ParallelObjectFiles)
366        $(Print) $@    
367        $(Print) $(DynamicArchiver) $(ParallelObjectFiles) $(DynamicArchiverOptions) -o $@
632          $(DynamicArchiver) $(ParallelObjectFiles) $(DynamicArchiverOptions) -o $@
633  
634 + %_UP.so : $(ObjectFiles)
635 +        $(MAKE) $(MakeOptions) $(LibDir)/$@
636 +
637   %_MPI.so : $(ParallelObjectFiles)
638          $(MAKE) $(MakeOptions) $(LibDir)/$@
639  
640   # .class -> .jar
641   $(LibDir)/%.jar : $(JavaClassFiles) $(OtherTargetFiles)
642          $(Print) $@
376        $(Print) $(JavaArchiver) -cf $@ $(JavaClassFilesRel) $(OtherTargetFiles)
643          @cd $(TargetDir); $(JavaArchiver) -cf $@ \
644          $(JavaClassFilesRel) $(OtherTargetFiles)
645  
# Line 403 | Line 669 | $(PackageTargetDir)/%_Skel.class : $(PackageTargetDir)
669   %_Skel.class : %.class
670          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
671  
672 + document :
673 +        $(Print) Generate Documentation for OOPSE-2.0
674 +        @cd $(DEV_ROOT)/src    
675 +        $(Doxygen) $(DEV_ROOT)/make/Doxyfile
676 +
677 + #GUN make funtions to merge the libraries
678 + find_objs = $(shell $(StaticArchiver) -t $(1) | $(EGREP) -v "SYMDEF")
679 + extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
680 + create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
681 + remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
682 + do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
683 + do_link = $(shell $(LN_S) $(1) $(2))
684 + all_objs = $(foreach thisLib,$(LibNames), $(call find_objs, $(thisLib)))
685 + all_parallel_objs = $(foreach thisLib,$(ParallelLibNames), $(call find_objs, $(thisLib)))
686 + all_lib_objs = $(patsubst %,$(TargetDir)/%,$(call all_objs))
687 + all_lib_parallel_objs = $(patsubst %,$(ParallelTargetDir)/%,$(call all_parallel_objs))
688 +
689 + $(CombinedStaticLib) : $(LibDir)/.stamp_UP
690 +        $(Print) creating $@            
691 +        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_objs)
692 +        $(Ranlib) $(CombinedStaticLib)
693 +
694 + $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
695 +        $(Print) creating $@
696 +        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_parallel_objs)
697 +        $(Ranlib) $(CombinedParallelStaticLib)
698 +
699   # Executable
700 < $(Executable) : $(ObjectFiles)
701 <        $(Print) $@
702 <        $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@
700 > $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
701 >        if test ! -d $(BinDir); then \
702 >                $(MkDir) $(BinDir) ;\
703 >        fi
704 >        $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
705  
706 < $(ParallelExecutable) : $(ParallelObjectFiles)
707 <        $(Print) $@
708 <        $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ParallelObjectFiles) -o $@
706 > $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
707 >        if test ! -d $(BinDir); then \
708 >                $(MkDir) $(BinDir) ;\
709 >        fi
710 >        $(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@
711  
712   # Anything else is just copied from source to target
713   $(PackageTargetDir)/% : $(PackageSourceDir)/%
# Line 423 | Line 720 | _buildall : \
720  
721   _all : _buildall
722  
723 + _buildall :
724 + ifeq "$(UseMPI)" "yes"
725   _buildall : \
726          $(DependencyFile) \
727          $(PackageTargetDir) \
728          $(ObjectFiles) \
729 +        $(ParallelObjectFiles) \
730          $(JavaClassFiles) \
731          $(RmiStubFiles) \
732          $(RmiSkeletonFiles) \
733          $(OtherTargetFiles) \
434        $(SharedLibrary) \
734          $(StaticLibrary) \
735 +        $(ParallelStaticLibrary) \
736          $(JarFile) \
737 <        $(Executable)
737 >        $(Executable) \
738 >        $(ParallelExecutable)
739 > else
740 > _buildall : \
741 >        $(DependencyFile) \
742 >        $(PackageTargetDir) \
743 >        $(ObjectFiles) \
744 >        $(JavaClassFiles) \
745 >        $(RmiStubFiles) \
746 >        $(RmiSkeletonFiles) \
747 >        $(OtherTargetFiles) \
748 >        $(StaticLibrary) \
749 >        $(JarFile) \
750 >        $(Executable)
751 > endif
752  
753 + echo : $(PackageListLoop)
754 +        $(Print) Done echo.
755  
756 + _echoall :
757 +        $(Print) $(Modules)
758 +
759   # make clean
760   clean : $(PackageListLoop)
761          $(Print) Done clean.    
762  
763   _cleanall :
764 <        $(Delete) $(PackageTargetDir)/* \
765 <                  $(JarFile) \
766 <                  $(SharedLibrary) \
767 <                  $(StaticLibrary) \
768 <                  $(Executable) \
769 <                  $(DependencyFile)
764 >        $(Delete) \
765 >                $(ObjectFiles) \
766 >                $(ModuleFiles) \
767 >                $(ParallelObjectFiles) \
768 >                $(ParallelModuleFiles) \
769 >                $(JarFile) \
770 >                $(SharedLibrary) \
771 >                $(StaticLibrary) \
772 >                $(ParallelSharedLibrary) \
773 >                $(ParallelStaticLibrary) \
774 >                $(CombinedStaticLib) \
775 >                $(CombinedParallelStaticLib)
776  
777 + # make distclean
778 + distclean : $(PackageListLoop)
779 +        $(Print) Done clean.    
780  
781 + _distcleanall : _cleanall
782 +        $(Delete) $(Executable) \
783 +                  $(ParallelExecutable) \
784 +                  $(DependencyFile)
785 +
786   # make depend
787   depend : $(PackageListLoop)
788          $(Print) Done dependencies.
# Line 459 | Line 792 | $(DependencyFile) : $(DerivedSource)
792   $(DependencyFile) : $(DerivedSource)
793          $(Print) $@
794          @cd $(PackageSourceDir)
795 <        touch Make.temp
796 < ifdef $(CppFiles)
797 <        $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.temp
795 >
796 > ifneq "$(words $(CppFiles))" "0"
797 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' -MM $(CppFiles)>> Make.cpptemp
798 >        @cat Make.cpptemp  >> $(DependencyFile)
799 >        $(Delete) Make.cpptemp
800 >
801 >  ifeq "$(UseMPI)" "yes"
802 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CppFiles)>> Make.cpptemp
803 >        @cat Make.cpptemp  >> $(DependencyFile)
804 >        @$(Delete) Make.cpptemp
805 >  endif
806 >
807   endif
808 < ifdef $(CFiles)
809 <        $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   >> Make.temp
808 >
809 > ifneq "$(words $(CFiles))" "0"
810 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/'  -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
811 >        @cat Make.ctemp  >> $(DependencyFile)
812 >        $(Delete) Make.ctemp
813 >
814 >  ifeq "$(UseMPI)" "yes"
815 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
816 >        @cat Make.ctemp  >> $(DependencyFile)
817 >        @$(Delete) Make.ctemp
818 >  endif
819 >
820   endif
821 <        cat Make.temp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
822 <        cat Make.temp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
823 <        echo $(F90Files)
824 < ifdef $(F90Files)
825 <        $(DEV_ROOT)/scripts/sfmakedepend  -I $(DEV_ROOT)/src -d '$$(DEV_ROOT)/obj' -f ./Make.ftemp -h *.F90
826 <        cat Make.ftemp >> $(DependencyFile)
821 >
822 > ifneq "$(words $(F90Files))" "0"
823 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
824 >        @cat Make.ftemp >> $(DependencyFile)
825 >        @$(Delete) Make.ftemp
826 >
827 >  ifeq "$(UseMPI)" "yes"
828 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
829 >        @cat Make.ftemp >> $(DependencyFile)
830 >        @$(Delete) Make.ftemp
831 >  endif
832 >
833   endif
476        $(Delete) Make.temp Make.ftemp
834  
835   # make lib
836   lib    : $(PackageListLoop)
# Line 486 | Line 843 | jarsign : $(JarFile)
843   jarsign : $(JarFile)
844          $(JarSigner) -keystore GeoSoftKeystore $(JarFile) myself
845  
846 + #make install
847 + %.install :
848 +        @$(MAKE) $(MakeOptions) -C $(subst .install,,$@) _installall    
849 +
850 + install : $(InstallListLoop)
851 +        $(Print) Done Install
852 +
853 + _installall : _buildall _installdata _installlinks
854 +
855 + $(MyInstallDir) :
856 +        $(MkDir) $@
857 +
858 + _installdata :  $(MyInstallDir)
859 +        $(Print) $(InstallFiles)
860 + ifneq "$(words $(InstallFiles))" "0"
861 +        $(InstallCommand) $(InstallFiles) $(MyInstallDir)
862 + endif      
863 +
864 + _installlinks :  $(MyInstallDir)
865 + ifneq "$(words $(MyLinkTargets))" "0"
866 +        @cd $(MyInstallDir)
867 +        $(foreach thisLink,$(MyLinkTargets),$(call do_link,$(MyLinkSource),$(thisLink)))
868 + endif      
869 +
870   # make statistics
871   _statisticsall :
872 <        @$(Print) $(SourceFiles) >> $(DEV_ROOT)/files.tmp
872 >        @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
873  
874   statistics : $(PackageListLoop)
875          @$(List) $(DEV_ROOT)/files.tmp | xargs $(WordCount) $(WordCountOptions)
# Line 496 | Line 877 | $(Executable).pure :
877          $(Print) Done statistics.
878  
879   # make pure
880 < $(Executable).pure :
881 <        $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
882 <        $(LibList) $(ObjectFiles) -o $@
880 > #$(Executable).pure :
881 > #       $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
882 > #       $(LibList) $(ObjectFiles) -o $@
883 > #
884 > #pure : $(Executable).pure
885  
886 < pure : $(Executable).pure
886 > #make cvslog
887 > cvslog:
888 >        $(DEV_ROOT)/scripts/cvs2cl
889  
890   # Execute
891   _runexe :

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines