--- trunk/OOPSE-3.0/make/Makefile.in 2004/10/06 18:18:47 1529 +++ trunk/OOPSE-3.0/make/Makefile.in 2004/10/08 22:10:22 1544 @@ -58,6 +58,20 @@ IncludeDirs = \ applications/dump2Xyz \ applications/simpleBuilder +Samples = \ + samples/argon \ + samples/water/dimer \ + samples/water/spce \ + samples/water/ssd \ + samples/water/ssde \ + samples/water/tip3p_ice \ + samples/water/tip4p \ + samples/lipid \ + samples/alkane \ + samples/minimizer \ + samples/metals \ + samples/zcons \ + IncludeDirs = \ @SPRNG_INC_DIR@ \ @MPI_INC_DIR@ @@ -74,9 +88,14 @@ FrcDeclare = -DFRC_PATH="$(ForceParamDir)" OopseHome = @OOPSE_HOME@ ForceParamDir = @OOPSE_HOME@/share/forceFields/ SampleSimDir = @OOPSE_HOME@/share/samples/ +BinDir = @OOPSE_HOME@/bin +DocDir = @OOPSE_HOME@/doc FrcDeclare = -DFRC_PATH="$(ForceParamDir)" +F90Declare = -D__FORTRAN90 ParallelDeclare = -DIS_MPI UseMPI = @USE_MPI@ +ModuleCase = @F90_MODULE_NAMES@ +ModSuffix = @MOD@ LinkOptions = \ @F90LIBS@ @@ -94,7 +113,6 @@ ParallelLibDir = $(DEV_ROOT)/MPIlib TargetDir = $(DEV_ROOT)/obj ParallelTargetDir = $(DEV_ROOT)/MPIobj LibDir = $(DEV_ROOT)/lib -ParallelLibDir = $(DEV_ROOT)/MPIlib MakeDir = $(DEV_ROOT)/make BinDir = $(DEV_ROOT)/bin DocsDir = $(DEV_ROOT)/docs @@ -207,6 +225,7 @@ endif ParallelStaticLibrary = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.a endif endif + # # Misc # @@ -237,7 +256,7 @@ MakeDir = @MKINSTALLDIRS@ Install = @INSTALL@ InstallProgram = @INSTALL_PROGRAM@ InstallData = @INSTALL_DATA@ -MakeDir = @MKINSTALLDIRS@ +MkDir = @MKINSTALLDIRS@ Delete = rm -fr StaticArchiver = @AR@ DynamicArchiver = @CC@ @@ -256,8 +275,8 @@ Ranlib = @RANLIB@ Yacc = @YACC@ Lex = @LEX@ Ranlib = @RANLIB@ +Doxygen = @DOXYGEN@ - MakeOptions = -k MakeDependOptions = StaticArchiverOptions = rc @@ -298,6 +317,41 @@ 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 = $(BinDir)/ +InstallFiles = $(Executable) $(ParallelExecutable) +InstallCommand = $(InstallProgram) +endif + +ifneq "$(words $(ForcefiledFiles))" "0" +MyInstallDir = $(ForceParamDir) +InstallFiles = $(ForcefiledFiles)/ +InstallCommand = $(InstallData) +endif + +ifneq "$(words $(InstallFiles))" "0" + InstallList = +else + InstallList = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(patsubst %, $(DEV_ROOT)/%,$(Forcefield)) $(patsubst %, $(SourceDir)/%,$(Applications)) +endif + +InstallListLoop = $(patsubst %,$(SourceDir)/%/.install,$(PackageList)) $(patsubst %,%/.install,$(InstallList)) + + + +#--------------------------------------------------------------------------- +# # Rules # #--------------------------------------------------------------------------- @@ -413,11 +467,11 @@ $(LibDir)/%_UP.a : $(ObjectFiles) $(LibDir)/%_UP.a : $(ObjectFiles) $(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles) - touch $(LibDir)/.stamp_UP + @touch $(LibDir)/.stamp_UP $(LibDir)/%_MPI.a: $(ParallelObjectFiles) $(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles) - touch $(LibDir)/.stamp_MPI + @touch $(LibDir)/.stamp_MPI %_UP.a : $(ObjectFiles) $(MAKE) $(MakeOptions) $(LibDir)/$@ @@ -470,6 +524,11 @@ $(PackageTargetDir)/%_Skel.class : $(PackageTargetDir) %_Skel.class : %.class $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ +document : + $(Print) Generate Documentation for OOPSE-2.0 + @cd $(DEV_ROOT)/src + $(Doxygen) $(DEV_ROOT)/make/Doxyfile + #GUN make funtions to merge the libraries find_objs = $(shell $(StaticArchiver) -t $(1)) extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1))) @@ -477,11 +536,13 @@ $(CombinedStaticLib) : $(LibDir)/.stamp_UP remove_objs = $(shell $(Delete) $(call find_objs, $(1))) do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1)) -$(CombinedStaticLib) : $(LibDir)/.stamp_UP +$(CombinedStaticLib) : $(LibDir)/.stamp_UP + $(Print) create $@ $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@)) $(Ranlib) $(CombinedStaticLib) $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI + $(Print) create $@ $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@)) $(Ranlib) $(CombinedParallelStaticLib) @@ -503,6 +564,7 @@ ifeq "$(UseMPI)" "yes" _all : _buildall +_buildall : ifeq "$(UseMPI)" "yes" _buildall : \ $(DependencyFile) \ @@ -567,28 +629,30 @@ $(DependencyFile) : $(DerivedSource) $(Print) $@ @cd $(PackageSourceDir) - @touch Make.ctemp - @touch Make.ctemp - ifneq "$(words $(CppFiles))" "0" - $(CppCompiler) $(IncludePath) -MM $(CppFiles) > Make.cpptemp - cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile) - cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile) + $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp + @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile) + $(Delete) Make.cpptemp + $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp + @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile) + @$(Delete) Make.cpptemp endif ifneq "$(words $(CFiles))" "0" - $(CCompiler) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp - cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile) - cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile) - + $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp + @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile) + $(Delete) Make.ctemp + $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp + @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile) + @$(Delete) Make.ctemp endif ifneq "$(words $(F90Files))" "0" - $(DEV_ROOT)/scripts/filepp -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/obj/' -D__FORTRAN90 $(F90Files) > Make.ftemp - $(DEV_ROOT)/scripts/filepp -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/MPIobj/' -DIS_MPI -D__FORTRAN90 $(F90Files) >> Make.ftemp - cat Make.ftemp >> $(DependencyFile) + $(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 + @cat Make.ftemp >> $(DependencyFile) + @$(Delete) Make.ftemp endif - $(Delete) Make.cpptemp Make.ctemp Make.ftemp # make lib lib : $(PackageListLoop) @@ -601,9 +665,29 @@ 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 + +_installprogram: + # make statistics _statisticsall : - @$(Print) $(SourceFiles) >> $(DEV_ROOT)/files.tmp + @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp statistics : $(PackageListLoop) @$(List) $(DEV_ROOT)/files.tmp | xargs $(WordCount) $(WordCountOptions)