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

Comparing trunk/OOPSE-4/make/Makefile.in (file contents):
Revision 1508 by gezelter, Wed Sep 29 17:56:08 2004 UTC vs.
Revision 1535 by gezelter, Wed Oct 6 21:22:43 2004 UTC

# Line 33 | Line 33
33   #  $<      - Current dependency
34   #
35   #---------------------------------------------------------------------------
36 + IS_UNIX=1
37  
38 < Packages = \
39 <        utils \
40 <        math \
41 <        types \
42 <        primitives \
43 <        visitors \
44 <        UseTheForce/DarkSide \
45 <        UseTheForce \
46 <        brains \
47 <        io \
48 <        integrators \
49 <        minimizers \
50 <        constraints \
51 <        profiling \
52 <        restraints \
53 <        applications \
38 > #packages containing libraries
39 > PackageLibs = \
40 >        utils \
41 >        math \
42 >        types \
43 >        primitives \
44 >        visitors \
45 >        UseTheForce/DarkSide \
46 >        UseTheForce \
47 >        brains \
48 >        io \
49 >        integrators \
50 >        minimizers \
51 >        constraints \
52 >        profiling \
53 >        restraints \
54  
55 + #packages containing applications
56 + Applications = \
57 +        applications/oopse \
58 +        applications/dump2Xyz \
59 +        applications/simpleBuilder
60 +
61 + Samples = \
62 +        samples/argon \
63 +        samples/water/dimer \
64 +        samples/water/spce \
65 +        samples/water/ssd \
66 +        samples/water/ssde \
67 +        samples/water/tip3p_ice \
68 +        samples/water/tip4p \
69 +        samples/lipid \
70 +        samples/alkane \
71 +        samples/minimizer \
72 +        samples/metals \
73 +        samples/zcons \
74 +
75 + IncludeDirs = \
76 +        @SPRNG_INC_DIR@ \
77 +        @MPI_INC_DIR@
78 +
79 + LibraryDirs = \
80 +        @SPRNG_LIB_DIR@ \
81 +        @MPI_LIB_DIR@
82 +
83 + Libraries = \
84 +        @SPRNG_LIB@ \
85 +        @MPI_LIB@ \
86 +        @MPI_F90_LIB@
87 +
88 + OopseHome       = @OOPSE_HOME@
89 + ForceParamDir   = @OOPSE_HOME@/share/forceFields/
90 + SampleSimDir    = @OOPSE_HOME@/share/samples/
91 + FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
92 + F90Declare      = -D__FORTRAN90
93 + ParallelDeclare = -DIS_MPI
94 + UseMPI          = @USE_MPI@
95 + ModuleCase      = @F90_MODULE_NAMES@
96 + ModSuffix       = @MOD@
97 + LinkOptions = \
98 +        @F90LIBS@
99 +
100 + ParallelLinkOptions = \
101 +        @F90LIBS@
102 +
103 +
104   #---------------------------------------------------------------------------
105   #
106   #  Directories
107   #
108   #---------------------------------------------------------------------------
109  
60 – srcdir = @srcdir@
110   SourceDir         = $(DEV_ROOT)/src
111   TargetDir         = $(DEV_ROOT)/obj
112   ParallelTargetDir = $(DEV_ROOT)/MPIobj
# Line 66 | Line 115 | CurrentDir        = $(CURDIR)
115   BinDir            = $(DEV_ROOT)/bin
116   DocsDir           = $(DEV_ROOT)/docs
117   CurrentDir        = $(CURDIR)
118 + CombinedStaticLib = $(LibDir)/libOOPSE.a
119 + CombinedParallelStaticLib = $(LibDir)/libOOPSE_MPI.a
120  
121   ifdef Source
122 < Package                  = $(subst $(SourceDir)/,,$(CurrentDir))
122 > #get the relative path of current package to source directory
123 > # /home/maul/gezelter/src/code/src/UseTheForce/Darkside --> UseTheForce/Darkside
124 > #Package          = $(shell echo $(CurrentDir) | sed -e 's/^.*\/src\/\(.*\)/\1/g')
125 > #use shell script to get the absolute path and then rip it off from $(CurrentDir)
126 > Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
127 >
128   PackageList              = $(Package)
129   PackageSourceDir         = $(SourceDir)/$(Package)
130   PackageTargetDir         = $(TargetDir)
131   PackageParallelTargetDir = $(ParallelTargetDir)
132   JavaMainClass            = $(subst /,.,$(Package)).$(Main)
133   else
134 < PackageList              = $(Packages) $(JavaPackages)
134 > PackageList              = $(PackageLibs) $(JavaPackages) $(Applications)
135   endif
136  
137 < PackageListLoop  = $(patsubst %,$(SourceDir)/%/.loop,$(PackageList))
137 > PackageListLoop          = $(patsubst %,$(SourceDir)/%/.loop,$(PackageList))
138  
139 < JRE              = $(JAVA_HOME)/jre/lib/rt.jar
139 > JRE                      = $(JAVA_HOME)/jre/lib/rt.jar
140  
141   ifdef IS_UNIX
142   X = :
# Line 108 | Line 164 | SourceFiles            = $(JavaFiles:%.java=  $(Packag
164                                        $(YaccFiles) $(CorbaFiles), \
165                                        $(Source))
166   ManifestFile           = $(PackageSourceDir)/Manifest
167 < SourceFiles            = $(JavaFiles:%.java=  $(PackageSourceDir)/%.java)\
168 <                         $(CppFiles:%.cpp=    $(PackageSourceDir)/%.cpp)\
169 <                         $(CFiles:%.c=        $(PackageSourceDir)/%.c)\
170 <                         $(FortranFiles:%.f=  $(PackageSourceDir)/%.f)\
171 <                         $(F90Files:%.F90=    $(PackageSourceDir)/%.F90)\
172 <                         $(LexFiles:%.l=      $(PackageSourceDir)/%.l)\
173 <                         $(YaccFiles:%.y=     $(PackageSourceDir)/%.y)\
167 >
168 > SourceFiles            = $(JavaFiles)\
169 >                         $(CppFiles)\
170 >                         $(CFiles)\
171 >                         $(FortranFiles)\
172 >                         $(F90Files)\
173 >                         $(LexFiles)\
174 >                         $(YaccFiles)
175  
119 –
176   # Target
177   JavaClassFiles         = $(JavaFiles:%.java=  $(PackageTargetDir)/%.class)
178   JavaClassFilesRel      = $(JavaFiles:%.java=  $(Package)/%.class)
# Line 125 | Line 181 | ObjectFiles            = $(CFiles:%.c=        $(Packag
181   JniClassFiles          = $(JniSource:%.java=  $(PackageTargetDir)/%.class)
182   JniHeaders             = $(JniSource:%.java=  $(PackageSourceDir)/%.h)
183   ObjectFiles            = $(CFiles:%.c=        $(PackageTargetDir)/%.o)\
184 <                         $(CppFiles:%.cpp=    $(PackageTargetDir)/%.o)\
184 >                         $(CppFiles:%.cpp=    $(PackageTargetDir)/%.o)\
185                           $(FortranFiles:%.f=  $(PackageTargetDir)/%.o)\
186                           $(F90Files:%.F90=    $(PackageTargetDir)/%.o)\
187                           $(LexFiles:%.l=      $(PackageTargetDir)/%.o)\
# Line 158 | Line 214 | ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))
214   ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))" "0"
215    DependencyFile    = $(PackageSourceDir)/Makedepend
216    ifneq "$(Main)" ""
217 <    Executable        = $(BinDir)/$(Main)
217 >    Executable             = $(BinDir)/$(Main)
218      ParallelExecutable     = $(BinDir)/$(Main)_MPI
219    else
220 <    SharedLibrary     = $(LibDir)/lib$(subst /,,$(Package)).so
221 <    StaticLibrary     = $(LibDir)/lib$(subst /,,$(Package)).a
222 <    ParallelSharedLibrary  = $(LibDir)/lib$(subst /,,$(Package))_MPI.so
223 <    ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(Package))_MPI.a
220 >    SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.so
221 >    StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.a
222 >    ParallelSharedLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.so
223 >    ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.a
224    endif
225   endif
226   #
# Line 174 | Line 230 | LocalLibs        = $(subst /,,$(Packages))
230   JavaPackageNames = $(subst /,.,$(JavaPackages))
231   IncludePath      = -I$(SourceDir) $(IncludeDirs:%=-I%)
232   LibDirs          = -L$(LibDir)    $(LibraryDirs:%=-L%)
233 < LocalLibs        = $(subst /,,$(Packages))
234 < LibList          = $(LocalLibs:%=-l%) $(Libraries:%=-l%)
233 > LocalLibs        = $(subst /,,$(patsubst %, oopse_%_UP, $(PackageLibs)))
234 > ParallelLocalLibs= $(subst /,,$(patsubst %, oopse_%_MPI, $(PackageLibs)))
235 > LibList          = $(LocalLibs:%=-l%) $(Libraries)
236 > LibNames         = $(LocalLibs:%=$(LibDir)/lib%.a)
237 > ParallelLibList  = $(ParallelLocalLibs:%=-l%) $(Libraries)
238 > ParallelLibNames = $(ParallelLocalLibs:%=$(LibDir)/lib%.a)
239  
240  
241   #---------------------------------------------------------------------------
# Line 211 | Line 271 | Lex                    = @LEX@
271   List                   = cat
272   Yacc                   = @YACC@
273   Lex                    = @LEX@
274 + Ranlib                 = @RANLIB@
275  
276  
277 < MakeOptions            = -k -s
277 > MakeOptions            = -k
278   MakeDependOptions      =
279   StaticArchiverOptions  = rc
280   DynamicArchiverOptions = -shared
# Line 221 | Line 282 | FortranOptions         =
282   JniOptions             =
283   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
284                           -sourcepath $(SourceDir)
285 + COptions               = $(FrcDeclare)
286 + CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
287 + CppOptions             = $(FrcDeclare)
288 + CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
289   FortranOptions         =
290 < F90Options             =  -I$(SourceDir) -module $(TargetDir)
290 > F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir)
291 > F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
292   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
293                           -sourcepath $(SourceDir) -deprecation
294   JavaRunOptions         = -classpath $(ClassPath)
# Line 261 | Line 327 | $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.c
327          $(MakeDir) $@
328  
329   # .c -> .o
330 < $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.c
330 > $(PackageTargetDir)/%.o : %.c
331          $(Print) $@
332 <        $(Print) $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
267 <        @$(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
332 >        $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
333  
334 < %.o : $(PackageSourceDir)/%.c
334 > $(PackageParallelTargetDir)/%.o : %.c
335 >        $(Print) $@
336 >        $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@
337 >
338 > ifeq "$(UseMPI)" "yes"
339 > %.o : %.c
340          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
341 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
342 + else
343 + %.o : %.c
344 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
345 + endif
346  
347   # .cpp -> .o
348 < $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.cpp
274 <        $(Print) $@
275 <        $(Print) $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
348 > $(PackageTargetDir)/%.o : %.cpp
349          $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
350  
351 < %.o : $(PackageSourceDir)/%.cpp
351 > $(PackageParallelTargetDir)/%.o : %.cpp
352 >        $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@
353 >
354 > ifeq "$(UseMPI)" "yes"
355 > %.o : %.cpp
356          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
357 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
358 + else
359 + %.o : %.cpp
360 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
361 + endif
362  
363   # .f -> .o
364 < $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.f
365 <        $(Print) $@
284 <        $(Print) $(FortranCompiler) $(FortranOptions) -c $< -o $@
285 <        @$(FortranCompiler) $(FortranOptions) -c $< -o $@
364 > $(PackageTargetDir)/%.o : %.f
365 >        $(FortranCompiler) $(FortranOptions) -c $< -o $@
366  
367 < %.o : $(PackageSourceDir)/%.f
367 > $(PackageParallelTargetDir)/%.o : %.f
368 >        $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@
369 >
370 > ifeq "$(UseMPI)" "yes"
371 > %.o : %.f
372          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
373 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
374 + else
375 + %.o : %.f
376 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
377 + endif
378  
379   # .F90 -> .o
380 < $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.F90
381 <        $(Print) $@
293 <        $(Print) $(F90Compiler) $(F90Options) -c $< -o $@
294 <        @$(F90Compiler) $(F90Options) -c $< -o $@
380 > $(PackageTargetDir)/%.o : %.F90
381 >        $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
382  
383 < %.o : $(PackageSourceDir)/%.F90
383 > $(PackageParallelTargetDir)/%.o : %.F90
384 >        $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
385 >
386 > ifeq "$(UseMPI)" "yes"
387 > %.o : %.F90
388          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
389 +        $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
390 + else
391 + %.o : %.F90
392 +        $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
393 + endif
394  
395 +
396   # .java -> .class
397   $(PackageTargetDir)/%.class : $(PackageSourceDir)/%.java
398 <        $(Print) $@
302 <        $(Print) $(JavaCompiler) $(JavaCompilerOptions) $<
303 <        @$(JavaCompiler) $(JavaCompilerOptions) $<
398 >        $(JavaCompiler) $(JavaCompilerOptions) $<
399  
400   %.class : $(PackageSourceDir)/%.java
401          @$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
402  
403   # .class -> .h
404   $(PackageSourceDir)/%.h : $(PackageTargetDir)/%.class
310 –        $(Print) $@
311 –        $(Print) $(JniCompiler) $(JniOptions) $(JavaPackageName).$*
405          $(JniCompiler) $(JniOptions) $(JavaPackageName).$*
406  
407   %.h : %.class
408          $(MAKE) $(MakeOptions) $(PackageSourceDir)/$@
409  
410   #.y -> .h
411 < $(PackageSourceDir)/%.h : $(PackageSourceDir)/%.y
412 <        $(Print) $@
320 <        $(Print) @$(Yacc) -d $?
321 <        @$(Yacc) -d  $?
411 > %.h : %.y
412 >        $(Yacc) -d  $?
413          @$(Move) y.tab.h $*.h
414          @$(Delete) y.tab.c
415  
416   #.y -> .c
417 < $(PackageSourceDir)/%.c : $(PackageSourceDir)/%.y
418 <        $(Print) $@
328 <        $(Print) $(Yacc) -d $?
329 <        @$(Yacc) -d  $?
417 > %.c : %.y
418 >        $(Yacc) -d  $?
419          @$(Move) y.tab.c $*.c
420          @$(Delete) y.tab.h
421  
422   # .l -> .c
423 < $(PackageSourceDir)/%.c : $(PackageSourceDir)/%.l
423 > %.c : %.l
424          $(Print) $@
425          $(Print) $(Lex) -o$@ $?
426          @$(Lex) -o$@ $?
427  
428   # .o -> .a
340 – $(LibDir)/%.a : $(ObjectFiles)
341 –        $(Print) $@
342 –        $(Print) $(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles)
343 –        @$(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles)
429  
430 < %.a : $(ObjectFiles)
431 <        $(MAKE) $(MakeOptions) $(LibDir)/$@
430 > $(LibDir)/%_UP.a : $(ObjectFiles)
431 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles)
432 >        @touch $(LibDir)/.stamp_UP
433  
434 < $(LibDir)/%_MPI.a : $(ParallelObjectFiles)
435 <        $(Print) $@
436 <        $(Print) $(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles)
351 <        @$(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles)
434 > $(LibDir)/%_MPI.a: $(ParallelObjectFiles)
435 >        $(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles)
436 >        @touch $(LibDir)/.stamp_MPI
437  
438 + %_UP.a : $(ObjectFiles)
439 +        $(MAKE) $(MakeOptions) $(LibDir)/$@
440 +
441   %_MPI.a : $(ParallelObjectFiles)
442          $(MAKE) $(MakeOptions) $(LibDir)/$@
443  
444   # .o -> .so
445 < $(LibDir)/%.so : $(ObjectFiles)
358 <        $(Print) $@    
359 <        $(Print) $(DynamicArchiver) $(ObjectFiles) $(DynamicArchiverOptions) -o $@
445 > $(LibDir)/%_UP.so : $(ObjectFiles)
446          $(DynamicArchiver) $(ObjectFiles) $(DynamicArchiverOptions) -o $@
447  
362 – %.so : $(ObjectFiles)
363 –        $(MAKE) $(MakeOptions) $(LibDir)/$@
364 –
448   $(LibDir)/%_MPI.so : $(ParallelObjectFiles)
366 –        $(Print) $@    
367 –        $(Print) $(DynamicArchiver) $(ParallelObjectFiles) $(DynamicArchiverOptions) -o $@
449          $(DynamicArchiver) $(ParallelObjectFiles) $(DynamicArchiverOptions) -o $@
450  
451 + %_UP.so : $(ObjectFiles)
452 +        $(MAKE) $(MakeOptions) $(LibDir)/$@
453 +
454   %_MPI.so : $(ParallelObjectFiles)
455          $(MAKE) $(MakeOptions) $(LibDir)/$@
456  
457   # .class -> .jar
458   $(LibDir)/%.jar : $(JavaClassFiles) $(OtherTargetFiles)
459          $(Print) $@
376 –        $(Print) $(JavaArchiver) -cf $@ $(JavaClassFilesRel) $(OtherTargetFiles)
460          @cd $(TargetDir); $(JavaArchiver) -cf $@ \
461          $(JavaClassFilesRel) $(OtherTargetFiles)
462  
# Line 403 | Line 486 | $(PackageTargetDir)/%_Skel.class : $(PackageTargetDir)
486   %_Skel.class : %.class
487          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
488  
489 + #GUN make funtions to merge the libraries
490 + find_objs = $(shell $(StaticArchiver) -t $(1))
491 + extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
492 + create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
493 + remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
494 + do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
495 +
496 + $(CombinedStaticLib) : $(LibDir)/.stamp_UP
497 +        $(Print) create $@      
498 +        $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
499 +        $(Ranlib) $(CombinedStaticLib)
500 +
501 + $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
502 +        $(Print) create $@
503 +        $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
504 +        $(Ranlib) $(CombinedParallelStaticLib)
505 +
506   # Executable
507 < $(Executable) : $(ObjectFiles)
508 <        $(Print) $@
409 <        $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@
507 > $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
508 >        $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(CombinedStaticLib) $(Libraries) -o $@
509  
510 < $(ParallelExecutable) : $(ParallelObjectFiles)
511 <        $(Print) $@
413 <        $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ParallelObjectFiles) -o $@
510 > $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
511 >        $(Linker) $(ParallelObjectFiles) $(ParallelLinkOptions) $(LibDirs) $(CombinedParallelStaticLib) $(Libraries) -o $@
512  
513   # Anything else is just copied from source to target
514   $(PackageTargetDir)/% : $(PackageSourceDir)/%
# Line 423 | Line 521 | _buildall : \
521  
522   _all : _buildall
523  
524 + ifeq "$(UseMPI)" "yes"
525   _buildall : \
526          $(DependencyFile) \
527          $(PackageTargetDir) \
528          $(ObjectFiles) \
529 +        $(ParallelObjectFiles) \
530          $(JavaClassFiles) \
531          $(RmiStubFiles) \
532          $(RmiSkeletonFiles) \
533          $(OtherTargetFiles) \
434 –        $(SharedLibrary) \
534          $(StaticLibrary) \
535 +        $(ParallelStaticLibrary) \
536          $(JarFile) \
537 <        $(Executable)
537 >        $(Executable) \
538 >        $(ParallelExecutable)
539 > else
540 > _buildall : \
541 >        $(DependencyFile) \
542 >        $(PackageTargetDir) \
543 >        $(ObjectFiles) \
544 >        $(JavaClassFiles) \
545 >        $(RmiStubFiles) \
546 >        $(RmiSkeletonFiles) \
547 >        $(OtherTargetFiles) \
548 >        $(StaticLibrary) \
549 >        $(JarFile) \
550 >        $(Executable)
551 > endif
552  
553  
554   # make clean
# Line 442 | Line 556 | _cleanall :
556          $(Print) Done clean.    
557  
558   _cleanall :
559 <        $(Delete) $(PackageTargetDir)/* \
560 <                  $(JarFile) \
559 >        $(Delete) $(ObjectFiles) $(ParallelObjectFiles)
560 >
561 > # make distclean
562 > distclean : $(PackageListLoop)
563 >        $(Print) Done clean.    
564 >
565 > _distcleanall :
566 >        $(Delete) $(ObjectFiles) \
567 >                  $(ParallelObjectFiles) \
568 >                        $(JarFile) \
569                    $(SharedLibrary) \
570                    $(StaticLibrary) \
571 +                  $(ParallelSharedLibrary) \
572 +                  $(ParallelStaticLibrary) \
573                    $(Executable) \
574 <                  $(DependencyFile)
574 >                  $(ParallelExecutable) \
575 >                  $(DependencyFile)
576  
577  
578   # make depend
# Line 459 | Line 584 | $(DependencyFile) : $(DerivedSource)
584   $(DependencyFile) : $(DerivedSource)
585          $(Print) $@
586          @cd $(PackageSourceDir)
587 <        touch Make.temp
588 < ifdef $(CppFiles)
589 <        $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.temp
587 >
588 > ifneq "$(words $(CppFiles))" "0"
589 >        $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
590 >        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
591 >        $(Delete) Make.cpptemp
592 >        $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
593 >        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
594 >        $(Delete) Make.cpptemp
595   endif
596 < ifdef $(CFiles)
597 <        $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   >> Make.temp
596 >
597 > ifneq "$(words $(CFiles))" "0"
598 >        $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
599 >        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
600 >        $(Delete) Make.ctemp
601 >        $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
602 >        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
603 >        $(Delete) Make.ctemp
604   endif
605 <        cat Make.temp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
606 <        cat Make.temp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
607 <        echo $(F90Files)
608 < ifdef $(F90Files)
473 <        $(DEV_ROOT)/scripts/sfmakedepend  -I $(DEV_ROOT)/src -d '$$(DEV_ROOT)/obj' -f ./Make.ftemp -h *.F90
605 >
606 > ifneq "$(words $(F90Files))" "0"
607 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare)  $(F90Files) > Make.ftemp
608 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare)  $(F90Files) >> Make.ftemp
609          cat Make.ftemp >> $(DependencyFile)
610 +        $(Delete) Make.ftemp
611   endif
476 –        $(Delete) Make.temp Make.ftemp
612  
613   # make lib
614   lib    : $(PackageListLoop)
# Line 488 | Line 623 | _statisticsall :
623  
624   # make statistics
625   _statisticsall :
626 <        @$(Print) $(SourceFiles) >> $(DEV_ROOT)/files.tmp
626 >        @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
627  
628   statistics : $(PackageListLoop)
629          @$(List) $(DEV_ROOT)/files.tmp | xargs $(WordCount) $(WordCountOptions)
# Line 502 | Line 637 | pure : $(Executable).pure
637  
638   pure : $(Executable).pure
639  
640 + #make cvslog
641 + cvslog:
642 +        $(DEV_ROOT)/scripts/cvs2cl.pl
643 +
644   # Execute
645   _runexe :
646          $(Executable) $(RunParameters)

Diff Legend

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