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

Diff Legend

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