From a1ed52cad4d189249d2179f5430ba78b3d5a7838 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Tue, 5 Oct 2021 21:25:21 +0000
Subject: hitex: -I for md5, define dependencies

git-svn-id: svn://tug.org/texlive/trunk@60703 c570f23f-e606-0410-a88d-b1316a301751
---
 Build/source/texk/web2c/Makefile.in          | 14 +++++---------
 Build/source/texk/web2c/hitexdir/ChangeLog   |  8 ++++++++
 Build/source/texk/web2c/hitexdir/am/hitex.am | 11 ++++++++---
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index fe2dd618dd7..b660d6f8a19 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1392,17 +1392,14 @@ nodist_hishrink_OBJECTS = hishrink-hformat.$(OBJEXT) \
 	hitexdir/hishrink-hishrink-lexer.$(OBJEXT) \
 	hitexdir/hishrink-hishrink-parser.$(OBJEXT)
 hishrink_OBJECTS = $(nodist_hishrink_OBJECTS)
-hishrink_DEPENDENCIES = $(am__DEPENDENCIES_1)
 nodist_histretch_OBJECTS = histretch-hformat.$(OBJEXT) \
 	histretch-histretch.$(OBJEXT)
 histretch_OBJECTS = $(nodist_histretch_OBJECTS)
-histretch_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am__objects_37 = hitex-htex.$(OBJEXT)
 am__objects_38 = hitex-hitex.$(OBJEXT)
 nodist_hitex_OBJECTS = hitex-hformat.$(OBJEXT) hitex-hput.$(OBJEXT) \
 	$(am__objects_37) $(am__objects_38)
 hitex_OBJECTS = $(nodist_hitex_OBJECTS)
-hitex_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 nodist_initex_OBJECTS = initex-callexe.$(OBJEXT)
 initex_OBJECTS = $(nodist_initex_OBJECTS)
 initex_DEPENDENCIES =
@@ -4572,19 +4569,18 @@ euptex_ch_srcs = \
 # e-upTeX Tests
 #
 euptex_tests = euptexdir/euptriptest.test euptexdir/pdfprimitive.test euptexdir/eupver.test
-
-# We want debugging for the parser, and we use features not in POSIX yacc.
-# The result is that we assume bison? Not sure if that's ok.
-AM_YFLAGS = -d -v -Wno-yacc
-hitex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES)
-hitex_LDADD = $(KPATHSEA_LIBS) $(ZLIB_LIBS)
+hitex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) -I$(srcdir)/libmd5
+hitex_LDADD = $(KPATHSEA_LIBS) $(ZLIB_LIBS) libmd5.a
+hitex_DEPENDENCIES = $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) libmd5.a
 #
 histretch_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES)
 histretch_LDADD = $(ZLIB_LIBS)
+histretch_DEPENDENCIES = $(ZLIB_DEPEND)
 #
 # The -I$(srcdir)/hitexdir is so the compiler can find the *parser.h file.
 hishrink_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) -I$(srcdir)/hitexdir
 hishrink_LDADD = $(ZLIB_LIBS)
+hishrink_DEPENDENCIES = $(ZLIB_DEPEND)
 
 # HiTeX CWEB sources
 hitex_web = hitexdir/format.w hitexdir/htex.w hitexdir/hitex.w
diff --git a/Build/source/texk/web2c/hitexdir/ChangeLog b/Build/source/texk/web2c/hitexdir/ChangeLog
index 7a6eb08c5cc..0dae85927dc 100644
--- a/Build/source/texk/web2c/hitexdir/ChangeLog
+++ b/Build/source/texk/web2c/hitexdir/ChangeLog
@@ -1,3 +1,11 @@
+2021-10-05  Karl Berry  <karl@freefriends.org>
+
+	* am/hitex.am (AM_YFLAGS): comment out since we aren't doing
+	lex/yacc stuff any more.
+
+	(hitex_CPPFLAGS): include -I$(srcdir)/libmd5 for extensions.
+	(hi{tex,stretch,shrink}_DEPENDENCIES): define.
+
 2021-10-01  Karl Berry  <karl@freefriends.org>
 
 	* am/hitex.am (nodist_hishrink_SOURCES): remove references to .[ly]
diff --git a/Build/source/texk/web2c/hitexdir/am/hitex.am b/Build/source/texk/web2c/hitexdir/am/hitex.am
index 52e54fd8720..109cb4e0e42 100644
--- a/Build/source/texk/web2c/hitexdir/am/hitex.am
+++ b/Build/source/texk/web2c/hitexdir/am/hitex.am
@@ -12,19 +12,24 @@ EXTRA_PROGRAMS += hitex hishrink histretch
 # convenience target to build all the programs here.
 hiall: hitex hishrink histretch
 
-# We want debugging for the parser, and we use features not in POSIX yacc.
-# The result is that we assume bison? Not sure if that's ok.
-AM_YFLAGS = -d -v -Wno-yacc
+## Debugging for the parser as usual.
+## Except we eschew all lex/yacc steps in the Makefile here; see below.
+## AM_YFLAGS = -d -v -Wno-yacc
 
 hitex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES)
+hitex_CPPFLAGS += -I$(srcdir)/libmd5
 hitex_LDADD = $(KPATHSEA_LIBS) $(ZLIB_LIBS)
+hitex_LDADD += libmd5.a
+hitex_DEPENDENCIES = $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) libmd5.a
 #
 histretch_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES)
 histretch_LDADD = $(ZLIB_LIBS)
+histretch_DEPENDENCIES = $(ZLIB_DEPEND)
 #
 # The -I$(srcdir)/hitexdir is so the compiler can find the *parser.h file.
 hishrink_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) -I$(srcdir)/hitexdir
 hishrink_LDADD = $(ZLIB_LIBS)
+hishrink_DEPENDENCIES = $(ZLIB_DEPEND)
 
 # HiTeX CWEB sources
 hitex_web = hitexdir/format.w hitexdir/htex.w hitexdir/hitex.w
-- 
cgit v1.2.3