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 1544 by tim, Fri Oct 8 22:10:22 2004 UTC vs.
Revision 2550 by tim, Thu Jan 12 15:22:34 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/argon \
70 <        samples/water/dimer \
70 >        samples/water/dimer \
71          samples/water/spce \
72          samples/water/ssd \
73          samples/water/ssde \
74 +        samples/water/ssdrf \
75 +        samples/water/ssd-ion \
76          samples/water/tip3p_ice \
77          samples/water/tip4p \
78          samples/lipid \
79          samples/alkane \
80          samples/minimizer \
81 <        samples/metals \
81 >        samples/metals/EAM \
82 >        samples/metals/EAM/nanoparticle \
83 >        samples/metals/EAM/nanorod \
84 >        samples/metals/Sutton-Chen \
85 >        samples/thermoIntegration/liquid \
86 >        samples/thermoIntegration/solid \
87 >        samples/dipole \
88 >        samples/shape \
89          samples/zcons \
90  
91   IncludeDirs = \
92 <        @SPRNG_INC_DIR@ \
93 <        @MPI_INC_DIR@
92 >        @CGAL_INC_DIR@ \
93 >        @MPI_INC_DIR@
94  
95   LibraryDirs = \
96 <        @SPRNG_LIB_DIR@ \
96 >        @CGAL_LIB_DIR@ \
97          @MPI_LIB_DIR@
98  
99   Libraries = \
100 <        @SPRNG_LIB@ \
100 >        @LIBS@ \
101 >        @CGAL_LIBS@ \
102          @MPI_LIB@ \
103 <        @MPI_F90_LIB@
103 >        @MPI_F90_LIB@
104  
105   OopseHome       = @OOPSE_HOME@
106 < ForceParamDir   = @OOPSE_HOME@/share/forceFields/
107 < SampleSimDir    = @OOPSE_HOME@/share/samples/
108 < BinDir          = @OOPSE_HOME@/bin
109 < DocDir          = @OOPSE_HOME@/doc
106 > ForceParamDir   = $(OopseHome)/share/forceFields
107 > SampleSimDir    = $(OopseHome)/share/samples
108 > InstallBinDir   = $(OopseHome)/bin
109 > DocDir          = $(OopseHome)/doc
110   FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
111   F90Declare      = -D__FORTRAN90
112   ParallelDeclare = -DIS_MPI
# Line 97 | Line 114 | LinkOptions = \
114   ModuleCase      = @F90_MODULE_NAMES@
115   ModSuffix       = @MOD@
116   LinkOptions = \
117 <        @F90LIBS@
117 >        @FCLIBS@
118  
119   ParallelLinkOptions = \
120 <        @F90LIBS@
120 >        @FCLIBS@
121  
122  
123   #---------------------------------------------------------------------------
# Line 114 | Line 131 | BinDir            = $(DEV_ROOT)/bin
131   ParallelTargetDir = $(DEV_ROOT)/MPIobj
132   LibDir            = $(DEV_ROOT)/lib
133   MakeDir           = $(DEV_ROOT)/make
134 + MainMakefile      = $(MakeDir)/Makefile
135   BinDir            = $(DEV_ROOT)/bin
136   DocsDir           = $(DEV_ROOT)/docs
137   CurrentDir        = $(CURDIR)
# Line 125 | Line 143 | Package          = $(subst $(shell cd $(SourceDir); pw
143   # /home/maul/gezelter/src/code/src/UseTheForce/Darkside --> UseTheForce/Darkside
144   #Package          = $(shell echo $(CurrentDir) | sed -e 's/^.*\/src\/\(.*\)/\1/g')
145   #use shell script to get the absolute path and then rip it off from $(CurrentDir)
146 < Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
146 > #Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
147 > # REMINDER: We are now using the Package line in each subdir makefile.
148 > # This avoids the strange path problem and the subshell
149  
150   PackageList              = $(Package)
151   PackageSourceDir         = $(SourceDir)/$(Package)
# Line 203 | Line 223 | OtherTargetFiles       = $(OtherSourceFiles:%=$(Packag
223                           $(LexFiles:%.l=     %.c)
224  
225   OtherTargetFiles       = $(OtherSourceFiles:%=$(PackageTargetDir)/%)
226 +
227 + ###########################################################################
228 + #
229 + # Figure out the names of the module files based on some work done by
230 + # configure.  The tr function below is from John Graham-Cumming
231 + # (http://www.jgc.org).
232 + #
233 + # The tr function.   Has three arguments:
234 + #
235 + # $1   The list of characters to translate from
236 + # $2   The list of characters to translate to
237 + # $3   The text to translate
238 + #
239 + # For example, $(call tr,A B C,1 2 3,CAPITAL) becomes 21PIT1L.
240 +
241 + tr = $(eval __t := $3)                                                    \
242 +     $(foreach c,                                                         \
243 +         $(join $(addsuffix :,$1),$2),                                    \
244 +         $(eval __t :=                                                    \
245 +             $(subst $(word 1,$(subst :, ,$c)),$(word 2,$(subst :, ,$c)), \
246 +                 $(__t))))$(__t)
247 +
248 + # Common character classes for use with the tr function.  Each of
249 + # these is actually a variable declaration and must be wrapped with
250 + # $() or ${} to be used.
251 +
252 + [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 #
253 + [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 #
254 + [0-9] := 0 1 2 3 4 5 6 7 8 9 #
255 + [A-F] := A B C D E F #
256 +
257 + # Figure out whether we have $(eval) or not (GNU Make 3.80 and above)
258 + # if we do not then we need to use the shell version of tr, and not the
259 + # faster tr function above:
260 +
261 + __have_eval := $(false)
262 + __ignore := $(eval __have_eval := $(true))
263  
264 + ifndef __have_eval
265 +  uc = $(shell echo $1 | tr "a-z" "A-Z")
266 +  lc = $(shell echo $1 | tr "A-Z" "a-z")
267 + else
268 +  uc = $(call tr,$([a-z]),$([A-Z]),$1)
269 +  lc = $(call tr,$([A-Z]),$([a-z]),$1)
270 + endif
271 +
272 + # OK, now we can actually use these functions to figure out the names
273 + # of the module files:
274 +
275 + ifneq "$(words $(Modules))" "0"
276 + ifeq "$(ModuleCase)" "UPPER"
277 +  MODULES = $(call uc,$(Modules))
278 + else
279 +  ifeq "$(ModuleCase)" "lower"
280 +    MODULES = $(call lc,$(Modules))
281 +  else
282 +    MODULES = $(Modules)
283 +  endif
284 + endif
285 +  ModuleFiles = $(MODULES:%= $(PackageTargetDir)/%.$(ModSuffix))
286 +  ParallelModuleFiles = $(MODULES:%= $(PackageParallelTargetDir)/%.$(ModSuffix))
287 + endif
288 + #
289 + ###########################################################################
290 +
291   ThirdPartyJarsTmp = $(patsubst %,$(LibDir)/%,$(JavaLibraries))
292   ThirdPartyJars    = $(subst $(Space),$(X),$(ThirdPartyJarsTmp))
293  
# Line 215 | Line 299 | ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))
299   #if Main is defined, do not build library. It may not be true sometimes
300   ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))" "0"
301    DependencyFile    = $(PackageSourceDir)/Makedepend
302 <  ifneq "$(Main)" ""
302 >  ifneq "$(words $(Main))" "0"
303      Executable             = $(BinDir)/$(Main)
304 <    ParallelExecutable     = $(BinDir)/$(Main)_MPI
304 >    ifeq "$(BuiltParallelExe)" "1"
305 >      ParallelExecutable     = $(BinDir)/$(Main)_MPI
306 >    endif
307    else
308      SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.so
309      StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.a
# Line 247 | Line 333 | Move                   = mv
333   #
334   #---------------------------------------------------------------------------
335   Print                  = @echo
336 < Move                   = mv
336 > Move                   = mv -f
337   Copy                   = cp
338   CCompiler              = @CC@
339   CppCompiler            = @CXX@
340   Linker                 = @CXX@
341   MakeDepend             = makedepend
342 < Install                = @INSTALL@
342 > LN_S                   = @LN_S@
343 > INSTALL                = @INSTALL@
344 > EGREP                  = @EGREP@
345   InstallProgram         = @INSTALL_PROGRAM@
346 + InstallScript          = @INSTALL_SCRIPT@
347   InstallData            = @INSTALL_DATA@
348 < MkDir                = @MKINSTALLDIRS@
349 < Delete                 = rm -fr
348 > MkDir                  = @MKINSTALLDIRS@
349 > Delete                 = rm -f
350   StaticArchiver         = @AR@
351   DynamicArchiver        = @CC@
352   FortranCompiler        = @FC@
264 – F90Compiler            = @F90@
353   JavaCompiler           = $(JAVA_HOME)/bin/javac
354   JavaArchiver           = $(JAVA_HOME)/bin/jar
355   JarSigner              = $(JAVA_HOME)/bin/jarsigner
# Line 285 | Line 373 | COptions               = $(FrcDeclare)
373   JniOptions             =
374   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
375                           -sourcepath $(SourceDir)
376 < COptions               = $(FrcDeclare)
377 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
378 < CppOptions             = $(FrcDeclare)
379 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
380 < FortranOptions         =
381 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir)
294 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
376 > COptions               = $(FrcDeclare) @CFLAGS@
377 > CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
378 > CppOptions             = $(FrcDeclare) @CXXFLAGS@
379 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
380 > FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@
381 > FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclar) @FCFLAGS_SRCEXT@
382   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
383                           -sourcepath $(SourceDir) -deprecation
384   JavaRunOptions         = -classpath $(ClassPath)
# Line 322 | Line 409 | MySample                 = $(subst $(shell cd $(DEV_RO
409   #---------------------------------------------------------------------------
410  
411   ifneq "$(words $(SampleFiles))" "0"
412 < MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
413 < MyInstallDir             = $(SampleSimDir)/$(MySample)
414 < InstallFiles             = $(SampleFiles)
415 < InstallCommand           = $(InstallData)
412 >  MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
413 >  MyInstallDir             = $(SampleSimDir)/$(MySample)
414 >  InstallFiles             = $(SampleFiles)
415 >  InstallCommand           = $(InstallData)
416   endif
417  
418   ifneq "$(words $(Main))" "0"
419 < MyInstallDir             = $(BinDir)/
420 < InstallFiles             = $(Executable) $(ParallelExecutable)
421 < InstallCommand           = $(InstallProgram)
419 >  MyInstallDir             = $(InstallBinDir)
420 >  ifeq "$(UseMPI)" "yes"
421 >    InstallFiles             = $(Executable) $(ParallelExecutable)
422 >  else
423 >    InstallFiles             = $(Executable)
424 >  endif
425 >  InstallCommand           = $(InstallProgram)
426 >  ifneq "$(words $(LinkTargets))" "0"
427 >    MyLinkSource = $(patsubst %, $(MyInstallDir)/%,$(Main))
428 >    MyLinkTargets = $(patsubst %, $(MyInstallDir)/%,$(LinkTargets))
429 >  endif
430   endif
431  
432 < ifneq "$(words $(ForcefiledFiles))" "0"
433 < MyInstallDir             = $(ForceParamDir)
434 < InstallFiles             = $(ForcefiledFiles)/
435 < InstallCommand           = $(InstallData)
432 > ifneq "$(words $(ForcefieldFiles))" "0"
433 >  MyInstallDir             = $(ForceParamDir)
434 >  InstallFiles             = $(ForcefieldFiles)
435 >  InstallCommand           = $(InstallData)
436   endif
437  
438   ifneq "$(words $(InstallFiles))" "0"
439    InstallList            =
440   else
441 <  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(patsubst %, $(DEV_ROOT)/%,$(Forcefield)) $(patsubst %, $(SourceDir)/%,$(Applications))
441 >  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(DEV_ROOT)/forceFields $(patsubst %, $(SourceDir)/%,$(Applications))
442   endif
443  
444   InstallListLoop          = $(patsubst %,$(SourceDir)/%/.install,$(PackageList))  $(patsubst %,%/.install,$(InstallList))
# Line 362 | Line 457 | $(PackageTargetDir) :
457  
458   # Create target directory
459   $(PackageTargetDir) :
460 <        $(MakeDir) $@
460 >        $(MkDir) $@
461 >
462 > $(BinDir) :
463 >        $(MkDir) $@
464  
465   # .c -> .o
466 < $(PackageTargetDir)/%.o : %.c
466 > $(PackageTargetDir)/%.o : %.c $(MainMakefile)
467          $(Print) $@
468          $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
469  
470 < $(PackageParallelTargetDir)/%.o : %.c
470 > $(PackageParallelTargetDir)/%.o : %.c $(MainMakefile)
471          $(Print) $@
472          $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@
473  
474   ifeq "$(UseMPI)" "yes"
475 < %.o : %.c
475 > %.o : %.c $(MainMakefile)
476          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
477          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
478   else
479 < %.o : %.c
479 > %.o : %.c $(MainMakefile)
480          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
481   endif
482  
483   # .cpp -> .o
484 < $(PackageTargetDir)/%.o : %.cpp
484 > $(PackageTargetDir)/%.o : %.cpp $(MainMakefile)
485          $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
486  
487 < $(PackageParallelTargetDir)/%.o : %.cpp
487 > $(PackageParallelTargetDir)/%.o : %.cpp $(MainMakefile)
488          $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@
489  
490   ifeq "$(UseMPI)" "yes"
491 < %.o : %.cpp
491 > %.o : %.cpp $(MainMakefile)
492          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
493          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
494   else
495 < %.o : %.cpp
495 > %.o : %.cpp $(MainMakefile)
496          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
497   endif
498  
499   # .f -> .o
500 < $(PackageTargetDir)/%.o : %.f
500 > $(PackageTargetDir)/%.o : %.f $(MainMakefile)
501          $(FortranCompiler) $(FortranOptions) -c $< -o $@
502  
503 < $(PackageParallelTargetDir)/%.o : %.f
503 > $(PackageParallelTargetDir)/%.o : %.f $(MainMakefile)
504          $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@
505  
506   ifeq "$(UseMPI)" "yes"
507 < %.o : %.f
507 > %.o : %.f $(MainMakefile)
508          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
509          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
510   else
511 < %.o : %.f
511 > %.o : %.f $(MainMakefile)
512          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
513   endif
514  
515   # .F90 -> .o
516 < $(PackageTargetDir)/%.o : %.F90
517 <        $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
516 > $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
517 >        $(FortranCompiler) $(FortranOptions) $(IncludePath) -c $< -o $@
518 >        if test -n "`ls *.$(ModSuffix)`"; then \
519 >          $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
520 >        fi
521  
522 < $(PackageParallelTargetDir)/%.o : %.F90
523 <        $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
522 > $(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile)
523 >        $(FortranCompiler) $(FortranParallelOptions) $(IncludePath) -c $< -o $@
524 >        if test -n "`ls *.$(ModSuffix)`"; then \
525 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
526 >        fi
527  
528   ifeq "$(UseMPI)" "yes"
529 < %.o : %.F90
529 > %.o : %.F90 $(MainMakefile)
530          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
531 +        if test -n "`ls *.$(ModSuffix)`"; then\
532 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
533 +        fi
534 +
535          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
536 +        if test -n "`ls *.$(ModSuffix)`"; then\
537 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
538 +        fi
539 +
540   else
541 < %.o : %.F90
541 > %.o : %.F90 $(MainMakefile)
542          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
543 +        if test -n "`ls *.$(ModSuffix)`"; then\
544 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
545 +        fi
546   endif
547  
548  
# Line 530 | Line 645 | find_objs = $(shell $(StaticArchiver) -t $(1))
645          $(Doxygen) $(DEV_ROOT)/make/Doxyfile
646  
647   #GUN make funtions to merge the libraries
648 < find_objs = $(shell $(StaticArchiver) -t $(1))
648 > find_objs = $(shell $(StaticArchiver) -t $(1) | $(EGREP) -v "SYMDEF")
649   extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
650   create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
651   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
652   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
653 + do_link = $(shell $(LN_S) $(1) $(2))
654 + all_objs = $(foreach thisLib,$(LibNames), $(call find_objs, $(thisLib)))
655 + all_parallel_objs = $(foreach thisLib,$(ParallelLibNames), $(call find_objs, $(thisLib)))
656 + all_lib_objs = $(patsubst %,$(TargetDir)/%,$(call all_objs))
657 + all_lib_parallel_objs = $(patsubst %,$(ParallelTargetDir)/%,$(call all_parallel_objs))
658  
659   $(CombinedStaticLib) : $(LibDir)/.stamp_UP
660 <        $(Print) create $@      
661 <        $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
660 >        $(Print) creating $@            
661 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_objs)
662          $(Ranlib) $(CombinedStaticLib)
663  
664   $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
665 <        $(Print) create $@
666 <        $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
665 >        $(Print) creating $@
666 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_parallel_objs)
667          $(Ranlib) $(CombinedParallelStaticLib)
668  
669   # Executable
670 < $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
671 <        $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(CombinedStaticLib) $(Libraries) -o $@
670 > $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir)
671 >        $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
672  
673 < $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
674 <        $(Linker) $(ParallelObjectFiles) $(ParallelLinkOptions) $(LibDirs) $(CombinedParallelStaticLib) $(Libraries) -o $@
673 > $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) $(BinDir)
674 >        $(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@
675  
676   # Anything else is just copied from source to target
677   $(PackageTargetDir)/% : $(PackageSourceDir)/%
# Line 594 | Line 714 | endif
714          $(Executable)
715   endif
716  
717 + echo : $(PackageListLoop)
718 +        $(Print) Done echo.
719  
720 + _echoall :
721 +        $(Print) $(Modules)
722 +
723   # make clean
724   clean : $(PackageListLoop)
725          $(Print) Done clean.    
726  
727   _cleanall :
728 <        $(Delete) $(ObjectFiles) $(ParallelObjectFiles)
728 >        $(Delete) \
729 >                $(ObjectFiles) \
730 >                $(ModuleFiles) \
731 >                $(ParallelObjectFiles) \
732 >                $(ParallelModuleFiles) \
733 >                $(JarFile) \
734 >                $(SharedLibrary) \
735 >                $(StaticLibrary) \
736 >                $(ParallelSharedLibrary) \
737 >                $(ParallelStaticLibrary) \
738 >                $(CombinedStaticLib) \
739 >                $(CombinedParallelStaticLib)
740  
741   # make distclean
742   distclean : $(PackageListLoop)
743          $(Print) Done clean.    
744  
745 < _distcleanall :
746 <        $(Delete) $(ObjectFiles) \
611 <                  $(ParallelObjectFiles) \
612 <                        $(JarFile) \
613 <                  $(SharedLibrary) \
614 <                  $(StaticLibrary) \
615 <                  $(ParallelSharedLibrary) \
616 <                  $(ParallelStaticLibrary) \
617 <                  $(Executable) \
745 > _distcleanall : _cleanall
746 >        $(Delete) $(Executable) \
747                    $(ParallelExecutable) \
748                    $(DependencyFile)
749  
621 –
750   # make depend
751   depend : $(PackageListLoop)
752          $(Print) Done dependencies.
# Line 630 | Line 758 | ifneq "$(words $(CppFiles))" "0"
758          @cd $(PackageSourceDir)
759  
760   ifneq "$(words $(CppFiles))" "0"
761 <        $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
762 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
761 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' -MM $(CppFiles)>> Make.cpptemp
762 >        @cat Make.cpptemp  >> $(DependencyFile)
763          $(Delete) Make.cpptemp
764 <        $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
765 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
764 >
765 >  ifeq "$(UseMPI)" "yes"
766 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CppFiles)>> Make.cpptemp
767 >        @cat Make.cpptemp  >> $(DependencyFile)
768          @$(Delete) Make.cpptemp
769 +  endif
770 +
771   endif
772  
773   ifneq "$(words $(CFiles))" "0"
774 <        $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
775 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
774 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/'  -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
775 >        @cat Make.ctemp  >> $(DependencyFile)
776          $(Delete) Make.ctemp
777 <        $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
778 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
777 >
778 >  ifeq "$(UseMPI)" "yes"
779 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
780 >        @cat Make.ctemp  >> $(DependencyFile)
781          @$(Delete) Make.ctemp
782 +  endif
783 +
784   endif
785  
786   ifneq "$(words $(F90Files))" "0"
787 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
652 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
787 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
788          @cat Make.ftemp >> $(DependencyFile)
789          @$(Delete) Make.ftemp
790 +
791 +  ifeq "$(UseMPI)" "yes"
792 +        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
793 +        @cat Make.ftemp >> $(DependencyFile)
794 +        @$(Delete) Make.ftemp
795 +  endif
796 +
797   endif
798  
799   # make lib
# Line 672 | Line 814 | _installall : _buildall _installdata
814   install : $(InstallListLoop)
815          $(Print) Done Install
816  
817 < _installall : _buildall _installdata
817 > _installall : _buildall _installdata _installlinks
818  
819   $(MyInstallDir) :
820          $(MkDir) $@
# Line 680 | Line 822 | ifneq "$(words $(InstallFiles))" "0"
822   _installdata :  $(MyInstallDir)
823          $(Print) $(InstallFiles)
824   ifneq "$(words $(InstallFiles))" "0"
825 <        $(InstallData) $(InstallFiles) $(MyInstallDir)
825 >        $(InstallCommand) $(InstallFiles) $(MyInstallDir)
826   endif      
827  
828 < _installprogram:
829 <        
828 > _installlinks :  $(MyInstallDir)
829 > ifneq "$(words $(MyLinkTargets))" "0"
830 >        @cd $(MyInstallDir)
831 >        $(foreach thisLink,$(MyLinkTargets),$(call do_link,$(MyLinkSource),$(thisLink)))
832 > endif      
833 >
834   # make statistics
835   _statisticsall :
836          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
# Line 695 | Line 841 | $(Executable).pure :
841          $(Print) Done statistics.
842  
843   # make pure
844 < $(Executable).pure :
845 <        $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
846 <        $(LibList) $(ObjectFiles) -o $@
844 > #$(Executable).pure :
845 > #       $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
846 > #       $(LibList) $(ObjectFiles) -o $@
847 > #
848 > #pure : $(Executable).pure
849  
702 – pure : $(Executable).pure
703 –
850   #make cvslog
851   cvslog:
852 <        $(DEV_ROOT)/scripts/cvs2cl.pl
852 >        $(DEV_ROOT)/scripts/cvs2cl
853  
854   # Execute
855   _runexe :

Diff Legend

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