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

Diff Legend

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