diff options
Diffstat (limited to 'Build/source/texk/web2c/etexdir')
-rw-r--r-- | Build/source/texk/web2c/etexdir/ChangeLog | 7 | ||||
-rw-r--r-- | Build/source/texk/web2c/etexdir/am/etex.am | 12 |
2 files changed, 15 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog index c13c795be8d..822c6488e82 100644 --- a/Build/source/texk/web2c/etexdir/ChangeLog +++ b/Build/source/texk/web2c/etexdir/ChangeLog @@ -1,3 +1,10 @@ +2019-12-10 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp> + + * am/etex.am (etex_CPPFLAGS): append $(ZLIB_INCLUDES). + (etex_LDADD): include $(ZLIB_LIBS.) + (etex_DEPENDENCIES): define as $(ZLIB_DEPEND) + (etex_web_srcs): include zlib-fmt.ch. + 2018-03-24 Hironobu Yamashita <h.y.acetaminophen@gmail.com> Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp> diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am index 71c99518b20..aa6f9b1f874 100644 --- a/Build/source/texk/web2c/etexdir/am/etex.am +++ b/Build/source/texk/web2c/etexdir/am/etex.am @@ -1,6 +1,7 @@ ## texk/web2c/etexdir/am/etex.am: Makefile fragment for e-TeX. ## -## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org> +## Copyright 2015-2019 Karl Berry <tex-live@tug.org> +## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## e-TeX @@ -10,17 +11,19 @@ bin_PROGRAMS += etex endif ETEX EXTRA_PROGRAMS += etex -etex_CPPFLAGS = $(AM_CPPFLAGS) +etex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) # With --enable-ipc, e-TeX may need to link with -lsocket. -etex_LDADD = $(LDADD) $(ipc_socketlibs) +etex_LDADD = $(LDADD) $(ZLIB_LIBS) $(ipc_socketlibs) +etex_DEPENDENCIES = $(ZLIB_DEPEND) # e-TeX C sources etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h nodist_etex_SOURCES = $(etex_c_h) etex-pool.c dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h etexdir/etex_version.h -# We must create etexd.h and etexdir/etex_version.h before building the etex_OBJECTS. +# We must create etexd.h and etexdir/etex_version.h before building the +# etex_OBJECTS. etex_prereq = etexd.h etexdir/etex_version.h $(etex_OBJECTS): $(etex_prereq) @@ -56,6 +59,7 @@ etex.ch: tie$(EXEEXT) etex.web $(etex_ch_srcs) etex_ch_srcs = \ etexdir/tex.ch0 \ tex.ch \ + zlib-fmt.ch \ enctex.ch \ $(etex_ch_synctex) \ etexdir/tex.ch1 \ |