ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/devel_omp/make/Makefile.in
(Generate patch)

Comparing trunk/make/Makefile.in (file contents):
Revision 19 by gezelter, Wed Sep 29 17:56:08 2004 UTC vs.
Revision 21 by tim, Wed Sep 29 18:37:08 2004 UTC

# Line 34 | Line 34
34   #
35   #---------------------------------------------------------------------------
36  
37 + #---------------------------------------------------------------------------
38 + #
39 + #  Packages
40 + #
41 + #---------------------------------------------------------------------------
42 +
43 + #packages to be made
44   Packages = \
45          utils \
46          math \
# Line 51 | Line 58 | Packages = \
58          restraints \
59          applications \
60  
61 + #packages contain libraries
62 + PackageLibs = \
63 +        utils \
64 +        math \
65 +        types \
66 +        primitives \
67 +        visitors \
68 +        UseTheForce/DarkSide \
69 +        UseTheForce \
70 +        brains \
71 +        io \
72 +        integrators \
73 +        minimizers \
74 +        constraints \
75 +        profiling \
76 +        restraints \
77   #---------------------------------------------------------------------------
78   #
79   #  Directories
# Line 174 | Line 197 | LibDirs          = -L$(LibDir)    $(LibraryDirs:%=-L%)
197   JavaPackageNames = $(subst /,.,$(JavaPackages))
198   IncludePath      = -I$(SourceDir) $(IncludeDirs:%=-I%)
199   LibDirs          = -L$(LibDir)    $(LibraryDirs:%=-L%)
200 < LocalLibs        = $(subst /,,$(Packages))
200 > LocalLibs        = $(subst /,,$(PackageLibs))
201   LibList          = $(LocalLibs:%=-l%) $(Libraries:%=-l%)
202  
203  
# Line 406 | Line 429 | $(Executable) : $(ObjectFiles)
429   # Executable
430   $(Executable) : $(ObjectFiles)
431          $(Print) $@
432 +        $(Print) $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@
433          $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@
434  
435   $(ParallelExecutable) : $(ParallelObjectFiles)
436          $(Print) $@
437 +        $(Print) $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ParallelObjectFiles) -o $@
438          $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ParallelObjectFiles) -o $@
439  
440   # Anything else is just copied from source to target
# Line 459 | Line 484 | $(DependencyFile) : $(DerivedSource)
484   $(DependencyFile) : $(DerivedSource)
485          $(Print) $@
486          @cd $(PackageSourceDir)
487 <        touch Make.temp
488 < ifdef $(CppFiles)
489 <        $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.temp
487 >
488 >        touch Make.ctemp
489 >        touch Make.ctemp
490 >
491 > ifneq "$(words $(CppFiles))" "0"
492 >        $(Print) Make dependencies for $(CppFiles)
493 >        $(Print) $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
494 >        $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
495 >        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
496 >        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
497   endif
498 < ifdef $(CFiles)
499 <        $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   >> Make.temp
498 >
499 > ifneq "$(words $(CFiles))" "0"
500 >        $(Print) Make dependencies for $(CFiles)
501 >        $(Print) $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   > Make.ctemp
502 >        $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   > Make.ctemp
503 >        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
504 >        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
505 >
506   endif
507 <        cat Make.temp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
508 <        cat Make.temp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
509 <        echo $(F90Files)
472 < ifdef $(F90Files)
507 >
508 > ifneq "$(words $(F90Files))" "0"
509 >        $(Print) Make dependencies for $(F90Files)
510          $(DEV_ROOT)/scripts/sfmakedepend  -I $(DEV_ROOT)/src -d '$$(DEV_ROOT)/obj' -f ./Make.ftemp -h *.F90
511          cat Make.ftemp >> $(DependencyFile)
512   endif
513 <        $(Delete) Make.temp Make.ftemp
513 >        $(Delete) Make.cpptemp Make.ctemp Make.ftemp
514  
515   # make lib
516   lib    : $(PackageListLoop)

Diff Legend

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