--- trunk/OOPSE-2.0/make/Makefile.in 2004/09/30 15:41:35 1514 +++ trunk/OOPSE-2.0/make/Makefile.in 2004/10/06 18:18:47 1529 @@ -34,27 +34,8 @@ IS_UNIX=1 # #--------------------------------------------------------------------------- IS_UNIX=1 -#packages to be made -Packages = \ - utils \ - math \ - types \ - primitives \ - visitors \ - UseTheForce/DarkSide \ - UseTheForce \ - brains \ - io \ - integrators \ - minimizers \ - constraints \ - profiling \ - restraints \ - applications/oopse \ - applications/dump2Xyz \ - applications/simpleBuilder \ -#packages contain libraries +#packages containing libraries PackageLibs = \ utils \ math \ @@ -71,21 +52,38 @@ IncludeDirs = \ profiling \ restraints \ +#packages containing applications +Applications = \ + applications/oopse \ + applications/dump2Xyz \ + applications/simpleBuilder + IncludeDirs = \ - /usr/include \ - /usr/local/include + @SPRNG_INC_DIR@ \ + @MPI_INC_DIR@ LibraryDirs = \ - /usr/lib \ - /usr/local/mpich/lib \ - /usr/local/lib \ - /usr/local/intel/compiler80/lib \ + @SPRNG_LIB_DIR@ \ + @MPI_LIB_DIR@ Libraries = \ - mpich \ - sprng \ - ifcore \ + @SPRNG_LIB@ \ + @MPI_LIB@ \ + @MPI_F90_LIB@ +OopseHome = @OOPSE_HOME@ +ForceParamDir = @OOPSE_HOME@/share/forceFields/ +SampleSimDir = @OOPSE_HOME@/share/samples/ +FrcDeclare = -DFRC_PATH="$(ForceParamDir)" +ParallelDeclare = -DIS_MPI +UseMPI = @USE_MPI@ +LinkOptions = \ + @F90LIBS@ + +ParallelLinkOptions = \ + @F90LIBS@ + + #--------------------------------------------------------------------------- # # Directories @@ -96,10 +94,13 @@ MakeDir = $(DEV_ROOT)/make 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 CurrentDir = $(CURDIR) +CombinedStaticLib = $(LibDir)/libOOPSE.a +CombinedParallelStaticLib = $(LibDir)/libOOPSE_MPI.a ifdef Source #get the relative path of current package to source directory @@ -114,7 +115,7 @@ PackageList = $(Packages) $(JavaPackages) PackageParallelTargetDir = $(ParallelTargetDir) JavaMainClass = $(subst /,.,$(Package)).$(Main) else -PackageList = $(Packages) $(JavaPackages) +PackageList = $(PackageLibs) $(JavaPackages) $(Applications) endif PackageListLoop = $(patsubst %,$(SourceDir)/%/.loop,$(PackageList)) @@ -165,23 +166,23 @@ ObjectFiles = $(CFiles:%.c= $(Packag JniHeaders = $(JniSource:%.java= $(PackageSourceDir)/%.h) ObjectFiles = $(CFiles:%.c= $(PackageTargetDir)/%.o)\ $(CppFiles:%.cpp= $(PackageTargetDir)/%.o)\ - $(FortranFiles:%.f= $(PackageTargetDir)/%.o)\ - $(F90Files:%.F90= $(PackageTargetDir)/%.o)\ - $(LexFiles:%.l= $(PackageTargetDir)/%.o)\ - $(YaccFiles:%.y= $(PackageTargetDir)/%.o) + $(FortranFiles:%.f= $(PackageTargetDir)/%.o)\ + $(F90Files:%.F90= $(PackageTargetDir)/%.o)\ + $(LexFiles:%.l= $(PackageTargetDir)/%.o)\ + $(YaccFiles:%.y= $(PackageTargetDir)/%.o) ParallelObjectFiles = $(CFiles:%.c= $(PackageParallelTargetDir)/%.o)\ - $(CppFiles:%.cpp= $(PackageParallelTargetDir)/%.o)\ - $(FortranFiles:%.f= $(PackageParallelTargetDir)/%.o)\ - $(F90Files:%.F90= $(PackageParallelTargetDir)/%.o)\ - $(LexFiles:%.l= $(PackageParallelTargetDir)/%.o)\ - $(YaccFiles:%.y= $(PackageParallelTargetDir)/%.o) + $(CppFiles:%.cpp= $(PackageParallelTargetDir)/%.o)\ + $(FortranFiles:%.f= $(PackageParallelTargetDir)/%.o)\ + $(F90Files:%.F90= $(PackageParallelTargetDir)/%.o)\ + $(LexFiles:%.l= $(PackageParallelTargetDir)/%.o)\ + $(YaccFiles:%.y= $(PackageParallelTargetDir)/%.o) DerivedSource = $(YaccFiles:%.y= %.h) \ - $(YaccFiles:%.y= %.c) \ - $(LexFiles:%.l= %.c) + $(YaccFiles:%.y= %.c) \ + $(LexFiles:%.l= %.c) DerivedCFiles = $(YaccFiles:%.y= %.c) \ - $(LexFiles:%.l= %.c) + $(LexFiles:%.l= %.c) OtherTargetFiles = $(OtherSourceFiles:%=$(PackageTargetDir)/%) @@ -200,10 +201,10 @@ ifneq "$(words $(ObjectFiles) $(ParallelObjectFiles)) Executable = $(BinDir)/$(Main) ParallelExecutable = $(BinDir)/$(Main)_MPI else - SharedLibrary = $(LibDir)/lib$(subst /,,$(Package)).so - StaticLibrary = $(LibDir)/lib$(subst /,,$(Package)).a - ParallelSharedLibrary = $(LibDir)/lib$(subst /,,$(Package))_MPI.so - ParallelStaticLibrary = $(LibDir)/lib$(subst /,,$(Package))_MPI.a + SharedLibrary = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.so + StaticLibrary = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.a + ParallelSharedLibrary = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.so + ParallelStaticLibrary = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.a endif endif # @@ -213,8 +214,12 @@ LocalLibs = $(subst /,,$(PackageLibs)) JavaPackageNames = $(subst /,.,$(JavaPackages)) IncludePath = -I$(SourceDir) $(IncludeDirs:%=-I%) LibDirs = -L$(LibDir) $(LibraryDirs:%=-L%) -LocalLibs = $(subst /,,$(PackageLibs)) -LibList = $(LocalLibs:%=-l%) $(Libraries:%=-l%) +LocalLibs = $(subst /,,$(patsubst %, oopse_%_UP, $(PackageLibs))) +ParallelLocalLibs= $(subst /,,$(patsubst %, oopse_%_MPI, $(PackageLibs))) +LibList = $(LocalLibs:%=-l%) $(Libraries) +LibNames = $(LocalLibs:%=$(LibDir)/lib%.a) +ParallelLibList = $(ParallelLocalLibs:%=-l%) $(Libraries) +ParallelLibNames = $(ParallelLocalLibs:%=$(LibDir)/lib%.a) #--------------------------------------------------------------------------- @@ -250,6 +255,7 @@ Lex = @LEX@ List = cat Yacc = @YACC@ Lex = @LEX@ +Ranlib = @RANLIB@ MakeOptions = -k @@ -260,8 +266,13 @@ FortranOptions = JniOptions = RmiOptions = -d $(TargetDir) -classpath $(ClassPath) \ -sourcepath $(SourceDir) +COptions = $(FrcDeclare) +CParallelOptions = $(FrcDeclare) $(ParallelDeclare) +CppOptions = $(FrcDeclare) +CppParallelOptions = $(FrcDeclare) $(ParallelDeclare) FortranOptions = -F90Options = -I$(SourceDir) -module $(TargetDir) +F90Options = @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(TargetDir) +F90ParallelOptions = @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) -module $(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclare) JavaCompilerOptions = -d $(TargetDir) -classpath $(ClassPath) \ -sourcepath $(SourceDir) -deprecation JavaRunOptions = -classpath $(ClassPath) @@ -304,30 +315,68 @@ $(PackageTargetDir)/%.o : %.c $(Print) $@ $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@ +$(PackageParallelTargetDir)/%.o : %.c + $(Print) $@ + $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@ + +ifeq "$(UseMPI)" "yes" +%.o : %.c + $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ + $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@ +else %.o : %.c $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ +endif # .cpp -> .o $(PackageTargetDir)/%.o : %.cpp $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@ +$(PackageParallelTargetDir)/%.o : %.cpp + $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@ + +ifeq "$(UseMPI)" "yes" %.o : %.cpp $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ + $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@ +else +%.o : %.cpp + $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ +endif # .f -> .o $(PackageTargetDir)/%.o : %.f $(FortranCompiler) $(FortranOptions) -c $< -o $@ +$(PackageParallelTargetDir)/%.o : %.f + $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@ + +ifeq "$(UseMPI)" "yes" %.o : %.f $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ + $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@ +else +%.o : %.f + $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ +endif # .F90 -> .o $(PackageTargetDir)/%.o : %.F90 - $(F90Compiler) $(F90Options) -c $< -o $@ + $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@ +$(PackageParallelTargetDir)/%.o : %.F90 + $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@ + +ifeq "$(UseMPI)" "yes" %.o : %.F90 $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ + $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@ +else +%.o : %.F90 + $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ +endif + # .java -> .class $(PackageTargetDir)/%.class : $(PackageSourceDir)/%.java $(JavaCompiler) $(JavaCompilerOptions) $< @@ -361,28 +410,31 @@ $(LibDir)/%.a : $(ObjectFiles) @$(Lex) -o$@ $? # .o -> .a -$(LibDir)/%.a : $(ObjectFiles) + +$(LibDir)/%_UP.a : $(ObjectFiles) $(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles) + touch $(LibDir)/.stamp_UP -%.a : $(ObjectFiles) - $(MAKE) $(MakeOptions) $(LibDir)/$@ - -$(LibDir)/%_MPI.a : $(ParallelObjectFiles) +$(LibDir)/%_MPI.a: $(ParallelObjectFiles) $(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles) + touch $(LibDir)/.stamp_MPI +%_UP.a : $(ObjectFiles) + $(MAKE) $(MakeOptions) $(LibDir)/$@ + %_MPI.a : $(ParallelObjectFiles) $(MAKE) $(MakeOptions) $(LibDir)/$@ # .o -> .so -$(LibDir)/%.so : $(ObjectFiles) +$(LibDir)/%_UP.so : $(ObjectFiles) $(DynamicArchiver) $(ObjectFiles) $(DynamicArchiverOptions) -o $@ -%.so : $(ObjectFiles) - $(MAKE) $(MakeOptions) $(LibDir)/$@ - $(LibDir)/%_MPI.so : $(ParallelObjectFiles) $(DynamicArchiver) $(ParallelObjectFiles) $(DynamicArchiverOptions) -o $@ +%_UP.so : $(ObjectFiles) + $(MAKE) $(MakeOptions) $(LibDir)/$@ + %_MPI.so : $(ParallelObjectFiles) $(MAKE) $(MakeOptions) $(LibDir)/$@ @@ -418,13 +470,28 @@ $(PackageTargetDir)/%_Skel.class : $(PackageTargetDir) %_Skel.class : %.class $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ -# Executable -$(Executable) : $(ObjectFiles) - $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@ +#GUN make funtions to merge the libraries +find_objs = $(shell $(StaticArchiver) -t $(1)) +extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1))) +create_archive = $(shell $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1))) +remove_objs = $(shell $(Delete) $(call find_objs, $(1))) +do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1)) -$(ParallelExecutable) : $(ParallelObjectFiles) - $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ParallelObjectFiles) -o $@ +$(CombinedStaticLib) : $(LibDir)/.stamp_UP + $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@)) + $(Ranlib) $(CombinedStaticLib) +$(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI + $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@)) + $(Ranlib) $(CombinedParallelStaticLib) + +# Executable +$(Executable) : $(CombinedStaticLib) $(ObjectFiles) + $(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(CombinedStaticLib) $(Libraries) -o $@ + +$(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) + $(Linker) $(ParallelObjectFiles) $(ParallelLinkOptions) $(LibDirs) $(CombinedParallelStaticLib) $(Libraries) -o $@ + # Anything else is just copied from source to target $(PackageTargetDir)/% : $(PackageSourceDir)/% $(Print) $@ @@ -436,20 +503,36 @@ _buildall : \ _all : _buildall +ifeq "$(UseMPI)" "yes" _buildall : \ $(DependencyFile) \ $(PackageTargetDir) \ $(ObjectFiles) \ + $(ParallelObjectFiles) \ $(JavaClassFiles) \ $(RmiStubFiles) \ $(RmiSkeletonFiles) \ $(OtherTargetFiles) \ - $(SharedLibrary) \ $(StaticLibrary) \ + $(ParallelStaticLibrary) \ $(JarFile) \ - $(Executable) - + $(Executable) \ + $(ParallelExecutable) +else +_buildall : \ + $(DependencyFile) \ + $(PackageTargetDir) \ + $(ObjectFiles) \ + $(JavaClassFiles) \ + $(RmiStubFiles) \ + $(RmiSkeletonFiles) \ + $(OtherTargetFiles) \ + $(StaticLibrary) \ + $(JarFile) \ + $(Executable) +endif + # make clean clean : $(PackageListLoop) $(Print) Done clean. @@ -464,14 +547,14 @@ _distcleanall : _distcleanall : $(Delete) $(ObjectFiles) \ $(ParallelObjectFiles) \ - $(JarFile) \ + $(JarFile) \ $(SharedLibrary) \ $(StaticLibrary) \ $(ParallelSharedLibrary) \ $(ParallelStaticLibrary) \ $(Executable) \ $(ParallelExecutable) \ - $(DependencyFile) + $(DependencyFile) # make depend @@ -484,8 +567,8 @@ $(DependencyFile) : $(DerivedSource) $(Print) $@ @cd $(PackageSourceDir) - touch Make.ctemp - touch Make.ctemp + @touch Make.ctemp + @touch Make.ctemp ifneq "$(words $(CppFiles))" "0" $(CppCompiler) $(IncludePath) -MM $(CppFiles) > Make.cpptemp @@ -501,7 +584,8 @@ ifneq "$(words $(F90Files))" "0" endif ifneq "$(words $(F90Files))" "0" - $(DEV_ROOT)/scripts/sfmakedepend -I $(DEV_ROOT)/src -d '$$(DEV_ROOT)/obj' -f ./Make.ftemp -h *.F90 + $(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) endif $(Delete) Make.cpptemp Make.ctemp Make.ftemp @@ -533,6 +617,10 @@ pure : $(Executable).pure pure : $(Executable).pure +#make cvslog +cvslog: + $(DEV_ROOT)/scripts/cvs2cl.pl + # Execute _runexe : $(Executable) $(RunParameters)