--- trunk/OOPSE-2.0/make/Makefile.in 2004/09/29 21:54:03 1512 +++ trunk/OOPSE-2.0/make/Makefile.in 2004/10/04 20:56:51 1523 @@ -33,55 +33,72 @@ # $< - Current dependency # #--------------------------------------------------------------------------- - -#--------------------------------------------------------------------------- -# -# Packages -# -#--------------------------------------------------------------------------- - +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 + 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 @@ -190,10 +207,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))).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 # @@ -203,8 +220,10 @@ 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_%, $(PackageLibs))) +ParallelLocalLibs= $(subst /,,$(patsubst %, oopse_%_MPI, $(PackageLibs))) +LibList = $(LocalLibs:%=-l%) $(Libraries) +ParallelLibList = $(LocalLibs:%=-l%) $(Libraries) #--------------------------------------------------------------------------- @@ -242,7 +261,7 @@ MakeOptions = -k -s Lex = @LEX@ -MakeOptions = -k -s +MakeOptions = -k MakeDependOptions = StaticArchiverOptions = rc DynamicArchiverOptions = -shared @@ -250,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) @@ -292,16 +316,13 @@ $(PackageTargetDir)/%.o : %.c # .c -> .o $(PackageTargetDir)/%.o : %.c $(Print) $@ - $(Print) $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@ - @$(CCompiler) $(COptions) -c $(IncludePath) $< -o $@ + $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@ %.o : %.c $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ # .cpp -> .o $(PackageTargetDir)/%.o : %.cpp - $(Print) $@ - $(Print) $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@ $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@ %.o : %.cpp @@ -309,35 +330,27 @@ $(PackageTargetDir)/%.o : %.f # .f -> .o $(PackageTargetDir)/%.o : %.f - $(Print) $@ - $(Print) $(FortranCompiler) $(FortranOptions) -c $< -o $@ - @$(FortranCompiler) $(FortranOptions) -c $< -o $@ + $(FortranCompiler) $(FortranOptions) -c $< -o $@ %.o : %.f $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ # .F90 -> .o $(PackageTargetDir)/%.o : %.F90 - $(Print) $@ - $(Print) $(F90Compiler) $(F90Options) -c $< -o $@ - @$(F90Compiler) $(F90Options) -c $< -o $@ + $(F90Compiler) $(F90Options) -c $< -o $@ %.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 @@ -345,17 +358,13 @@ $(PackageSourceDir)/%.h : $(PackageTargetDir)/%.class #.y -> .h %.h : %.y - $(Print) $@ - $(Print) @$(Yacc) -d $? - @$(Yacc) -d $? + $(Yacc) -d $? @$(Move) y.tab.h $*.h @$(Delete) y.tab.c #.y -> .c %.c : %.y - $(Print) $@ - $(Print) $(Yacc) -d $? - @$(Yacc) -d $? + $(Yacc) -d $? @$(Move) y.tab.c $*.c @$(Delete) y.tab.h @@ -367,33 +376,25 @@ $(LibDir)/%.a : $(ObjectFiles) # .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) @@ -402,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) @@ -434,14 +434,10 @@ $(Executable) : $(ObjectFiles) # Executable $(Executable) : $(ObjectFiles) - $(Print) $@ - $(Print) $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@ $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ObjectFiles) -o $@ $(ParallelExecutable) : $(ParallelObjectFiles) - $(Print) $@ - $(Print) $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ParallelObjectFiles) -o $@ - $(Linker) $(LinkOptions) $(LibDirs) $(LibList) $(ParallelObjectFiles) -o $@ + $(Linker) $(LinkOptions) $(LibDirs) $(ParallelLibList) $(ParallelObjectFiles) -o $@ # Anything else is just copied from source to target $(PackageTargetDir)/% : $(PackageSourceDir)/% @@ -466,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 @@ -491,20 +498,16 @@ $(DependencyFile) : $(DerivedSource) $(Print) $@ @cd $(PackageSourceDir) - touch Make.ctemp - touch Make.ctemp + @touch Make.ctemp + @touch Make.ctemp ifneq "$(words $(CppFiles))" "0" - $(Print) Make dependencies for $(CppFiles) - $(Print) $(CppCompiler) $(IncludePath) -MM $(CppFiles) > Make.cpptemp $(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 ifneq "$(words $(CFiles))" "0" - $(Print) Make dependencies for $(CFiles) - $(Print) $(CCompiler) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp $(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) @@ -512,8 +515,8 @@ ifneq "$(words $(F90Files))" "0" endif ifneq "$(words $(F90Files))" "0" - $(Print) Make dependencies for $(F90Files) - $(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__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.cpptemp Make.ctemp Make.ftemp @@ -545,6 +548,10 @@ pure : $(Executable).pure pure : $(Executable).pure +#make cvslog +cvslog: + $(DEV_ROOT)/scripts/cvs2cl.pl + # Execute _runexe : $(Executable) $(RunParameters)