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 1984 by tim, Mon Feb 7 20:31:50 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 \
52 <        restraints \
51 >        minimizers \
52 >        selection \
53  
54   #packages containing applications
55   Applications = \
56          applications/oopse \
57          applications/dump2Xyz \
58 <        applications/simpleBuilder
58 >        applications/simpleBuilder\
59  
60   Samples = \
61          samples/argon \
# Line 86 | Line 85 | ForceParamDir   = @OOPSE_HOME@/share/forceFields/
85          @MPI_F90_LIB@
86  
87   OopseHome       = @OOPSE_HOME@
88 < ForceParamDir   = @OOPSE_HOME@/share/forceFields/
89 < SampleSimDir    = @OOPSE_HOME@/share/samples/
90 < BinDir          = @OOPSE_HOME@/bin
91 < DocDir          = @OOPSE_HOME@/doc
88 > ForceParamDir   = $(OopseHome)/share/forceFields
89 > SampleSimDir    = $(OopseHome)/share/samples
90 > InstallBinDir   = $(OopseHome)/bin
91 > DocDir          = $(OopseHome)/doc
92   FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
93   F90Declare      = -D__FORTRAN90
94   ParallelDeclare = -DIS_MPI
# Line 125 | Line 124 | Package          = $(subst $(shell cd $(SourceDir); pw
124   # /home/maul/gezelter/src/code/src/UseTheForce/Darkside --> UseTheForce/Darkside
125   #Package          = $(shell echo $(CurrentDir) | sed -e 's/^.*\/src\/\(.*\)/\1/g')
126   #use shell script to get the absolute path and then rip it off from $(CurrentDir)
127 < Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
127 > #Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
128 > # REMINDER: We are now using the Package line in each subdir makefile.
129 > # This avoids the strange path problem and the subshell
130  
131   PackageList              = $(Package)
132   PackageSourceDir         = $(SourceDir)/$(Package)
# Line 247 | Line 248 | Move                   = mv
248   #
249   #---------------------------------------------------------------------------
250   Print                  = @echo
251 < Move                   = mv
251 > Move                   = mv -f
252   Copy                   = cp
253   CCompiler              = @CC@
254   CppCompiler            = @CXX@
255   Linker                 = @CXX@
256   MakeDepend             = makedepend
257 < Install                = @INSTALL@
257 > INSTALL                = @INSTALL@
258   InstallProgram         = @INSTALL_PROGRAM@
259   InstallData            = @INSTALL_DATA@
260 < MkDir                = @MKINSTALLDIRS@
260 > MkDir                  = @MKINSTALLDIRS@
261   Delete                 = rm -fr
262   StaticArchiver         = @AR@
263   DynamicArchiver        = @CC@
# Line 285 | Line 286 | COptions               = $(FrcDeclare)
286   JniOptions             =
287   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
288                           -sourcepath $(SourceDir)
289 < COptions               = $(FrcDeclare)
290 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
291 < CppOptions             = $(FrcDeclare)
292 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
289 > COptions               = $(FrcDeclare) @CFLAGS@
290 > CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
291 > CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
292 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
293   FortranOptions         =
294 < F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir)
295 < F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
294 > F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
295 > F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
296   JavaCompilerOptions    = -d $(TargetDir) -classpath $(ClassPath) \
297                           -sourcepath $(SourceDir) -deprecation
298   JavaRunOptions         = -classpath $(ClassPath)
# Line 322 | Line 323 | MySample                 = $(subst $(shell cd $(DEV_RO
323   #---------------------------------------------------------------------------
324  
325   ifneq "$(words $(SampleFiles))" "0"
326 < MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
327 < MyInstallDir             = $(SampleSimDir)/$(MySample)
328 < InstallFiles             = $(SampleFiles)
329 < InstallCommand           = $(InstallData)
326 >  MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
327 >  MyInstallDir             = $(SampleSimDir)/$(MySample)
328 >  InstallFiles             = $(SampleFiles)
329 >  InstallCommand           = $(InstallData)
330   endif
331  
332   ifneq "$(words $(Main))" "0"
333 < MyInstallDir             = $(BinDir)/
334 < InstallFiles             = $(Executable) $(ParallelExecutable)
335 < InstallCommand           = $(InstallProgram)
333 >  MyInstallDir             = $(InstallBinDir)
334 >  ifeq "$(UseMPI)" "yes"
335 >    InstallFiles             = $(Executable) $(ParallelExecutable)
336 >  else
337 >    InstallFiles             = $(Executable)
338 >  endif
339 >  InstallCommand           = $(InstallProgram)
340   endif
341  
342 < ifneq "$(words $(ForcefiledFiles))" "0"
343 < MyInstallDir             = $(ForceParamDir)
344 < InstallFiles             = $(ForcefiledFiles)/
345 < InstallCommand           = $(InstallData)
342 > ifneq "$(words $(ForcefieldFiles))" "0"
343 >  MyInstallDir             = $(ForceParamDir)
344 >  InstallFiles             = $(ForcefieldFiles)
345 >  InstallCommand           = $(InstallData)
346   endif
347  
348   ifneq "$(words $(InstallFiles))" "0"
349    InstallList            =
350   else
351 <  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(patsubst %, $(DEV_ROOT)/%,$(Forcefield)) $(patsubst %, $(SourceDir)/%,$(Applications))
351 >  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(DEV_ROOT)/forceFields $(patsubst %, $(SourceDir)/%,$(Applications))
352   endif
353  
354   InstallListLoop          = $(patsubst %,$(SourceDir)/%/.install,$(PackageList))  $(patsubst %,%/.install,$(InstallList))
# Line 362 | Line 367 | $(PackageTargetDir) :
367  
368   # Create target directory
369   $(PackageTargetDir) :
370 <        $(MakeDir) $@
370 >        $(MkDir) $@
371  
372 + $(BinDir) :
373 +        $(MkDir) $@
374 +
375   # .c -> .o
376   $(PackageTargetDir)/%.o : %.c
377          $(Print) $@
# Line 417 | Line 425 | $(PackageTargetDir)/%.o : %.F90
425   # .F90 -> .o
426   $(PackageTargetDir)/%.o : %.F90
427          $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
428 +        if test -n "`ls *.$(ModSuffix)`"; then \
429 +          $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
430 +        fi
431  
432   $(PackageParallelTargetDir)/%.o : %.F90
433          $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
434 +        if test -n "`ls *.$(ModSuffix)`"; then \
435 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
436 +        fi
437  
438   ifeq "$(UseMPI)" "yes"
439   %.o : %.F90
440          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
441 +        if test -n "`ls *.$(ModSuffix)`"; then\
442 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
443 +        fi
444 +
445          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
446 +        if test -n "`ls *.$(ModSuffix)`"; then\
447 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
448 +        fi
449 +
450   else
451   %.o : %.F90
452          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
453 +        if test -n "`ls *.$(ModSuffix)`"; then\
454 +          $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
455 +        fi
456   endif
457  
458  
# Line 547 | Line 572 | $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
572          $(Ranlib) $(CombinedParallelStaticLib)
573  
574   # Executable
575 < $(Executable) : $(CombinedStaticLib) $(ObjectFiles)
576 <        $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(CombinedStaticLib) $(Libraries) -o $@
575 > $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir)
576 >        $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@
577  
578 < $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles)
579 <        $(Linker) $(ParallelObjectFiles) $(ParallelLinkOptions) $(LibDirs) $(CombinedParallelStaticLib) $(Libraries) -o $@
578 > $(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) $(BinDir)
579 >        $(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@
580  
581   # Anything else is just copied from source to target
582   $(PackageTargetDir)/% : $(PackageSourceDir)/%
# Line 630 | Line 655 | ifneq "$(words $(CppFiles))" "0"
655          @cd $(PackageSourceDir)
656  
657   ifneq "$(words $(CppFiles))" "0"
658 <        $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
659 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
658 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' -MM $(CppFiles)>> Make.cpptemp
659 >        @cat Make.cpptemp  >> $(DependencyFile)
660          $(Delete) Make.cpptemp
661 <        $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
662 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
661 >
662 >  ifeq "$(UseMPI)" "yes"
663 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CppFiles)>> Make.cpptemp
664 >        @cat Make.cpptemp  >> $(DependencyFile)
665          @$(Delete) Make.cpptemp
666 +  endif
667 +
668   endif
669  
670   ifneq "$(words $(CFiles))" "0"
671 <        $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
672 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
671 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/'  -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
672 >        @cat Make.ctemp  >> $(DependencyFile)
673          $(Delete) Make.ctemp
674 <        $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
675 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
674 >
675 >  ifeq "$(UseMPI)" "yes"
676 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
677 >        @cat Make.ctemp  >> $(DependencyFile)
678          @$(Delete) Make.ctemp
679 +  endif
680 +
681   endif
682  
683   ifneq "$(words $(F90Files))" "0"
684 <        $(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
684 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
685          @cat Make.ftemp >> $(DependencyFile)
686          @$(Delete) Make.ftemp
687 +
688 +  ifeq "$(UseMPI)" "yes"
689 +        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
690 +        @cat Make.ftemp >> $(DependencyFile)
691 +        @$(Delete) Make.ftemp
692 +  endif
693 +
694   endif
695  
696   # make lib
# Line 683 | Line 722 | _installprogram:
722          $(InstallData) $(InstallFiles) $(MyInstallDir)
723   endif      
724  
686 – _installprogram:
687 –        
725   # make statistics
726   _statisticsall :
727          @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp

Diff Legend

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