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 1545 by tim, Fri Oct 8 22:51:06 2004 UTC vs.
Revision 1932 by tim, Wed Jan 12 23:17:02 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 < InstallBinDir   = @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@
# 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@
289 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
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             = $(InstallBinDir)
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 $(ForcefieldFiles))" "0"
340 < MyInstallDir             = $(ForceParamDir)
341 < InstallFiles             = $(ForcefieldFiles)
342 < InstallCommand           = $(InstallData)
340 >  MyInstallDir             = $(ForceParamDir)
341 >  InstallFiles             = $(ForcefieldFiles)
342 >  InstallCommand           = $(InstallData)
343   endif
344  
345   ifneq "$(words $(InstallFiles))" "0"
# Line 417 | Line 419 | $(PackageTargetDir)/%.o : %.F90
419   # .F90 -> .o
420   $(PackageTargetDir)/%.o : %.F90
421          $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
422 +        if test -n "`ls *.$(ModSuffix)`"; then \
423 +          $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
424 +        fi
425  
426   $(PackageParallelTargetDir)/%.o : %.F90
427          $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
428 +        if test -n "`ls *.$(ModSuffix)`"; then \
429 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
430 +        fi
431  
432   ifeq "$(UseMPI)" "yes"
433   %.o : %.F90
434          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
435 +        if test -n "`ls *.$(ModSuffix)`"; then\
436 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
437 +        fi
438 +
439          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
440 +        if test -n "`ls *.$(ModSuffix)`"; then\
441 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
442 +        fi
443 +
444   else
445   %.o : %.F90
446          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
447 +        if test -n "`ls *.$(ModSuffix)`"; then\
448 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
449 +        fi
450 +
451   endif
452  
453  
# Line 630 | Line 650 | ifneq "$(words $(CppFiles))" "0"
650          @cd $(PackageSourceDir)
651  
652   ifneq "$(words $(CppFiles))" "0"
653 <        $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
654 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
653 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' -MM $(CppFiles)>> Make.cpptemp
654 >        @cat Make.cpptemp  >> $(DependencyFile)
655          $(Delete) Make.cpptemp
656 <        $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
657 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
656 >
657 >  ifeq "$(UseMPI)" "yes"
658 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CppFiles)>> Make.cpptemp
659 >        @cat Make.cpptemp  >> $(DependencyFile)
660          @$(Delete) Make.cpptemp
661 +  endif
662 +
663   endif
664  
665   ifneq "$(words $(CFiles))" "0"
666 <        $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
667 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
666 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/'  -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
667 >        @cat Make.ctemp  >> $(DependencyFile)
668          $(Delete) Make.ctemp
669 <        $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
670 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
669 >
670 >  ifeq "$(UseMPI)" "yes"
671 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
672 >        @cat Make.ctemp  >> $(DependencyFile)
673          @$(Delete) Make.ctemp
674 +  endif
675 +
676   endif
677  
678   ifneq "$(words $(F90Files))" "0"
679 <        $(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
679 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
680          @cat Make.ftemp >> $(DependencyFile)
681          @$(Delete) Make.ftemp
682 +
683 +  ifeq "$(UseMPI)" "yes"
684 +        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
685 +        @cat Make.ftemp >> $(DependencyFile)
686 +        @$(Delete) Make.ftemp
687 +  endif
688 +
689   endif
690  
691   # make lib
# Line 682 | Line 716 | endif      
716   ifneq "$(words $(InstallFiles))" "0"
717          $(InstallData) $(InstallFiles) $(MyInstallDir)
718   endif      
719 <        
719 >
720   # make statistics
721   _statisticsall :
722          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp

Diff Legend

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