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 1951 by gezelter, Fri Jan 14 21:13:24 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 124 | Line 123 | Package          = $(subst $(shell cd $(SourceDir); pw
123   # /home/maul/gezelter/src/code/src/UseTheForce/Darkside --> UseTheForce/Darkside
124   #Package          = $(shell echo $(CurrentDir) | sed -e 's/^.*\/src\/\(.*\)/\1/g')
125   #use shell script to get the absolute path and then rip it off from $(CurrentDir)
126 < Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
126 > #Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
127 > # REMINDER: We are now using the Package line in each subdir makefile.
128 > # This avoids the strange path problem and the subshell
129  
130   PackageList              = $(Package)
131   PackageSourceDir         = $(SourceDir)/$(Package)
# Line 246 | Line 247 | Move                   = mv
247   #
248   #---------------------------------------------------------------------------
249   Print                  = @echo
250 < Move                   = mv
250 > Move                   = mv -f
251   Copy                   = cp
252   CCompiler              = @CC@
253   CppCompiler            = @CXX@
# Line 255 | Line 256 | MkDir                = @MKINSTALLDIRS@
256   INSTALL                = @INSTALL@
257   InstallProgram         = @INSTALL_PROGRAM@
258   InstallData            = @INSTALL_DATA@
259 < MkDir                = @MKINSTALLDIRS@
259 > MkDir                  = @MKINSTALLDIRS@
260   Delete                 = rm -fr
261   StaticArchiver         = @AR@
262   DynamicArchiver        = @CC@
# Line 286 | Line 287 | CppOptions             = $(FrcDeclare) @CXXFLAGS@
287                           -sourcepath $(SourceDir)
288   COptions               = $(FrcDeclare) @CFLAGS@
289   CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
290 < CppOptions             = $(FrcDeclare) @CXXFLAGS@
291 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
290 > CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
291 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
292   FortranOptions         =
293   F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
294   F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
# Line 365 | Line 366 | $(PackageTargetDir) :
366  
367   # Create target directory
368   $(PackageTargetDir) :
369 <        $(MakeDir) $@
369 >        $(MkDir) $@
370  
371 + $(BinDir) :
372 +        $(MkDir) $@
373 +
374   # .c -> .o
375   $(PackageTargetDir)/%.o : %.c
376          $(Print) $@
# Line 420 | Line 424 | $(PackageTargetDir)/%.o : %.F90
424   # .F90 -> .o
425   $(PackageTargetDir)/%.o : %.F90
426          $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
427 <        if test -f *.$(ModSuffix); then \
428 <          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
427 >        if test -n "`ls *.$(ModSuffix)`"; then \
428 >          $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
429          fi
430  
431   $(PackageParallelTargetDir)/%.o : %.F90
432          $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
433 <        if test -f *.$(ModSuffix); then \
434 <          $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
433 >        if test -n "`ls *.$(ModSuffix)`"; then \
434 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
435          fi
436  
437   ifeq "$(UseMPI)" "yes"
438   %.o : %.F90
439          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
440 <        if test -f *.$(ModSuffix); then \
441 <          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
442 <        fi
440 >        if test -n "`ls *.$(ModSuffix)`"; then\
441 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
442 >        fi
443  
444          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
445 <        if test -f *.$(ModSuffix); then \
446 <          $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
445 >        if test -n "`ls *.$(ModSuffix)`"; then\
446 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
447          fi
448  
449   else
450   %.o : %.F90
451          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
452 <        if test -f *.$(ModSuffix); then \
453 <          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
454 <        fi
451 <
452 >        if test -n "`ls *.$(ModSuffix)`"; then\
453 >          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
454 >        fi
455   endif
456  
457  
# Line 568 | Line 571 | $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
571          $(Ranlib) $(CombinedParallelStaticLib)
572  
573   # Executable
574 < $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
575 <        $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(CombinedStaticLib) $(Libraries) -o $@
574 > $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir)
575 >        $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
576  
577 < $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
578 <        $(Linker) $(ParallelObjectFiles) $(ParallelLinkOptions) $(LibDirs) $(CombinedParallelStaticLib) $(Libraries) -o $@
577 > $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) $(BinDir)
578 >        $(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@
579  
580   # Anything else is just copied from source to target
581   $(PackageTargetDir)/% : $(PackageSourceDir)/%
# Line 717 | Line 720 | endif      
720   ifneq "$(words $(InstallFiles))" "0"
721          $(InstallData) $(InstallFiles) $(MyInstallDir)
722   endif      
723 <        
723 >
724   # make statistics
725   _statisticsall :
726          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp

Diff Legend

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