X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=mk-1st.awk;h=87a8b414df000cc15c131b26c19721c08e48ca54;hb=0be808514502f3149b379d036ab3a83cbb4d4c02;hp=e41c864b3f0bb78ea32d261ed9127bb19c6694bc;hpb=0c9774ef662e2137933ac0c79077eaa9c8981357;p=ncurses.git diff --git a/mk-1st.awk b/mk-1st.awk index e41c864b..87a8b414 100644 --- a/mk-1st.awk +++ b/mk-1st.awk @@ -1,4 +1,4 @@ -# $Id: mk-1st.awk,v 1.73 2007/02/17 21:31:09 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. # # # @@ -164,11 +164,7 @@ function sharedlinks(directory) { } } function shlib_build(directory) { - if ( ShlibVer == "cygdll" ) { - dst_libs = sprintf("%s/$(SHARED_LIB) %s/$(IMPORT_LIB)", directory, directory); - } else { - dst_libs = sprintf("%s/%s", directory, end_name); - } + dst_libs = sprintf("%s/%s", directory, end_name); printf "%s : \\\n", dst_libs printf "\t\t%s \\\n", directory if (subset ~ /^base/ || subset == "ticlib" ) { @@ -182,7 +178,6 @@ function shlib_build(directory) { } 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() ) { @@ -193,25 +188,12 @@ function shlib_build(directory) { sharedlinks(directory) } function shlib_install(directory) { - if ( ShlibVer == "cygdll" ) { - src_lib1 = sprintf("%s/$(SHARED_LIB)", "../lib"); - src_lib2 = sprintf("%s/$(IMPORT_LIB)", "../lib"); - src_libs = sprintf("%s %s", src_lib1, src_lib2); - dst_lib1 = sprintf("%s/$(SHARED_LIB)", directory); - dst_lib2 = sprintf("%s/$(IMPORT_LIB)", directory); - dst_libs = sprintf("%s %s", dst_lib1, dst_lib2); - } else { - src_lib1 = sprintf("../lib/%s", end_name); - src_lib2 = "" - src_libs = src_lib1 - dst_lib1 = sprintf("%s/%s", directory, end_name); - dst_libs = dst_lib1; - } + 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" - print "\t-@rm -f %s", dst_libs; 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; @@ -222,7 +204,6 @@ 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 {