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 1510 by tim, Wed Sep 29 18:37:08 2004 UTC vs.
Revision 1539 by tim, Wed Oct 6 22:20:47 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 + 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  
83 – srcdir = @srcdir@
110   SourceDir         = $(DEV_ROOT)/src
111   TargetDir         = $(DEV_ROOT)/obj
112   ParallelTargetDir = $(DEV_ROOT)/MPIobj
# Line 89 | 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 131 | 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  
142 –
176   # Target
177   JavaClassFiles         = $(JavaFiles:%.java=  $(PackageTargetDir)/%.class)
178   JavaClassFilesRel      = $(JavaFiles:%.java=  $(Package)/%.class)
# Line 148 | 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 181 | 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 197 | Line 230 | LocalLibs        = $(subst /,,$(PackageLibs))
230   JavaPackageNames = $(subst /,.,$(JavaPackages))
231   IncludePath      = -I$(SourceDir) $(IncludeDirs:%=-I%)
232   LibDirs          = -L$(LibDir)    $(LibraryDirs:%=-L%)
233 < LocalLibs        = $(subst /,,$(PackageLibs))
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 234 | Line 271 | Lex                    = @LEX@
271   List                   = cat
272   Yacc                   = @YACC@
273   Lex                    = @LEX@
274 + Ranlib                 = @RANLIB@
275 + Doxygen                = @DOXYGEN@
276  
277 <
239 < MakeOptions            = -k -s
277 > MakeOptions            = -k
278   MakeDependOptions      =
279   StaticArchiverOptions  = rc
280   DynamicArchiverOptions = -shared
# Line 244 | 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 284 | 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 $@
290 <        @$(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
297 <        $(Print) $@
298 <        $(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) $@
307 <        $(Print) $(FortranCompiler) $(FortranOptions) -c $< -o $@
308 <        @$(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) $@
316 <        $(Print) $(F90Compiler) $(F90Options) -c $< -o $@
317 <        @$(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) $@
325 <        $(Print) $(JavaCompiler) $(JavaCompilerOptions) $<
326 <        @$(JavaCompiler) $(JavaCompilerOptions) $<
398 >        $(JavaCompiler) $(JavaCompilerOptions) $<
399  
400   %.class : $(PackageSourceDir)/%.java
401          @$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
402  
403   # .class -> .h
404   $(PackageSourceDir)/%.h : $(PackageTargetDir)/%.class
333 –        $(Print) $@
334 –        $(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) $@
343 <        $(Print) @$(Yacc) -d $?
344 <        @$(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) $@
351 <        $(Print) $(Yacc) -d $?
352 <        @$(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
363 – $(LibDir)/%.a : $(ObjectFiles)
364 –        $(Print) $@
365 –        $(Print) $(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles)
366 –        @$(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)
374 <        @$(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)
381 <        $(Print) $@    
382 <        $(Print) $(DynamicArchiver) $(ObjectFiles) $(DynamicArchiverOptions) -o $@
445 > $(LibDir)/%_UP.so : $(ObjectFiles)
446          $(DynamicArchiver) $(ObjectFiles) $(DynamicArchiverOptions) -o $@
447  
385 – %.so : $(ObjectFiles)
386 –        $(MAKE) $(MakeOptions) $(LibDir)/$@
387 –
448   $(LibDir)/%_MPI.so : $(ParallelObjectFiles)
389 –        $(Print) $@    
390 –        $(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) $@
399 –        $(Print) $(JavaArchiver) -cf $@ $(JavaClassFilesRel) $(OtherTargetFiles)
460          @cd $(TargetDir); $(JavaArchiver) -cf $@ \
461          $(JavaClassFilesRel) $(OtherTargetFiles)
462  
# Line 426 | Line 486 | $(PackageTargetDir)/%_Skel.class : $(PackageTargetDir)
486   %_Skel.class : %.class
487          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
488  
489 < # Executable
490 < $(Executable) : $(ObjectFiles)
491 <        $(Print) $@
492 <        $(Print) $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@
433 <        $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@
489 > document :
490 >        $(Print) Generate Documentation for OOPSE-2.0
491 >        @cd $(DEV_ROOT)/src    
492 >        $(Doxygen) $(DEV_ROOT)/make/Doxyfile
493  
494 < $(ParallelExecutable) : $(ParallelObjectFiles)
495 <        $(Print) $@
496 <        $(Print) $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ParallelObjectFiles) -o $@
497 <        $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ParallelObjectFiles) -o $@
494 > #GUN make funtions to merge the libraries
495 > find_objs = $(shell $(StaticArchiver) -t $(1))
496 > extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
497 > create_archive = $(shell  $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1)))
498 > remove_objs = $(shell $(Delete) $(call find_objs, $(1)))
499 > do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1))  
500 >
501 > $(CombinedStaticLib) : $(LibDir)/.stamp_UP
502 >        $(Print) create $@      
503 >        $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@))
504 >        $(Ranlib) $(CombinedStaticLib)
505  
506 + $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI
507 +        $(Print) create $@
508 +        $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@))
509 +        $(Ranlib) $(CombinedParallelStaticLib)
510 +
511 + # Executable
512 + $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
513 +        $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(CombinedStaticLib) $(Libraries) -o $@
514 +
515 + $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
516 +        $(Linker) $(ParallelObjectFiles) $(ParallelLinkOptions) $(LibDirs) $(CombinedParallelStaticLib) $(Libraries) -o $@
517 +
518   # Anything else is just copied from source to target
519   $(PackageTargetDir)/% : $(PackageSourceDir)/%
520          $(Print) $@
# Line 448 | Line 526 | _buildall : \
526  
527   _all : _buildall
528  
529 + ifeq "$(UseMPI)" "yes"
530   _buildall : \
531          $(DependencyFile) \
532          $(PackageTargetDir) \
533          $(ObjectFiles) \
534 +        $(ParallelObjectFiles) \
535          $(JavaClassFiles) \
536          $(RmiStubFiles) \
537          $(RmiSkeletonFiles) \
538          $(OtherTargetFiles) \
459 –        $(SharedLibrary) \
539          $(StaticLibrary) \
540 +        $(ParallelStaticLibrary) \
541          $(JarFile) \
542 <        $(Executable)
542 >        $(Executable) \
543 >        $(ParallelExecutable)
544 > else
545 > _buildall : \
546 >        $(DependencyFile) \
547 >        $(PackageTargetDir) \
548 >        $(ObjectFiles) \
549 >        $(JavaClassFiles) \
550 >        $(RmiStubFiles) \
551 >        $(RmiSkeletonFiles) \
552 >        $(OtherTargetFiles) \
553 >        $(StaticLibrary) \
554 >        $(JarFile) \
555 >        $(Executable)
556 > endif
557  
558  
559   # make clean
# Line 467 | Line 561 | _cleanall :
561          $(Print) Done clean.    
562  
563   _cleanall :
564 <        $(Delete) $(PackageTargetDir)/* \
565 <                  $(JarFile) \
564 >        $(Delete) $(ObjectFiles) $(ParallelObjectFiles)
565 >
566 > # make distclean
567 > distclean : $(PackageListLoop)
568 >        $(Print) Done clean.    
569 >
570 > _distcleanall :
571 >        $(Delete) $(ObjectFiles) \
572 >                  $(ParallelObjectFiles) \
573 >                        $(JarFile) \
574                    $(SharedLibrary) \
575                    $(StaticLibrary) \
576 +                  $(ParallelSharedLibrary) \
577 +                  $(ParallelStaticLibrary) \
578                    $(Executable) \
579 <                  $(DependencyFile)
579 >                  $(ParallelExecutable) \
580 >                  $(DependencyFile)
581  
582  
583   # make depend
# Line 485 | Line 590 | $(DependencyFile) : $(DerivedSource)
590          $(Print) $@
591          @cd $(PackageSourceDir)
592  
488 –        touch Make.ctemp
489 –        touch Make.ctemp
490 –
593   ifneq "$(words $(CppFiles))" "0"
594 <        $(Print) Make dependencies for $(CppFiles)
595 <        $(Print) $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
596 <        $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
597 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
598 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
594 >        $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
595 >        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
596 >        $(Delete) Make.cpptemp
597 >        $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
598 >        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
599 >        @$(Delete) Make.cpptemp
600   endif
601  
602   ifneq "$(words $(CFiles))" "0"
603 <        $(Print) Make dependencies for $(CFiles)
604 <        $(Print) $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   > Make.ctemp
605 <        $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   > Make.ctemp
606 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
607 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
608 <
603 >        $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
604 >        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
605 >        $(Delete) Make.ctemp
606 >        $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
607 >        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
608 >        @$(Delete) Make.ctemp
609   endif
610  
611   ifneq "$(words $(F90Files))" "0"
612 <        $(Print) Make dependencies for $(F90Files)
613 <        $(DEV_ROOT)/scripts/sfmakedepend  -I $(DEV_ROOT)/src -d '$$(DEV_ROOT)/obj' -f ./Make.ftemp -h *.F90
614 <        cat Make.ftemp >> $(DependencyFile)
612 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
613 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
614 >        @cat Make.ftemp >> $(DependencyFile)
615 >        @$(Delete) Make.ftemp
616   endif
513 –        $(Delete) Make.cpptemp Make.ctemp Make.ftemp
617  
618   # make lib
619   lib    : $(PackageListLoop)
# Line 525 | Line 628 | _statisticsall :
628  
629   # make statistics
630   _statisticsall :
631 <        @$(Print) $(SourceFiles) >> $(DEV_ROOT)/files.tmp
631 >        @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp
632  
633   statistics : $(PackageListLoop)
634          @$(List) $(DEV_ROOT)/files.tmp | xargs $(WordCount) $(WordCountOptions)
# Line 539 | Line 642 | pure : $(Executable).pure
642  
643   pure : $(Executable).pure
644  
645 + #make cvslog
646 + cvslog:
647 +        $(DEV_ROOT)/scripts/cvs2cl.pl
648 +
649   # Execute
650   _runexe :
651          $(Executable) $(RunParameters)

Diff Legend

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