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

Comparing trunk/OOPSE-2.0/make/Makefile.in (file contents):
Revision 1510 by tim, Wed Sep 29 18:37:08 2004 UTC vs.
Revision 1554 by tim, Mon Oct 11 18:40:22 2004 UTC

# Line 33 | Line 33
33   #  $<      - Current dependency
34   #
35   #---------------------------------------------------------------------------
36 + IS_UNIX=1
37  
38 < #---------------------------------------------------------------------------
38 < #
39 < #  Packages
40 < #
41 < #---------------------------------------------------------------------------
42 <
43 < #packages to be made
44 < Packages = \
45 <        utils \
46 <        math \
47 <        types \
48 <        primitives \
49 <        visitors \
50 <        UseTheForce/DarkSide \
51 <        UseTheForce \
52 <        brains \
53 <        io \
54 <        integrators \
55 <        minimizers \
56 <        constraints \
57 <        profiling \
58 <        restraints \
59 <        applications \
60 <
61 < #packages contain libraries
38 > #packages containing libraries
39   PackageLibs = \
40          utils \
41          math \
# Line 74 | Line 51 | PackageLibs = \
51          constraints \
52          profiling \
53          restraints \
54 +
55 + #packages containing applications
56 + Applications = \
57 +        applications/oopse \
58 +        applications/dump2Xyz \
59 +        applications/simpleBuilder
60 +
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@ \
77 +        @MPI_INC_DIR@
78 +
79 + LibraryDirs = \
80 +        @SPRNG_LIB_DIR@ \
81 +        @MPI_LIB_DIR@
82 +
83 + Libraries = \
84 +        @SPRNG_LIB@ \
85 +        @MPI_LIB@ \
86 +        @MPI_F90_LIB@
87 +
88 + OopseHome       = @OOPSE_HOME@
89 + ForceParamDir   = $(OopseHome)/share/forceFields
90 + SampleSimDir    = $(OopseHome)/share/samples
91 + InstallBinDir   = $(OopseHome)/bin
92 + DocDir          = $(OopseHome)/doc
93 + FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
94 + F90Declare      = -D__FORTRAN90
95 + ParallelDeclare = -DIS_MPI
96 + UseMPI          = @USE_MPI@
97 + ModuleCase      = @F90_MODULE_NAMES@
98 + ModSuffix       = @MOD@
99 + LinkOptions = \
100 +        @F90LIBS@
101 +
102 + ParallelLinkOptions = \
103 +        @F90LIBS@
104 +
105 +
106   #---------------------------------------------------------------------------
107   #
108   #  Directories
109   #
110   #---------------------------------------------------------------------------
111  
83 – srcdir = @srcdir@
112   SourceDir         = $(DEV_ROOT)/src
113   TargetDir         = $(DEV_ROOT)/obj
114   ParallelTargetDir = $(DEV_ROOT)/MPIobj
# Line 89 | Line 117 | CurrentDir        = $(CURDIR)
117   BinDir            = $(DEV_ROOT)/bin
118   DocsDir           = $(DEV_ROOT)/docs
119   CurrentDir        = $(CURDIR)
120 + CombinedStaticLib = $(LibDir)/libOOPSE.a
121 + CombinedParallelStaticLib = $(LibDir)/libOOPSE_MPI.a
122  
123   ifdef Source
124 < Package                  = $(subst $(SourceDir)/,,$(CurrentDir))
124 > #get the relative path of current package to source directory
125 > # /home/maul/gezelter/src/code/src/UseTheForce/Darkside --> UseTheForce/Darkside
126 > #Package          = $(shell echo $(CurrentDir) | sed -e 's/^.*\/src\/\(.*\)/\1/g')
127 > #use shell script to get the absolute path and then rip it off from $(CurrentDir)
128 > Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
129 >
130   PackageList              = $(Package)
131   PackageSourceDir         = $(SourceDir)/$(Package)
132   PackageTargetDir         = $(TargetDir)
133   PackageParallelTargetDir = $(ParallelTargetDir)
134   JavaMainClass            = $(subst /,.,$(Package)).$(Main)
135   else
136 < PackageList              = $(Packages) $(JavaPackages)
136 > PackageList              = $(PackageLibs) $(JavaPackages) $(Applications)
137   endif
138  
139 < PackageListLoop  = $(patsubst %,$(SourceDir)/%/.loop,$(PackageList))
139 > PackageListLoop          = $(patsubst %,$(SourceDir)/%/.loop,$(PackageList))
140  
141 < JRE              = $(JAVA_HOME)/jre/lib/rt.jar
141 > JRE                      = $(JAVA_HOME)/jre/lib/rt.jar
142  
143   ifdef IS_UNIX
144   X = :
# Line 131 | Line 166 | SourceFiles            = $(JavaFiles:%.java=  $(Packag
166                                        $(YaccFiles) $(CorbaFiles), \
167                                        $(Source))
168   ManifestFile           = $(PackageSourceDir)/Manifest
134 – SourceFiles            = $(JavaFiles:%.java=  $(PackageSourceDir)/%.java)\
135 –                         $(CppFiles:%.cpp=    $(PackageSourceDir)/%.cpp)\
136 –                         $(CFiles:%.c=        $(PackageSourceDir)/%.c)\
137 –                         $(FortranFiles:%.f=  $(PackageSourceDir)/%.f)\
138 –                         $(F90Files:%.F90=    $(PackageSourceDir)/%.F90)\
139 –                         $(LexFiles:%.l=      $(PackageSourceDir)/%.l)\
140 –                         $(YaccFiles:%.y=     $(PackageSourceDir)/%.y)\
169  
170 + SourceFiles            = $(JavaFiles)\
171 +                         $(CppFiles)\
172 +                         $(CFiles)\
173 +                         $(FortranFiles)\
174 +                         $(F90Files)\
175 +                         $(LexFiles)\
176 +                         $(YaccFiles)
177  
178   # Target
179   JavaClassFiles         = $(JavaFiles:%.java=  $(PackageTargetDir)/%.class)
# Line 148 | Line 183 | ObjectFiles            = $(CFiles:%.c=        $(Packag
183   JniClassFiles          = $(JniSource:%.java=  $(PackageTargetDir)/%.class)
184   JniHeaders             = $(JniSource:%.java=  $(PackageSourceDir)/%.h)
185   ObjectFiles            = $(CFiles:%.c=        $(PackageTargetDir)/%.o)\
186 <                         $(CppFiles:%.cpp=    $(PackageTargetDir)/%.o)\
186 >                         $(CppFiles:%.cpp=    $(PackageTargetDir)/%.o)\
187                           $(FortranFiles:%.f=  $(PackageTargetDir)/%.o)\
188                           $(F90Files:%.F90=    $(PackageTargetDir)/%.o)\
189                           $(LexFiles:%.l=      $(PackageTargetDir)/%.o)\
# Line 181 | Line 216 | ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))
216   ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))" "0"
217    DependencyFile    = $(PackageSourceDir)/Makedepend
218    ifneq "$(Main)" ""
219 <    Executable        = $(BinDir)/$(Main)
219 >    Executable             = $(BinDir)/$(Main)
220      ParallelExecutable     = $(BinDir)/$(Main)_MPI
221    else
222 <    SharedLibrary     = $(LibDir)/lib$(subst /,,$(Package)).so
223 <    StaticLibrary     = $(LibDir)/lib$(subst /,,$(Package)).a
224 <    ParallelSharedLibrary  = $(LibDir)/lib$(subst /,,$(Package))_MPI.so
225 <    ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(Package))_MPI.a
222 >    SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.so
223 >    StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.a
224 >    ParallelSharedLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.so
225 >    ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.a
226    endif
227   endif
228 +
229   #
230   # Misc
231   #
# Line 197 | Line 233 | LocalLibs        = $(subst /,,$(PackageLibs))
233   JavaPackageNames = $(subst /,.,$(JavaPackages))
234   IncludePath      = -I$(SourceDir) $(IncludeDirs:%=-I%)
235   LibDirs          = -L$(LibDir)    $(LibraryDirs:%=-L%)
236 < LocalLibs        = $(subst /,,$(PackageLibs))
237 < LibList          = $(LocalLibs:%=-l%) $(Libraries:%=-l%)
236 > LocalLibs        = $(subst /,,$(patsubst %, oopse_%_UP, $(PackageLibs)))
237 > ParallelLocalLibs= $(subst /,,$(patsubst %, oopse_%_MPI, $(PackageLibs)))
238 > LibList          = $(LocalLibs:%=-l%) $(Libraries)
239 > LibNames         = $(LocalLibs:%=$(LibDir)/lib%.a)
240 > ParallelLibList  = $(ParallelLocalLibs:%=-l%) $(Libraries)
241 > ParallelLibNames = $(ParallelLocalLibs:%=$(LibDir)/lib%.a)
242  
243  
244   #---------------------------------------------------------------------------
# Line 213 | Line 253 | Install                = @INSTALL@
253   CppCompiler            = @CXX@
254   Linker                 = @CXX@
255   MakeDepend             = makedepend
256 < Install                = @INSTALL@
256 > INSTALL                = @INSTALL@
257   InstallProgram         = @INSTALL_PROGRAM@
258   InstallData            = @INSTALL_DATA@
259 < MakeDir                = @MKINSTALLDIRS@
259 > MkDir                = @MKINSTALLDIRS@
260   Delete                 = rm -fr
261   StaticArchiver         = @AR@
262   DynamicArchiver        = @CC@
# Line 234 | Line 274 | Lex                    = @LEX@
274   List                   = cat
275   Yacc                   = @YACC@
276   Lex                    = @LEX@
277 + Ranlib                 = @RANLIB@
278 + Doxygen                = @DOXYGEN@
279  
280 <
239 < MakeOptions            = -k -s
280 > MakeOptions            = -k
281   MakeDependOptions      =
282   StaticArchiverOptions  = rc
283   DynamicArchiverOptions = -shared
# Line 244 | Line 285 | FortranOptions         =
285   JniOptions             =
286   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
287                           -sourcepath $(SourceDir)
288 + COptions               = $(FrcDeclare)
289 + CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
290 + CppOptions             = $(FrcDeclare)
291 + CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
292   FortranOptions         =
293 < F90Options             =  -I$(SourceDir) -module $(TargetDir)
293 > F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
294 > F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
295   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
296                           -sourcepath $(SourceDir) -deprecation
297   JavaRunOptions         = -classpath $(ClassPath)
# Line 271 | Line 317 | Space                  = $(Empty) $(Empty)
317  
318   #---------------------------------------------------------------------------
319   #
320 + #  Install
321 + #
322 + #---------------------------------------------------------------------------
323 +
324 + ifneq "$(words $(SampleFiles))" "0"
325 +  MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
326 +  MyInstallDir             = $(SampleSimDir)/$(MySample)
327 +  InstallFiles             = $(SampleFiles)
328 +  InstallCommand           = $(InstallData)
329 + endif
330 +
331 + ifneq "$(words $(Main))" "0"
332 +  MyInstallDir             = $(InstallBinDir)
333 +  ifeq "$(UseMPI)" "yes"
334 +    InstallFiles             = $(Executable) $(ParallelExecutable)
335 +  else
336 +    InstallFiles             = $(Executable)
337 +  endif
338 +  InstallCommand           = $(InstallProgram)
339 + endif
340 +
341 + ifneq "$(words $(ForcefieldFiles))" "0"
342 +  MyInstallDir             = $(ForceParamDir)
343 +  InstallFiles             = $(ForcefieldFiles)
344 +  InstallCommand           = $(InstallData)
345 + endif
346 +
347 + ifneq "$(words $(InstallFiles))" "0"
348 +  InstallList            =
349 + else
350 +  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(DEV_ROOT)/forceFields $(patsubst %, $(SourceDir)/%,$(Applications))
351 + endif
352 +
353 + InstallListLoop          = $(patsubst %,$(SourceDir)/%/.install,$(PackageList))  $(patsubst %,%/.install,$(InstallList))
354 +
355 +
356 +
357 + #---------------------------------------------------------------------------
358 + #
359   # Rules
360   #
361   #---------------------------------------------------------------------------
# Line 284 | Line 369 | $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.c
369          $(MakeDir) $@
370  
371   # .c -> .o
372 < $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.c
372 > $(PackageTargetDir)/%.o : %.c
373          $(Print) $@
374 <        $(Print) $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
290 <        @$(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
374 >        $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
375  
376 < %.o : $(PackageSourceDir)/%.c
376 > $(PackageParallelTargetDir)/%.o : %.c
377 >        $(Print) $@
378 >        $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@
379 >
380 > ifeq "$(UseMPI)" "yes"
381 > %.o : %.c
382          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
383 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
384 + else
385 + %.o : %.c
386 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
387 + endif
388  
389   # .cpp -> .o
390 < $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.cpp
297 <        $(Print) $@
298 <        $(Print) $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
390 > $(PackageTargetDir)/%.o : %.cpp
391          $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
392  
393 < %.o : $(PackageSourceDir)/%.cpp
393 > $(PackageParallelTargetDir)/%.o : %.cpp
394 >        $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@
395 >
396 > ifeq "$(UseMPI)" "yes"
397 > %.o : %.cpp
398          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
399 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
400 + else
401 + %.o : %.cpp
402 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
403 + endif
404  
405   # .f -> .o
406 < $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.f
407 <        $(Print) $@
307 <        $(Print) $(FortranCompiler) $(FortranOptions) -c $< -o $@
308 <        @$(FortranCompiler) $(FortranOptions) -c $< -o $@
406 > $(PackageTargetDir)/%.o : %.f
407 >        $(FortranCompiler) $(FortranOptions) -c $< -o $@
408  
409 < %.o : $(PackageSourceDir)/%.f
409 > $(PackageParallelTargetDir)/%.o : %.f
410 >        $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@
411 >
412 > ifeq "$(UseMPI)" "yes"
413 > %.o : %.f
414          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
415 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
416 + else
417 + %.o : %.f
418 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
419 + endif
420  
421   # .F90 -> .o
422 < $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.F90
423 <        $(Print) $@
424 <        $(Print) $(F90Compiler) $(F90Options) -c $< -o $@
425 <        @$(F90Compiler) $(F90Options) -c $< -o $@
422 > $(PackageTargetDir)/%.o : %.F90
423 >        $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
424 >        if test -f *.$(ModSuffix); then \
425 >          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
426 >        fi
427  
428 < %.o : $(PackageSourceDir)/%.F90
428 > $(PackageParallelTargetDir)/%.o : %.F90
429 >        $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
430 >        if test -f *.$(ModSuffix); then \
431 >          $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
432 >        fi
433 >
434 > ifeq "$(UseMPI)" "yes"
435 > %.o : %.F90
436          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
437 +        if test -f *.$(ModSuffix); then \
438 +          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
439 +        fi
440  
441 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
442 +        if test -f *.$(ModSuffix); then \
443 +          $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
444 +        fi
445 +
446 + else
447 + %.o : %.F90
448 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
449 +        if test -f *.$(ModSuffix); then \
450 +          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
451 +        fi
452 +
453 + endif
454 +
455 +
456   # .java -> .class
457   $(PackageTargetDir)/%.class : $(PackageSourceDir)/%.java
458 <        $(Print) $@
325 <        $(Print) $(JavaCompiler) $(JavaCompilerOptions) $<
326 <        @$(JavaCompiler) $(JavaCompilerOptions) $<
458 >        $(JavaCompiler) $(JavaCompilerOptions) $<
459  
460   %.class : $(PackageSourceDir)/%.java
461          @$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
462  
463   # .class -> .h
464   $(PackageSourceDir)/%.h : $(PackageTargetDir)/%.class
333 –        $(Print) $@
334 –        $(Print) $(JniCompiler) $(JniOptions) $(JavaPackageName).$*
465          $(JniCompiler) $(JniOptions) $(JavaPackageName).$*
466  
467   %.h : %.class
468          $(MAKE) $(MakeOptions) $(PackageSourceDir)/$@
469  
470   #.y -> .h
471 < $(PackageSourceDir)/%.h : $(PackageSourceDir)/%.y
472 <        $(Print) $@
343 <        $(Print) @$(Yacc) -d $?
344 <        @$(Yacc) -d  $?
471 > %.h : %.y
472 >        $(Yacc) -d  $?
473          @$(Move) y.tab.h $*.h
474          @$(Delete) y.tab.c
475  
476   #.y -> .c
477 < $(PackageSourceDir)/%.c : $(PackageSourceDir)/%.y
478 <        $(Print) $@
351 <        $(Print) $(Yacc) -d $?
352 <        @$(Yacc) -d  $?
477 > %.c : %.y
478 >        $(Yacc) -d  $?
479          @$(Move) y.tab.c $*.c
480          @$(Delete) y.tab.h
481  
482   # .l -> .c
483 < $(PackageSourceDir)/%.c : $(PackageSourceDir)/%.l
483 > %.c : %.l
484          $(Print) $@
485          $(Print) $(Lex) -o$@ $?
486          @$(Lex) -o$@ $?
487  
488   # .o -> .a
363 – $(LibDir)/%.a : $(ObjectFiles)
364 –        $(Print) $@
365 –        $(Print) $(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles)
366 –        @$(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles)
489  
490 < %.a : $(ObjectFiles)
491 <        $(MAKE) $(MakeOptions) $(LibDir)/$@
490 > $(LibDir)/%_UP.a : $(ObjectFiles)
491 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles)
492 >        @touch $(LibDir)/.stamp_UP
493  
494 < $(LibDir)/%_MPI.a : $(ParallelObjectFiles)
495 <        $(Print) $@
496 <        $(Print) $(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles)
374 <        @$(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles)
494 > $(LibDir)/%_MPI.a: $(ParallelObjectFiles)
495 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles)
496 >        @touch $(LibDir)/.stamp_MPI
497  
498 + %_UP.a : $(ObjectFiles)
499 +        $(MAKE) $(MakeOptions) $(LibDir)/$@
500 +
501   %_MPI.a : $(ParallelObjectFiles)
502          $(MAKE) $(MakeOptions) $(LibDir)/$@
503  
504   # .o -> .so
505 < $(LibDir)/%.so : $(ObjectFiles)
381 <        $(Print) $@    
382 <        $(Print) $(DynamicArchiver) $(ObjectFiles) $(DynamicArchiverOptions) -o $@
505 > $(LibDir)/%_UP.so : $(ObjectFiles)
506          $(DynamicArchiver) $(ObjectFiles) $(DynamicArchiverOptions) -o $@
507  
385 – %.so : $(ObjectFiles)
386 –        $(MAKE) $(MakeOptions) $(LibDir)/$@
387 –
508   $(LibDir)/%_MPI.so : $(ParallelObjectFiles)
389 –        $(Print) $@    
390 –        $(Print) $(DynamicArchiver) $(ParallelObjectFiles) $(DynamicArchiverOptions) -o $@
509          $(DynamicArchiver) $(ParallelObjectFiles) $(DynamicArchiverOptions) -o $@
510  
511 + %_UP.so : $(ObjectFiles)
512 +        $(MAKE) $(MakeOptions) $(LibDir)/$@
513 +
514   %_MPI.so : $(ParallelObjectFiles)
515          $(MAKE) $(MakeOptions) $(LibDir)/$@
516  
517   # .class -> .jar
518   $(LibDir)/%.jar : $(JavaClassFiles) $(OtherTargetFiles)
519          $(Print) $@
399 –        $(Print) $(JavaArchiver) -cf $@ $(JavaClassFilesRel) $(OtherTargetFiles)
520          @cd $(TargetDir); $(JavaArchiver) -cf $@ \
521          $(JavaClassFilesRel) $(OtherTargetFiles)
522  
# Line 426 | Line 546 | $(PackageTargetDir)/%_Skel.class : $(PackageTargetDir)
546   %_Skel.class : %.class
547          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
548  
549 + document :
550 +        $(Print) Generate Documentation for OOPSE-2.0
551 +        @cd $(DEV_ROOT)/src    
552 +        $(Doxygen) $(DEV_ROOT)/make/Doxyfile
553 +
554 + #GUN make funtions to merge the libraries
555 + find_objs = $(shell $(StaticArchiver) -t $(1))
556 + extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
557 + create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
558 + remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
559 + do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
560 +
561 + $(CombinedStaticLib) : $(LibDir)/.stamp_UP
562 +        $(Print) create $@      
563 +        $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
564 +        $(Ranlib) $(CombinedStaticLib)
565 +
566 + $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
567 +        $(Print) create $@
568 +        $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
569 +        $(Ranlib) $(CombinedParallelStaticLib)
570 +
571   # Executable
572 < $(Executable) : $(ObjectFiles)
573 <        $(Print) $@
432 <        $(Print) $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@
433 <        $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@
572 > $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
573 >        $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(CombinedStaticLib) $(Libraries) -o $@
574  
575 < $(ParallelExecutable) : $(ParallelObjectFiles)
576 <        $(Print) $@
437 <        $(Print) $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ParallelObjectFiles) -o $@
438 <        $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ParallelObjectFiles) -o $@
575 > $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
576 >        $(Linker) $(ParallelObjectFiles) $(ParallelLinkOptions) $(LibDirs) $(CombinedParallelStaticLib) $(Libraries) -o $@
577  
578   # Anything else is just copied from source to target
579   $(PackageTargetDir)/% : $(PackageSourceDir)/%
# Line 448 | Line 586 | _buildall : \
586  
587   _all : _buildall
588  
589 + _buildall :
590 + ifeq "$(UseMPI)" "yes"
591   _buildall : \
592          $(DependencyFile) \
593          $(PackageTargetDir) \
594          $(ObjectFiles) \
595 +        $(ParallelObjectFiles) \
596          $(JavaClassFiles) \
597          $(RmiStubFiles) \
598          $(RmiSkeletonFiles) \
599          $(OtherTargetFiles) \
459 –        $(SharedLibrary) \
600          $(StaticLibrary) \
601 +        $(ParallelStaticLibrary) \
602          $(JarFile) \
603 <        $(Executable)
603 >        $(Executable) \
604 >        $(ParallelExecutable)
605 > else
606 > _buildall : \
607 >        $(DependencyFile) \
608 >        $(PackageTargetDir) \
609 >        $(ObjectFiles) \
610 >        $(JavaClassFiles) \
611 >        $(RmiStubFiles) \
612 >        $(RmiSkeletonFiles) \
613 >        $(OtherTargetFiles) \
614 >        $(StaticLibrary) \
615 >        $(JarFile) \
616 >        $(Executable)
617 > endif
618  
619  
620   # make clean
# Line 467 | Line 622 | _cleanall :
622          $(Print) Done clean.    
623  
624   _cleanall :
625 <        $(Delete) $(PackageTargetDir)/* \
626 <                  $(JarFile) \
625 >        $(Delete) $(ObjectFiles) $(ParallelObjectFiles)
626 >
627 > # make distclean
628 > distclean : $(PackageListLoop)
629 >        $(Print) Done clean.    
630 >
631 > _distcleanall :
632 >        $(Delete) $(ObjectFiles) \
633 >                  $(ParallelObjectFiles) \
634 >                        $(JarFile) \
635                    $(SharedLibrary) \
636                    $(StaticLibrary) \
637 +                  $(ParallelSharedLibrary) \
638 +                  $(ParallelStaticLibrary) \
639                    $(Executable) \
640 <                  $(DependencyFile)
640 >                  $(ParallelExecutable) \
641 >                  $(DependencyFile)
642  
643  
644   # make depend
# Line 485 | Line 651 | $(DependencyFile) : $(DerivedSource)
651          $(Print) $@
652          @cd $(PackageSourceDir)
653  
488 –        touch Make.ctemp
489 –        touch Make.ctemp
490 –
654   ifneq "$(words $(CppFiles))" "0"
655 <        $(Print) Make dependencies for $(CppFiles)
656 <        $(Print) $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
657 <        $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
658 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
659 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
655 >        $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
656 >        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
657 >        $(Delete) Make.cpptemp
658 >
659 >  ifeq "$(UseMPI)" "yes"
660 >        $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
661 >        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
662 >        @$(Delete) Make.cpptemp
663 >  endif
664 >
665   endif
666  
667   ifneq "$(words $(CFiles))" "0"
668 <        $(Print) Make dependencies for $(CFiles)
669 <        $(Print) $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   > Make.ctemp
670 <        $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   > Make.ctemp
503 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
504 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
668 >        $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
669 >        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
670 >        $(Delete) Make.ctemp
671  
672 +  ifeq "$(UseMPI)" "yes"
673 +        $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
674 +        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
675 +        @$(Delete) Make.ctemp
676 +  endif
677 +
678   endif
679  
680   ifneq "$(words $(F90Files))" "0"
681 <        $(Print) Make dependencies for $(F90Files)
682 <        $(DEV_ROOT)/scripts/sfmakedepend  -I $(DEV_ROOT)/src -d '$$(DEV_ROOT)/obj' -f ./Make.ftemp -h *.F90
683 <        cat Make.ftemp >> $(DependencyFile)
681 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
682 >        @cat Make.ftemp >> $(DependencyFile)
683 >        @$(Delete) Make.ftemp
684 >
685 >  ifeq "$(UseMPI)" "yes"
686 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
687 >        @cat Make.ftemp >> $(DependencyFile)
688 >        @$(Delete) Make.ftemp
689 >  endif
690 >
691   endif
513 –        $(Delete) Make.cpptemp Make.ctemp Make.ftemp
692  
693   # make lib
694   lib    : $(PackageListLoop)
# Line 523 | Line 701 | jarsign : $(JarFile)
701   jarsign : $(JarFile)
702          $(JarSigner) -keystore GeoSoftKeystore $(JarFile) myself
703  
704 + #make install
705 + %.install :
706 +        @$(MAKE) $(MakeOptions) -C $(subst .install,,$@) _installall    
707 +
708 + install : $(InstallListLoop)
709 +        $(Print) Done Install
710 +
711 + _installall : _buildall _installdata
712 +
713 + $(MyInstallDir) :
714 +        $(MkDir) $@
715 +
716 + _installdata :  $(MyInstallDir)
717 +        $(Print) $(InstallFiles)
718 + ifneq "$(words $(InstallFiles))" "0"
719 +        $(InstallData) $(InstallFiles) $(MyInstallDir)
720 + endif      
721 +        
722   # make statistics
723   _statisticsall :
724 <        @$(Print) $(SourceFiles) >> $(DEV_ROOT)/files.tmp
724 >        @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
725  
726   statistics : $(PackageListLoop)
727          @$(List) $(DEV_ROOT)/files.tmp | xargs $(WordCount) $(WordCountOptions)
# Line 539 | Line 735 | pure : $(Executable).pure
735  
736   pure : $(Executable).pure
737  
738 + #make cvslog
739 + cvslog:
740 +        $(DEV_ROOT)/scripts/cvs2cl.pl
741 +
742   # Execute
743   _runexe :
744          $(Executable) $(RunParameters)

Diff Legend

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