--- trunk/OOPSE-4/make/Makefile.in 2005/04/14 21:41:56 2199 +++ trunk/OOPSE-4/make/Makefile.in 2006/01/12 15:22:34 2550 @@ -52,7 +52,9 @@ PackageLibs = \ selection \ restraints \ lattice \ - + openbabel\ + antlr\ + mdParser #packages containing applications Applications = \ applications/oopse \ @@ -61,19 +63,29 @@ Applications = \ applications/dynamicProps \ applications/simpleBuilder\ applications/nanoRodBuilder \ + applications/atom2mdin Samples = \ samples/argon \ - samples/water/dimer \ + samples/water/dimer \ samples/water/spce \ samples/water/ssd \ samples/water/ssde \ + samples/water/ssdrf \ + samples/water/ssd-ion \ samples/water/tip3p_ice \ samples/water/tip4p \ samples/lipid \ samples/alkane \ samples/minimizer \ - samples/metals \ + samples/metals/EAM \ + samples/metals/EAM/nanoparticle \ + samples/metals/EAM/nanorod \ + samples/metals/Sutton-Chen \ + samples/thermoIntegration/liquid \ + samples/thermoIntegration/solid \ + samples/dipole \ + samples/shape \ samples/zcons \ IncludeDirs = \ @@ -85,6 +97,7 @@ Libraries = \ @MPI_LIB_DIR@ Libraries = \ + @LIBS@ \ @CGAL_LIBS@ \ @MPI_LIB@ \ @MPI_F90_LIB@ @@ -101,10 +114,10 @@ LinkOptions = \ ModuleCase = @F90_MODULE_NAMES@ ModSuffix = @MOD@ LinkOptions = \ - @F90LIBS@ + @FCLIBS@ ParallelLinkOptions = \ - @F90LIBS@ + @FCLIBS@ #--------------------------------------------------------------------------- @@ -118,6 +131,7 @@ BinDir = $(DEV_ROOT)/bin ParallelTargetDir = $(DEV_ROOT)/MPIobj LibDir = $(DEV_ROOT)/lib MakeDir = $(DEV_ROOT)/make +MainMakefile = $(MakeDir)/Makefile BinDir = $(DEV_ROOT)/bin DocsDir = $(DEV_ROOT)/docs CurrentDir = $(CURDIR) @@ -325,16 +339,17 @@ INSTALL = @INSTALL@ CppCompiler = @CXX@ Linker = @CXX@ MakeDepend = makedepend +LN_S = @LN_S@ INSTALL = @INSTALL@ +EGREP = @EGREP@ InstallProgram = @INSTALL_PROGRAM@ InstallScript = @INSTALL_SCRIPT@ InstallData = @INSTALL_DATA@ MkDir = @MKINSTALLDIRS@ -Delete = rm -fr +Delete = rm -f StaticArchiver = @AR@ DynamicArchiver = @CC@ FortranCompiler = @FC@ -F90Compiler = @F90@ JavaCompiler = $(JAVA_HOME)/bin/javac JavaArchiver = $(JAVA_HOME)/bin/jar JarSigner = $(JAVA_HOME)/bin/jarsigner @@ -360,11 +375,10 @@ CppOptions = $(FrcDeclare) @CXXFLAGS@ @OOP -sourcepath $(SourceDir) COptions = $(FrcDeclare) @CFLAGS@ CParallelOptions = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@ -CppOptions = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@ -CppParallelOptions = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@ -FortranOptions = -F90Options = @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) -F90ParallelOptions = @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclare) +CppOptions = $(FrcDeclare) @CXXFLAGS@ +CppParallelOptions = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ +FortranOptions = @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@ +FortranParallelOptions = @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclar) @FCFLAGS_SRCEXT@ JavaCompilerOptions = -d $(TargetDir) -classpath $(ClassPath) \ -sourcepath $(SourceDir) -deprecation JavaRunOptions = -classpath $(ClassPath) @@ -409,6 +423,10 @@ endif InstallFiles = $(Executable) endif InstallCommand = $(InstallProgram) + ifneq "$(words $(LinkTargets))" "0" + MyLinkSource = $(patsubst %, $(MyInstallDir)/%,$(Main)) + MyLinkTargets = $(patsubst %, $(MyInstallDir)/%,$(LinkTargets)) + endif endif ifneq "$(words $(ForcefieldFiles))" "0" @@ -445,70 +463,70 @@ $(PackageTargetDir)/%.o : %.c $(MkDir) $@ # .c -> .o -$(PackageTargetDir)/%.o : %.c +$(PackageTargetDir)/%.o : %.c $(MainMakefile) $(Print) $@ $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@ -$(PackageParallelTargetDir)/%.o : %.c +$(PackageParallelTargetDir)/%.o : %.c $(MainMakefile) $(Print) $@ $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@ ifeq "$(UseMPI)" "yes" -%.o : %.c +%.o : %.c $(MainMakefile) $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@ else -%.o : %.c +%.o : %.c $(MainMakefile) $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ endif # .cpp -> .o -$(PackageTargetDir)/%.o : %.cpp +$(PackageTargetDir)/%.o : %.cpp $(MainMakefile) $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@ -$(PackageParallelTargetDir)/%.o : %.cpp +$(PackageParallelTargetDir)/%.o : %.cpp $(MainMakefile) $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@ ifeq "$(UseMPI)" "yes" -%.o : %.cpp +%.o : %.cpp $(MainMakefile) $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@ else -%.o : %.cpp +%.o : %.cpp $(MainMakefile) $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ endif # .f -> .o -$(PackageTargetDir)/%.o : %.f +$(PackageTargetDir)/%.o : %.f $(MainMakefile) $(FortranCompiler) $(FortranOptions) -c $< -o $@ -$(PackageParallelTargetDir)/%.o : %.f +$(PackageParallelTargetDir)/%.o : %.f $(MainMakefile) $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@ ifeq "$(UseMPI)" "yes" -%.o : %.f +%.o : %.f $(MainMakefile) $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@ else -%.o : %.f +%.o : %.f $(MainMakefile) $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ endif # .F90 -> .o -$(PackageTargetDir)/%.o : %.F90 - $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@ +$(PackageTargetDir)/%.o : %.F90 $(MainMakefile) + $(FortranCompiler) $(FortranOptions) $(IncludePath) -c $< -o $@ if test -n "`ls *.$(ModSuffix)`"; then \ $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\ fi -$(PackageParallelTargetDir)/%.o : %.F90 - $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@ +$(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile) + $(FortranCompiler) $(FortranParallelOptions) $(IncludePath) -c $< -o $@ if test -n "`ls *.$(ModSuffix)`"; then \ $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\ fi ifeq "$(UseMPI)" "yes" -%.o : %.F90 +%.o : %.F90 $(MainMakefile) $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ if test -n "`ls *.$(ModSuffix)`"; then\ $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\ @@ -520,7 +538,7 @@ else fi else -%.o : %.F90 +%.o : %.F90 $(MainMakefile) $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ if test -n "`ls *.$(ModSuffix)`"; then\ $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\ @@ -627,20 +645,25 @@ find_objs = $(shell $(StaticArchiver) -t $(1)) $(Doxygen) $(DEV_ROOT)/make/Doxyfile #GUN make funtions to merge the libraries -find_objs = $(shell $(StaticArchiver) -t $(1)) +find_objs = $(shell $(StaticArchiver) -t $(1) | $(EGREP) -v "SYMDEF") 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)) +do_link = $(shell $(LN_S) $(1) $(2)) +all_objs = $(foreach thisLib,$(LibNames), $(call find_objs, $(thisLib))) +all_parallel_objs = $(foreach thisLib,$(ParallelLibNames), $(call find_objs, $(thisLib))) +all_lib_objs = $(patsubst %,$(TargetDir)/%,$(call all_objs)) +all_lib_parallel_objs = $(patsubst %,$(ParallelTargetDir)/%,$(call all_parallel_objs)) $(CombinedStaticLib) : $(LibDir)/.stamp_UP - $(Print) create $@ - $(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@)) + $(Print) creating $@ + $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_objs) $(Ranlib) $(CombinedStaticLib) $(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI - $(Print) create $@ - $(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@)) + $(Print) creating $@ + $(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_parallel_objs) $(Ranlib) $(CombinedParallelStaticLib) # Executable @@ -791,7 +814,7 @@ _installall : _buildall _installdata install : $(InstallListLoop) $(Print) Done Install -_installall : _buildall _installdata +_installall : _buildall _installdata _installlinks $(MyInstallDir) : $(MkDir) $@ @@ -802,6 +825,12 @@ endif $(InstallCommand) $(InstallFiles) $(MyInstallDir) endif +_installlinks : $(MyInstallDir) +ifneq "$(words $(MyLinkTargets))" "0" + @cd $(MyInstallDir) + $(foreach thisLink,$(MyLinkTargets),$(call do_link,$(MyLinkSource),$(thisLink))) +endif + # make statistics _statisticsall : @$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp @@ -812,12 +841,12 @@ $(Executable).pure : $(Print) Done statistics. # make pure -$(Executable).pure : - $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \ - $(LibList) $(ObjectFiles) -o $@ +#$(Executable).pure : +# $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \ +# $(LibList) $(ObjectFiles) -o $@ +# +#pure : $(Executable).pure -pure : $(Executable).pure - #make cvslog cvslog: $(DEV_ROOT)/scripts/cvs2cl