X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=mk-1st.awk;h=8ce72f5c6bdf31ea67f7fd3fe2a044b6ad82a8ab;hp=bbd7c40efa561d55ad7580a8d0ffe0e974d442aa;hb=a8987e73ec254703634802b4f7ee30d3a485524d;hpb=46722468f47c2b77b3987729b4bcf2321cccfd01

diff --git a/mk-1st.awk b/mk-1st.awk
index bbd7c40e..8ce72f5c 100644
--- a/mk-1st.awk
+++ b/mk-1st.awk
@@ -1,6 +1,6 @@
-# $Id: mk-1st.awk,v 1.55 2002/04/20 17:32:47 tom Exp $
+# $Id: mk-1st.awk,v 1.62 2004/01/10 20:48:43 tom Exp $
 ##############################################################################
-# Copyright (c) 1998,2000,2002 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -27,7 +27,7 @@
 # authorization.                                                             #
 ##############################################################################
 #
-# Author: Thomas E. Dickey <dickey@clark.net> 1996,1997,2000
+# Author: Thomas E. Dickey
 #
 # Generate list of objects for a given model library
 # Variables:
@@ -38,7 +38,7 @@
 #	MODEL (e.g., "DEBUG", uppercase; toupper is not portable)
 #	depend (optional dependencies for all objects, e.g, ncurses_cfg.h)
 #	subset ("none", "base", "base+ext_funcs" or "termlib")
-#	target (cross-compile target, if any)
+#	host (cross-compile host, if any)
 #	ShlibVer ("rel", "abi" or "auto", to augment DoLinks variable)
 #	ShlibVerInfix ("yes" or "no", determines location of version #)
 #	DoLinks ("yes", "reverse" or "no", flag to add symbolic links)
@@ -110,12 +110,12 @@ BEGIN	{
 			if (using == 0) {
 				if (found == 0) {
 					print  ""
-					print  "# generated by mk-1st.awk"
+					printf "# generated by mk-1st.awk (subset=%s)\n", subset
 					print  ""
 				}
 				using = 1
 			}
-			if ( subset == "termlib") {
+			if ( subset == "termlib" || subset == "termlib+ext_tinfo" ) {
 				name  = "tinfo"
 				OBJS  = MODEL "_T"
 			} else {
@@ -146,7 +146,7 @@ BEGIN	{
 				else
 					found = 2
 			}
-			printf " \\\n\t../%s/%s.o", model, $1
+			printf " \\\n\t../%s/%s$o", model, $1
 		}
 	}
 END	{
@@ -162,8 +162,8 @@ END	{
 			if ( MODEL == "SHARED" )
 			{
 				if (ShlibVerInfix == "cygdll") {
-					abi_name = sprintf("%s%s$(ABI_VERSION)%s", prefix, name, suffix);
-					rel_name = sprintf("%s%s$(REL_VERSION)%s", prefix, name, suffix);
+					abi_name = sprintf("%s%s$(ABI_VERSION)%s", "cyg", name, suffix);
+					rel_name = sprintf("%s%s$(REL_VERSION)%s", "cyg", name, suffix);
 					imp_name = sprintf("%s%s%s.a", prefix, name, suffix);
 				} else if (ShlibVerInfix == "yes") {
 					abi_name = sprintf("%s%s.$(ABI_VERSION)%s", prefix, name, suffix);
@@ -193,8 +193,8 @@ END	{
 					printf "../lib/%s : $(%s_OBJS)\n", end_name, OBJS
 					print "\t-@rm -f $@";
 				}
-				if ( subset == "termlib") {
-					printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(TINFO_LIST)\n", OBJS
+				if ( subset == "termlib" || subset == "termlib+ext_tinfo" ) {
+					printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(TINFO_LIST) $(LDFLAGS)\n", OBJS
 				} else {
 					printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(SHLIB_LIST) $(LDFLAGS)\n", OBJS
 				}
@@ -233,9 +233,15 @@ END	{
 
 				if ( overwrite == "yes" && name == "ncurses" )
 				{
-					ovr_name = sprintf("libcurses%s", suffix)
-					printf "\t@echo linking %s to %s\n", end_name, ovr_name
-					printf "\tcd $(DESTDIR)$(libdir) && (rm -f %s; $(LN_S) %s %s; )\n", ovr_name, end_name, ovr_name
+					if ( ShlibVer == "cygdll" ) {
+						ovr_name = sprintf("libcurses%s.a", suffix)
+						printf "\t@echo linking %s to %s\n", imp_name, ovr_name
+						printf "\tcd $(DESTDIR)$(libdir) && (rm -f %s; $(LN_S) %s %s; )\n", ovr_name, imp_name, ovr_name
+					} else {
+						ovr_name = sprintf("libcurses%s", suffix)
+						printf "\t@echo linking %s to %s\n", end_name, ovr_name
+						printf "\tcd $(DESTDIR)$(libdir) && (rm -f %s; $(LN_S) %s %s; )\n", ovr_name, end_name, ovr_name
+					}
 				}
 				if ( ldconfig != "" ) {
 					printf "\t- test -z \"$(DESTDIR)\" && %s\n", ldconfig
@@ -257,7 +263,11 @@ END	{
 					removelinks("$(DESTDIR)$(libdir)")
 					if ( overwrite == "yes" && name == "ncurses" )
 					{
-						ovr_name = sprintf("libcurses%s", suffix)
+						if ( ShlibVer == "cygdll" ) {
+							ovr_name = sprintf("libcurses%s.a", suffix)
+						} else {
+							ovr_name = sprintf("libcurses%s", suffix)
+						}
 						printf "\t-@rm -f $(DESTDIR)$(libdir)/%s\n", ovr_name
 					}
 				}
@@ -277,19 +287,19 @@ END	{
 				}
 				end_name = lib_name;
 				printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
-				printf "\tcd ../lib && $(LIBTOOL) $(%s) -o %s $(%s_OBJS:.o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR)\n", compile, lib_name, OBJS
+				printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)\n", compile, lib_name, OBJS
 				print  ""
 				print  "install \\"
 				print  "install.libs \\"
 				printf "install.%s :: $(DESTDIR)$(libdir) ../lib/%s\n", name, lib_name
 				printf "\t@echo installing ../lib/%s as $(DESTDIR)$(libdir)/%s\n", lib_name, lib_name
-				printf "\tcd ../lib; $(LIBTOOL) $(INSTALL_DATA) %s $(DESTDIR)$(libdir)\n", lib_name
+				printf "\tcd ../lib; $(LIBTOOL_INSTALL) $(INSTALL) %s $(DESTDIR)$(libdir)\n", lib_name
 				print  ""
 				print  "uninstall \\"
 				print  "uninstall.libs \\"
 				printf "uninstall.%s ::\n", name
 				printf "\t@echo uninstalling $(DESTDIR)$(libdir)/%s\n", lib_name
-				printf "\t-@$(LIBTOOL) rm -f $(DESTDIR)$(libdir)/%s\n", lib_name
+				printf "\t-@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(libdir)/%s\n", lib_name
 			}
 			else
 			{
@@ -297,9 +307,9 @@ END	{
 				printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
 				printf "\t$(AR) $(AR_OPTS) $@ $?\n"
 				printf "\t$(RANLIB) $@\n"
-				if ( target == "vxworks" )
+				if ( host == "vxworks" )
 				{
-					printf "\t$(LD) $(LD_OPTS) $? -o $(@:.a=.o)\n"
+					printf "\t$(LD) $(LD_OPTS) $? -o $(@:.a=$o)\n"
 				}
 				print  ""
 				print  "install \\"
@@ -314,10 +324,10 @@ END	{
 					printf "\t(cd $(DESTDIR)$(libdir) && $(LN_S) libncurses.a libcurses.a)\n"
 				}
 				printf "\t$(RANLIB) $(DESTDIR)$(libdir)/%s\n", lib_name
-				if ( target == "vxworks" )
+				if ( host == "vxworks" )
 				{
-					printf "\t@echo installing ../lib/lib%s.o as $(DESTDIR)$(libdir)/lib%s.o\n", name, name
-					printf "\t$(INSTALL_DATA) ../lib/lib%s.o $(DESTDIR)$(libdir)/lib%s.o\n", name, name
+					printf "\t@echo installing ../lib/lib%s$o as $(DESTDIR)$(libdir)/lib%s$o\n", name, name
+					printf "\t$(INSTALL_DATA) ../lib/lib%s$o $(DESTDIR)$(libdir)/lib%s$o\n", name, name
 				}
 				print  ""
 				print  "uninstall \\"
@@ -330,10 +340,10 @@ END	{
 					printf "\t@echo linking libcurses.a to libncurses.a\n"
 					printf "\t-@rm -f $(DESTDIR)$(libdir)/libcurses.a\n"
 				}
-				if ( target == "vxworks" )
+				if ( host == "vxworks" )
 				{
-					printf "\t@echo uninstalling $(DESTDIR)$(libdir)/lib%s.o\n", name
-					printf "\t-@rm -f $(DESTDIR)$(libdir)/lib%s.o\n", name
+					printf "\t@echo uninstalling $(DESTDIR)$(libdir)/lib%s$o\n", name
+					printf "\t-@rm -f $(DESTDIR)$(libdir)/lib%s$o\n", name
 				}
 			}
 			print ""
@@ -343,7 +353,7 @@ END	{
 			print "mostlyclean::"
 			printf "\t-rm -f $(%s_OBJS)\n", OBJS
 			if ( MODEL == "LIBTOOL" ) {
-				printf "\t-rm -f $(%s_OBJS:.o=.lo)\n", OBJS
+				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:$o=.lo)\n", OBJS
 			}
 		}
 		else if ( found == 2 )
@@ -352,13 +362,13 @@ END	{
 			print "mostlyclean::"
 			printf "\t-rm -f $(%s_OBJS)\n", OBJS
 			if ( MODEL == "LIBTOOL" ) {
-				printf "\t-rm -f $(%s_OBJS:.o=.lo)\n", OBJS
+				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:$o=.lo)\n", OBJS
 			}
 			print ""
 			print "clean ::"
 			printf "\t-rm -f $(%s_OBJS)\n", OBJS
 			if ( MODEL == "LIBTOOL" ) {
-				printf "\t-rm -f $(%s_OBJS:.o=.lo)\n", OBJS
+				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:$o=.lo)\n", OBJS
 			}
 		}
 	}