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

Comparing trunk/OOPSE-2.0/make/Makefile.in (file contents):
Revision 1514 by tim, Thu Sep 30 15:41:35 2004 UTC vs.
Revision 2067 by gezelter, Tue Mar 1 15:44:45 2005 UTC

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

Diff Legend

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