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

Comparing trunk/OOPSE-4/make/Makefile.in (file contents):
Revision 1535 by gezelter, Wed Oct 6 21:22:43 2004 UTC vs.
Revision 2557 by gezelter, Thu Jan 12 20:19:18 2006 UTC

# Line 38 | Line 38 | PackageLibs = \
38   #packages containing libraries
39   PackageLibs = \
40          utils \
41 +        visitors \
42          math \
43          types \
44          primitives \
44 –        visitors \
45          UseTheForce/DarkSide \
46          UseTheForce \
47          brains \
48          io \
49 <        integrators \
50 <        minimizers \
49 >        integrators\
50          constraints \
51 <        profiling \
51 >        minimizers \
52 >        selection \
53          restraints \
54 <
54 >        lattice \
55 >        openbabel\
56 >        antlr\
57 >        mdParser
58   #packages containing applications
59   Applications = \
60          applications/oopse \
61          applications/dump2Xyz \
62 <        applications/simpleBuilder
62 >        applications/staticProps \
63 >        applications/dynamicProps \
64 >        applications/simpleBuilder\
65 >        applications/nanoRodBuilder \
66 >        applications/atom2mdin
67  
68   Samples = \
69 +        samples/alkane \
70          samples/argon \
71 <        samples/water/dimer \
71 >        samples/cutoff \
72 >        samples/dipole \
73 >        samples/gbljtest \
74 >        samples/lipid \
75 >        samples/metals/EAM \
76 >        samples/metals/EAM/nanoparticle \
77 >        samples/metals/EAM/nanorod \
78 >        samples/metals/Sutton-Chen \
79 >        samples/minimizer \
80 >        samples/shape \
81 >        samples/thermoIntegration/liquid \
82 >        samples/thermoIntegration/solid \
83 >        samples/water/dimer \
84          samples/water/spce \
85          samples/water/ssd \
86          samples/water/ssde \
87 +        samples/water/ssdrf \
88 +        samples/water/ssd-ion \
89          samples/water/tip3p_ice \
90          samples/water/tip4p \
91 <        samples/lipid \
70 <        samples/alkane \
71 <        samples/minimizer \
72 <        samples/metals \
73 <        samples/zcons \
91 >        samples/zcons
92  
93   IncludeDirs = \
94 <        @SPRNG_INC_DIR@ \
95 <        @MPI_INC_DIR@
94 >        @CGAL_INC_DIR@ \
95 >        @MPI_INC_DIR@
96  
97   LibraryDirs = \
98 <        @SPRNG_LIB_DIR@ \
98 >        @CGAL_LIB_DIR@ \
99          @MPI_LIB_DIR@
100  
101   Libraries = \
102 <        @SPRNG_LIB@ \
102 >        @LIBS@ \
103 >        @CGAL_LIBS@ \
104          @MPI_LIB@ \
105 <        @MPI_F90_LIB@
105 >        @MPI_F90_LIB@
106  
107   OopseHome       = @OOPSE_HOME@
108 < ForceParamDir   = @OOPSE_HOME@/share/forceFields/
109 < SampleSimDir    = @OOPSE_HOME@/share/samples/
108 > ForceParamDir   = $(OopseHome)/share/forceFields
109 > SampleSimDir    = $(OopseHome)/share/samples
110 > InstallBinDir   = $(OopseHome)/bin
111 > DocDir          = $(OopseHome)/doc
112   FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
113   F90Declare      = -D__FORTRAN90
114   ParallelDeclare = -DIS_MPI
# Line 95 | Line 116 | LinkOptions = \
116   ModuleCase      = @F90_MODULE_NAMES@
117   ModSuffix       = @MOD@
118   LinkOptions = \
119 <        @F90LIBS@
119 >        @FCLIBS@
120  
121   ParallelLinkOptions = \
122 <        @F90LIBS@
122 >        @FCLIBS@
123  
124  
125   #---------------------------------------------------------------------------
# Line 112 | Line 133 | BinDir            = $(DEV_ROOT)/bin
133   ParallelTargetDir = $(DEV_ROOT)/MPIobj
134   LibDir            = $(DEV_ROOT)/lib
135   MakeDir           = $(DEV_ROOT)/make
136 + MainMakefile      = $(MakeDir)/Makefile
137   BinDir            = $(DEV_ROOT)/bin
138   DocsDir           = $(DEV_ROOT)/docs
139   CurrentDir        = $(CURDIR)
# Line 123 | Line 145 | Package          = $(subst $(shell cd $(SourceDir); pw
145   # /home/maul/gezelter/src/code/src/UseTheForce/Darkside --> UseTheForce/Darkside
146   #Package          = $(shell echo $(CurrentDir) | sed -e 's/^.*\/src\/\(.*\)/\1/g')
147   #use shell script to get the absolute path and then rip it off from $(CurrentDir)
148 < Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
148 > #Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
149 > # REMINDER: We are now using the Package line in each subdir makefile.
150 > # This avoids the strange path problem and the subshell
151  
152   PackageList              = $(Package)
153   PackageSourceDir         = $(SourceDir)/$(Package)
# Line 201 | Line 225 | OtherTargetFiles       = $(OtherSourceFiles:%=$(Packag
225                           $(LexFiles:%.l=     %.c)
226  
227   OtherTargetFiles       = $(OtherSourceFiles:%=$(PackageTargetDir)/%)
228 +
229 + ###########################################################################
230 + #
231 + # Figure out the names of the module files based on some work done by
232 + # configure.  The tr function below is from John Graham-Cumming
233 + # (http://www.jgc.org).
234 + #
235 + # The tr function.   Has three arguments:
236 + #
237 + # $1   The list of characters to translate from
238 + # $2   The list of characters to translate to
239 + # $3   The text to translate
240 + #
241 + # For example, $(call tr,A B C,1 2 3,CAPITAL) becomes 21PIT1L.
242 +
243 + tr = $(eval __t := $3)                                                    \
244 +     $(foreach c,                                                         \
245 +         $(join $(addsuffix :,$1),$2),                                    \
246 +         $(eval __t :=                                                    \
247 +             $(subst $(word 1,$(subst :, ,$c)),$(word 2,$(subst :, ,$c)), \
248 +                 $(__t))))$(__t)
249 +
250 + # Common character classes for use with the tr function.  Each of
251 + # these is actually a variable declaration and must be wrapped with
252 + # $() or ${} to be used.
253 +
254 + [A-Z] := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z #
255 + [a-z] := a b c d e f g h i j k l m n o p q r s t u v w x y z #
256 + [0-9] := 0 1 2 3 4 5 6 7 8 9 #
257 + [A-F] := A B C D E F #
258 +
259 + # Figure out whether we have $(eval) or not (GNU Make 3.80 and above)
260 + # if we do not then we need to use the shell version of tr, and not the
261 + # faster tr function above:
262 +
263 + __have_eval := $(false)
264 + __ignore := $(eval __have_eval := $(true))
265 +
266 + ifndef __have_eval
267 +  uc = $(shell echo $1 | tr "a-z" "A-Z")
268 +  lc = $(shell echo $1 | tr "A-Z" "a-z")
269 + else
270 +  uc = $(call tr,$([a-z]),$([A-Z]),$1)
271 +  lc = $(call tr,$([A-Z]),$([a-z]),$1)
272 + endif
273  
274 + # OK, now we can actually use these functions to figure out the names
275 + # of the module files:
276 +
277 + ifneq "$(words $(Modules))" "0"
278 + ifeq "$(ModuleCase)" "UPPER"
279 +  MODULES = $(call uc,$(Modules))
280 + else
281 +  ifeq "$(ModuleCase)" "lower"
282 +    MODULES = $(call lc,$(Modules))
283 +  else
284 +    MODULES = $(Modules)
285 +  endif
286 + endif
287 +  ModuleFiles = $(MODULES:%= $(PackageTargetDir)/%.$(ModSuffix))
288 +  ParallelModuleFiles = $(MODULES:%= $(PackageParallelTargetDir)/%.$(ModSuffix))
289 + endif
290 + #
291 + ###########################################################################
292 +
293   ThirdPartyJarsTmp = $(patsubst %,$(LibDir)/%,$(JavaLibraries))
294   ThirdPartyJars    = $(subst $(Space),$(X),$(ThirdPartyJarsTmp))
295  
# Line 213 | Line 301 | ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))
301   #if Main is defined, do not build library. It may not be true sometimes
302   ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))" "0"
303    DependencyFile    = $(PackageSourceDir)/Makedepend
304 <  ifneq "$(Main)" ""
304 >  ifneq "$(words $(Main))" "0"
305      Executable             = $(BinDir)/$(Main)
306 <    ParallelExecutable     = $(BinDir)/$(Main)_MPI
306 >    ifeq "$(BuiltParallelExe)" "1"
307 >      ParallelExecutable     = $(BinDir)/$(Main)_MPI
308 >    endif
309    else
310      SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.so
311      StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.a
# Line 223 | Line 313 | endif
313      ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.a
314    endif
315   endif
316 +
317   #
318   # Misc
319   #
# Line 244 | Line 335 | Move                   = mv
335   #
336   #---------------------------------------------------------------------------
337   Print                  = @echo
338 < Move                   = mv
338 > Move                   = mv -f
339   Copy                   = cp
340   CCompiler              = @CC@
341   CppCompiler            = @CXX@
342   Linker                 = @CXX@
343   MakeDepend             = makedepend
344 < Install                = @INSTALL@
344 > LN_S                   = @LN_S@
345 > INSTALL                = @INSTALL@
346 > EGREP                  = @EGREP@
347   InstallProgram         = @INSTALL_PROGRAM@
348 + InstallScript          = @INSTALL_SCRIPT@
349   InstallData            = @INSTALL_DATA@
350 < MakeDir                = @MKINSTALLDIRS@
351 < Delete                 = rm -fr
350 > MkDir                  = @MKINSTALLDIRS@
351 > Delete                 = rm -f
352   StaticArchiver         = @AR@
353   DynamicArchiver        = @CC@
354   FortranCompiler        = @FC@
261 – F90Compiler            = @F90@
355   JavaCompiler           = $(JAVA_HOME)/bin/javac
356   JavaArchiver           = $(JAVA_HOME)/bin/jar
357   JarSigner              = $(JAVA_HOME)/bin/jarsigner
# Line 272 | Line 365 | Ranlib                 = @RANLIB@
365   Yacc                   = @YACC@
366   Lex                    = @LEX@
367   Ranlib                 = @RANLIB@
368 + Doxygen                = @DOXYGEN@
369  
276 –
370   MakeOptions            = -k
371   MakeDependOptions      =
372   StaticArchiverOptions  = rc
# Line 282 | Line 375 | COptions               = $(FrcDeclare)
375   JniOptions             =
376   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
377                           -sourcepath $(SourceDir)
378 < COptions               = $(FrcDeclare)
379 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
380 < CppOptions             = $(FrcDeclare)
381 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
382 < FortranOptions         =
383 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir)
291 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
378 > COptions               = $(FrcDeclare) @CFLAGS@
379 > CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
380 > CppOptions             = $(FrcDeclare) @CXXFLAGS@
381 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
382 > FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@
383 > FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclar) @FCFLAGS_SRCEXT@
384   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
385                           -sourcepath $(SourceDir) -deprecation
386   JavaRunOptions         = -classpath $(ClassPath)
# Line 314 | Line 406 | Space                  = $(Empty) $(Empty)
406  
407   #---------------------------------------------------------------------------
408   #
409 + #  Install
410 + #
411 + #---------------------------------------------------------------------------
412 +
413 + ifneq "$(words $(SampleFiles))" "0"
414 +  MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
415 +  MyInstallDir             = $(SampleSimDir)/$(MySample)
416 +  InstallFiles             = $(SampleFiles)
417 +  InstallCommand           = $(InstallData)
418 + endif
419 +
420 + ifneq "$(words $(Main))" "0"
421 +  MyInstallDir             = $(InstallBinDir)
422 +  ifeq "$(UseMPI)" "yes"
423 +    InstallFiles             = $(Executable) $(ParallelExecutable)
424 +  else
425 +    InstallFiles             = $(Executable)
426 +  endif
427 +  InstallCommand           = $(InstallProgram)
428 +  ifneq "$(words $(LinkTargets))" "0"
429 +    MyLinkSource = $(patsubst %, $(MyInstallDir)/%,$(Main))
430 +    MyLinkTargets = $(patsubst %, $(MyInstallDir)/%,$(LinkTargets))
431 +  endif
432 + endif
433 +
434 + ifneq "$(words $(ForcefieldFiles))" "0"
435 +  MyInstallDir             = $(ForceParamDir)
436 +  InstallFiles             = $(ForcefieldFiles)
437 +  InstallCommand           = $(InstallData)
438 + endif
439 +
440 + ifneq "$(words $(InstallFiles))" "0"
441 +  InstallList            =
442 + else
443 +  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(DEV_ROOT)/forceFields $(patsubst %, $(SourceDir)/%,$(Applications))
444 + endif
445 +
446 + InstallListLoop          = $(patsubst %,$(SourceDir)/%/.install,$(PackageList))  $(patsubst %,%/.install,$(InstallList))
447 +
448 +
449 +
450 + #---------------------------------------------------------------------------
451 + #
452   # Rules
453   #
454   #---------------------------------------------------------------------------
# Line 324 | Line 459 | $(PackageTargetDir) :
459  
460   # Create target directory
461   $(PackageTargetDir) :
462 <        $(MakeDir) $@
462 >        $(MkDir) $@
463 >
464 > $(BinDir) :
465 >        $(MkDir) $@
466  
467   # .c -> .o
468 < $(PackageTargetDir)/%.o : %.c
468 > $(PackageTargetDir)/%.o : %.c $(MainMakefile)
469          $(Print) $@
470          $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
471  
472 < $(PackageParallelTargetDir)/%.o : %.c
472 > $(PackageParallelTargetDir)/%.o : %.c $(MainMakefile)
473          $(Print) $@
474          $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@
475  
476   ifeq "$(UseMPI)" "yes"
477 < %.o : %.c
477 > %.o : %.c $(MainMakefile)
478          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
479          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
480   else
481 < %.o : %.c
481 > %.o : %.c $(MainMakefile)
482          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
483   endif
484  
485   # .cpp -> .o
486 < $(PackageTargetDir)/%.o : %.cpp
486 > $(PackageTargetDir)/%.o : %.cpp $(MainMakefile)
487          $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
488  
489 < $(PackageParallelTargetDir)/%.o : %.cpp
489 > $(PackageParallelTargetDir)/%.o : %.cpp $(MainMakefile)
490          $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@
491  
492   ifeq "$(UseMPI)" "yes"
493 < %.o : %.cpp
493 > %.o : %.cpp $(MainMakefile)
494          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
495          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
496   else
497 < %.o : %.cpp
497 > %.o : %.cpp $(MainMakefile)
498          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
499   endif
500  
501   # .f -> .o
502 < $(PackageTargetDir)/%.o : %.f
502 > $(PackageTargetDir)/%.o : %.f $(MainMakefile)
503          $(FortranCompiler) $(FortranOptions) -c $< -o $@
504  
505 < $(PackageParallelTargetDir)/%.o : %.f
505 > $(PackageParallelTargetDir)/%.o : %.f $(MainMakefile)
506          $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@
507  
508   ifeq "$(UseMPI)" "yes"
509 < %.o : %.f
509 > %.o : %.f $(MainMakefile)
510          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
511          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
512   else
513 < %.o : %.f
513 > %.o : %.f $(MainMakefile)
514          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
515   endif
516  
517   # .F90 -> .o
518 < $(PackageTargetDir)/%.o : %.F90
519 <        $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
518 > $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
519 >        $(FortranCompiler) $(FortranOptions) $(IncludePath) -c $< -o $@
520 >        if test -n "`ls *.$(ModSuffix)`"; then \
521 >          $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
522 >        fi
523  
524 < $(PackageParallelTargetDir)/%.o : %.F90
525 <        $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
524 > $(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile)
525 >        $(FortranCompiler) $(FortranParallelOptions) $(IncludePath) -c $< -o $@
526 >        if test -n "`ls *.$(ModSuffix)`"; then \
527 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
528 >        fi
529  
530   ifeq "$(UseMPI)" "yes"
531 < %.o : %.F90
531 > %.o : %.F90 $(MainMakefile)
532          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
533 +        if test -n "`ls *.$(ModSuffix)`"; then\
534 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
535 +        fi
536 +
537          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
538 +        if test -n "`ls *.$(ModSuffix)`"; then\
539 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
540 +        fi
541 +
542   else
543 < %.o : %.F90
543 > %.o : %.F90 $(MainMakefile)
544          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
545 +        if test -n "`ls *.$(ModSuffix)`"; then\
546 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
547 +        fi
548   endif
549  
550  
# Line 486 | Line 641 | $(PackageTargetDir)/%_Skel.class : $(PackageTargetDir)
641   %_Skel.class : %.class
642          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
643  
644 + document :
645 +        $(Print) Generate Documentation for OOPSE-2.0
646 +        @cd $(DEV_ROOT)/src    
647 +        $(Doxygen) $(DEV_ROOT)/make/Doxyfile
648 +
649   #GUN make funtions to merge the libraries
650 < find_objs = $(shell $(StaticArchiver) -t $(1))
650 > find_objs = $(shell $(StaticArchiver) -t $(1) | $(EGREP) -v "SYMDEF")
651   extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
652   create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
653   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
654   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
655 + do_link = $(shell $(LN_S) $(1) $(2))
656 + all_objs = $(foreach thisLib,$(LibNames), $(call find_objs, $(thisLib)))
657 + all_parallel_objs = $(foreach thisLib,$(ParallelLibNames), $(call find_objs, $(thisLib)))
658 + all_lib_objs = $(patsubst %,$(TargetDir)/%,$(call all_objs))
659 + all_lib_parallel_objs = $(patsubst %,$(ParallelTargetDir)/%,$(call all_parallel_objs))
660  
661   $(CombinedStaticLib) : $(LibDir)/.stamp_UP
662 <        $(Print) create $@      
663 <        $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
662 >        $(Print) creating $@            
663 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_objs)
664          $(Ranlib) $(CombinedStaticLib)
665  
666   $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
667 <        $(Print) create $@
668 <        $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
667 >        $(Print) creating $@
668 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_parallel_objs)
669          $(Ranlib) $(CombinedParallelStaticLib)
670  
671   # Executable
672   $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
673 <        $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(CombinedStaticLib) $(Libraries) -o $@
673 >        if test ! -d $(BinDir); then \
674 >                $(MkDir) $(BinDir) ;\
675 >        fi
676 >        $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
677  
678   $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
679 <        $(Linker) $(ParallelObjectFiles) $(ParallelLinkOptions) $(LibDirs) $(CombinedParallelStaticLib) $(Libraries) -o $@
679 >        if test ! -d $(BinDir); then \
680 >                $(MkDir) $(BinDir) ;\
681 >        fi
682 >        $(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@
683  
684   # Anything else is just copied from source to target
685   $(PackageTargetDir)/% : $(PackageSourceDir)/%
# Line 521 | Line 692 | ifeq "$(UseMPI)" "yes"
692  
693   _all : _buildall
694  
695 + _buildall :
696   ifeq "$(UseMPI)" "yes"
697   _buildall : \
698          $(DependencyFile) \
# Line 550 | Line 722 | endif
722          $(Executable)
723   endif
724  
725 + echo : $(PackageListLoop)
726 +        $(Print) Done echo.
727  
728 + _echoall :
729 +        $(Print) $(Modules)
730 +
731   # make clean
732   clean : $(PackageListLoop)
733          $(Print) Done clean.    
734  
735   _cleanall :
736 <        $(Delete) $(ObjectFiles) $(ParallelObjectFiles)
736 >        $(Delete) \
737 >                $(ObjectFiles) \
738 >                $(ModuleFiles) \
739 >                $(ParallelObjectFiles) \
740 >                $(ParallelModuleFiles) \
741 >                $(JarFile) \
742 >                $(SharedLibrary) \
743 >                $(StaticLibrary) \
744 >                $(ParallelSharedLibrary) \
745 >                $(ParallelStaticLibrary) \
746 >                $(CombinedStaticLib) \
747 >                $(CombinedParallelStaticLib)
748  
749   # make distclean
750   distclean : $(PackageListLoop)
751          $(Print) Done clean.    
752  
753 < _distcleanall :
754 <        $(Delete) $(ObjectFiles) \
567 <                  $(ParallelObjectFiles) \
568 <                        $(JarFile) \
569 <                  $(SharedLibrary) \
570 <                  $(StaticLibrary) \
571 <                  $(ParallelSharedLibrary) \
572 <                  $(ParallelStaticLibrary) \
573 <                  $(Executable) \
753 > _distcleanall : _cleanall
754 >        $(Delete) $(Executable) \
755                    $(ParallelExecutable) \
756                    $(DependencyFile)
757  
577 –
758   # make depend
759   depend : $(PackageListLoop)
760          $(Print) Done dependencies.
# Line 586 | Line 766 | ifneq "$(words $(CppFiles))" "0"
766          @cd $(PackageSourceDir)
767  
768   ifneq "$(words $(CppFiles))" "0"
769 <        $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
770 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
769 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' -MM $(CppFiles)>> Make.cpptemp
770 >        @cat Make.cpptemp  >> $(DependencyFile)
771          $(Delete) Make.cpptemp
772 <        $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
773 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
774 <        $(Delete) Make.cpptemp
772 >
773 >  ifeq "$(UseMPI)" "yes"
774 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CppFiles)>> Make.cpptemp
775 >        @cat Make.cpptemp  >> $(DependencyFile)
776 >        @$(Delete) Make.cpptemp
777 >  endif
778 >
779   endif
780  
781   ifneq "$(words $(CFiles))" "0"
782 <        $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
783 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
782 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/'  -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
783 >        @cat Make.ctemp  >> $(DependencyFile)
784          $(Delete) Make.ctemp
785 <        $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
786 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
787 <        $(Delete) Make.ctemp
785 >
786 >  ifeq "$(UseMPI)" "yes"
787 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
788 >        @cat Make.ctemp  >> $(DependencyFile)
789 >        @$(Delete) Make.ctemp
790 >  endif
791 >
792   endif
793  
794   ifneq "$(words $(F90Files))" "0"
795 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare)  $(F90Files) > Make.ftemp
796 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare)  $(F90Files) >> Make.ftemp
797 <        cat Make.ftemp >> $(DependencyFile)
798 <        $(Delete) Make.ftemp
795 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
796 >        @cat Make.ftemp >> $(DependencyFile)
797 >        @$(Delete) Make.ftemp
798 >
799 >  ifeq "$(UseMPI)" "yes"
800 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
801 >        @cat Make.ftemp >> $(DependencyFile)
802 >        @$(Delete) Make.ftemp
803 >  endif
804 >
805   endif
806  
807   # make lib
# Line 621 | Line 815 | jarsign : $(JarFile)
815   jarsign : $(JarFile)
816          $(JarSigner) -keystore GeoSoftKeystore $(JarFile) myself
817  
818 + #make install
819 + %.install :
820 +        @$(MAKE) $(MakeOptions) -C $(subst .install,,$@) _installall    
821 +
822 + install : $(InstallListLoop)
823 +        $(Print) Done Install
824 +
825 + _installall : _buildall _installdata _installlinks
826 +
827 + $(MyInstallDir) :
828 +        $(MkDir) $@
829 +
830 + _installdata :  $(MyInstallDir)
831 +        $(Print) $(InstallFiles)
832 + ifneq "$(words $(InstallFiles))" "0"
833 +        $(InstallCommand) $(InstallFiles) $(MyInstallDir)
834 + endif      
835 +
836 + _installlinks :  $(MyInstallDir)
837 + ifneq "$(words $(MyLinkTargets))" "0"
838 +        @cd $(MyInstallDir)
839 +        $(foreach thisLink,$(MyLinkTargets),$(call do_link,$(MyLinkSource),$(thisLink)))
840 + endif      
841 +
842   # make statistics
843   _statisticsall :
844          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
# Line 631 | Line 849 | $(Executable).pure :
849          $(Print) Done statistics.
850  
851   # make pure
852 < $(Executable).pure :
853 <        $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
854 <        $(LibList) $(ObjectFiles) -o $@
852 > #$(Executable).pure :
853 > #       $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
854 > #       $(LibList) $(ObjectFiles) -o $@
855 > #
856 > #pure : $(Executable).pure
857  
638 – pure : $(Executable).pure
639 –
858   #make cvslog
859   cvslog:
860 <        $(DEV_ROOT)/scripts/cvs2cl.pl
860 >        $(DEV_ROOT)/scripts/cvs2cl
861  
862   # Execute
863   _runexe :

Diff Legend

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