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

Comparing trunk/OOPSE-3.0/make/Makefile.in (file contents):
Revision 1510 by tim, Wed Sep 29 18:37:08 2004 UTC vs.
Revision 1530 by tim, Wed Oct 6 18:53:05 2004 UTC

# Line 33 | Line 33
33   #  $<      - Current dependency
34   #
35   #---------------------------------------------------------------------------
36 + IS_UNIX=1
37  
38 < #---------------------------------------------------------------------------
38 < #
39 < #  Packages
40 < #
41 < #---------------------------------------------------------------------------
42 <
43 < #packages to be made
44 < Packages = \
45 <        utils \
46 <        math \
47 <        types \
48 <        primitives \
49 <        visitors \
50 <        UseTheForce/DarkSide \
51 <        UseTheForce \
52 <        brains \
53 <        io \
54 <        integrators \
55 <        minimizers \
56 <        constraints \
57 <        profiling \
58 <        restraints \
59 <        applications \
60 <
61 < #packages contain libraries
38 > #packages containing libraries
39   PackageLibs = \
40          utils \
41          math \
# Line 74 | Line 51 | PackageLibs = \
51          constraints \
52          profiling \
53          restraints \
54 +
55 + #packages containing applications
56 + Applications = \
57 +        applications/oopse \
58 +        applications/dump2Xyz \
59 +        applications/simpleBuilder
60 +
61 + IncludeDirs = \
62 +        @SPRNG_INC_DIR@ \
63 +        @MPI_INC_DIR@
64 +
65 + LibraryDirs = \
66 +        @SPRNG_LIB_DIR@ \
67 +        @MPI_LIB_DIR@
68 +
69 + Libraries = \
70 +        @SPRNG_LIB@ \
71 +        @MPI_LIB@ \
72 +        @MPI_F90_LIB@
73 +
74 + OopseHome       = @OOPSE_HOME@
75 + ForceParamDir   = @OOPSE_HOME@/share/forceFields/
76 + SampleSimDir    = @OOPSE_HOME@/share/samples/
77 + FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
78 + ParallelDeclare = -DIS_MPI
79 + UseMPI          = @USE_MPI@
80 + LinkOptions = \
81 +        @F90LIBS@
82 +
83 + ParallelLinkOptions = \
84 +        @F90LIBS@
85 +
86 +
87   #---------------------------------------------------------------------------
88   #
89   #  Directories
90   #
91   #---------------------------------------------------------------------------
92  
83 – srcdir = @srcdir@
93   SourceDir         = $(DEV_ROOT)/src
94   TargetDir         = $(DEV_ROOT)/obj
95   ParallelTargetDir = $(DEV_ROOT)/MPIobj
96   LibDir            = $(DEV_ROOT)/lib
97 + ParallelLibDir    = $(DEV_ROOT)/MPIlib
98   MakeDir           = $(DEV_ROOT)/make
99   BinDir            = $(DEV_ROOT)/bin
100   DocsDir           = $(DEV_ROOT)/docs
101   CurrentDir        = $(CURDIR)
102 + CombinedStaticLib = $(LibDir)/libOOPSE.a
103 + CombinedParallelStaticLib = $(LibDir)/libOOPSE_MPI.a
104  
105   ifdef Source
106 < Package                  = $(subst $(SourceDir)/,,$(CurrentDir))
106 > #get the relative path of current package to source directory
107 > # /home/maul/gezelter/src/code/src/UseTheForce/Darkside --> UseTheForce/Darkside
108 > #Package          = $(shell echo $(CurrentDir) | sed -e 's/^.*\/src\/\(.*\)/\1/g')
109 > #use shell script to get the absolute path and then rip it off from $(CurrentDir)
110 > Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
111 >
112   PackageList              = $(Package)
113   PackageSourceDir         = $(SourceDir)/$(Package)
114   PackageTargetDir         = $(TargetDir)
115   PackageParallelTargetDir = $(ParallelTargetDir)
116   JavaMainClass            = $(subst /,.,$(Package)).$(Main)
117   else
118 < PackageList              = $(Packages) $(JavaPackages)
118 > PackageList              = $(PackageLibs) $(JavaPackages) $(Applications)
119   endif
120  
121 < PackageListLoop  = $(patsubst %,$(SourceDir)/%/.loop,$(PackageList))
121 > PackageListLoop          = $(patsubst %,$(SourceDir)/%/.loop,$(PackageList))
122  
123 < JRE              = $(JAVA_HOME)/jre/lib/rt.jar
123 > JRE                      = $(JAVA_HOME)/jre/lib/rt.jar
124  
125   ifdef IS_UNIX
126   X = :
# Line 131 | Line 148 | SourceFiles            = $(JavaFiles:%.java=  $(Packag
148                                        $(YaccFiles) $(CorbaFiles), \
149                                        $(Source))
150   ManifestFile           = $(PackageSourceDir)/Manifest
134 – SourceFiles            = $(JavaFiles:%.java=  $(PackageSourceDir)/%.java)\
135 –                         $(CppFiles:%.cpp=    $(PackageSourceDir)/%.cpp)\
136 –                         $(CFiles:%.c=        $(PackageSourceDir)/%.c)\
137 –                         $(FortranFiles:%.f=  $(PackageSourceDir)/%.f)\
138 –                         $(F90Files:%.F90=    $(PackageSourceDir)/%.F90)\
139 –                         $(LexFiles:%.l=      $(PackageSourceDir)/%.l)\
140 –                         $(YaccFiles:%.y=     $(PackageSourceDir)/%.y)\
151  
152 + SourceFiles            = $(JavaFiles)\
153 +                         $(CppFiles)\
154 +                         $(CFiles)\
155 +                         $(FortranFiles)\
156 +                         $(F90Files)\
157 +                         $(LexFiles)\
158 +                         $(YaccFiles)
159  
160   # Target
161   JavaClassFiles         = $(JavaFiles:%.java=  $(PackageTargetDir)/%.class)
# Line 148 | Line 165 | ObjectFiles            = $(CFiles:%.c=        $(Packag
165   JniClassFiles          = $(JniSource:%.java=  $(PackageTargetDir)/%.class)
166   JniHeaders             = $(JniSource:%.java=  $(PackageSourceDir)/%.h)
167   ObjectFiles            = $(CFiles:%.c=        $(PackageTargetDir)/%.o)\
168 <                         $(CppFiles:%.cpp=    $(PackageTargetDir)/%.o)\
168 >                         $(CppFiles:%.cpp=    $(PackageTargetDir)/%.o)\
169                           $(FortranFiles:%.f=  $(PackageTargetDir)/%.o)\
170                           $(F90Files:%.F90=    $(PackageTargetDir)/%.o)\
171                           $(LexFiles:%.l=      $(PackageTargetDir)/%.o)\
# Line 181 | Line 198 | ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))
198   ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))" "0"
199    DependencyFile    = $(PackageSourceDir)/Makedepend
200    ifneq "$(Main)" ""
201 <    Executable        = $(BinDir)/$(Main)
201 >    Executable             = $(BinDir)/$(Main)
202      ParallelExecutable     = $(BinDir)/$(Main)_MPI
203    else
204 <    SharedLibrary     = $(LibDir)/lib$(subst /,,$(Package)).so
205 <    StaticLibrary     = $(LibDir)/lib$(subst /,,$(Package)).a
206 <    ParallelSharedLibrary  = $(LibDir)/lib$(subst /,,$(Package))_MPI.so
207 <    ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(Package))_MPI.a
204 >    SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.so
205 >    StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.a
206 >    ParallelSharedLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.so
207 >    ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.a
208    endif
209   endif
210   #
# Line 197 | Line 214 | LocalLibs        = $(subst /,,$(PackageLibs))
214   JavaPackageNames = $(subst /,.,$(JavaPackages))
215   IncludePath      = -I$(SourceDir) $(IncludeDirs:%=-I%)
216   LibDirs          = -L$(LibDir)    $(LibraryDirs:%=-L%)
217 < LocalLibs        = $(subst /,,$(PackageLibs))
218 < LibList          = $(LocalLibs:%=-l%) $(Libraries:%=-l%)
217 > LocalLibs        = $(subst /,,$(patsubst %, oopse_%_UP, $(PackageLibs)))
218 > ParallelLocalLibs= $(subst /,,$(patsubst %, oopse_%_MPI, $(PackageLibs)))
219 > LibList          = $(LocalLibs:%=-l%) $(Libraries)
220 > LibNames         = $(LocalLibs:%=$(LibDir)/lib%.a)
221 > ParallelLibList  = $(ParallelLocalLibs:%=-l%) $(Libraries)
222 > ParallelLibNames = $(ParallelLocalLibs:%=$(LibDir)/lib%.a)
223  
224  
225   #---------------------------------------------------------------------------
# Line 234 | Line 255 | Lex                    = @LEX@
255   List                   = cat
256   Yacc                   = @YACC@
257   Lex                    = @LEX@
258 + Ranlib                 = @RANLIB@
259  
260  
261 < MakeOptions            = -k -s
261 > MakeOptions            = -k
262   MakeDependOptions      =
263   StaticArchiverOptions  = rc
264   DynamicArchiverOptions = -shared
# Line 244 | Line 266 | FortranOptions         =
266   JniOptions             =
267   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
268                           -sourcepath $(SourceDir)
269 + COptions               = $(FrcDeclare)
270 + CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
271 + CppOptions             = $(FrcDeclare)
272 + CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
273   FortranOptions         =
274 < F90Options             =  -I$(SourceDir) -module $(TargetDir)
274 > F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir)
275 > F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
276   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
277                           -sourcepath $(SourceDir) -deprecation
278   JavaRunOptions         = -classpath $(ClassPath)
# Line 284 | Line 311 | $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.c
311          $(MakeDir) $@
312  
313   # .c -> .o
314 < $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.c
314 > $(PackageTargetDir)/%.o : %.c
315          $(Print) $@
316 <        $(Print) $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
290 <        @$(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
316 >        $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
317  
318 < %.o : $(PackageSourceDir)/%.c
318 > $(PackageParallelTargetDir)/%.o : %.c
319 >        $(Print) $@
320 >        $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@
321 >
322 > ifeq "$(UseMPI)" "yes"
323 > %.o : %.c
324          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
325 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
326 + else
327 + %.o : %.c
328 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
329 + endif
330  
331   # .cpp -> .o
332 < $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.cpp
297 <        $(Print) $@
298 <        $(Print) $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
332 > $(PackageTargetDir)/%.o : %.cpp
333          $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
334  
335 < %.o : $(PackageSourceDir)/%.cpp
335 > $(PackageParallelTargetDir)/%.o : %.cpp
336 >        $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@
337 >
338 > ifeq "$(UseMPI)" "yes"
339 > %.o : %.cpp
340          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
341 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
342 + else
343 + %.o : %.cpp
344 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
345 + endif
346  
347   # .f -> .o
348 < $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.f
349 <        $(Print) $@
307 <        $(Print) $(FortranCompiler) $(FortranOptions) -c $< -o $@
308 <        @$(FortranCompiler) $(FortranOptions) -c $< -o $@
348 > $(PackageTargetDir)/%.o : %.f
349 >        $(FortranCompiler) $(FortranOptions) -c $< -o $@
350  
351 < %.o : $(PackageSourceDir)/%.f
351 > $(PackageParallelTargetDir)/%.o : %.f
352 >        $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@
353 >
354 > ifeq "$(UseMPI)" "yes"
355 > %.o : %.f
356 >        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
357 >        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
358 > else
359 > %.o : %.f
360          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
361 + endif
362  
363   # .F90 -> .o
364 < $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.F90
365 <        $(Print) $@
316 <        $(Print) $(F90Compiler) $(F90Options) -c $< -o $@
317 <        @$(F90Compiler) $(F90Options) -c $< -o $@
364 > $(PackageTargetDir)/%.o : %.F90
365 >        $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
366  
367 < %.o : $(PackageSourceDir)/%.F90
367 > $(PackageParallelTargetDir)/%.o : %.F90
368 >        $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
369 >
370 > ifeq "$(UseMPI)" "yes"
371 > %.o : %.F90
372          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
373 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
374 + else
375 + %.o : %.F90
376 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
377 + endif
378  
379 +
380   # .java -> .class
381   $(PackageTargetDir)/%.class : $(PackageSourceDir)/%.java
382 <        $(Print) $@
325 <        $(Print) $(JavaCompiler) $(JavaCompilerOptions) $<
326 <        @$(JavaCompiler) $(JavaCompilerOptions) $<
382 >        $(JavaCompiler) $(JavaCompilerOptions) $<
383  
384   %.class : $(PackageSourceDir)/%.java
385          @$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
386  
387   # .class -> .h
388   $(PackageSourceDir)/%.h : $(PackageTargetDir)/%.class
333 –        $(Print) $@
334 –        $(Print) $(JniCompiler) $(JniOptions) $(JavaPackageName).$*
389          $(JniCompiler) $(JniOptions) $(JavaPackageName).$*
390  
391   %.h : %.class
392          $(MAKE) $(MakeOptions) $(PackageSourceDir)/$@
393  
394   #.y -> .h
395 < $(PackageSourceDir)/%.h : $(PackageSourceDir)/%.y
396 <        $(Print) $@
343 <        $(Print) @$(Yacc) -d $?
344 <        @$(Yacc) -d  $?
395 > %.h : %.y
396 >        $(Yacc) -d  $?
397          @$(Move) y.tab.h $*.h
398          @$(Delete) y.tab.c
399  
400   #.y -> .c
401 < $(PackageSourceDir)/%.c : $(PackageSourceDir)/%.y
402 <        $(Print) $@
351 <        $(Print) $(Yacc) -d $?
352 <        @$(Yacc) -d  $?
401 > %.c : %.y
402 >        $(Yacc) -d  $?
403          @$(Move) y.tab.c $*.c
404          @$(Delete) y.tab.h
405  
406   # .l -> .c
407 < $(PackageSourceDir)/%.c : $(PackageSourceDir)/%.l
407 > %.c : %.l
408          $(Print) $@
409          $(Print) $(Lex) -o$@ $?
410          @$(Lex) -o$@ $?
411  
412   # .o -> .a
363 – $(LibDir)/%.a : $(ObjectFiles)
364 –        $(Print) $@
365 –        $(Print) $(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles)
366 –        @$(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles)
413  
414 < %.a : $(ObjectFiles)
415 <        $(MAKE) $(MakeOptions) $(LibDir)/$@
414 > $(LibDir)/%_UP.a : $(ObjectFiles)
415 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles)
416 >        @touch $(LibDir)/.stamp_UP
417  
418 < $(LibDir)/%_MPI.a : $(ParallelObjectFiles)
419 <        $(Print) $@
420 <        $(Print) $(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles)
374 <        @$(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles)
418 > $(LibDir)/%_MPI.a: $(ParallelObjectFiles)
419 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles)
420 >        @touch $(LibDir)/.stamp_MPI
421  
422 + %_UP.a : $(ObjectFiles)
423 +        $(MAKE) $(MakeOptions) $(LibDir)/$@
424 +
425   %_MPI.a : $(ParallelObjectFiles)
426          $(MAKE) $(MakeOptions) $(LibDir)/$@
427  
428   # .o -> .so
429 < $(LibDir)/%.so : $(ObjectFiles)
381 <        $(Print) $@    
382 <        $(Print) $(DynamicArchiver) $(ObjectFiles) $(DynamicArchiverOptions) -o $@
429 > $(LibDir)/%_UP.so : $(ObjectFiles)
430          $(DynamicArchiver) $(ObjectFiles) $(DynamicArchiverOptions) -o $@
431  
385 – %.so : $(ObjectFiles)
386 –        $(MAKE) $(MakeOptions) $(LibDir)/$@
387 –
432   $(LibDir)/%_MPI.so : $(ParallelObjectFiles)
389 –        $(Print) $@    
390 –        $(Print) $(DynamicArchiver) $(ParallelObjectFiles) $(DynamicArchiverOptions) -o $@
433          $(DynamicArchiver) $(ParallelObjectFiles) $(DynamicArchiverOptions) -o $@
434  
435 + %_UP.so : $(ObjectFiles)
436 +        $(MAKE) $(MakeOptions) $(LibDir)/$@
437 +
438   %_MPI.so : $(ParallelObjectFiles)
439          $(MAKE) $(MakeOptions) $(LibDir)/$@
440  
441   # .class -> .jar
442   $(LibDir)/%.jar : $(JavaClassFiles) $(OtherTargetFiles)
443          $(Print) $@
399 –        $(Print) $(JavaArchiver) -cf $@ $(JavaClassFilesRel) $(OtherTargetFiles)
444          @cd $(TargetDir); $(JavaArchiver) -cf $@ \
445          $(JavaClassFilesRel) $(OtherTargetFiles)
446  
# Line 426 | Line 470 | $(PackageTargetDir)/%_Skel.class : $(PackageTargetDir)
470   %_Skel.class : %.class
471          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
472  
473 < # Executable
474 < $(Executable) : $(ObjectFiles)
475 <        $(Print) $@
476 <        $(Print) $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@
477 <        $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@
473 > #GUN make funtions to merge the libraries
474 > find_objs = $(shell $(StaticArchiver) -t $(1))
475 > extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
476 > create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
477 > remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
478 > do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
479  
480 < $(ParallelExecutable) : $(ParallelObjectFiles)
481 <        $(Print) $@
482 <        $(Print) $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ParallelObjectFiles) -o $@
483 <        $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ParallelObjectFiles) -o $@
480 > $(CombinedStaticLib) : $(LibDir)/.stamp_UP
481 >        $(Print) create $@      
482 >        $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
483 >        $(Ranlib) $(CombinedStaticLib)
484  
485 + $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
486 +        $(Print) create $@
487 +        $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
488 +        $(Ranlib) $(CombinedParallelStaticLib)
489 +
490 + # Executable
491 + $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
492 +        $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(CombinedStaticLib) $(Libraries) -o $@
493 +
494 + $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
495 +        $(Linker) $(ParallelObjectFiles) $(ParallelLinkOptions) $(LibDirs) $(CombinedParallelStaticLib) $(Libraries) -o $@
496 +
497   # Anything else is just copied from source to target
498   $(PackageTargetDir)/% : $(PackageSourceDir)/%
499          $(Print) $@
# Line 448 | Line 505 | _buildall : \
505  
506   _all : _buildall
507  
508 + ifeq "$(UseMPI)" "yes"
509   _buildall : \
510          $(DependencyFile) \
511          $(PackageTargetDir) \
512          $(ObjectFiles) \
513 +        $(ParallelObjectFiles) \
514          $(JavaClassFiles) \
515          $(RmiStubFiles) \
516          $(RmiSkeletonFiles) \
517          $(OtherTargetFiles) \
459 –        $(SharedLibrary) \
518          $(StaticLibrary) \
519 +        $(ParallelStaticLibrary) \
520          $(JarFile) \
521 <        $(Executable)
521 >        $(Executable) \
522 >        $(ParallelExecutable)
523 > else
524 > _buildall : \
525 >        $(DependencyFile) \
526 >        $(PackageTargetDir) \
527 >        $(ObjectFiles) \
528 >        $(JavaClassFiles) \
529 >        $(RmiStubFiles) \
530 >        $(RmiSkeletonFiles) \
531 >        $(OtherTargetFiles) \
532 >        $(StaticLibrary) \
533 >        $(JarFile) \
534 >        $(Executable)
535 > endif
536  
537  
538   # make clean
# Line 467 | Line 540 | _cleanall :
540          $(Print) Done clean.    
541  
542   _cleanall :
543 <        $(Delete) $(PackageTargetDir)/* \
544 <                  $(JarFile) \
543 >        $(Delete) $(ObjectFiles) $(ParallelObjectFiles)
544 >
545 > # make distclean
546 > distclean : $(PackageListLoop)
547 >        $(Print) Done clean.    
548 >
549 > _distcleanall :
550 >        $(Delete) $(ObjectFiles) \
551 >                  $(ParallelObjectFiles) \
552 >                        $(JarFile) \
553                    $(SharedLibrary) \
554                    $(StaticLibrary) \
555 +                  $(ParallelSharedLibrary) \
556 +                  $(ParallelStaticLibrary) \
557                    $(Executable) \
558 <                  $(DependencyFile)
558 >                  $(ParallelExecutable) \
559 >                  $(DependencyFile)
560  
561  
562   # make depend
# Line 485 | Line 569 | $(DependencyFile) : $(DerivedSource)
569          $(Print) $@
570          @cd $(PackageSourceDir)
571  
572 <        touch Make.ctemp
573 <        touch Make.ctemp
572 >        @touch Make.ctemp
573 >        @touch Make.ctemp
574  
575   ifneq "$(words $(CppFiles))" "0"
492 –        $(Print) Make dependencies for $(CppFiles)
493 –        $(Print) $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
576          $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
577          cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
578          cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
579   endif
580  
581   ifneq "$(words $(CFiles))" "0"
500 –        $(Print) Make dependencies for $(CFiles)
501 –        $(Print) $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   > Make.ctemp
582          $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   > Make.ctemp
583          cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
584          cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
# Line 506 | Line 586 | ifneq "$(words $(F90Files))" "0"
586   endif
587  
588   ifneq "$(words $(F90Files))" "0"
589 <        $(Print) Make dependencies for $(F90Files)
590 <        $(DEV_ROOT)/scripts/sfmakedepend  -I $(DEV_ROOT)/src -d '$$(DEV_ROOT)/obj' -f ./Make.ftemp -h *.F90
589 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/obj/' -D__FORTRAN90  $(F90Files) > Make.ftemp
590 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/MPIobj/' -DIS_MPI -D__FORTRAN90  $(F90Files) >> Make.ftemp
591          cat Make.ftemp >> $(DependencyFile)
592   endif
593          $(Delete) Make.cpptemp Make.ctemp Make.ftemp
# Line 525 | Line 605 | _statisticsall :
605  
606   # make statistics
607   _statisticsall :
608 <        @$(Print) $(SourceFiles) >> $(DEV_ROOT)/files.tmp
608 >        @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
609  
610   statistics : $(PackageListLoop)
611          @$(List) $(DEV_ROOT)/files.tmp | xargs $(WordCount) $(WordCountOptions)
# Line 539 | Line 619 | pure : $(Executable).pure
619  
620   pure : $(Executable).pure
621  
622 + #make cvslog
623 + cvslog:
624 +        $(DEV_ROOT)/scripts/cvs2cl.pl
625 +
626   # Execute
627   _runexe :
628          $(Executable) $(RunParameters)

Diff Legend

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