summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/hitexdir/am/hitex.am
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c/hitexdir/am/hitex.am')
-rw-r--r--Build/source/texk/web2c/hitexdir/am/hitex.am46
1 files changed, 20 insertions, 26 deletions
diff --git a/Build/source/texk/web2c/hitexdir/am/hitex.am b/Build/source/texk/web2c/hitexdir/am/hitex.am
index 109cb4e0e42..2419d82d3bc 100644
--- a/Build/source/texk/web2c/hitexdir/am/hitex.am
+++ b/Build/source/texk/web2c/hitexdir/am/hitex.am
@@ -16,9 +16,9 @@ hiall: hitex hishrink histretch
## 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 = $(AM_CPPFLAGS) $(ZLIB_INCLUDES)
hitex_CPPFLAGS += -I$(srcdir)/libmd5
-hitex_LDADD = $(KPATHSEA_LIBS) $(ZLIB_LIBS)
+hitex_LDADD = $(KPATHSEA_LIBS) $(ZLIB_LIBS) libmd5.a
hitex_LDADD += libmd5.a
hitex_DEPENDENCIES = $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) libmd5.a
#
@@ -32,20 +32,19 @@ hishrink_LDADD = $(ZLIB_LIBS)
hishrink_DEPENDENCIES = $(ZLIB_DEPEND)
# HiTeX CWEB sources
-hitex_web = hitexdir/format.w hitexdir/htex.w hitexdir/hitex.w
+hitex_web = hitexdir/format.w hitexdir/hitex.w
# Creating several files: need stamp file and two rules with identical recipes
hi_ctangle_sh = CWEBINPUTS=$(srcdir)/hitexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(CTANGLE)
# HiTeX C/yacc/lex sources generated using ctangle.
# For each cweb (.w) source file, list the files generated.
-format_c_h_l_y = basetypes.h error.h hformat.h \
- mkhformat.c \
- hput.c hput.h \
- hget.c hget.h \
- shrink.l shrink.y \
+format_c_h_l_y = hibasetypes.h hierror.h hiformat.h \
+ himktables.c \
+ hiput.c hiput.h \
+ higet.c higet.h \
+ hilexer.l hiparser.y \
hishrink.c histretch.c
-htex_c_h = htex.c htex.h
hitex_c_h = hitex.c hitex.h
$(format_c_h_l_y): format-tangle
@@ -60,36 +59,31 @@ $(hitex_c_h): hitex-tangle
hitex-tangle: ctangle$(EXEEXT) hitexdir/hitex.w tangle-sh
$(hi_ctangle_sh) hitex
-# htex.c needs hitex.h, so depend on the hitex tangle.
-$(htex_c_h): htex-tangle hitex-tangle
- $(hi_ctangle_sh) htex
-#
-htex-tangle: ctangle$(EXEEXT) hitexdir/htex.w tangle-sh hitex-tangle
- $(hi_ctangle_sh) htex
-
-# Generating hformat.c using mkhformat.
-hformat.c: mkhformat
- ./mkhformat >hformat.c || { rm -f hformat.c; exit 1; }
+# Generating hitables.c using himktables.
+hitables.c: himktables
+ ./himktables > $@ || { rm -f hitables.c; exit 1; }
# hitex
-nodist_hitex_SOURCES = hformat.c hput.c $(htex_c_h) $(hitex_c_h)
+nodist_hitex_SOURCES = hitables.c hiput.c $(hitex_c_h)
# histretch
-nodist_histretch_SOURCES = hformat.c histretch.c
+nodist_histretch_SOURCES = hitables.c histretch.c
# The actual sources for the lexer and parser are in format.w.
# However, to simplify life with Automake (a little), we include the
# generated [.ch] files as if they were the sources here, and don't try
# to have Automake support the derivation from .w.
#
-nodist_hishrink_SOURCES = hformat.c hishrink.c \
- hitexdir/hishrink-lexer.c \
- hitexdir/hishrink-parser.c hitexdir/hishrink-parser.h
+# The $(srcdir) is not necessary if everything is up to date,
+# but can help with the remake if the [.ch] or [.ly] are not present.
+nodist_hishrink_SOURCES = hitables.c \
+ hitexdir/hilexer.c \
+ hitexdir/hiparser.c hitexdir/hiparser.h
# This is our attempt to ensure that bison got run before anything else,
# when needed.
#
-$(hishrink_OBJECTS): $(srcdir)/hitexdir/hishrink-parser.h
+$(hishrink_OBJECTS): $(srcdir)/hitexdir/hiparser.h
#
# By the way, the $(BUILT_SOURCES) suggestion in the Automake manual for
# this does not work for us, because we want to be able to invoke
@@ -100,7 +94,7 @@ EXTRA_DIST += hitexdir/ChangeLog $(hitex_web)
DISTCLEANFILES += $(nodist_hitex_SOURCES)
DISTCLEANFILES += $(nodist_hishrink_SOURCES) $(nodist_histretch_SOURCES)
-DISTCLEANFILES += format-tangle htex-tangle hitex-tangle
+DISTCLEANFILES += format-tangle hitex-tangle
## HiTeX tests
# still missing