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

Diff Legend

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