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 2547 by gezelter, Wed Jan 11 23:06:08 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 \
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 97 | Line 115 | LinkOptions = \
115   ModuleCase      = @F90_MODULE_NAMES@
116   ModSuffix       = @MOD@
117   LinkOptions = \
118 <        @F90LIBS@
118 >        @FCLIBS@
119  
120   ParallelLinkOptions = \
121 <        @F90LIBS@
121 >        @FCLIBS@
122  
123  
124   #---------------------------------------------------------------------------
# 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@
264 – F90Compiler            = @F90@
354   JavaCompiler           = $(JAVA_HOME)/bin/javac
355   JavaArchiver           = $(JAVA_HOME)/bin/jar
356   JarSigner              = $(JAVA_HOME)/bin/jarsigner
# Line 285 | Line 374 | COptions               = $(FrcDeclare)
374   JniOptions             =
375   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
376                           -sourcepath $(SourceDir)
377 < COptions               = $(FrcDeclare)
378 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
379 < CppOptions             = $(FrcDeclare)
380 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
381 < FortranOptions         =
382 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir)
294 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
377 > COptions               = $(FrcDeclare) @CFLAGS@
378 > CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
379 > CppOptions             = $(FrcDeclare) @CXXFLAGS@
380 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
381 > FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@
382 > FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclar) @FCFLAGS_SRCEXT@
383   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
384                           -sourcepath $(SourceDir) -deprecation
385   JavaRunOptions         = -classpath $(ClassPath)
# Line 336 | Line 424 | endif
424      InstallFiles             = $(Executable)
425    endif
426    InstallCommand           = $(InstallProgram)
427 +  ifneq "$(words $(LinkTargets))" "0"
428 +    MyLinkSource = $(patsubst %, $(MyInstallDir)/%,$(Main))
429 +    MyLinkTargets = $(patsubst %, $(MyInstallDir)/%,$(LinkTargets))
430 +  endif
431   endif
432  
433   ifneq "$(words $(ForcefieldFiles))" "0"
# Line 366 | Line 458 | $(PackageTargetDir) :
458  
459   # Create target directory
460   $(PackageTargetDir) :
461 <        $(MakeDir) $@
461 >        $(MkDir) $@
462  
463 + $(BinDir) :
464 +        $(MkDir) $@
465 +
466   # .c -> .o
467 < $(PackageTargetDir)/%.o : %.c
467 > $(PackageTargetDir)/%.o : %.c $(MainMakefile)
468          $(Print) $@
469          $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
470  
471 < $(PackageParallelTargetDir)/%.o : %.c
471 > $(PackageParallelTargetDir)/%.o : %.c $(MainMakefile)
472          $(Print) $@
473          $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@
474  
475   ifeq "$(UseMPI)" "yes"
476 < %.o : %.c
476 > %.o : %.c $(MainMakefile)
477          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
478          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
479   else
480 < %.o : %.c
480 > %.o : %.c $(MainMakefile)
481          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
482   endif
483  
484   # .cpp -> .o
485 < $(PackageTargetDir)/%.o : %.cpp
485 > $(PackageTargetDir)/%.o : %.cpp $(MainMakefile)
486          $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
487  
488 < $(PackageParallelTargetDir)/%.o : %.cpp
488 > $(PackageParallelTargetDir)/%.o : %.cpp $(MainMakefile)
489          $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@
490  
491   ifeq "$(UseMPI)" "yes"
492 < %.o : %.cpp
492 > %.o : %.cpp $(MainMakefile)
493          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
494          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
495   else
496 < %.o : %.cpp
496 > %.o : %.cpp $(MainMakefile)
497          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
498   endif
499  
500   # .f -> .o
501 < $(PackageTargetDir)/%.o : %.f
501 > $(PackageTargetDir)/%.o : %.f $(MainMakefile)
502          $(FortranCompiler) $(FortranOptions) -c $< -o $@
503  
504 < $(PackageParallelTargetDir)/%.o : %.f
504 > $(PackageParallelTargetDir)/%.o : %.f $(MainMakefile)
505          $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@
506  
507   ifeq "$(UseMPI)" "yes"
508 < %.o : %.f
508 > %.o : %.f $(MainMakefile)
509          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
510          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
511   else
512 < %.o : %.f
512 > %.o : %.f $(MainMakefile)
513          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
514   endif
515  
516   # .F90 -> .o
517 < $(PackageTargetDir)/%.o : %.F90
518 <        $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
517 > $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
518 >        $(FortranCompiler) $(FortranOptions) $(IncludePath) -c $< -o $@
519 >        if test -n "`ls *.$(ModSuffix)`"; then \
520 >          $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
521 >        fi
522  
523 < $(PackageParallelTargetDir)/%.o : %.F90
524 <        $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
523 > $(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile)
524 >        $(FortranCompiler) $(FortranParallelOptions) $(IncludePath) -c $< -o $@
525 >        if test -n "`ls *.$(ModSuffix)`"; then \
526 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
527 >        fi
528  
529   ifeq "$(UseMPI)" "yes"
530 < %.o : %.F90
530 > %.o : %.F90 $(MainMakefile)
531          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
532 +        if test -n "`ls *.$(ModSuffix)`"; then\
533 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
534 +        fi
535 +
536          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
537 +        if test -n "`ls *.$(ModSuffix)`"; then\
538 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
539 +        fi
540 +
541   else
542 < %.o : %.F90
542 > %.o : %.F90 $(MainMakefile)
543          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
544 +        if test -n "`ls *.$(ModSuffix)`"; then\
545 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
546 +        fi
547   endif
548  
549  
# Line 534 | Line 646 | find_objs = $(shell $(StaticArchiver) -t $(1))
646          $(Doxygen) $(DEV_ROOT)/make/Doxyfile
647  
648   #GUN make funtions to merge the libraries
649 < find_objs = $(shell $(StaticArchiver) -t $(1))
649 > find_objs = $(shell $(StaticArchiver) -t $(1) | $(EGREP) -v "SYMDEF")
650   extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
651   create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
652   remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
653   do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
654 + do_link = $(shell $(LN_S) $(1) $(2))
655 + all_objs = $(foreach thisLib,$(LibNames), $(call find_objs, $(thisLib)))
656 + all_parallel_objs = $(foreach thisLib,$(ParallelLibNames), $(call find_objs, $(thisLib)))
657 + all_lib_objs = $(patsubst %,$(TargetDir)/%,$(call all_objs))
658 + all_lib_parallel_objs = $(patsubst %,$(ParallelTargetDir)/%,$(call all_parallel_objs))
659  
660   $(CombinedStaticLib) : $(LibDir)/.stamp_UP
661 <        $(Print) create $@      
662 <        $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
661 >        $(Print) creating $@            
662 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_objs)
663          $(Ranlib) $(CombinedStaticLib)
664  
665   $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
666 <        $(Print) create $@
667 <        $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
666 >        $(Print) creating $@
667 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_parallel_objs)
668          $(Ranlib) $(CombinedParallelStaticLib)
669  
670   # Executable
671 < $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
672 <        $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(CombinedStaticLib) $(Libraries) -o $@
671 > $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir)
672 >        $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
673  
674 < $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
675 <        $(Linker) $(ParallelObjectFiles) $(ParallelLinkOptions) $(LibDirs) $(CombinedParallelStaticLib) $(Libraries) -o $@
674 > $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) $(BinDir)
675 >        $(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@
676  
677   # Anything else is just copied from source to target
678   $(PackageTargetDir)/% : $(PackageSourceDir)/%
# Line 598 | Line 715 | endif
715          $(Executable)
716   endif
717  
718 + echo : $(PackageListLoop)
719 +        $(Print) Done echo.
720  
721 + _echoall :
722 +        $(Print) $(Modules)
723 +
724   # make clean
725   clean : $(PackageListLoop)
726          $(Print) Done clean.    
727  
728   _cleanall :
729 <        $(Delete) $(ObjectFiles) $(ParallelObjectFiles)
729 >        $(Delete) \
730 >                $(ObjectFiles) \
731 >                $(ModuleFiles) \
732 >                $(ParallelObjectFiles) \
733 >                $(ParallelModuleFiles) \
734 >                $(JarFile) \
735 >                $(SharedLibrary) \
736 >                $(StaticLibrary) \
737 >                $(ParallelSharedLibrary) \
738 >                $(ParallelStaticLibrary) \
739 >                $(CombinedStaticLib) \
740 >                $(CombinedParallelStaticLib)
741  
742   # make distclean
743   distclean : $(PackageListLoop)
744          $(Print) Done clean.    
745  
746 < _distcleanall :
747 <        $(Delete) $(ObjectFiles) \
615 <                  $(ParallelObjectFiles) \
616 <                        $(JarFile) \
617 <                  $(SharedLibrary) \
618 <                  $(StaticLibrary) \
619 <                  $(ParallelSharedLibrary) \
620 <                  $(ParallelStaticLibrary) \
621 <                  $(Executable) \
746 > _distcleanall : _cleanall
747 >        $(Delete) $(Executable) \
748                    $(ParallelExecutable) \
749                    $(DependencyFile)
750  
625 –
751   # make depend
752   depend : $(PackageListLoop)
753          $(Print) Done dependencies.
# Line 634 | Line 759 | ifneq "$(words $(CppFiles))" "0"
759          @cd $(PackageSourceDir)
760  
761   ifneq "$(words $(CppFiles))" "0"
762 <        $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
763 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
762 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' -MM $(CppFiles)>> Make.cpptemp
763 >        @cat Make.cpptemp  >> $(DependencyFile)
764          $(Delete) Make.cpptemp
765 <        $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
766 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
765 >
766 >  ifeq "$(UseMPI)" "yes"
767 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CppFiles)>> Make.cpptemp
768 >        @cat Make.cpptemp  >> $(DependencyFile)
769          @$(Delete) Make.cpptemp
770 +  endif
771 +
772   endif
773  
774   ifneq "$(words $(CFiles))" "0"
775 <        $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
776 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
775 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/'  -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
776 >        @cat Make.ctemp  >> $(DependencyFile)
777          $(Delete) Make.ctemp
778 <        $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
779 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
778 >
779 >  ifeq "$(UseMPI)" "yes"
780 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
781 >        @cat Make.ctemp  >> $(DependencyFile)
782          @$(Delete) Make.ctemp
783 +  endif
784 +
785   endif
786  
787   ifneq "$(words $(F90Files))" "0"
788 <        $(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
788 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
789          @cat Make.ftemp >> $(DependencyFile)
790          @$(Delete) Make.ftemp
791 +
792 +  ifeq "$(UseMPI)" "yes"
793 +        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
794 +        @cat Make.ftemp >> $(DependencyFile)
795 +        @$(Delete) Make.ftemp
796 +  endif
797 +
798   endif
799  
800   # make lib
# Line 676 | Line 815 | _installall : _buildall _installdata
815   install : $(InstallListLoop)
816          $(Print) Done Install
817  
818 < _installall : _buildall _installdata
818 > _installall : _buildall _installdata _installlinks
819  
820   $(MyInstallDir) :
821          $(MkDir) $@
# Line 684 | Line 823 | ifneq "$(words $(InstallFiles))" "0"
823   _installdata :  $(MyInstallDir)
824          $(Print) $(InstallFiles)
825   ifneq "$(words $(InstallFiles))" "0"
826 <        $(InstallData) $(InstallFiles) $(MyInstallDir)
826 >        $(InstallCommand) $(InstallFiles) $(MyInstallDir)
827   endif      
828 <        
828 >
829 > _installlinks :  $(MyInstallDir)
830 > ifneq "$(words $(MyLinkTargets))" "0"
831 >        @cd $(MyInstallDir)
832 >        $(foreach thisLink,$(MyLinkTargets),$(call do_link,$(MyLinkSource),$(thisLink)))
833 > endif      
834 >
835   # make statistics
836   _statisticsall :
837          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
# Line 697 | Line 842 | $(Executable).pure :
842          $(Print) Done statistics.
843  
844   # make pure
845 < $(Executable).pure :
846 <        $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
847 <        $(LibList) $(ObjectFiles) -o $@
845 > #$(Executable).pure :
846 > #       $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \
847 > #       $(LibList) $(ObjectFiles) -o $@
848 > #
849 > #pure : $(Executable).pure
850  
704 – pure : $(Executable).pure
705 –
851   #make cvslog
852   cvslog:
853 <        $(DEV_ROOT)/scripts/cvs2cl.pl
853 >        $(DEV_ROOT)/scripts/cvs2cl
854  
855   # Execute
856   _runexe :

Diff Legend

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