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 1546 by tim, Fri Oct 8 23:15:07 2004 UTC vs.
Revision 2960 by gezelter, Wed Jul 26 21:00:44 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 >        hydrodynamics \
56 >        openbabel\
57 >        antlr\
58 >        mdParser
59   #packages containing applications
60   Applications = \
61          applications/oopse \
62          applications/dump2Xyz \
63 <        applications/simpleBuilder
63 >        applications/staticProps \
64 >        applications/dynamicProps \
65 >        applications/simpleBuilder \
66 >        applications/randomBuilder \
67 >        applications/nanoRodBuilder \
68 >        applications/nanoparticleBuilder \
69 >        applications/atom2mdin \
70 >        applications/hydrodynamics \
71 >        applications/utilities
72  
73 +
74   Samples = \
75 +        samples/alkane \
76          samples/argon \
77 <        samples/water/dimer \
77 >        samples/cutoff \
78 >        samples/dipole \
79 >        samples/gbljtest \
80 >        samples/lipid \
81 >        samples/metals/EAM \
82 >        samples/metals/EAM/nanoparticle \
83 >        samples/metals/EAM/nanorod \
84 >        samples/metals/Sutton-Chen \
85 >        samples/minimizer \
86 >        samples/shape \
87 >        samples/thermoIntegration/liquid \
88 >        samples/thermoIntegration/solid \
89 >        samples/water/dimer \
90          samples/water/spce \
91          samples/water/ssd \
92          samples/water/ssde \
93 +        samples/water/ssdrf \
94 +        samples/water/ssd-ion \
95          samples/water/tip3p_ice \
96          samples/water/tip4p \
97 <        samples/lipid \
70 <        samples/alkane \
71 <        samples/minimizer \
72 <        samples/metals \
73 <        samples/zcons \
97 >        samples/zcons
98  
99   IncludeDirs = \
100 <        @SPRNG_INC_DIR@ \
101 <        @MPI_INC_DIR@
100 >        @MPI_INC_DIR@ \
101 >        @FFTW_INC_DIR@ \
102 >        @CGAL_INC_DIR@ \
103 >        @ZLIB_INC_DIR@
104  
105   LibraryDirs = \
106 <        @SPRNG_LIB_DIR@ \
107 <        @MPI_LIB_DIR@
106 >        @MPI_LIB_DIR@ \
107 >        @FFTW_LIB_DIR@ \
108 >        @CGAL_LIB_DIR@ \
109 >        @ZLIB_LIB_DIR@
110  
111   Libraries = \
112 <        @SPRNG_LIB@ \
112 >        @LIBS@ \
113          @MPI_LIB@ \
114 <        @MPI_F90_LIB@
114 >        @MPI_F90_LIB@ \
115 >        @FFTW_LIBS@ \
116 >        @CGAL_LIBS@ \
117 >        @ZLIB@
118  
119   OopseHome       = @OOPSE_HOME@
120 < ForceParamDir   = @OOPSE_HOME@/share/forceFields
121 < SampleSimDir    = @OOPSE_HOME@/share/samples
122 < InstallBinDir   = @OOPSE_HOME@/bin
123 < DocDir          = @OOPSE_HOME@/doc
120 > ForceParamDir   = $(OopseHome)/share/forceFields
121 > SampleSimDir    = $(OopseHome)/share/samples
122 > InstallBinDir   = $(OopseHome)/bin
123 > DocDir          = $(OopseHome)/doc
124   FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
125   F90Declare      = -D__FORTRAN90
126 + UseSingle       = @USE_SINGLE_PRECISION@
127 + ifeq "$(UseSingle)" "yes"
128 + SingleDeclare   = -DSINGLE_PRECISION
129 + else
130 + SingleDeclare   =
131 + endif
132   ParallelDeclare = -DIS_MPI
133 + SinglePrecision = -DSINGLE_PRECISION
134   UseMPI          = @USE_MPI@
135   ModuleCase      = @F90_MODULE_NAMES@
136   ModSuffix       = @MOD@
137   LinkOptions = \
138 <        @F90LIBS@
138 >        @LDFLAGS@ \
139 >        @FCLIBS@ \
140 >        @CXXFLAGS@
141 >        
142  
143   ParallelLinkOptions = \
144 <        @F90LIBS@
144 >        @LDFLAGS@ \
145 >        @FCLIBS@ \
146 >        @CXXFLAGS@
147  
148  
149   #---------------------------------------------------------------------------
# Line 114 | Line 157 | BinDir            = $(DEV_ROOT)/bin
157   ParallelTargetDir = $(DEV_ROOT)/MPIobj
158   LibDir            = $(DEV_ROOT)/lib
159   MakeDir           = $(DEV_ROOT)/make
160 + MainMakefile      = $(MakeDir)/Makefile
161   BinDir            = $(DEV_ROOT)/bin
162   DocsDir           = $(DEV_ROOT)/docs
163   CurrentDir        = $(CURDIR)
# Line 125 | Line 169 | Package          = $(subst $(shell cd $(SourceDir); pw
169   # /home/maul/gezelter/src/code/src/UseTheForce/Darkside --> UseTheForce/Darkside
170   #Package          = $(shell echo $(CurrentDir) | sed -e 's/^.*\/src\/\(.*\)/\1/g')
171   #use shell script to get the absolute path and then rip it off from $(CurrentDir)
172 < Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
172 > #Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
173 > # REMINDER: We are now using the Package line in each subdir makefile.
174 > # This avoids the strange path problem and the subshell
175  
176   PackageList              = $(Package)
177   PackageSourceDir         = $(SourceDir)/$(Package)
# Line 203 | Line 249 | OtherTargetFiles       = $(OtherSourceFiles:%=$(Packag
249                           $(LexFiles:%.l=     %.c)
250  
251   OtherTargetFiles       = $(OtherSourceFiles:%=$(PackageTargetDir)/%)
252 +
253 + ###########################################################################
254 + #
255 + # Figure out the names of the module files based on some work done by
256 + # configure.  The tr function below is from John Graham-Cumming
257 + # (http://www.jgc.org).
258 + #
259 + # The tr function.   Has three arguments:
260 + #
261 + # $1   The list of characters to translate from
262 + # $2   The list of characters to translate to
263 + # $3   The text to translate
264 + #
265 + # For example, $(call tr,A B C,1 2 3,CAPITAL) becomes 21PIT1L.
266  
267 + tr = $(eval __t := $3)                                                    \
268 +     $(foreach c,                                                         \
269 +         $(join $(addsuffix :,$1),$2),                                    \
270 +         $(eval __t :=                                                    \
271 +             $(subst $(word 1,$(subst :, ,$c)),$(word 2,$(subst :, ,$c)), \
272 +                 $(__t))))$(__t)
273 +
274 + # Common character classes for use with the tr function.  Each of
275 + # these is actually a variable declaration and must be wrapped with
276 + # $() or ${} to be used.
277 +
278 + [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 #
279 + [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 #
280 + [0-9] := 0 1 2 3 4 5 6 7 8 9 #
281 + [A-F] := A B C D E F #
282 +
283 + # Figure out whether we have $(eval) or not (GNU Make 3.80 and above)
284 + # if we do not then we need to use the shell version of tr, and not the
285 + # faster tr function above:
286 +
287 + __have_eval := $(false)
288 + __ignore := $(eval __have_eval := $(true))
289 +
290 + ifndef __have_eval
291 +  uc = $(shell echo $1 | tr "a-z" "A-Z")
292 +  lc = $(shell echo $1 | tr "A-Z" "a-z")
293 + else
294 +  uc = $(call tr,$([a-z]),$([A-Z]),$1)
295 +  lc = $(call tr,$([A-Z]),$([a-z]),$1)
296 + endif
297 +
298 + # OK, now we can actually use these functions to figure out the names
299 + # of the module files:
300 +
301 + ifneq "$(words $(Modules))" "0"
302 + ifeq "$(ModuleCase)" "UPPER"
303 +  MODULES = $(call uc,$(Modules))
304 + else
305 +  ifeq "$(ModuleCase)" "lower"
306 +    MODULES = $(call lc,$(Modules))
307 +  else
308 +    MODULES = $(Modules)
309 +  endif
310 + endif
311 +  ModuleFiles = $(MODULES:%= $(PackageTargetDir)/%.$(ModSuffix))
312 +  ParallelModuleFiles = $(MODULES:%= $(PackageParallelTargetDir)/%.$(ModSuffix))
313 + endif
314 + #
315 + ###########################################################################
316 +
317   ThirdPartyJarsTmp = $(patsubst %,$(LibDir)/%,$(JavaLibraries))
318   ThirdPartyJars    = $(subst $(Space),$(X),$(ThirdPartyJarsTmp))
319  
# Line 215 | Line 325 | ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))
325   #if Main is defined, do not build library. It may not be true sometimes
326   ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))" "0"
327    DependencyFile    = $(PackageSourceDir)/Makedepend
328 <  ifneq "$(Main)" ""
328 >  ifneq "$(words $(Main))" "0"
329      Executable             = $(BinDir)/$(Main)
330 <    ParallelExecutable     = $(BinDir)/$(Main)_MPI
330 >    ifeq "$(BuiltParallelExe)" "1"
331 >      ParallelExecutable     = $(BinDir)/$(Main)_MPI
332 >    endif
333    else
334      SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.so
335      StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.a
# Line 247 | Line 359 | Move                   = mv
359   #
360   #---------------------------------------------------------------------------
361   Print                  = @echo
362 < Move                   = mv
362 > Move                   = mv -f
363   Copy                   = cp
364   CCompiler              = @CC@
365   CppCompiler            = @CXX@
366   Linker                 = @CXX@
367   MakeDepend             = makedepend
368 < Install                = @INSTALL@
368 > LN_S                   = @LN_S@
369 > INSTALL                = @INSTALL@
370 > EGREP                  = @EGREP@
371   InstallProgram         = @INSTALL_PROGRAM@
372 + InstallScript          = @INSTALL_SCRIPT@
373   InstallData            = @INSTALL_DATA@
374 < MkDir                = @MKINSTALLDIRS@
375 < Delete                 = rm -fr
374 > MkDir                  = @MKINSTALLDIRS@
375 > Delete                 = rm -f
376   StaticArchiver         = @AR@
377   DynamicArchiver        = @CC@
378   FortranCompiler        = @FC@
264 – F90Compiler            = @F90@
379   JavaCompiler           = $(JAVA_HOME)/bin/javac
380   JavaArchiver           = $(JAVA_HOME)/bin/jar
381   JarSigner              = $(JAVA_HOME)/bin/jarsigner
# Line 285 | Line 399 | COptions               = $(FrcDeclare)
399   JniOptions             =
400   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
401                           -sourcepath $(SourceDir)
402 < COptions               = $(FrcDeclare)
403 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
404 < CppOptions             = $(FrcDeclare)
405 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
406 < FortranOptions         =
407 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir)
408 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
402 > COptions               = $(FrcDeclare) $(SingleDeclare) @CFLAGS@
403 > CParallelOptions       = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CFLAGS@
404 > CppOptions             = $(FrcDeclare) $(SingleDeclare) @CXXFLAGS@
405 > CppParallelOptions     = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CXXFLAGS@
406 > ifeq "$(UseSingle)" "yes"
407 > FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @PREPDEFFLAG@$(SingleDeclare) @FCFLAGS_SRCEXT@
408 > FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(SingleDeclare) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@
409 > else
410 > FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@
411 > FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@
412 > endif
413   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
414                           -sourcepath $(SourceDir) -deprecation
415   JavaRunOptions         = -classpath $(ClassPath)
# Line 328 | Line 446 | ifneq "$(words $(Main))" "0"
446    InstallCommand           = $(InstallData)
447   endif
448  
449 + ifneq "$(words $(ScriptFiles))" "0"
450 +  MyInstallDir             = $(InstallBinDir)
451 +  InstallFiles             = $(ScriptFiles)
452 +  InstallCommand           = $(InstallProgram)
453 + endif
454 +
455   ifneq "$(words $(Main))" "0"
456    MyInstallDir             = $(InstallBinDir)
457    ifeq "$(UseMPI)" "yes"
# Line 336 | Line 460 | endif
460      InstallFiles             = $(Executable)
461    endif
462    InstallCommand           = $(InstallProgram)
463 +  ifneq "$(words $(LinkTargets))" "0"
464 +    MyLinkSource = $(patsubst %, $(MyInstallDir)/%,$(Main))
465 +    MyLinkTargets = $(patsubst %, $(MyInstallDir)/%,$(LinkTargets))
466 +  endif
467   endif
468  
469   ifneq "$(words $(ForcefieldFiles))" "0"
# Line 366 | Line 494 | $(PackageTargetDir) :
494  
495   # Create target directory
496   $(PackageTargetDir) :
497 <        $(MakeDir) $@
497 >        $(MkDir) $@
498  
499 + $(BinDir) :
500 +        $(MkDir) $@
501 +
502   # .c -> .o
503 < $(PackageTargetDir)/%.o : %.c
503 > $(PackageTargetDir)/%.o : %.c $(MainMakefile)
504          $(Print) $@
505          $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
506  
507 < $(PackageParallelTargetDir)/%.o : %.c
507 > $(PackageParallelTargetDir)/%.o : %.c $(MainMakefile)
508          $(Print) $@
509          $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@
510  
511   ifeq "$(UseMPI)" "yes"
512 < %.o : %.c
512 > %.o : %.c $(MainMakefile)
513          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
514          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
515   else
516 < %.o : %.c
516 > %.o : %.c $(MainMakefile)
517          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
518   endif
519  
520   # .cpp -> .o
521 < $(PackageTargetDir)/%.o : %.cpp
521 > $(PackageTargetDir)/%.o : %.cpp $(MainMakefile)
522          $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
523  
524 < $(PackageParallelTargetDir)/%.o : %.cpp
524 > $(PackageParallelTargetDir)/%.o : %.cpp $(MainMakefile)
525          $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@
526  
527   ifeq "$(UseMPI)" "yes"
528 < %.o : %.cpp
528 > %.o : %.cpp $(MainMakefile)
529          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
530          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
531   else
532 < %.o : %.cpp
532 > %.o : %.cpp $(MainMakefile)
533          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
534   endif
535  
536   # .f -> .o
537 < $(PackageTargetDir)/%.o : %.f
537 > $(PackageTargetDir)/%.o : %.f $(MainMakefile)
538          $(FortranCompiler) $(FortranOptions) -c $< -o $@
539  
540 < $(PackageParallelTargetDir)/%.o : %.f
540 > $(PackageParallelTargetDir)/%.o : %.f $(MainMakefile)
541          $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@
542  
543   ifeq "$(UseMPI)" "yes"
544 < %.o : %.f
544 > %.o : %.f $(MainMakefile)
545          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
546          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
547   else
548 < %.o : %.f
548 > %.o : %.f $(MainMakefile)
549          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
550   endif
551  
552   # .F90 -> .o
553 < $(PackageTargetDir)/%.o : %.F90
554 <        $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
553 > $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
554 >        $(FortranCompiler) $(FortranOptions) $(IncludePath) -c $< -o $@
555 >        if test -n "`ls *.$(ModSuffix)`"; then \
556 >          $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
557 >        fi
558  
559 < $(PackageParallelTargetDir)/%.o : %.F90
560 <        $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
559 > $(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile)
560 >        $(FortranCompiler) $(FortranParallelOptions) $(IncludePath) -c $< -o $@
561 >        if test -n "`ls *.$(ModSuffix)`"; then \
562 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
563 >        fi
564  
565   ifeq "$(UseMPI)" "yes"
566 < %.o : %.F90
566 > %.o : %.F90 $(MainMakefile)
567          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
568 +        if test -n "`ls *.$(ModSuffix)`"; then\
569 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
570 +        fi
571 +
572          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
573 +        if test -n "`ls *.$(ModSuffix)`"; then\
574 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
575 +        fi
576 +
577   else
578 < %.o : %.F90
578 > %.o : %.F90 $(MainMakefile)
579          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
580 +        if test -n "`ls *.$(ModSuffix)`"; then\
581 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
582 +        fi
583   endif
584  
585  
# Line 534 | Line 682 | find_objs = $(shell $(StaticArchiver) -t $(1))
682          $(Doxygen) $(DEV_ROOT)/make/Doxyfile
683  
684   #GUN make funtions to merge the libraries
685 < find_objs = $(shell $(StaticArchiver) -t $(1))
685 > find_objs = $(shell $(StaticArchiver) -t $(1) | $(EGREP) -v "SYMDEF")
686   extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
687   create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
688   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
689   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
690 + do_link = $(shell $(LN_S) $(1) $(2))
691 + all_objs = $(foreach thisLib,$(LibNames), $(call find_objs, $(thisLib)))
692 + all_parallel_objs = $(foreach thisLib,$(ParallelLibNames), $(call find_objs, $(thisLib)))
693 + all_lib_objs = $(patsubst %,$(TargetDir)/%,$(call all_objs))
694 + all_lib_parallel_objs = $(patsubst %,$(ParallelTargetDir)/%,$(call all_parallel_objs))
695  
696   $(CombinedStaticLib) : $(LibDir)/.stamp_UP
697 <        $(Print) create $@      
698 <        $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
697 >        $(Print) creating $@            
698 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_objs)
699          $(Ranlib) $(CombinedStaticLib)
700  
701   $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
702 <        $(Print) create $@
703 <        $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
702 >        $(Print) creating $@
703 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_parallel_objs)
704          $(Ranlib) $(CombinedParallelStaticLib)
705  
706   # Executable
707   $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
708 <        $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(CombinedStaticLib) $(Libraries) -o $@
708 >        if test ! -d $(BinDir); then \
709 >                $(MkDir) $(BinDir) ;\
710 >        fi
711 >        $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
712  
713   $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
714 <        $(Linker) $(ParallelObjectFiles) $(ParallelLinkOptions) $(LibDirs) $(CombinedParallelStaticLib) $(Libraries) -o $@
714 >        if test ! -d $(BinDir); then \
715 >                $(MkDir) $(BinDir) ;\
716 >        fi
717 >        $(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@
718  
719   # Anything else is just copied from source to target
720   $(PackageTargetDir)/% : $(PackageSourceDir)/%
# Line 598 | Line 757 | endif
757          $(Executable)
758   endif
759  
760 + echo : $(PackageListLoop)
761 +        $(Print) Done echo.
762 +
763 + _echoall :
764 +        $(Print) $(Modules)
765  
766   # make clean
767   clean : $(PackageListLoop)
768          $(Print) Done clean.    
769  
770   _cleanall :
771 <        $(Delete) $(ObjectFiles) $(ParallelObjectFiles)
771 >        $(Delete) \
772 >                $(ObjectFiles) \
773 >                $(ModuleFiles) \
774 >                $(ParallelObjectFiles) \
775 >                $(ParallelModuleFiles) \
776 >                $(JarFile) \
777 >                $(SharedLibrary) \
778 >                $(StaticLibrary) \
779 >                $(ParallelSharedLibrary) \
780 >                $(ParallelStaticLibrary) \
781 >                $(CombinedStaticLib) \
782 >                $(CombinedParallelStaticLib)
783  
784   # make distclean
785   distclean : $(PackageListLoop)
786          $(Print) Done clean.    
787  
788 < _distcleanall :
789 <        $(Delete) $(ObjectFiles) \
615 <                  $(ParallelObjectFiles) \
616 <                        $(JarFile) \
617 <                  $(SharedLibrary) \
618 <                  $(StaticLibrary) \
619 <                  $(ParallelSharedLibrary) \
620 <                  $(ParallelStaticLibrary) \
621 <                  $(Executable) \
788 > _distcleanall : _cleanall
789 >        $(Delete) $(Executable) \
790                    $(ParallelExecutable) \
791                    $(DependencyFile)
792  
625 –
793   # make depend
794   depend : $(PackageListLoop)
795          $(Print) Done dependencies.
# Line 634 | Line 801 | ifneq "$(words $(CppFiles))" "0"
801          @cd $(PackageSourceDir)
802  
803   ifneq "$(words $(CppFiles))" "0"
804 <        $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
805 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
804 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' -MM $(CppFiles)>> Make.cpptemp
805 >        @cat Make.cpptemp  >> $(DependencyFile)
806          $(Delete) Make.cpptemp
807 <        $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
808 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
807 >
808 >  ifeq "$(UseMPI)" "yes"
809 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CppFiles)>> Make.cpptemp
810 >        @cat Make.cpptemp  >> $(DependencyFile)
811          @$(Delete) Make.cpptemp
812 +  endif
813 +
814   endif
815  
816   ifneq "$(words $(CFiles))" "0"
817 <        $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
818 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
817 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/'  -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
818 >        @cat Make.ctemp  >> $(DependencyFile)
819          $(Delete) Make.ctemp
820 <        $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
821 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
820 >
821 >  ifeq "$(UseMPI)" "yes"
822 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
823 >        @cat Make.ctemp  >> $(DependencyFile)
824          @$(Delete) Make.ctemp
825 +  endif
826 +
827   endif
828  
829   ifneq "$(words $(F90Files))" "0"
830 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
656 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
830 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
831          @cat Make.ftemp >> $(DependencyFile)
832          @$(Delete) Make.ftemp
833 +
834 +  ifeq "$(UseMPI)" "yes"
835 +        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
836 +        @cat Make.ftemp >> $(DependencyFile)
837 +        @$(Delete) Make.ftemp
838 +  endif
839 +
840   endif
841  
842   # make lib
# Line 676 | Line 857 | _installall : _buildall _installdata
857   install : $(InstallListLoop)
858          $(Print) Done Install
859  
860 < _installall : _buildall _installdata
860 > _installall : _buildall _installdata _installlinks
861  
862   $(MyInstallDir) :
863          $(MkDir) $@
# Line 684 | Line 865 | ifneq "$(words $(InstallFiles))" "0"
865   _installdata :  $(MyInstallDir)
866          $(Print) $(InstallFiles)
867   ifneq "$(words $(InstallFiles))" "0"
868 <        $(InstallData) $(InstallFiles) $(MyInstallDir)
868 >        $(InstallCommand) $(InstallFiles) $(MyInstallDir)
869   endif      
870 <        
870 >
871 > _installlinks :  $(MyInstallDir)
872 > ifneq "$(words $(MyLinkTargets))" "0"
873 >        @cd $(MyInstallDir)
874 >        $(foreach thisLink,$(MyLinkTargets),$(call do_link,$(MyLinkSource),$(thisLink)))
875 > endif      
876 >
877   # make statistics
878   _statisticsall :
879          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
# Line 697 | Line 884 | $(Executable).pure :
884          $(Print) Done statistics.
885  
886   # make pure
887 < $(Executable).pure :
888 <        $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
889 <        $(LibList) $(ObjectFiles) -o $@
887 > #$(Executable).pure :
888 > #       $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
889 > #       $(LibList) $(ObjectFiles) -o $@
890 > #
891 > #pure : $(Executable).pure
892  
704 – pure : $(Executable).pure
705 –
893   #make cvslog
894   cvslog:
895 <        $(DEV_ROOT)/scripts/cvs2cl.pl
895 >        $(DEV_ROOT)/scripts/cvs2cl
896  
897   # Execute
898   _runexe :

Diff Legend

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