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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines