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

Comparing trunk/OOPSE-3.0/make/Makefile.in (file contents):
Revision 1932 by tim, Wed Jan 12 23:17:02 2005 UTC vs.
Revision 1938 by gezelter, Thu Jan 13 21:48:09 2005 UTC

# Line 254 | Line 254 | MkDir                = @MKINSTALLDIRS@
254   INSTALL                = @INSTALL@
255   InstallProgram         = @INSTALL_PROGRAM@
256   InstallData            = @INSTALL_DATA@
257 < MkDir                = @MKINSTALLDIRS@
257 > MkDir                  = @MKINSTALLDIRS@
258   Delete                 = rm -fr
259   StaticArchiver         = @AR@
260   DynamicArchiver        = @CC@
# Line 364 | Line 364 | $(PackageTargetDir) :
364  
365   # Create target directory
366   $(PackageTargetDir) :
367 <        $(MakeDir) $@
367 >        $(MkDir) $@
368 >
369 > $(BinDir) :
370 >        $(MkDir) $@
371  
372   # .c -> .o
373   $(PackageTargetDir)/%.o : %.c
# Line 437 | Line 440 | ifeq "$(UseMPI)" "yes"
440          fi
441  
442          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
443 <        if test -n "`ls *.$(ModSuffix)`"; then\
444 <          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
445 <        fi
443 >        if test -n "`ls *.$(ModSuffix)`"; then\
444 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
445 >        fi
446  
447   else
448   %.o : %.F90
# Line 447 | Line 450 | else
450          if test -n "`ls *.$(ModSuffix)`"; then\
451            $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
452          fi
450 –
453   endif
454  
455  
# Line 567 | Line 569 | $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
569          $(Ranlib) $(CombinedParallelStaticLib)
570  
571   # Executable
572 < $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
573 <        $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(CombinedStaticLib) $(Libraries) -o $@
572 > $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir)
573 >        $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
574  
575 < $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
576 <        $(Linker) $(ParallelObjectFiles) $(ParallelLinkOptions) $(LibDirs) $(CombinedParallelStaticLib) $(Libraries) -o $@
575 > $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) $(BinDir)
576 >        $(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@
577  
578   # Anything else is just copied from source to target
579   $(PackageTargetDir)/% : $(PackageSourceDir)/%

Diff Legend

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