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 1505 by gezelter, Wed Sep 29 15:58:18 2004 UTC vs.
Revision 1506 by tim, Wed Sep 29 17:12:15 2004 UTC

# Line 33 | Line 33
33   #  $<      - Current dependency
34   #
35   #---------------------------------------------------------------------------
36 + IS_UNIX=1
37 + #packages to be made
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/oopse \
54 +        applications/dump2Xyz \
55 +        applications/simpleBuilder \
56 +
57 + #packages contain libraries
58 + PackageLibs = \
59 +        utils \
60 +        math \
61 +        types \
62 +        primitives \
63 +        visitors \
64 +        UseTheForce/DarkSide \
65 +        UseTheForce \
66 +        brains \
67 +        io \
68 +        integrators \
69 +        minimizers \
70 +        constraints \
71 +        profiling \
72 +        restraints \
73 +
74 + IncludeDirs = \
75 +        /usr/include \
76 +        /usr/local/include \
77 +        
78 + LibraryDirs = \
79 +        /usr/lib \
80 +        /usr/local/mpich/lib \
81 +        /usr/local/lib \
82 +        /usr/local/intel/compiler80/lib \
83 +
84 + Libraries = \
85 +        mpich \
86 +        sprng \
87 +        ifcore \
88  
89   #---------------------------------------------------------------------------
90   #
# Line 144 | Line 196 | LocalLibs        = $(subst /,,$(Packages))
196   JavaPackageNames = $(subst /,.,$(JavaPackages))
197   IncludePath      = -I$(SourceDir) $(IncludeDirs:%=-I%)
198   LibDirs          = -L$(LibDir)    $(LibraryDirs:%=-L%)
199 < LocalLibs        = $(subst /,,$(Packages))
199 > LocalLibs        = $(subst /,,$(PackageLibs))
200   LibList          = $(LocalLibs:%=-l%) $(Libraries:%=-l%)
201  
202  
# Line 357 | Line 409 | $(Executable) : $(ObjectFiles)
409   # Executable
410   $(Executable) : $(ObjectFiles)
411          $(Print) $@
412 +        $(Print) $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@
413          $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@
414  
415   # Anything else is just copied from source to target
# Line 406 | Line 459 | $(DependencyFile) : $(DerivedSource)
459   $(DependencyFile) : $(DerivedSource)
460          $(Print) $@
461          @cd $(PackageSourceDir)
462 <        touch Make.temp
463 < ifdef $(CppFiles)
464 <        $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.temp
465 < endif
466 < ifdef $(CFiles)
467 <        $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   >> Make.temp
462 >
463 >        touch Make.ctemp
464 >        touch Make.ctemp
465 >
466 > ifneq "$(words $(CppFiles))" "0"
467 >        $(Print) Make dependencies for $(CppFiles)
468 >        $(Print) $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
469 >        $(CppCompiler) $(IncludePath) -MM $(CppFiles)  > Make.cpptemp
470 >        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
471 >        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
472   endif
473 <        cat Make.temp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
474 <        cat Make.temp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
475 < ifdef $(F90Files)
473 >
474 > ifneq "$(words $(CFiles))" "0"
475 >        $(Print) Make dependencies for $(CFiles)
476 >        $(Print) $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   > Make.ctemp
477 >        $(CCompiler)   $(IncludePath) -MM $(CFiles) $(DerivedCFiles)   > Make.ctemp
478 >        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile)
479 >        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile)
480 >
481 > endif
482 >
483 > ifneq "$(words $(F90Files))" "0"
484 >        $(Print) Make dependencies for $(F90Files)
485          $(DEV_ROOT)/scripts/sfmakedepend  -I $(DEV_ROOT)/src -d '$$(DEV_ROOT)/obj' -f ./Make.ftemp -h *.F90
486          cat Make.ftemp >> $(DependencyFile)
487   endif
488 <        $(Delete) Make.temp Make.ftemp
488 >        $(Delete) Make.cpptemp Make.ctemp Make.ftemp
489  
490   # make lib
491   lib    : $(PackageListLoop)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines