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 1940 by gezelter, Thu Jan 13 21:56:58 2005 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 +        visitors \
42          math \
43          types \
44          primitives \
67 –        visitors \
45          UseTheForce/DarkSide \
46          UseTheForce \
47          brains \
48          io \
49 <        integrators \
73 <        minimizers \
49 >        integrators\
50          constraints \
51 <        profiling \
52 <        restraints \
51 >        minimizers \
52 >
53 > #packages containing applications
54 > Applications = \
55 >        applications/oopse \
56 >        applications/dump2Xyz \
57 >        applications/simpleBuilder\
58 >
59 > Samples = \
60 >        samples/argon \
61 >        samples/water/dimer \
62 >        samples/water/spce \
63 >        samples/water/ssd \
64 >        samples/water/ssde \
65 >        samples/water/tip3p_ice \
66 >        samples/water/tip4p \
67 >        samples/lipid \
68 >        samples/alkane \
69 >        samples/minimizer \
70 >        samples/metals \
71 >        samples/zcons \
72 >
73 > IncludeDirs = \
74 >        @SPRNG_INC_DIR@ \
75 >        @MPI_INC_DIR@
76 >
77 > LibraryDirs = \
78 >        @SPRNG_LIB_DIR@ \
79 >        @MPI_LIB_DIR@
80 >
81 > Libraries = \
82 >        @SPRNG_LIB@ \
83 >        @MPI_LIB@ \
84 >        @MPI_F90_LIB@
85 >
86 > OopseHome       = @OOPSE_HOME@
87 > ForceParamDir   = $(OopseHome)/share/forceFields
88 > SampleSimDir    = $(OopseHome)/share/samples
89 > InstallBinDir   = $(OopseHome)/bin
90 > DocDir          = $(OopseHome)/doc
91 > FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
92 > F90Declare      = -D__FORTRAN90
93 > ParallelDeclare = -DIS_MPI
94 > UseMPI          = @USE_MPI@
95 > ModuleCase      = @F90_MODULE_NAMES@
96 > ModSuffix       = @MOD@
97 > LinkOptions = \
98 >        @F90LIBS@
99 >
100 > ParallelLinkOptions = \
101 >        @F90LIBS@
102 >
103 >
104   #---------------------------------------------------------------------------
105   #
106   #  Directories
107   #
108   #---------------------------------------------------------------------------
109  
83 – srcdir = @srcdir@
110   SourceDir         = $(DEV_ROOT)/src
111   TargetDir         = $(DEV_ROOT)/obj
112   ParallelTargetDir = $(DEV_ROOT)/MPIobj
# Line 89 | Line 115 | CurrentDir        = $(CURDIR)
115   BinDir            = $(DEV_ROOT)/bin
116   DocsDir           = $(DEV_ROOT)/docs
117   CurrentDir        = $(CURDIR)
118 + CombinedStaticLib = $(LibDir)/libOOPSE.a
119 + CombinedParallelStaticLib = $(LibDir)/libOOPSE_MPI.a
120  
121   ifdef Source
122 < Package                  = $(subst $(SourceDir)/,,$(CurrentDir))
122 > #get the relative path of current package to source directory
123 > # /home/maul/gezelter/src/code/src/UseTheForce/Darkside --> UseTheForce/Darkside
124 > #Package          = $(shell echo $(CurrentDir) | sed -e 's/^.*\/src\/\(.*\)/\1/g')
125 > #use shell script to get the absolute path and then rip it off from $(CurrentDir)
126 > Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
127 >
128   PackageList              = $(Package)
129   PackageSourceDir         = $(SourceDir)/$(Package)
130   PackageTargetDir         = $(TargetDir)
131   PackageParallelTargetDir = $(ParallelTargetDir)
132   JavaMainClass            = $(subst /,.,$(Package)).$(Main)
133   else
134 < PackageList              = $(Packages) $(JavaPackages)
134 > PackageList              = $(PackageLibs) $(JavaPackages) $(Applications)
135   endif
136  
137 < PackageListLoop  = $(patsubst %,$(SourceDir)/%/.loop,$(PackageList))
137 > PackageListLoop          = $(patsubst %,$(SourceDir)/%/.loop,$(PackageList))
138  
139 < JRE              = $(JAVA_HOME)/jre/lib/rt.jar
139 > JRE                      = $(JAVA_HOME)/jre/lib/rt.jar
140  
141   ifdef IS_UNIX
142   X = :
# Line 131 | Line 164 | SourceFiles            = $(JavaFiles:%.java=  $(Packag
164                                        $(YaccFiles) $(CorbaFiles), \
165                                        $(Source))
166   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)\
167  
168 + SourceFiles            = $(JavaFiles)\
169 +                         $(CppFiles)\
170 +                         $(CFiles)\
171 +                         $(FortranFiles)\
172 +                         $(F90Files)\
173 +                         $(LexFiles)\
174 +                         $(YaccFiles)
175  
176   # Target
177   JavaClassFiles         = $(JavaFiles:%.java=  $(PackageTargetDir)/%.class)
# Line 148 | Line 181 | ObjectFiles            = $(CFiles:%.c=        $(Packag
181   JniClassFiles          = $(JniSource:%.java=  $(PackageTargetDir)/%.class)
182   JniHeaders             = $(JniSource:%.java=  $(PackageSourceDir)/%.h)
183   ObjectFiles            = $(CFiles:%.c=        $(PackageTargetDir)/%.o)\
184 <                         $(CppFiles:%.cpp=    $(PackageTargetDir)/%.o)\
184 >                         $(CppFiles:%.cpp=    $(PackageTargetDir)/%.o)\
185                           $(FortranFiles:%.f=  $(PackageTargetDir)/%.o)\
186                           $(F90Files:%.F90=    $(PackageTargetDir)/%.o)\
187                           $(LexFiles:%.l=      $(PackageTargetDir)/%.o)\
# Line 181 | Line 214 | ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))
214   ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))" "0"
215    DependencyFile    = $(PackageSourceDir)/Makedepend
216    ifneq "$(Main)" ""
217 <    Executable        = $(BinDir)/$(Main)
217 >    Executable             = $(BinDir)/$(Main)
218      ParallelExecutable     = $(BinDir)/$(Main)_MPI
219    else
220 <    SharedLibrary     = $(LibDir)/lib$(subst /,,$(Package)).so
221 <    StaticLibrary     = $(LibDir)/lib$(subst /,,$(Package)).a
222 <    ParallelSharedLibrary  = $(LibDir)/lib$(subst /,,$(Package))_MPI.so
223 <    ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(Package))_MPI.a
220 >    SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.so
221 >    StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.a
222 >    ParallelSharedLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.so
223 >    ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.a
224    endif
225   endif
226 +
227   #
228   # Misc
229   #
# Line 197 | Line 231 | LocalLibs        = $(subst /,,$(PackageLibs))
231   JavaPackageNames = $(subst /,.,$(JavaPackages))
232   IncludePath      = -I$(SourceDir) $(IncludeDirs:%=-I%)
233   LibDirs          = -L$(LibDir)    $(LibraryDirs:%=-L%)
234 < LocalLibs        = $(subst /,,$(PackageLibs))
235 < LibList          = $(LocalLibs:%=-l%) $(Libraries:%=-l%)
234 > LocalLibs        = $(subst /,,$(patsubst %, oopse_%_UP, $(PackageLibs)))
235 > ParallelLocalLibs= $(subst /,,$(patsubst %, oopse_%_MPI, $(PackageLibs)))
236 > LibList          = $(LocalLibs:%=-l%) $(Libraries)
237 > LibNames         = $(LocalLibs:%=$(LibDir)/lib%.a)
238 > ParallelLibList  = $(ParallelLocalLibs:%=-l%) $(Libraries)
239 > ParallelLibNames = $(ParallelLocalLibs:%=$(LibDir)/lib%.a)
240  
241  
242   #---------------------------------------------------------------------------
# Line 207 | Line 245 | Move                   = mv
245   #
246   #---------------------------------------------------------------------------
247   Print                  = @echo
248 < Move                   = mv
248 > Move                   = mv -f
249   Copy                   = cp
250   CCompiler              = @CC@
251   CppCompiler            = @CXX@
252   Linker                 = @CXX@
253   MakeDepend             = makedepend
254 < Install                = @INSTALL@
254 > INSTALL                = @INSTALL@
255   InstallProgram         = @INSTALL_PROGRAM@
256   InstallData            = @INSTALL_DATA@
257 < MakeDir                = @MKINSTALLDIRS@
257 > MkDir                  = @MKINSTALLDIRS@
258   Delete                 = rm -fr
259   StaticArchiver         = @AR@
260   DynamicArchiver        = @CC@
# Line 234 | Line 272 | Lex                    = @LEX@
272   List                   = cat
273   Yacc                   = @YACC@
274   Lex                    = @LEX@
275 + Ranlib                 = @RANLIB@
276 + Doxygen                = @DOXYGEN@
277  
278 <
239 < MakeOptions            = -k -s
278 > MakeOptions            = -k
279   MakeDependOptions      =
280   StaticArchiverOptions  = rc
281   DynamicArchiverOptions = -shared
# Line 244 | Line 283 | FortranOptions         =
283   JniOptions             =
284   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
285                           -sourcepath $(SourceDir)
286 + COptions               = $(FrcDeclare) @CFLAGS@
287 + CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
288 + CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
289 + CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
290   FortranOptions         =
291 < F90Options             =  -I$(SourceDir) -module $(TargetDir)
291 > F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
292 > F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
293   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
294                           -sourcepath $(SourceDir) -deprecation
295   JavaRunOptions         = -classpath $(ClassPath)
# Line 271 | Line 315 | Space                  = $(Empty) $(Empty)
315  
316   #---------------------------------------------------------------------------
317   #
318 + #  Install
319 + #
320 + #---------------------------------------------------------------------------
321 +
322 + ifneq "$(words $(SampleFiles))" "0"
323 +  MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
324 +  MyInstallDir             = $(SampleSimDir)/$(MySample)
325 +  InstallFiles             = $(SampleFiles)
326 +  InstallCommand           = $(InstallData)
327 + endif
328 +
329 + ifneq "$(words $(Main))" "0"
330 +  MyInstallDir             = $(InstallBinDir)
331 +  ifeq "$(UseMPI)" "yes"
332 +    InstallFiles             = $(Executable) $(ParallelExecutable)
333 +  else
334 +    InstallFiles             = $(Executable)
335 +  endif
336 +  InstallCommand           = $(InstallProgram)
337 + endif
338 +
339 + ifneq "$(words $(ForcefieldFiles))" "0"
340 +  MyInstallDir             = $(ForceParamDir)
341 +  InstallFiles             = $(ForcefieldFiles)
342 +  InstallCommand           = $(InstallData)
343 + endif
344 +
345 + ifneq "$(words $(InstallFiles))" "0"
346 +  InstallList            =
347 + else
348 +  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(DEV_ROOT)/forceFields $(patsubst %, $(SourceDir)/%,$(Applications))
349 + endif
350 +
351 + InstallListLoop          = $(patsubst %,$(SourceDir)/%/.install,$(PackageList))  $(patsubst %,%/.install,$(InstallList))
352 +
353 +
354 +
355 + #---------------------------------------------------------------------------
356 + #
357   # Rules
358   #
359   #---------------------------------------------------------------------------
# Line 281 | Line 364 | $(PackageTargetDir) :
364  
365   # Create target directory
366   $(PackageTargetDir) :
367 <        $(MakeDir) $@
367 >        $(MkDir) $@
368  
369 + $(BinDir) :
370 +        $(MkDir) $@
371 +
372   # .c -> .o
373 < $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.c
373 > $(PackageTargetDir)/%.o : %.c
374          $(Print) $@
375 <        $(Print) $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
290 <        @$(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
375 >        $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
376  
377 < %.o : $(PackageSourceDir)/%.c
377 > $(PackageParallelTargetDir)/%.o : %.c
378 >        $(Print) $@
379 >        $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@
380 >
381 > ifeq "$(UseMPI)" "yes"
382 > %.o : %.c
383          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
384 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
385 + else
386 + %.o : %.c
387 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
388 + endif
389  
390   # .cpp -> .o
391 < $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.cpp
297 <        $(Print) $@
298 <        $(Print) $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
391 > $(PackageTargetDir)/%.o : %.cpp
392          $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
393  
394 < %.o : $(PackageSourceDir)/%.cpp
394 > $(PackageParallelTargetDir)/%.o : %.cpp
395 >        $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@
396 >
397 > ifeq "$(UseMPI)" "yes"
398 > %.o : %.cpp
399          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
400 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
401 + else
402 + %.o : %.cpp
403 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
404 + endif
405  
406   # .f -> .o
407 < $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.f
408 <        $(Print) $@
307 <        $(Print) $(FortranCompiler) $(FortranOptions) -c $< -o $@
308 <        @$(FortranCompiler) $(FortranOptions) -c $< -o $@
407 > $(PackageTargetDir)/%.o : %.f
408 >        $(FortranCompiler) $(FortranOptions) -c $< -o $@
409  
410 < %.o : $(PackageSourceDir)/%.f
410 > $(PackageParallelTargetDir)/%.o : %.f
411 >        $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@
412 >
413 > ifeq "$(UseMPI)" "yes"
414 > %.o : %.f
415          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
416 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
417 + else
418 + %.o : %.f
419 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
420 + endif
421  
422   # .F90 -> .o
423 < $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.F90
424 <        $(Print) $@
425 <        $(Print) $(F90Compiler) $(F90Options) -c $< -o $@
426 <        @$(F90Compiler) $(F90Options) -c $< -o $@
423 > $(PackageTargetDir)/%.o : %.F90
424 >        $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
425 >        if test -n "`ls *.$(ModSuffix)`"; then \
426 >          $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
427 >        fi
428  
429 < %.o : $(PackageSourceDir)/%.F90
429 > $(PackageParallelTargetDir)/%.o : %.F90
430 >        $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
431 >        if test -n "`ls *.$(ModSuffix)`"; then \
432 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
433 >        fi
434 >
435 > ifeq "$(UseMPI)" "yes"
436 > %.o : %.F90
437          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
438 +        if test -n "`ls *.$(ModSuffix)`"; then\
439 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
440 +        fi
441  
442 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
443 +        if test -n "`ls *.$(ModSuffix)`"; then\
444 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
445 +        fi
446 +
447 + else
448 + %.o : %.F90
449 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
450 +        if test -n "`ls *.$(ModSuffix)`"; then\
451 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
452 +        fi
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 < # Executable
550 < $(Executable) : $(ObjectFiles)
551 <        $(Print) $@
552 <        $(Print) $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@
433 <        $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@
549 > document :
550 >        $(Print) Generate Documentation for OOPSE-2.0
551 >        @cd $(DEV_ROOT)/src    
552 >        $(Doxygen) $(DEV_ROOT)/make/Doxyfile
553  
554 < $(ParallelExecutable) : $(ParallelObjectFiles)
555 <        $(Print) $@
556 <        $(Print) $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ParallelObjectFiles) -o $@
557 <        $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ParallelObjectFiles) -o $@
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) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir)
573 +        $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
574 +
575 + $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) $(BinDir)
576 +        $(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@
577 +
578   # Anything else is just copied from source to target
579   $(PackageTargetDir)/% : $(PackageSourceDir)/%
580          $(Print) $@
# 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 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' -MM $(CppFiles)>> Make.cpptemp
656 >        @cat Make.cpptemp  >> $(DependencyFile)
657 >        $(Delete) Make.cpptemp
658 >
659 >  ifeq "$(UseMPI)" "yes"
660 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CppFiles)>> Make.cpptemp
661 >        @cat Make.cpptemp  >> $(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 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/'  -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
669 >        @cat Make.ctemp  >> $(DependencyFile)
670 >        $(Delete) Make.ctemp
671  
672 +  ifeq "$(UseMPI)" "yes"
673 +        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
674 +        @cat Make.ctemp  >> $(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) -MM -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) -MM -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