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

Comparing trunk/OOPSE-4/make/Makefile (file contents):
Revision 1526 by tim, Tue Oct 5 19:35:59 2004 UTC vs.
Revision 1527 by tim, Tue Oct 5 22:57:01 2004 UTC

# Line 84 | Line 84 | LinkOptions = \
84          -lmpich \
85          -lfmpich
86  
87 LinkOptions = \
88         -L/usr/local/intel/compiler81/lib -L/usr/lib -lifport -lifcore -limf -lm -lcxa -lirc -lunwind -lirc_s
89
87   OopseHome       = /usr/local/oopse
88   ForceParamDir   = /usr/local/oopse/share/forceFields/
89   SampleSimDir    = /usr/local/oopse/share/samples/
# Line 109 | Line 106 | CurrentDir        = $(CURDIR)
106   BinDir            = $(DEV_ROOT)/bin
107   DocsDir           = $(DEV_ROOT)/docs
108   CurrentDir        = $(CURDIR)
109 + RPath = $(shell cd $(DEV_ROOT); pwd)/lib:$(OopseHome)/lib
110 + ParallelRPath = $(shell cd $(DEV_ROOT); pwd)/MPIlib:$(OopseHome)/MPIlib
111 + LinkOptions = \
112 +         -L/usr/local/intel/compiler81/lib -L/usr/lib -lifport -lifcore -limf -lm -lcxa -lirc -lunwind -lirc_s \
113 +        -Wl,-R$(RPath)
114 +
115 + ParallelLinkOptions = \
116 +         -L/usr/local/intel/compiler81/lib -L/usr/lib -lifport -lifcore -limf -lm -lcxa -lirc -lunwind -lirc_s \
117 +        -Wl,-R$(ParallelRPath)
118  
119   ifdef Source
120   #get the relative path of current package to source directory
# Line 479 | Line 485 | $(PackageTargetDir)/%_Skel.class : $(PackageTargetDir)
485  
486   %_Skel.class : %.class
487          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
488 +
489 + $(OopseStaticLibrary) : .stamp
490 +        touch .stamp
491 +
492 + $(OopseStaticLibrary) : $(ObjectFiles)
493 +        $(StaticArchiver)  $(StaticArchiverOptions) $(OopseStaticLibrary) $(ObjectFiles)
494  
495 + .MPIstamp : $(OopseParallelStaticLibrary)
496 +        touch .MPIstamp
497 +
498 + $(OopseParallelStaticLibrary) : $(ParallelObjectFiles)
499 +        $(StaticArchiver)  $(StaticArchiverOptions) $(OopseParallelStaticLibrary) $(ParallelObjectFiles)
500 +
501 +
502   # Executable
503   $(Executable) : $(ObjectFiles)
504 <        $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(LibList) $(LibList) $(LibList) -o $@
504 >        $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(LibList) -o $@
505  
506   $(ParallelExecutable) : $(ParallelObjectFiles)
507 <        $(Linker) $(ParallelObjectFiles) $(LinkOptions) $(ParallelLibDirs) $(ParallelLibList) $(ParallelLibList) $(ParallelLibList) -o $@
507 >        $(Linker) $(ParallelObjectFiles)  $(ParallelLinkOptions) $(ParallelLibDirs) $(LibList) -o $@
508  
509   # Anything else is just copied from source to target
510   $(PackageTargetDir)/% : $(PackageSourceDir)/%
# Line 508 | Line 527 | _buildall : \
527          $(RmiStubFiles) \
528          $(RmiSkeletonFiles) \
529          $(OtherTargetFiles) \
530 +        $(SharedLibrary) \
531          $(StaticLibrary) \
532 +        $(ParallelSharedLibrary) \
533          $(ParallelStaticLibrary) \
534          $(JarFile) \
535          $(Executable) \
# Line 522 | Line 543 | _buildall : \
543          $(RmiStubFiles) \
544          $(RmiSkeletonFiles) \
545          $(OtherTargetFiles) \
546 +        $(SharedLibrary) \
547          $(StaticLibrary) \
548          $(JarFile) \
549          $(Executable)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines