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 1544 by tim, Fri Oct 8 22:10:22 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 <        minimizers \
49 >        integrators\
50          constraints \
51 <        profiling \
53 <        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 86 | Line 84 | ForceParamDir   = @OOPSE_HOME@/share/forceFields/
84          @MPI_F90_LIB@
85  
86   OopseHome       = @OOPSE_HOME@
87 < ForceParamDir   = @OOPSE_HOME@/share/forceFields/
88 < SampleSimDir    = @OOPSE_HOME@/share/samples/
89 < BinDir          = @OOPSE_HOME@/bin
90 < DocDir          = @OOPSE_HOME@/doc
87 > ForceParamDir   = $(OopseHome)/share/forceFields
88 > SampleSimDir    = $(OopseHome)/share/samples
89 > InstallBinDir   = $(OopseHome)/bin
90 > DocDir          = $(OopseHome)/doc
91   FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
92   F90Declare      = -D__FORTRAN90
93   ParallelDeclare = -DIS_MPI
# Line 247 | 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@
252   Linker                 = @CXX@
253   MakeDepend             = makedepend
254 < Install                = @INSTALL@
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 285 | Line 283 | COptions               = $(FrcDeclare)
283   JniOptions             =
284   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
285                           -sourcepath $(SourceDir)
286 < COptions               = $(FrcDeclare)
287 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
288 < CppOptions             = $(FrcDeclare)
289 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
286 > COptions               = $(FrcDeclare) @CFLAGS@
287 > CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
288 > CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
289 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
290   FortranOptions         =
291 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir)
292 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
291 > F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
292 > F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
293   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
294                           -sourcepath $(SourceDir) -deprecation
295   JavaRunOptions         = -classpath $(ClassPath)
# Line 322 | Line 320 | MySample                 = $(subst $(shell cd $(DEV_RO
320   #---------------------------------------------------------------------------
321  
322   ifneq "$(words $(SampleFiles))" "0"
323 < MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
324 < MyInstallDir             = $(SampleSimDir)/$(MySample)
325 < InstallFiles             = $(SampleFiles)
326 < InstallCommand           = $(InstallData)
323 >  MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
324 >  MyInstallDir             = $(SampleSimDir)/$(MySample)
325 >  InstallFiles             = $(SampleFiles)
326 >  InstallCommand           = $(InstallData)
327   endif
328  
329   ifneq "$(words $(Main))" "0"
330 < MyInstallDir             = $(BinDir)/
331 < InstallFiles             = $(Executable) $(ParallelExecutable)
332 < InstallCommand           = $(InstallProgram)
330 >  MyInstallDir             = $(InstallBinDir)
331 >  ifeq "$(UseMPI)" "yes"
332 >    InstallFiles             = $(Executable) $(ParallelExecutable)
333 >  else
334 >    InstallFiles             = $(Executable)
335 >  endif
336 >  InstallCommand           = $(InstallProgram)
337   endif
338  
339 < ifneq "$(words $(ForcefiledFiles))" "0"
340 < MyInstallDir             = $(ForceParamDir)
341 < InstallFiles             = $(ForcefiledFiles)/
342 < InstallCommand           = $(InstallData)
339 > ifneq "$(words $(ForcefieldFiles))" "0"
340 >  MyInstallDir             = $(ForceParamDir)
341 >  InstallFiles             = $(ForcefieldFiles)
342 >  InstallCommand           = $(InstallData)
343   endif
344  
345   ifneq "$(words $(InstallFiles))" "0"
346    InstallList            =
347   else
348 <  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(patsubst %, $(DEV_ROOT)/%,$(Forcefield)) $(patsubst %, $(SourceDir)/%,$(Applications))
348 >  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(DEV_ROOT)/forceFields $(patsubst %, $(SourceDir)/%,$(Applications))
349   endif
350  
351   InstallListLoop          = $(patsubst %,$(SourceDir)/%/.install,$(PackageList))  $(patsubst %,%/.install,$(InstallList))
# Line 362 | 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 417 | Line 422 | $(PackageTargetDir)/%.o : %.F90
422   # .F90 -> .o
423   $(PackageTargetDir)/%.o : %.F90
424          $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
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 -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 -n "`ls *.$(ModSuffix)`"; then\
439 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
440 +        fi
441 +
442          $(MAKE) $(MakeOptions) $(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 -n "`ls *.$(ModSuffix)`"; then\
451 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
452 +        fi
453   endif
454  
455  
# Line 547 | 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 630 | Line 652 | ifneq "$(words $(CppFiles))" "0"
652          @cd $(PackageSourceDir)
653  
654   ifneq "$(words $(CppFiles))" "0"
655 <        $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
656 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
655 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' -MM $(CppFiles)>> Make.cpptemp
656 >        @cat Make.cpptemp  >> $(DependencyFile)
657          $(Delete) Make.cpptemp
658 <        $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
659 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
658 >
659 >  ifeq "$(UseMPI)" "yes"
660 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CppFiles)>> Make.cpptemp
661 >        @cat Make.cpptemp  >> $(DependencyFile)
662          @$(Delete) Make.cpptemp
663 +  endif
664 +
665   endif
666  
667   ifneq "$(words $(CFiles))" "0"
668 <        $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
669 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
668 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/'  -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
669 >        @cat Make.ctemp  >> $(DependencyFile)
670          $(Delete) Make.ctemp
671 <        $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
672 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
671 >
672 >  ifeq "$(UseMPI)" "yes"
673 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
674 >        @cat Make.ctemp  >> $(DependencyFile)
675          @$(Delete) Make.ctemp
676 +  endif
677 +
678   endif
679  
680   ifneq "$(words $(F90Files))" "0"
681 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
652 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
681 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
682          @cat Make.ftemp >> $(DependencyFile)
683          @$(Delete) Make.ftemp
684 +
685 +  ifeq "$(UseMPI)" "yes"
686 +        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
687 +        @cat Make.ftemp >> $(DependencyFile)
688 +        @$(Delete) Make.ftemp
689 +  endif
690 +
691   endif
692  
693   # make lib
# Line 683 | Line 719 | _installprogram:
719          $(InstallData) $(InstallFiles) $(MyInstallDir)
720   endif      
721  
686 – _installprogram:
687 –        
722   # make statistics
723   _statisticsall :
724          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp

Diff Legend

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