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

Comparing trunk/OOPSE-2.0/make/Makefile.in (file contents):
Revision 1715 by chrisfen, Fri Nov 5 21:04:12 2004 UTC vs.
Revision 1940 by gezelter, Thu Jan 13 21:56:58 2005 UTC

# Line 38 | Line 38 | PackageLibs = \
38   #packages containing libraries
39   PackageLibs = \
40          utils \
41 +        visitors \
42          math \
43          types \
44          primitives \
44 –        visitors \
45          UseTheForce/DarkSide \
46          UseTheForce \
47          brains \
48          io \
49 +        integrators\
50          constraints \
50 –        profiling \
51 –        restraints \
51          minimizers \
52  
53   #packages containing applications
54   Applications = \
55          applications/oopse \
56          applications/dump2Xyz \
57 <        applications/simpleBuilder
57 >        applications/simpleBuilder\
58  
59   Samples = \
60          samples/argon \
# Line 246 | Line 245 | Move                   = mv
245   #
246   #---------------------------------------------------------------------------
247   Print                  = @echo
248 < Move                   = mv
248 > Move                   = mv -f
249   Copy                   = cp
250   CCompiler              = @CC@
251   CppCompiler            = @CXX@
# Line 255 | 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 286 | Line 285 | CppOptions             = $(FrcDeclare) @CXXFLAGS@
285                           -sourcepath $(SourceDir)
286   COptions               = $(FrcDeclare) @CFLAGS@
287   CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
288 < CppOptions             = $(FrcDeclare) @CXXFLAGS@
289 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
288 > CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
289 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
290   FortranOptions         =
291   F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
292   F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
# Line 365 | 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
374          $(Print) $@
# Line 420 | Line 422 | $(PackageTargetDir)/%.o : %.F90
422   # .F90 -> .o
423   $(PackageTargetDir)/%.o : %.F90
424          $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
425 <        if test -f *.$(ModSuffix); then \
426 <          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
425 >        if test -n "`ls *.$(ModSuffix)`"; then \
426 >          $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
427          fi
428  
429   $(PackageParallelTargetDir)/%.o : %.F90
430          $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
431 <        if test -f *.$(ModSuffix); then \
432 <          $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
431 >        if test -n "`ls *.$(ModSuffix)`"; then \
432 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
433          fi
434  
435   ifeq "$(UseMPI)" "yes"
436   %.o : %.F90
437          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
438 <        if test -f *.$(ModSuffix); then \
439 <          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
440 <        fi
438 >        if test -n "`ls *.$(ModSuffix)`"; then\
439 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
440 >        fi
441  
442          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
443 <        if test -f *.$(ModSuffix); then \
444 <          $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
443 >        if test -n "`ls *.$(ModSuffix)`"; then\
444 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
445          fi
446  
447   else
448   %.o : %.F90
449          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
450 <        if test -f *.$(ModSuffix); then \
451 <          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
452 <        fi
451 <
450 >        if test -n "`ls *.$(ModSuffix)`"; then\
451 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
452 >        fi
453   endif
454  
455  
# Line 568 | 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)/%
# Line 717 | Line 718 | endif      
718   ifneq "$(words $(InstallFiles))" "0"
719          $(InstallData) $(InstallFiles) $(MyInstallDir)
720   endif      
721 <        
721 >
722   # make statistics
723   _statisticsall :
724          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp

Diff Legend

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