texlive[61619] Build/source/texk/web2c: libweb2c.a instead of -L.

[commits+karl at tug.org]

Revision: 61619
          http://tug.org/svn/texlive?view=revision&revision=61619
Author:   karl
Date:     2022-01-15 23:18:29 +0100 (Sat, 15 Jan 2022)
Log Message:
-----------
libweb2c.a instead of -L. -l web2c

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/ChangeLog
    trunk/Build/source/texk/web2c/Makefile.in
    trunk/Build/source/texk/web2c/web2c/Makefile.am
    trunk/Build/source/texk/web2c/web2c/Makefile.in

Modified: trunk/Build/source/texk/web2c/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ChangeLog	2022-01-15 21:43:10 UTC (rev 61618)
+++ trunk/Build/source/texk/web2c/ChangeLog	2022-01-15 22:18:29 UTC (rev 61619)
@@ -1,3 +1,10 @@
+2022-01-15  Karl Berry  <karl at freefriends.org>
+
+	* web2c/Makefile.am (web2c_LDADD): set to libweb2c.a
+	instead of -L. -lweb2c, for compatibility with slibtool,
+	and clarity. Report from Michael Orlitzky,
+	tex-k 15 Jan 2022 13:28:41.
+
 2022-01-15  Andreas Scherer  <https://ascherer.github.io>
 
 	* tangle.ch,

Modified: trunk/Build/source/texk/web2c/Makefile.in
===================================================================
--- trunk/Build/source/texk/web2c/Makefile.in	2022-01-15 21:43:10 UTC (rev 61618)
+++ trunk/Build/source/texk/web2c/Makefile.in	2022-01-15 22:18:29 UTC (rev 61619)
@@ -22203,26 +22203,27 @@
 hiall: hitex hishrink histretch
 
 $(hiformat_c_h_l_y): hiformat-tangle
-	$(hi_ctangle_sh) hiformat
+
 #
 hiformat-tangle: ctangle$(EXEEXT) hitexdir/hiformat.w tangle-sh
 	$(hi_ctangle_sh) hiformat
 
 $(hitex_c): hitex-tangle
-	$(hi_ctangle_sh) hitex
+
 #
 hitex-tangle: ctangle$(EXEEXT) hitexdir/hitex.w tangle-sh
 	$(hi_ctangle_sh) hitex
 
 # Generating hitables.c using himktables.
-hitables.c: himktables
-	./himktables$(EXEEXT) > $@ || { rm -f hitables.c; exit 1; }
+hitables.c: himktables$(EXEEXT)
+	./himktables > $@ || { rm -f hitables.c; exit 1; }
 
-# hitex and hishrink both need (at least) some of the sources generated
-# from hiformat.w.
+# hitex, histretch, and hishrink all need (at least) some 
+# of the sources generated from hiformat.w.
 #
-$(hitex_OBJECTS): $(hiformat_c_h_l_y)
-$(hishrink_OBJECTS): $(hiformat_c_h_l_y)
+$(hitex_OBJECTS): hiformat-tangle
+$(hishrink_OBJECTS): hiformat-tangle
+$(histretch_OBJECTS): hiformat-tangle
 
 hitexdir/tests/hello.log: hitex$(EXEEXT) histretch$(EXEEXT)
 hitexdir/tests/rule.log: hitex$(EXEEXT) histretch$(EXEEXT) hishrink$(EXEEXT)

Modified: trunk/Build/source/texk/web2c/web2c/Makefile.am
===================================================================
--- trunk/Build/source/texk/web2c/web2c/Makefile.am	2022-01-15 21:43:10 UTC (rev 61618)
+++ trunk/Build/source/texk/web2c/web2c/Makefile.am	2022-01-15 22:18:29 UTC (rev 61619)
@@ -1,8 +1,10 @@
+## $Id$
 ## Makefile.am for the TeX Live subdirectory texk/web2c/web2c/.
 ##
-## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live at tug.org>
+## Copyright 2015-2022 Peter Breitenlohner <tex-live at tug.org>
+## Copyright 2009-2014 Peter Breitenlohner <tex-live at tug.org>
 ## You may freely use, modify and/or distribute this file.
-##
+
 AM_CPPFLAGS = -I$(srcdir)/../..
 AM_YFLAGS = -d -v
 AM_CFLAGS = $(WARNING_CFLAGS)
@@ -55,7 +57,7 @@
 
 $(web2c_OBJECTS): web2c-parser.h stamp-lib
 
-web2c_LDADD = -L. -lweb2c
+web2c_LDADD = libweb2c.a
 
 DISTCLEANFILES += web2c-parser.output
 
@@ -106,4 +108,3 @@
 
 distclean-local:
 	rm -rf kpathsea w2c
-

Modified: trunk/Build/source/texk/web2c/web2c/Makefile.in
===================================================================
--- trunk/Build/source/texk/web2c/web2c/Makefile.in	2022-01-15 21:43:10 UTC (rev 61618)
+++ trunk/Build/source/texk/web2c/web2c/Makefile.in	2022-01-15 22:18:29 UTC (rev 61619)
@@ -127,8 +127,7 @@
 libweb2c_a_OBJECTS = $(am_libweb2c_a_OBJECTS)
 am_fixwrites_OBJECTS = fixwrites.$(OBJEXT)
 fixwrites_OBJECTS = $(am_fixwrites_OBJECTS)
-am__DEPENDENCIES_1 =
-fixwrites_DEPENDENCIES = $(am__DEPENDENCIES_1)
+fixwrites_DEPENDENCIES = $(web2c_LDADD)
 AM_V_lt = $(am__v_lt_ at AM_V@)
 am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -138,11 +137,11 @@
 makecpool_LDADD = $(LDADD)
 am_splitup_OBJECTS = splitup.$(OBJEXT)
 splitup_OBJECTS = $(am_splitup_OBJECTS)
-splitup_DEPENDENCIES = $(am__DEPENDENCIES_1)
+splitup_DEPENDENCIES = $(web2c_LDADD)
 am_web2c_OBJECTS = web2c-parser.$(OBJEXT) web2c-lexer.$(OBJEXT) \
 	main.$(OBJEXT)
 web2c_OBJECTS = $(am_web2c_OBJECTS)
-web2c_DEPENDENCIES =
+web2c_DEPENDENCIES = libweb2c.a
 SCRIPTS = $(dist_noinst_SCRIPTS)
 AM_V_P = $(am__v_P_ at AM_V@)
 am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
@@ -416,7 +415,7 @@
 	main.c \
 	web2c.h
 
-web2c_LDADD = -L. -lweb2c
+web2c_LDADD = libweb2c.a
 fixwrites_SOURCES = \
 	fixwrites.c