--- trunk/OOPSE-4/make/Makefile.in 2004/09/29 17:56:08 1508 +++ trunk/OOPSE-4/make/Makefile.in 2004/09/29 21:54:03 1512 @@ -34,6 +34,13 @@ Packages = \ # #--------------------------------------------------------------------------- +#--------------------------------------------------------------------------- +# +# Packages +# +#--------------------------------------------------------------------------- + +#packages to be made Packages = \ utils \ math \ @@ -49,8 +56,25 @@ Packages = \ constraints \ profiling \ restraints \ - applications \ + applications +#packages contain libraries +PackageLibs = \ + utils \ + math \ + types \ + primitives \ + visitors \ + UseTheForce/DarkSide \ + UseTheForce \ + brains \ + io \ + integrators \ + minimizers \ + constraints \ + profiling \ + restraints + #--------------------------------------------------------------------------- # # Directories @@ -68,7 +92,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 +107,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 +137,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 +154,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,11 +187,11 @@ 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 + 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 endif @@ -174,7 +203,7 @@ LocalLibs = $(subst /,,$(Packages)) JavaPackageNames = $(subst /,.,$(JavaPackages)) IncludePath = -I$(SourceDir) $(IncludeDirs:%=-I%) LibDirs = -L$(LibDir) $(LibraryDirs:%=-L%) -LocalLibs = $(subst /,,$(Packages)) +LocalLibs = $(subst /,,$(PackageLibs)) LibList = $(LocalLibs:%=-l%) $(Libraries:%=-l%) @@ -261,39 +290,39 @@ $(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 $@ -%.o : $(PackageSourceDir)/%.c +%.o : %.c $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ # .cpp -> .o -$(PackageTargetDir)/%.o : $(PackageSourceDir)/%.cpp +$(PackageTargetDir)/%.o : %.cpp $(Print) $@ $(Print) $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@ $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@ -%.o : $(PackageSourceDir)/%.cpp +%.o : %.cpp $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ # .f -> .o -$(PackageTargetDir)/%.o : $(PackageSourceDir)/%.f +$(PackageTargetDir)/%.o : %.f $(Print) $@ $(Print) $(FortranCompiler) $(FortranOptions) -c $< -o $@ @$(FortranCompiler) $(FortranOptions) -c $< -o $@ -%.o : $(PackageSourceDir)/%.f +%.o : %.f $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ # .F90 -> .o -$(PackageTargetDir)/%.o : $(PackageSourceDir)/%.F90 +$(PackageTargetDir)/%.o : %.F90 $(Print) $@ $(Print) $(F90Compiler) $(F90Options) -c $< -o $@ @$(F90Compiler) $(F90Options) -c $< -o $@ -%.o : $(PackageSourceDir)/%.F90 +%.o : %.F90 $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ # .java -> .class @@ -315,7 +344,7 @@ $(PackageSourceDir)/%.h : $(PackageSourceDir)/%.y $(MAKE) $(MakeOptions) $(PackageSourceDir)/$@ #.y -> .h -$(PackageSourceDir)/%.h : $(PackageSourceDir)/%.y +%.h : %.y $(Print) $@ $(Print) @$(Yacc) -d $? @$(Yacc) -d $? @@ -323,7 +352,7 @@ $(PackageSourceDir)/%.c : $(PackageSourceDir)/%.y @$(Delete) y.tab.c #.y -> .c -$(PackageSourceDir)/%.c : $(PackageSourceDir)/%.y +%.c : %.y $(Print) $@ $(Print) $(Yacc) -d $? @$(Yacc) -d $? @@ -331,7 +360,7 @@ $(PackageSourceDir)/%.c : $(PackageSourceDir)/%.l @$(Delete) y.tab.h # .l -> .c -$(PackageSourceDir)/%.c : $(PackageSourceDir)/%.l +%.c : %.l $(Print) $@ $(Print) $(Lex) -o$@ $? @$(Lex) -o$@ $? @@ -406,10 +435,12 @@ $(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 $@ # Anything else is just copied from source to target @@ -459,21 +490,33 @@ $(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" + $(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 -ifdef $(CFiles) - $(CCompiler) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) >> Make.temp + +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) + 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) + +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 cat Make.ftemp >> $(DependencyFile) endif - $(Delete) Make.temp Make.ftemp + $(Delete) Make.cpptemp Make.ctemp Make.ftemp # make lib lib : $(PackageListLoop)