--- trunk/OOPSE-2.0/make/Makefile.in 2004/10/06 22:20:47 1539 +++ trunk/OOPSE-2.0/make/Makefile.in 2005/02/14 23:26:25 2023 @@ -38,25 +38,26 @@ PackageLibs = \ #packages containing libraries PackageLibs = \ utils \ + visitors \ math \ types \ primitives \ - visitors \ UseTheForce/DarkSide \ UseTheForce \ brains \ io \ - integrators \ - minimizers \ + integrators\ constraints \ - profiling \ - restraints \ + minimizers \ + selection \ #packages containing applications Applications = \ applications/oopse \ applications/dump2Xyz \ - applications/simpleBuilder + applications/simpleBuilder\ + applications/staticProps \ + applications/dynamicProps \ Samples = \ samples/argon \ @@ -86,8 +87,10 @@ ForceParamDir = @OOPSE_HOME@/share/forceFields/ @MPI_F90_LIB@ OopseHome = @OOPSE_HOME@ -ForceParamDir = @OOPSE_HOME@/share/forceFields/ -SampleSimDir = @OOPSE_HOME@/share/samples/ +ForceParamDir = $(OopseHome)/share/forceFields +SampleSimDir = $(OopseHome)/share/samples +InstallBinDir = $(OopseHome)/bin +DocDir = $(OopseHome)/doc FrcDeclare = -DFRC_PATH="$(ForceParamDir)" F90Declare = -D__FORTRAN90 ParallelDeclare = -DIS_MPI @@ -123,7 +126,9 @@ Package = $(subst $(shell cd $(SourceDir); pw # /home/maul/gezelter/src/code/src/UseTheForce/Darkside --> UseTheForce/Darkside #Package = $(shell echo $(CurrentDir) | sed -e 's/^.*\/src\/\(.*\)/\1/g') #use shell script to get the absolute path and then rip it off from $(CurrentDir) -Package = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir)) +#Package = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir)) +# REMINDER: We are now using the Package line in each subdir makefile. +# This avoids the strange path problem and the subshell PackageList = $(Package) PackageSourceDir = $(SourceDir)/$(Package) @@ -223,6 +228,7 @@ endif ParallelStaticLibrary = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.a endif endif + # # Misc # @@ -244,16 +250,16 @@ Move = mv # #--------------------------------------------------------------------------- Print = @echo -Move = mv +Move = mv -f Copy = cp CCompiler = @CC@ CppCompiler = @CXX@ Linker = @CXX@ MakeDepend = makedepend -Install = @INSTALL@ +INSTALL = @INSTALL@ InstallProgram = @INSTALL_PROGRAM@ InstallData = @INSTALL_DATA@ -MakeDir = @MKINSTALLDIRS@ +MkDir = @MKINSTALLDIRS@ Delete = rm -fr StaticArchiver = @AR@ DynamicArchiver = @CC@ @@ -273,6 +279,8 @@ Doxygen = @DOXYGEN@ Lex = @LEX@ Ranlib = @RANLIB@ Doxygen = @DOXYGEN@ +Ps = @PS@ +PsType = @PSTYPE@ MakeOptions = -k MakeDependOptions = @@ -282,13 +290,13 @@ COptions = $(FrcDeclare) JniOptions = RmiOptions = -d $(TargetDir) -classpath $(ClassPath) \ -sourcepath $(SourceDir) -COptions = $(FrcDeclare) -CParallelOptions = $(FrcDeclare) $(ParallelDeclare) -CppOptions = $(FrcDeclare) -CppParallelOptions = $(FrcDeclare) $(ParallelDeclare) +COptions = $(FrcDeclare) @CFLAGS@ -DPS=$(Ps) -DPSTYPE=$(PsType) +CParallelOptions = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@ +CppOptions = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@ +CppParallelOptions = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@ FortranOptions = -F90Options = @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir) -F90ParallelOptions = @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclare) +F90Options = @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) +F90ParallelOptions = @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclare) JavaCompilerOptions = -d $(TargetDir) -classpath $(ClassPath) \ -sourcepath $(SourceDir) -deprecation JavaRunOptions = -classpath $(ClassPath) @@ -314,6 +322,45 @@ Space = $(Empty) $(Empty) #--------------------------------------------------------------------------- # +# Install +# +#--------------------------------------------------------------------------- + +ifneq "$(words $(SampleFiles))" "0" + MySample = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir)) + MyInstallDir = $(SampleSimDir)/$(MySample) + InstallFiles = $(SampleFiles) + InstallCommand = $(InstallData) +endif + +ifneq "$(words $(Main))" "0" + MyInstallDir = $(InstallBinDir) + ifeq "$(UseMPI)" "yes" + InstallFiles = $(Executable) $(ParallelExecutable) + else + InstallFiles = $(Executable) + endif + InstallCommand = $(InstallProgram) +endif + +ifneq "$(words $(ForcefieldFiles))" "0" + MyInstallDir = $(ForceParamDir) + InstallFiles = $(ForcefieldFiles) + InstallCommand = $(InstallData) +endif + +ifneq "$(words $(InstallFiles))" "0" + InstallList = +else + InstallList = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(DEV_ROOT)/forceFields $(patsubst %, $(SourceDir)/%,$(Applications)) +endif + +InstallListLoop = $(patsubst %,$(SourceDir)/%/.install,$(PackageList)) $(patsubst %,%/.install,$(InstallList)) + + + +#--------------------------------------------------------------------------- +# # Rules # #--------------------------------------------------------------------------- @@ -324,7 +371,10 @@ $(PackageTargetDir) : # Create target directory $(PackageTargetDir) : - $(MakeDir) $@ + $(MkDir) $@ + +$(BinDir) : + $(MkDir) $@ # .c -> .o $(PackageTargetDir)/%.o : %.c @@ -379,17 +429,34 @@ $(PackageTargetDir)/%.o : %.F90 # .F90 -> .o $(PackageTargetDir)/%.o : %.F90 $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@ + if test -n "`ls *.$(ModSuffix)`"; then \ + $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\ + fi $(PackageParallelTargetDir)/%.o : %.F90 $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@ + if test -n "`ls *.$(ModSuffix)`"; then \ + $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\ + fi ifeq "$(UseMPI)" "yes" %.o : %.F90 $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ + if test -n "`ls *.$(ModSuffix)`"; then\ + $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\ + fi + $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@ + if test -n "`ls *.$(ModSuffix)`"; then\ + $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\ + fi + else %.o : %.F90 $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ + if test -n "`ls *.$(ModSuffix)`"; then\ + $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\ + fi endif @@ -509,11 +576,11 @@ $(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(Ranlib) $(CombinedParallelStaticLib) # Executable -$(Executable) : $(CombinedStaticLib) $(ObjectFiles) - $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(CombinedStaticLib) $(Libraries) -o $@ +$(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir) + $(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@ -$(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) - $(Linker) $(ParallelObjectFiles) $(ParallelLinkOptions) $(LibDirs) $(CombinedParallelStaticLib) $(Libraries) -o $@ +$(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) $(BinDir) + $(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@ # Anything else is just copied from source to target $(PackageTargetDir)/% : $(PackageSourceDir)/% @@ -526,6 +593,7 @@ ifeq "$(UseMPI)" "yes" _all : _buildall +_buildall : ifeq "$(UseMPI)" "yes" _buildall : \ $(DependencyFile) \ @@ -591,28 +659,42 @@ ifneq "$(words $(CppFiles))" "0" @cd $(PackageSourceDir) ifneq "$(words $(CppFiles))" "0" - $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp - @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile) + $(DEV_ROOT)/scripts/filepp -I $(DEV_ROOT)/src -od '$$(TargetDir)/' -MM $(CppFiles)>> Make.cpptemp + @cat Make.cpptemp >> $(DependencyFile) $(Delete) Make.cpptemp - $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp - @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile) + + ifeq "$(UseMPI)" "yes" + $(DEV_ROOT)/scripts/filepp -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CppFiles)>> Make.cpptemp + @cat Make.cpptemp >> $(DependencyFile) @$(Delete) Make.cpptemp + endif + endif ifneq "$(words $(CFiles))" "0" - $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp - @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile) + $(DEV_ROOT)/scripts/filepp -I $(DEV_ROOT)/src -od '$$(TargetDir)/' -MM $(CFiles) $(DerivedCFiles) >> Make.ctemp + @cat Make.ctemp >> $(DependencyFile) $(Delete) Make.ctemp - $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp - @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile) + + ifeq "$(UseMPI)" "yes" + $(DEV_ROOT)/scripts/filepp -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CFiles) $(DerivedCFiles) >> Make.ctemp + @cat Make.ctemp >> $(DependencyFile) @$(Delete) Make.ctemp + endif + endif ifneq "$(words $(F90Files))" "0" - $(DEV_ROOT)/scripts/filepp -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp - $(DEV_ROOT)/scripts/filepp -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) >> Make.ftemp + $(DEV_ROOT)/scripts/filepp -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp @cat Make.ftemp >> $(DependencyFile) @$(Delete) Make.ftemp + + ifeq "$(UseMPI)" "yes" + $(DEV_ROOT)/scripts/filepp -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) >> Make.ftemp + @cat Make.ftemp >> $(DependencyFile) + @$(Delete) Make.ftemp + endif + endif # make lib @@ -626,6 +708,24 @@ jarsign : $(JarFile) jarsign : $(JarFile) $(JarSigner) -keystore GeoSoftKeystore $(JarFile) myself +#make install +%.install : + @$(MAKE) $(MakeOptions) -C $(subst .install,,$@) _installall + +install : $(InstallListLoop) + $(Print) Done Install + +_installall : _buildall _installdata + +$(MyInstallDir) : + $(MkDir) $@ + +_installdata : $(MyInstallDir) + $(Print) $(InstallFiles) +ifneq "$(words $(InstallFiles))" "0" + $(InstallData) $(InstallFiles) $(MyInstallDir) +endif + # make statistics _statisticsall : @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp