X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=mk-1st.awk;h=87a8b414df000cc15c131b26c19721c08e48ca54;hb=0be808514502f3149b379d036ab3a83cbb4d4c02;hp=232a175cd1f9d1a36d925adc24593229a9831b5f;hpb=53d4e8a9506b267d6758096a5e6b945a44432ef9;p=ncurses.git diff --git a/mk-1st.awk b/mk-1st.awk index 232a175c..87a8b414 100644 --- a/mk-1st.awk +++ b/mk-1st.awk @@ -1,4 +1,4 @@ -# $Id: mk-1st.awk,v 1.71 2007/01/13 21:33:25 tom Exp $ +# $Id: mk-1st.awk,v 1.76 2007/03/03 20:26:06 tom Exp $ ############################################################################## # Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. # # # @@ -40,6 +40,8 @@ # subset ("none", "base", "base+ext_funcs" or "termlib", etc.) # ShlibVer ("rel", "abi" or "auto", to augment DoLinks variable) # ShlibVerInfix ("yes" or "no", determines location of version #) +# TermlibRoot ("tinfo" or other root for libterm.so) +# ReLink ("yes", or "no", flag to rebuild shared libs on install) # DoLinks ("yes", "reverse" or "no", flag to add symbolic links) # rmSoLocs ("yes" or "no", flag to add extra clean target) # ldconfig (path for this tool, if used) @@ -161,23 +163,21 @@ function sharedlinks(directory) { printf ")\n" } } -function shlib_rule(directory) { - if ( ShlibVer == "cygdll" ) { - dst_libs = sprintf("%s/$(SHARED_LIB) %s/$(IMPORT_LIB)", directory, directory); - } else { - dst_libs = sprintf("%s/%s", directory, end_name); - } +function shlib_build(directory) { + dst_libs = sprintf("%s/%s", directory, end_name); printf "%s : \\\n", dst_libs printf "\t\t%s \\\n", directory - if (subset ~ /^base/ ) { + if (subset ~ /^base/ || subset == "ticlib" ) { + save_suffix = suffix + sub(/^[^.]\./,".",suffix) if (directory != "../lib") { - printf "\t\t%s/%s \\\n", "../lib", end_name_of("tinfo"); + printf "\t\t%s/%s \\\n", "../lib", end_name_of(TermlibRoot); } - printf "\t\t%s/%s \\\n", directory, end_name_of("tinfo"); + printf "\t\t%s/%s \\\n", directory, end_name_of(TermlibRoot); + suffix = save_suffix } printf "\t\t$(%s_OBJS)\n", OBJS printf "\t@echo linking $@\n" - print "\t-@rm -f %s", dst_libs; if ( is_ticlib() ) { make_shlib(OBJS, "TICS_LIST") } else if ( is_termlib() ) { @@ -187,11 +187,23 @@ function shlib_rule(directory) { } sharedlinks(directory) } +function shlib_install(directory) { + src_lib1 = sprintf("../lib/%s", end_name); + dst_lib1 = sprintf("%s/%s", directory, end_name); + printf "%s : \\\n", dst_libs + printf "\t\t%s \\\n", directory + printf "\t\t%s\n", src_libs + printf "\t@echo installing $@\n" + printf "\t$(INSTALL_LIB) %s %s\n", src_lib1, dst_lib1; + if ( src_lib2 != "" ) { + printf "\t$(INSTALL_LIB) %s %s\n", src_lib2, dst_lib2; + } + sharedlinks(directory) + } function install_dll(directory,filename) { src_name = sprintf("../lib/%s", filename); dst_name = sprintf("$(DESTDIR)%s/%s", directory, filename); printf "\t@echo installing %s as %s\n", src_name, dst_name - printf "\t-@rm -f %s\n", dst_name if ( directory == "$(bindir)" ) { program = "$(INSTALL) -m 755"; } else { @@ -221,6 +233,8 @@ BEGIN { printf "# subset: %s\n", subset printf "# ShlibVer: %s\n", ShlibVer printf "# ShlibVerInfix: %s\n", ShlibVerInfix + printf "# TermlibRoot: %s\n", TermlibRoot + printf "# ReLink: %s\n", ReLink printf "# DoLinks: %s\n", DoLinks printf "# rmSoLocs: %s\n", rmSoLocs printf "# ldconfig: %s\n", ldconfig @@ -283,7 +297,7 @@ END { imp_name = imp_name_of(name); end_name = end_name_of(name); - shlib_rule("../lib") + shlib_build("../lib") print "" print "install \\" @@ -301,7 +315,11 @@ END { lib_dir = "$(DESTDIR)$(libdir)"; printf "install.%s :: %s/%s\n", name, lib_dir, end_name print "" - shlib_rule(lib_dir) + if ( ReLink == "yes" ) { + shlib_build(lib_dir) + } else { + shlib_install(lib_dir) + } } if ( overwrite == "yes" && name == "ncurses" )