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

Comparing:
trunk/OOPSE-3.0/make/Makefile.in (file contents), Revision 1544 by tim, Fri Oct 8 22:10:22 2004 UTC vs.
branches/new_design/OOPSE-3.0/make/Makefile.in (file contents), Revision 1898 by tim, Mon Dec 20 20:36:40 2004 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 \
51 <        constraints \
52 <        profiling \
53 <        restraints \
49 >        integrators\
50  
51   #packages containing applications
52   Applications = \
# Line 86 | Line 82 | ForceParamDir   = @OOPSE_HOME@/share/forceFields/
82          @MPI_F90_LIB@
83  
84   OopseHome       = @OOPSE_HOME@
85 < ForceParamDir   = @OOPSE_HOME@/share/forceFields/
86 < SampleSimDir    = @OOPSE_HOME@/share/samples/
87 < BinDir          = @OOPSE_HOME@/bin
88 < DocDir          = @OOPSE_HOME@/doc
85 > ForceParamDir   = $(OopseHome)/share/forceFields
86 > SampleSimDir    = $(OopseHome)/share/samples
87 > InstallBinDir   = $(OopseHome)/bin
88 > DocDir          = $(OopseHome)/doc
89   FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
90   F90Declare      = -D__FORTRAN90
91   ParallelDeclare = -DIS_MPI
# Line 247 | Line 243 | Move                   = mv
243   #
244   #---------------------------------------------------------------------------
245   Print                  = @echo
246 < Move                   = mv
246 > Move                   = mv -f
247   Copy                   = cp
248   CCompiler              = @CC@
249   CppCompiler            = @CXX@
250   Linker                 = @CXX@
251   MakeDepend             = makedepend
252 < Install                = @INSTALL@
252 > INSTALL                = @INSTALL@
253   InstallProgram         = @INSTALL_PROGRAM@
254   InstallData            = @INSTALL_DATA@
255   MkDir                = @MKINSTALLDIRS@
# Line 285 | Line 281 | COptions               = $(FrcDeclare)
281   JniOptions             =
282   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
283                           -sourcepath $(SourceDir)
284 < COptions               = $(FrcDeclare)
285 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
286 < CppOptions             = $(FrcDeclare)
287 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
284 > COptions               = $(FrcDeclare) @CFLAGS@
285 > CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
286 > CppOptions             = $(FrcDeclare) @CXXFLAGS@
287 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
288   FortranOptions         =
289 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir)
290 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
289 > F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
290 > F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
291   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
292                           -sourcepath $(SourceDir) -deprecation
293   JavaRunOptions         = -classpath $(ClassPath)
# Line 322 | Line 318 | MySample                 = $(subst $(shell cd $(DEV_RO
318   #---------------------------------------------------------------------------
319  
320   ifneq "$(words $(SampleFiles))" "0"
321 < MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
322 < MyInstallDir             = $(SampleSimDir)/$(MySample)
323 < InstallFiles             = $(SampleFiles)
324 < InstallCommand           = $(InstallData)
321 >  MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
322 >  MyInstallDir             = $(SampleSimDir)/$(MySample)
323 >  InstallFiles             = $(SampleFiles)
324 >  InstallCommand           = $(InstallData)
325   endif
326  
327   ifneq "$(words $(Main))" "0"
328 < MyInstallDir             = $(BinDir)/
329 < InstallFiles             = $(Executable) $(ParallelExecutable)
330 < InstallCommand           = $(InstallProgram)
328 >  MyInstallDir             = $(InstallBinDir)
329 >  ifeq "$(UseMPI)" "yes"
330 >    InstallFiles             = $(Executable) $(ParallelExecutable)
331 >  else
332 >    InstallFiles             = $(Executable)
333 >  endif
334 >  InstallCommand           = $(InstallProgram)
335   endif
336  
337 < ifneq "$(words $(ForcefiledFiles))" "0"
338 < MyInstallDir             = $(ForceParamDir)
339 < InstallFiles             = $(ForcefiledFiles)/
340 < InstallCommand           = $(InstallData)
337 > ifneq "$(words $(ForcefieldFiles))" "0"
338 >  MyInstallDir             = $(ForceParamDir)
339 >  InstallFiles             = $(ForcefieldFiles)
340 >  InstallCommand           = $(InstallData)
341   endif
342  
343   ifneq "$(words $(InstallFiles))" "0"
344    InstallList            =
345   else
346 <  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(patsubst %, $(DEV_ROOT)/%,$(Forcefield)) $(patsubst %, $(SourceDir)/%,$(Applications))
346 >  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(DEV_ROOT)/forceFields $(patsubst %, $(SourceDir)/%,$(Applications))
347   endif
348  
349   InstallListLoop          = $(patsubst %,$(SourceDir)/%/.install,$(PackageList))  $(patsubst %,%/.install,$(InstallList))
# Line 417 | Line 417 | $(PackageTargetDir)/%.o : %.F90
417   # .F90 -> .o
418   $(PackageTargetDir)/%.o : %.F90
419          $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
420 +        if test -n "`ls *.$(ModSuffix)`"; then \
421 +          $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
422 +        fi
423  
424   $(PackageParallelTargetDir)/%.o : %.F90
425          $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
426 +        if test -n "`ls *.$(ModSuffix)`"; then \
427 +          $(Move) "`ls *.$(ModSuffix)`" (PackageParallelTargetDir);\
428 +        fi
429  
430   ifeq "$(UseMPI)" "yes"
431   %.o : %.F90
432          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
433 +        if test -f *.$(ModSuffix); then \
434 +          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
435 +        fi
436 +
437          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
438 +        if test -f *.$(ModSuffix); then \
439 +          $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
440 +        fi
441 +
442   else
443   %.o : %.F90
444          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
445 +        if test -f *.$(ModSuffix); then \
446 +          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
447 +        fi
448 +
449   endif
450  
451  
# Line 630 | Line 648 | ifneq "$(words $(CppFiles))" "0"
648          @cd $(PackageSourceDir)
649  
650   ifneq "$(words $(CppFiles))" "0"
651 <        $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
652 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
651 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' -MM $(CppFiles)>> Make.cpptemp
652 >        @cat Make.cpptemp  >> $(DependencyFile)
653          $(Delete) Make.cpptemp
654 <        $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
655 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
654 >
655 >  ifeq "$(UseMPI)" "yes"
656 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CppFiles)>> Make.cpptemp
657 >        @cat Make.cpptemp  >> $(DependencyFile)
658          @$(Delete) Make.cpptemp
659 +  endif
660 +
661   endif
662  
663   ifneq "$(words $(CFiles))" "0"
664 <        $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
665 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
664 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/'  -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
665 >        @cat Make.ctemp  >> $(DependencyFile)
666          $(Delete) Make.ctemp
667 <        $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
668 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
667 >
668 >  ifeq "$(UseMPI)" "yes"
669 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
670 >        @cat Make.ctemp  >> $(DependencyFile)
671          @$(Delete) Make.ctemp
672 +  endif
673 +
674   endif
675  
676   ifneq "$(words $(F90Files))" "0"
677 <        $(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
677 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
678          @cat Make.ftemp >> $(DependencyFile)
679          @$(Delete) Make.ftemp
680 +
681 +  ifeq "$(UseMPI)" "yes"
682 +        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
683 +        @cat Make.ftemp >> $(DependencyFile)
684 +        @$(Delete) Make.ftemp
685 +  endif
686 +
687   endif
688  
689   # make lib
# Line 682 | Line 714 | endif      
714   ifneq "$(words $(InstallFiles))" "0"
715          $(InstallData) $(InstallFiles) $(MyInstallDir)
716   endif      
685 –
686 – _installprogram:
717          
718   # make statistics
719   _statisticsall :

Diff Legend

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