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

Diff Legend

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