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

Comparing trunk/OOPSE-3.0/make/Makefile (file contents):
Revision 1514 by tim, Thu Sep 30 15:41:35 2004 UTC vs.
Revision 1527 by tim, Tue Oct 5 22:57:01 2004 UTC

# Line 72 | Line 72 | IncludeDirs = \
72          restraints \
73  
74   IncludeDirs = \
75 –        /usr/include \
75          /usr/local/include \
76 <        
76 >        /usr/local/mpich/include
77 >
78   LibraryDirs = \
79 –        /usr/lib \
80 –        /usr/local/mpich/lib \
79          /usr/local/lib \
80 <        /usr/local/intel/compiler80/lib \
80 >        /usr/local/mpich/lib
81  
82   Libraries = \
83 <        mpich \
84 <        sprng \
85 <        ifcore \
83 >        -lsprng \
84 >        -lmpich \
85 >        -lfmpich
86  
87 + OopseHome       = /usr/local/oopse
88 + ForceParamDir   = /usr/local/oopse/share/forceFields/
89 + SampleSimDir    = /usr/local/oopse/share/samples/
90 + FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
91 + ParallelDeclare = -DIS_MPI
92 + UseMPI          = yes
93 +
94   #---------------------------------------------------------------------------
95   #
96   #  Directories
97   #
98   #---------------------------------------------------------------------------
94 – SourceDir        = $(DEV_ROOT)/src
95 – TargetDir        = $(DEV_ROOT)/obj
96 – LibDir           = $(DEV_ROOT)/lib
97 – MakeDir          = $(DEV_ROOT)/make
98 – BinDir           = $(DEV_ROOT)/bin
99 – DocsDir          = $(DEV_ROOT)/docs
100 – CurrentDir       = $(CURDIR)
99  
100 + SourceDir         = $(DEV_ROOT)/src
101 + TargetDir         = $(DEV_ROOT)/obj
102 + ParallelTargetDir = $(DEV_ROOT)/MPIobj
103 + LibDir            = $(DEV_ROOT)/lib
104 + ParallelLibDir    = $(DEV_ROOT)/MPIlib
105 + MakeDir           = $(DEV_ROOT)/make
106 + BinDir            = $(DEV_ROOT)/bin
107 + DocsDir           = $(DEV_ROOT)/docs
108 + CurrentDir        = $(CURDIR)
109 + RPath = $(shell cd $(DEV_ROOT); pwd)/lib:$(OopseHome)/lib
110 + ParallelRPath = $(shell cd $(DEV_ROOT); pwd)/MPIlib:$(OopseHome)/MPIlib
111 + LinkOptions = \
112 +         -L/usr/local/intel/compiler81/lib -L/usr/lib -lifport -lifcore -limf -lm -lcxa -lirc -lunwind -lirc_s \
113 +        -Wl,-R$(RPath)
114 +
115 + ParallelLinkOptions = \
116 +         -L/usr/local/intel/compiler81/lib -L/usr/lib -lifport -lifcore -limf -lm -lcxa -lirc -lunwind -lirc_s \
117 +        -Wl,-R$(ParallelRPath)
118 +
119   ifdef Source
120   #get the relative path of current package to source directory
121   # /home/maul/gezelter/src/code/src/UseTheForce/Darkside --> UseTheForce/Darkside
122   #Package          = $(shell echo $(CurrentDir) | sed -e 's/^.*\/src\/\(.*\)/\1/g')
123 + #use shell script to get the absolute path and then rip it off from $(CurrentDir)
124   Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
125  
126 < PackageList      = $(Package)
127 < PackageSourceDir = $(SourceDir)/$(Package)
128 < PackageTargetDir = $(TargetDir)
129 < JavaMainClass    = $(subst /,.,$(Package)).$(Main)
126 > PackageList              = $(Package)
127 > PackageSourceDir         = $(SourceDir)/$(Package)
128 > PackageTargetDir         = $(TargetDir)
129 > PackageParallelTargetDir = $(ParallelTargetDir)
130 > JavaMainClass            = $(subst /,.,$(Package)).$(Main)
131   else
132 < PackageList      = $(Packages) $(JavaPackages)
132 > PackageList              = $(Packages) $(JavaPackages)
133   endif
134  
135 < PackageListLoop  = $(patsubst %,$(SourceDir)/%/.loop,$(PackageList))
117 < #PackageListLoop  = $(PackageList)
135 > PackageListLoop          = $(patsubst %,$(SourceDir)/%/.loop,$(PackageList))
136  
137 < JRE              = $(JAVA_HOME)/jre/lib/rt.jar
137 > JRE                      = $(JAVA_HOME)/jre/lib/rt.jar
138  
139   ifdef IS_UNIX
140   X = :
# Line 153 | Line 171 | SourceFiles            = $(JavaFiles)\
171                           $(LexFiles)\
172                           $(YaccFiles)
173  
156 – #SourceFiles            = $(JavaFiles:%.java=  $(PackageSourceDir)/%.java)\
157 –                         $(CppFiles:%.cpp=    $(PackageSourceDir)/%.cpp)\
158 –                         $(CFiles:%.c=        $(PackageSourceDir)/%.c)\
159 –                         $(FortranFiles:%.f=  $(PackageSourceDir)/%.f)\
160 –                         $(F90Files:%.F90=    $(PackageSourceDir)/%.F90)\
161 –                         $(LexFiles:%.l=      $(PackageSourceDir)/%.l)\
162 –                         $(YaccFiles:%.y=     $(PackageSourceDir)/%.y)\
163 –
174   # Target
175   JavaClassFiles         = $(JavaFiles:%.java=  $(PackageTargetDir)/%.class)
176   JavaClassFilesRel      = $(JavaFiles:%.java=  $(Package)/%.class)
# Line 169 | Line 179 | ObjectFiles            = $(CFiles:%.c=        $(Packag
179   JniClassFiles          = $(JniSource:%.java=  $(PackageTargetDir)/%.class)
180   JniHeaders             = $(JniSource:%.java=  $(PackageSourceDir)/%.h)
181   ObjectFiles            = $(CFiles:%.c=        $(PackageTargetDir)/%.o)\
182 <                         $(CppFiles:%.cpp=    $(PackageTargetDir)/%.o)\
182 >                         $(CppFiles:%.cpp=    $(PackageTargetDir)/%.o)\
183                           $(FortranFiles:%.f=  $(PackageTargetDir)/%.o)\
184                           $(F90Files:%.F90=    $(PackageTargetDir)/%.o)\
185                           $(LexFiles:%.l=      $(PackageTargetDir)/%.o)\
186                           $(YaccFiles:%.y=     $(PackageTargetDir)/%.o)
187 + ParallelObjectFiles    = $(CFiles:%.c=        $(PackageParallelTargetDir)/%.o)\
188 +                         $(CppFiles:%.cpp=    $(PackageParallelTargetDir)/%.o)\
189 +                         $(FortranFiles:%.f=  $(PackageParallelTargetDir)/%.o)\
190 +                         $(F90Files:%.F90=    $(PackageParallelTargetDir)/%.o)\
191 +                         $(LexFiles:%.l=      $(PackageParallelTargetDir)/%.o)\
192 +                         $(YaccFiles:%.y=     $(PackageParallelTargetDir)/%.o)
193  
194   DerivedSource          = $(YaccFiles:%.y=    %.h) \
195                           $(YaccFiles:%.y=    %.c) \
# Line 193 | Line 209 | ifneq  "$(words $(ObjectFiles))" "0"
209   endif
210  
211   #if Main is defined, do not build library. It may not be true sometimes
212 < ifneq  "$(words $(ObjectFiles))" "0"
212 > ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))" "0"
213    DependencyFile    = $(PackageSourceDir)/Makedepend
214    ifneq "$(Main)" ""
215 <    Executable        = $(BinDir)/$(Main)
215 >    Executable             = $(BinDir)/$(Main)
216 >    ParallelExecutable     = $(BinDir)/$(Main)_MPI
217    else
218 <    SharedLibrary     = $(LibDir)/lib$(subst /,,$(Package)).so
219 <    StaticLibrary     = $(LibDir)/lib$(subst /,,$(Package)).a
218 >    SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package))).so
219 >    StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package))).a
220 >    ParallelSharedLibrary  = $(ParallelLibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package))).so
221 >    ParallelStaticLibrary  = $(ParallelLibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package))).a
222    endif
223   endif
224   #
# Line 209 | Line 228 | LocalLibs        = $(subst /,,$(PackageLibs))
228   JavaPackageNames = $(subst /,.,$(JavaPackages))
229   IncludePath      = -I$(SourceDir) $(IncludeDirs:%=-I%)
230   LibDirs          = -L$(LibDir)    $(LibraryDirs:%=-L%)
231 < LocalLibs        = $(subst /,,$(PackageLibs))
232 < LibList          = $(LocalLibs:%=-l%) $(Libraries:%=-l%)
231 > ParallelLibDirs  = -L$(ParallelLibDir)  $(LibraryDirs:%=-L%)
232 > LocalLibs        = $(subst /,,$(patsubst %, oopse_%, $(PackageLibs)))
233 > ParallelLocalLibs= $(subst /,,$(patsubst %, oopse_%, $(PackageLibs)))
234 > LibList          = $(LocalLibs:%=-l%) $(Libraries)
235 > ParallelLibList  = $(ParallelLocalLibs:%=-l%) $(Libraries)
236  
237  
238   #---------------------------------------------------------------------------
# Line 225 | Line 247 | MakeDir                = mkdir -p
247   CppCompiler            = icpc
248   Linker                 = icpc
249   MakeDepend             = makedepend
250 < MakeDir                = mkdir -p
250 > Install                = /usr/bin/install -c
251 > InstallProgram         = ${INSTALL}
252 > InstallData            = ${INSTALL} -m 644
253 > MakeDir                = /home/maul/gezelter/tim/code/OOPSE-2.0/ac-tools/shtool mkdir -p -f
254   Delete                 = rm -fr
255   StaticArchiver         = ar
256   DynamicArchiver        = icc
257 < FortranCompiler        = ifort
257 > FortranCompiler        = @FC@
258   F90Compiler            = ifort
259   JavaCompiler           = $(JAVA_HOME)/bin/javac
260   JavaArchiver           = $(JAVA_HOME)/bin/jar
# Line 253 | Line 278 | FortranOptions         =
278   JniOptions             =
279   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
280                           -sourcepath $(SourceDir)
281 + COptions               = $(FrcDeclare)
282 + CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
283 + CppOptions             = $(FrcDeclare)
284 + CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
285   FortranOptions         =
286 < F90Options             =  -I$(SourceDir) -module $(TargetDir)
286 > F90Options             =  -fpp1  -O -I$(SourceDir) -module $(TargetDir)
287 > F90ParallelOptions     =  -fpp1  -O -I$(SourceDir) -module $(ParallelTargetDir)   $(ParallelDeclare)
288   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
289                           -sourcepath $(SourceDir) -deprecation
290   JavaRunOptions         = -classpath $(ClassPath)
# Line 294 | Line 324 | $(PackageTargetDir)/%.o : %.c
324  
325   # .c -> .o
326   $(PackageTargetDir)/%.o : %.c
327 +        $(Print) $@
328          $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
329  
330 + $(PackageParallelTargetDir)/%.o : %.c
331 +        $(Print) $@
332 +        $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@
333 +
334 + ifeq "$(UseMPI)" "yes"
335   %.o : %.c
336          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
337 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
338 + else
339 + %.o : %.c
340 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
341 + endif
342  
343   # .cpp -> .o
344   $(PackageTargetDir)/%.o : %.cpp
345          $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
346  
347 + $(PackageParallelTargetDir)/%.o : %.cpp
348 +        $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@
349 +
350 + ifeq "$(UseMPI)" "yes"
351   %.o : %.cpp
352          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
353 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
354 + else
355 + %.o : %.cpp
356 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
357 + endif
358  
359   # .f -> .o
360   $(PackageTargetDir)/%.o : %.f
361 <        $(Print) $@
312 <        $(Print) $(FortranCompiler) $(FortranOptions) -c $< -o $@
313 <        @$(FortranCompiler) $(FortranOptions) -c $< -o $@
361 >        $(FortranCompiler) $(FortranOptions) -c $< -o $@
362  
363 + $(PackageParallelTargetDir)/%.o : %.f
364 +        $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@
365 +
366 + ifeq "$(UseMPI)" "yes"
367   %.o : %.f
368          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
369 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
370 + else
371 + %.o : %.f
372 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
373 + endif
374  
375   # .F90 -> .o
376   $(PackageTargetDir)/%.o : %.F90
377 <        $(F90Compiler) $(F90Options) -c $< -o $@
377 >        $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
378  
379 + $(PackageParallelTargetDir)/%.o : %.F90
380 +        $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
381 +
382 + ifeq "$(UseMPI)" "yes"
383   %.o : %.F90
384          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
385 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
386 + else
387 + %.o : %.F90
388 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
389 + endif
390  
391 +
392   # .java -> .class
393   $(PackageTargetDir)/%.class : $(PackageSourceDir)/%.java
394 <        $(Print) $@
328 <        $(Print) $(JavaCompiler) $(JavaCompilerOptions) $<
329 <        @$(JavaCompiler) $(JavaCompilerOptions) $<
394 >        $(JavaCompiler) $(JavaCompilerOptions) $<
395  
396   %.class : $(PackageSourceDir)/%.java
397          @$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
398  
399   # .class -> .h
400   $(PackageSourceDir)/%.h : $(PackageTargetDir)/%.class
336 –        $(Print) $@
337 –        $(Print) $(JniCompiler) $(JniOptions) $(JavaPackageName).$*
401          $(JniCompiler) $(JniOptions) $(JavaPackageName).$*
402  
403   %.h : %.class
# Line 342 | Line 405 | $(PackageSourceDir)/%.h : $(PackageTargetDir)/%.class
405  
406   #.y -> .h
407   %.h : %.y
408 <        $(Print) $@
346 <        $(Print) @$(Yacc) -d $?
347 <        @$(Yacc) -d  $?
408 >        $(Yacc) -d  $?
409          @$(Move) y.tab.h $*.h
410          @$(Delete) y.tab.c
411  
412   #.y -> .c
413   %.c : %.y
414 <        $(Print) $@
354 <        $(Print) $(Yacc) -d $?
355 <        @$(Yacc) -d  $?
414 >        $(Yacc) -d  $?
415          @$(Move) y.tab.c $*.c
416          @$(Delete) y.tab.h
417  
# Line 363 | Line 422 | $(LibDir)/%.a : $(ObjectFiles)
422          @$(Lex) -o$@ $?
423  
424   # .o -> .a
425 +
426   $(LibDir)/%.a : $(ObjectFiles)
427 <        $(Print) $@
368 <        $(Print) $(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles)
369 <        @$(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles)
427 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles)
428  
429 + $(ParallelLibDir)/%.a: $(ParallelObjectFiles)
430 +        $(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles)
431 +
432 + ifeq "$(UseMPI)" "yes"
433 + %.a : $(ObjectFiles) $(ParallelObjectFiles)
434 +        $(MAKE) $(MakeOptions) $(LibDir)/$@
435 +        $(MAKE) $(MakeOptions) $(ParallelLibDir)/$@
436 + else
437   %.a : $(ObjectFiles)
438          $(MAKE) $(MakeOptions) $(LibDir)/$@
439 + endif
440  
441   # .o -> .so
442   $(LibDir)/%.so : $(ObjectFiles)
376 –        $(Print) $@    
377 –        $(Print) $(DynamicArchiver) $(ObjectFiles) $(DynamicArchiverOptions) -o $@
443          $(DynamicArchiver) $(ObjectFiles) $(DynamicArchiverOptions) -o $@
444  
445 + $(ParallelLibDir)/%.so : $(ParallelObjectFiles)
446 +        $(DynamicArchiver) $(ParallelObjectFiles) $(DynamicArchiverOptions) -o $@
447 +
448 + ifeq "$(UseMPI)" "yes"
449 + %.so : $(ObjectFiles) $(ParallelObjectFiles)
450 +        $(MAKE) $(MakeOptions) $(LibDir)/$@
451 +        $(MAKE) $(MakeOptions) $(ParallelLibDir)/$@
452 + else
453   %.so : $(ObjectFiles)
454          $(MAKE) $(MakeOptions) $(LibDir)/$@
455 + endif
456  
457   # .class -> .jar
458   $(LibDir)/%.jar : $(JavaClassFiles) $(OtherTargetFiles)
459          $(Print) $@
386 –        $(Print) $(JavaArchiver) -cf $@ $(JavaClassFilesRel) $(OtherTargetFiles)
460          @cd $(TargetDir); $(JavaArchiver) -cf $@ \
461          $(JavaClassFilesRel) $(OtherTargetFiles)
462  
# Line 413 | Line 486 | $(PackageTargetDir)/%_Skel.class : $(PackageTargetDir)
486   %_Skel.class : %.class
487          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
488  
489 + $(OopseStaticLibrary) : .stamp
490 +        touch .stamp
491 +
492 + $(OopseStaticLibrary) : $(ObjectFiles)
493 +        $(StaticArchiver)  $(StaticArchiverOptions) $(OopseStaticLibrary) $(ObjectFiles)
494 +
495 + .MPIstamp : $(OopseParallelStaticLibrary)
496 +        touch .MPIstamp
497 +
498 + $(OopseParallelStaticLibrary) : $(ParallelObjectFiles)
499 +        $(StaticArchiver)  $(StaticArchiverOptions) $(OopseParallelStaticLibrary) $(ParallelObjectFiles)
500 +
501 +
502   # Executable
503   $(Executable) : $(ObjectFiles)
504 <        $(Print) $@
419 <        $(Print) $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@
420 <        $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@
504 >        $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(LibList) -o $@
505  
506 + $(ParallelExecutable) : $(ParallelObjectFiles)
507 +        $(Linker) $(ParallelObjectFiles)  $(ParallelLinkOptions) $(ParallelLibDirs) $(LibList) -o $@
508 +
509   # Anything else is just copied from source to target
510   $(PackageTargetDir)/% : $(PackageSourceDir)/%
511          $(Print) $@
# Line 430 | Line 517 | _buildall : \
517  
518   _all : _buildall
519  
520 + ifeq "$(UseMPI)" "yes"
521   _buildall : \
522          $(DependencyFile) \
523          $(PackageTargetDir) \
524          $(ObjectFiles) \
525 +        $(ParallelObjectFiles) \
526          $(JavaClassFiles) \
527          $(RmiStubFiles) \
528          $(RmiSkeletonFiles) \
529          $(OtherTargetFiles) \
530          $(SharedLibrary) \
531          $(StaticLibrary) \
532 +        $(ParallelSharedLibrary) \
533 +        $(ParallelStaticLibrary) \
534          $(JarFile) \
535 <        $(Executable)
535 >        $(Executable) \
536 >        $(ParallelExecutable)
537 > else
538 > _buildall : \
539 >        $(DependencyFile) \
540 >        $(PackageTargetDir) \
541 >        $(ObjectFiles) \
542 >        $(JavaClassFiles) \
543 >        $(RmiStubFiles) \
544 >        $(RmiSkeletonFiles) \
545 >        $(OtherTargetFiles) \
546 >        $(SharedLibrary) \
547 >        $(StaticLibrary) \
548 >        $(JarFile) \
549 >        $(Executable)
550 > endif
551  
552  
553   # make clean
# Line 458 | Line 564 | _distcleanall :
564   _distcleanall :
565          $(Delete) $(ObjectFiles) \
566                    $(ParallelObjectFiles) \
567 <                  $(JarFile) \
567 >                        $(JarFile) \
568                    $(SharedLibrary) \
569                    $(StaticLibrary) \
570                    $(ParallelSharedLibrary) \
571                    $(ParallelStaticLibrary) \
572                    $(Executable) \
573                    $(ParallelExecutable) \
574 <                  $(DependencyFile)
574 >                  $(DependencyFile)
575  
576  
577   # make depend
# Line 478 | Line 584 | $(DependencyFile) : $(DerivedSource)
584          $(Print) $@
585          @cd $(PackageSourceDir)
586  
587 <        touch Make.ctemp
588 <        touch Make.ctemp
587 >        @touch Make.ctemp
588 >        @touch Make.ctemp
589  
590   ifneq "$(words $(CppFiles))" "0"
485 –        $(Print) Make dependencies for $(CppFiles)
486 –        $(Print) $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
591          $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
592          cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
593          cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
594   endif
595  
596   ifneq "$(words $(CFiles))" "0"
493 –        $(Print) Make dependencies for $(CFiles)
494 –        $(Print) $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   > Make.ctemp
597          $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   > Make.ctemp
598          cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
599          cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
# Line 499 | Line 601 | ifneq "$(words $(F90Files))" "0"
601   endif
602  
603   ifneq "$(words $(F90Files))" "0"
604 <        $(Print) Make dependencies for $(F90Files)
605 <        $(DEV_ROOT)/scripts/sfmakedepend  -I $(DEV_ROOT)/src -d '$$(DEV_ROOT)/obj' -f ./Make.ftemp -h *.F90
604 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/obj/' -D__FORTRAN90  $(F90Files) > Make.ftemp
605 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/MPIobj/' -DIS_MPI -D__FORTRAN90  $(F90Files) >> Make.ftemp
606          cat Make.ftemp >> $(DependencyFile)
607   endif
608          $(Delete) Make.cpptemp Make.ctemp Make.ftemp
# Line 532 | Line 634 | pure : $(Executable).pure
634  
635   pure : $(Executable).pure
636  
637 + #make cvslog
638 + cvslog:
639 +        $(DEV_ROOT)/scripts/cvs2cl.pl
640 +
641   # Execute
642   _runexe :
643          $(Executable) $(RunParameters)

Diff Legend

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