--- trunk/OOPSE-3.0/make/Makefile.in 2004/09/29 17:56:08 1508 +++ trunk/OOPSE-3.0/make/Makefile.in 2004/10/04 20:56:51 1523 @@ -33,31 +33,72 @@ # $< - Current dependency # #--------------------------------------------------------------------------- - +IS_UNIX=1 +#packages to be made Packages = \ - utils \ - math \ - types \ - primitives \ - visitors \ - UseTheForce/DarkSide \ - UseTheForce \ - brains \ - io \ - integrators \ - minimizers \ - constraints \ - profiling \ - restraints \ - applications \ + utils \ + math \ + types \ + primitives \ + visitors \ + UseTheForce/DarkSide \ + UseTheForce \ + brains \ + io \ + integrators \ + minimizers \ + constraints \ + profiling \ + restraints \ + applications/oopse \ + applications/dump2Xyz \ + applications/simpleBuilder \ +#packages contain libraries +PackageLibs = \ + utils \ + math \ + types \ + primitives \ + visitors \ + UseTheForce/DarkSide \ + UseTheForce \ + brains \ + io \ + integrators \ + minimizers \ + constraints \ + profiling \ + restraints \ + +IncludeDirs = \ + @SPRNG_INC_DIR@ \ + @MPI_INC_DIR@ + +LibraryDirs = \ + @SPRNG_LIB_DIR@ \ + @MPI_LIB_DIR@ + +Libraries = \ + @SPRNG_LIB@ \ + @MPI_LIB@ + +LinkOptions = \ + @F90LIBS@ + +OopseHome = @OOPSE_HOME@ +ForceParamDir = @OOPSE_HOME@/share/forceFields/ +SampleSimDir = @OOPSE_HOME@/share/samples/ +FrcDeclare = -DFRC_PATH="$(ForceParamDir)" +ParallelDeclare = -DIS_MPI + + #--------------------------------------------------------------------------- # # Directories # #--------------------------------------------------------------------------- -srcdir = @srcdir@ SourceDir = $(DEV_ROOT)/src TargetDir = $(DEV_ROOT)/obj ParallelTargetDir = $(DEV_ROOT)/MPIobj @@ -68,7 +109,12 @@ Package = $(subst $(SourceDir)/,,$(Cu CurrentDir = $(CURDIR) ifdef Source -Package = $(subst $(SourceDir)/,,$(CurrentDir)) +#get the relative path of current package to source directory +# /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)) + PackageList = $(Package) PackageSourceDir = $(SourceDir)/$(Package) PackageTargetDir = $(TargetDir) @@ -78,9 +124,9 @@ PackageListLoop = $(patsubst %,$(SourceDir)/%/.loop,$ PackageList = $(Packages) $(JavaPackages) endif -PackageListLoop = $(patsubst %,$(SourceDir)/%/.loop,$(PackageList)) +PackageListLoop = $(patsubst %,$(SourceDir)/%/.loop,$(PackageList)) -JRE = $(JAVA_HOME)/jre/lib/rt.jar +JRE = $(JAVA_HOME)/jre/lib/rt.jar ifdef IS_UNIX X = : @@ -108,14 +154,14 @@ SourceFiles = $(JavaFiles:%.java= $(Packag $(YaccFiles) $(CorbaFiles), \ $(Source)) ManifestFile = $(PackageSourceDir)/Manifest -SourceFiles = $(JavaFiles:%.java= $(PackageSourceDir)/%.java)\ - $(CppFiles:%.cpp= $(PackageSourceDir)/%.cpp)\ - $(CFiles:%.c= $(PackageSourceDir)/%.c)\ - $(FortranFiles:%.f= $(PackageSourceDir)/%.f)\ - $(F90Files:%.F90= $(PackageSourceDir)/%.F90)\ - $(LexFiles:%.l= $(PackageSourceDir)/%.l)\ - $(YaccFiles:%.y= $(PackageSourceDir)/%.y)\ +SourceFiles = $(JavaFiles)\ + $(CppFiles)\ + $(CFiles)\ + $(FortranFiles)\ + $(F90Files)\ + $(LexFiles)\ + $(YaccFiles) # Target JavaClassFiles = $(JavaFiles:%.java= $(PackageTargetDir)/%.class) @@ -125,24 +171,24 @@ ObjectFiles = $(CFiles:%.c= $(Packag JniClassFiles = $(JniSource:%.java= $(PackageTargetDir)/%.class) 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) + $(CppFiles:%.cpp= $(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)/%) @@ -158,13 +204,13 @@ ifneq "$(words $(ObjectFiles) $(ParallelObjectFiles)) ifneq "$(words $(ObjectFiles) $(ParallelObjectFiles))" "0" DependencyFile = $(PackageSourceDir)/Makedepend ifneq "$(Main)" "" - Executable = $(BinDir)/$(Main) + 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))).so + StaticLibrary = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package))).a + ParallelSharedLibrary = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.so + ParallelStaticLibrary = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.a endif endif # @@ -174,8 +220,10 @@ LocalLibs = $(subst /,,$(Packages)) JavaPackageNames = $(subst /,.,$(JavaPackages)) IncludePath = -I$(SourceDir) $(IncludeDirs:%=-I%) LibDirs = -L$(LibDir) $(LibraryDirs:%=-L%) -LocalLibs = $(subst /,,$(Packages)) -LibList = $(LocalLibs:%=-l%) $(Libraries:%=-l%) +LocalLibs = $(subst /,,$(patsubst %, oopse_%, $(PackageLibs))) +ParallelLocalLibs= $(subst /,,$(patsubst %, oopse_%_MPI, $(PackageLibs))) +LibList = $(LocalLibs:%=-l%) $(Libraries) +ParallelLibList = $(LocalLibs:%=-l%) $(Libraries) #--------------------------------------------------------------------------- @@ -213,7 +261,7 @@ MakeOptions = -k -s Lex = @LEX@ -MakeOptions = -k -s +MakeOptions = -k MakeDependOptions = StaticArchiverOptions = rc DynamicArchiverOptions = -shared @@ -221,8 +269,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 $(TargetDir) @PREPDEFFLAG@$(ParallelDeclare) JavaCompilerOptions = -d $(TargetDir) -classpath $(ClassPath) \ -sourcepath $(SourceDir) -deprecation JavaRunOptions = -classpath $(ClassPath) @@ -261,110 +314,87 @@ $(PackageTargetDir)/%.o : $(PackageSourceDir)/%.c $(MakeDir) $@ # .c -> .o -$(PackageTargetDir)/%.o : $(PackageSourceDir)/%.c +$(PackageTargetDir)/%.o : %.c $(Print) $@ - $(Print) $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@ - @$(CCompiler) $(COptions) -c $(IncludePath) $< -o $@ + $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@ -%.o : $(PackageSourceDir)/%.c +%.o : %.c $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ # .cpp -> .o -$(PackageTargetDir)/%.o : $(PackageSourceDir)/%.cpp - $(Print) $@ - $(Print) $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@ +$(PackageTargetDir)/%.o : %.cpp $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@ -%.o : $(PackageSourceDir)/%.cpp +%.o : %.cpp $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ # .f -> .o -$(PackageTargetDir)/%.o : $(PackageSourceDir)/%.f - $(Print) $@ - $(Print) $(FortranCompiler) $(FortranOptions) -c $< -o $@ - @$(FortranCompiler) $(FortranOptions) -c $< -o $@ +$(PackageTargetDir)/%.o : %.f + $(FortranCompiler) $(FortranOptions) -c $< -o $@ -%.o : $(PackageSourceDir)/%.f +%.o : %.f $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ # .F90 -> .o -$(PackageTargetDir)/%.o : $(PackageSourceDir)/%.F90 - $(Print) $@ - $(Print) $(F90Compiler) $(F90Options) -c $< -o $@ - @$(F90Compiler) $(F90Options) -c $< -o $@ +$(PackageTargetDir)/%.o : %.F90 + $(F90Compiler) $(F90Options) -c $< -o $@ -%.o : $(PackageSourceDir)/%.F90 +%.o : %.F90 $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ # .java -> .class $(PackageTargetDir)/%.class : $(PackageSourceDir)/%.java - $(Print) $@ - $(Print) $(JavaCompiler) $(JavaCompilerOptions) $< - @$(JavaCompiler) $(JavaCompilerOptions) $< + $(JavaCompiler) $(JavaCompilerOptions) $< %.class : $(PackageSourceDir)/%.java @$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ # .class -> .h $(PackageSourceDir)/%.h : $(PackageTargetDir)/%.class - $(Print) $@ - $(Print) $(JniCompiler) $(JniOptions) $(JavaPackageName).$* $(JniCompiler) $(JniOptions) $(JavaPackageName).$* %.h : %.class $(MAKE) $(MakeOptions) $(PackageSourceDir)/$@ #.y -> .h -$(PackageSourceDir)/%.h : $(PackageSourceDir)/%.y - $(Print) $@ - $(Print) @$(Yacc) -d $? - @$(Yacc) -d $? +%.h : %.y + $(Yacc) -d $? @$(Move) y.tab.h $*.h @$(Delete) y.tab.c #.y -> .c -$(PackageSourceDir)/%.c : $(PackageSourceDir)/%.y - $(Print) $@ - $(Print) $(Yacc) -d $? - @$(Yacc) -d $? +%.c : %.y + $(Yacc) -d $? @$(Move) y.tab.c $*.c @$(Delete) y.tab.h # .l -> .c -$(PackageSourceDir)/%.c : $(PackageSourceDir)/%.l +%.c : %.l $(Print) $@ $(Print) $(Lex) -o$@ $? @$(Lex) -o$@ $? # .o -> .a $(LibDir)/%.a : $(ObjectFiles) - $(Print) $@ - $(Print) $(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles) - @$(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles) + $(StaticArchiver) $(StaticArchiverOptions) $@ $(ObjectFiles) %.a : $(ObjectFiles) $(MAKE) $(MakeOptions) $(LibDir)/$@ $(LibDir)/%_MPI.a : $(ParallelObjectFiles) - $(Print) $@ - $(Print) $(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles) - @$(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles) + $(StaticArchiver) $(StaticArchiverOptions) $@ $(ParallelObjectFiles) %_MPI.a : $(ParallelObjectFiles) $(MAKE) $(MakeOptions) $(LibDir)/$@ # .o -> .so $(LibDir)/%.so : $(ObjectFiles) - $(Print) $@ - $(Print) $(DynamicArchiver) $(ObjectFiles) $(DynamicArchiverOptions) -o $@ $(DynamicArchiver) $(ObjectFiles) $(DynamicArchiverOptions) -o $@ %.so : $(ObjectFiles) $(MAKE) $(MakeOptions) $(LibDir)/$@ $(LibDir)/%_MPI.so : $(ParallelObjectFiles) - $(Print) $@ - $(Print) $(DynamicArchiver) $(ParallelObjectFiles) $(DynamicArchiverOptions) -o $@ $(DynamicArchiver) $(ParallelObjectFiles) $(DynamicArchiverOptions) -o $@ %_MPI.so : $(ParallelObjectFiles) @@ -373,7 +403,6 @@ $(LibDir)/%.jar : $(JavaClassFiles) $(OtherTargetFiles # .class -> .jar $(LibDir)/%.jar : $(JavaClassFiles) $(OtherTargetFiles) $(Print) $@ - $(Print) $(JavaArchiver) -cf $@ $(JavaClassFilesRel) $(OtherTargetFiles) @cd $(TargetDir); $(JavaArchiver) -cf $@ \ $(JavaClassFilesRel) $(OtherTargetFiles) @@ -405,12 +434,10 @@ $(Executable) : $(ObjectFiles) # Executable $(Executable) : $(ObjectFiles) - $(Print) $@ $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@ $(ParallelExecutable) : $(ParallelObjectFiles) - $(Print) $@ - $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ParallelObjectFiles) -o $@ + $(Linker) $(LinkOptions) $(LibDirs) $(ParallelLibList) $(ParallelObjectFiles) -o $@ # Anything else is just copied from source to target $(PackageTargetDir)/% : $(PackageSourceDir)/% @@ -435,19 +462,30 @@ _buildall : \ $(StaticLibrary) \ $(JarFile) \ $(Executable) + - # make clean clean : $(PackageListLoop) $(Print) Done clean. _cleanall : - $(Delete) $(PackageTargetDir)/* \ - $(JarFile) \ + $(Delete) $(ObjectFiles) $(ParallelObjectFiles) + +# make distclean +distclean : $(PackageListLoop) + $(Print) Done clean. + +_distcleanall : + $(Delete) $(ObjectFiles) \ + $(ParallelObjectFiles) \ + $(JarFile) \ $(SharedLibrary) \ $(StaticLibrary) \ + $(ParallelSharedLibrary) \ + $(ParallelStaticLibrary) \ $(Executable) \ - $(DependencyFile) + $(ParallelExecutable) \ + $(DependencyFile) # make depend @@ -459,21 +497,29 @@ $(DependencyFile) : $(DerivedSource) $(DependencyFile) : $(DerivedSource) $(Print) $@ @cd $(PackageSourceDir) - touch Make.temp -ifdef $(CppFiles) - $(CppCompiler) $(IncludePath) -MM $(CppFiles) > Make.temp + + @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) endif -ifdef $(CFiles) - $(CCompiler) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) >> Make.temp + +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) + endif - cat Make.temp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/obj\/&/g' >> $(DependencyFile) - cat Make.temp | sed 's/^[a-zA-Z0-9]/$$\(DEV_ROOT\)\/MPIobj\/&/g' >> $(DependencyFile) - echo $(F90Files) -ifdef $(F90Files) - $(DEV_ROOT)/scripts/sfmakedepend -I $(DEV_ROOT)/src -d '$$(DEV_ROOT)/obj' -f ./Make.ftemp -h *.F90 + +ifneq "$(words $(F90Files))" "0" + $(DEV_ROOT)/scripts/filepp -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/obj/' -D__F90 $(F90Files) > Make.ftemp + $(DEV_ROOT)/scripts/filepp -I $(DEV_ROOT)/src -od '$$(DEV_ROOT)/MPIobj/' -DIS_MPI -D__F90 $(F90Files) >> Make.ftemp cat Make.ftemp >> $(DependencyFile) endif - $(Delete) Make.temp Make.ftemp + $(Delete) Make.cpptemp Make.ctemp Make.ftemp # make lib lib : $(PackageListLoop) @@ -502,6 +548,10 @@ pure : $(Executable).pure pure : $(Executable).pure +#make cvslog +cvslog: + $(DEV_ROOT)/scripts/cvs2cl.pl + # Execute _runexe : $(Executable) $(RunParameters)