diff options
author | Luigi Scarso <luigi.scarso@gmail.com> | 2022-02-12 18:02:57 +0000 |
---|---|---|
committer | Luigi Scarso <luigi.scarso@gmail.com> | 2022-02-12 18:02:57 +0000 |
commit | 0f358457f0c576c1ee06d77e82a077bc7b614cde (patch) | |
tree | 64a9dbefd8ea2b03203c514efc244d9aa39dd32e /Build/source/texk/web2c/mfluajitdir | |
parent | 1f23f86e92f5e59c1b12b056b39a410b611c2dc8 (diff) |
Updated MFLua.
git-svn-id: svn://tug.org/texlive/trunk@61986 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/mfluajitdir')
-rw-r--r-- | Build/source/texk/web2c/mfluajitdir/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/mfluajitdir/am/mfluajit.am | 15 | ||||
-rw-r--r-- | Build/source/texk/web2c/mfluajitdir/am/mfluajitlpeg.am | 25 |
3 files changed, 32 insertions, 13 deletions
diff --git a/Build/source/texk/web2c/mfluajitdir/ChangeLog b/Build/source/texk/web2c/mfluajitdir/ChangeLog index 5337e281a67..aa75e43ea2e 100644 --- a/Build/source/texk/web2c/mfluajitdir/ChangeLog +++ b/Build/source/texk/web2c/mfluajitdir/ChangeLog @@ -1,11 +1,8 @@ -2022-01-10 Karl Berry <karl@freefriends.org> - - * am/mfluajit.am: do not silence tangle-sh. - 2017-04-16 Luigi Scarso <luigi.scarso@gmail.com> * am/mfluajit.am: delete useless lua files + 2016-04-05 Karl Berry <karl@tug.org> * am/mflua.am: no need for inimfluajit. diff --git a/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am b/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am index 180b6617e24..fa3b23646a9 100644 --- a/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am +++ b/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am @@ -1,7 +1,6 @@ -## $Id$ ## texk/web2c/mfluajitdir/am/mfluajit.am: Makefile fragment for MFLuaJIT. ## -## Copyright 2016-2022 Karl Berry <tex-live@tug.org> +## Copyright 2016 Karl Berry <tex-live@tug.org> ## Copyright 2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. @@ -43,11 +42,11 @@ endif WIN32 dist_mfluajit_SOURCES = mfluajitdir/mfluajitextra.c mfluajitdir/mfluajitextra.h mfluadir/mflua_version.h mfluajit_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES) -mfluajit_LDADD = libmfluajit.a libmfluaotfcc.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUAJIT_LIBS) +mfluajit_LDADD = libmfluajit.a libmfluaotfcc.a libmfluapotrace.a libmfluajitlpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUAJIT_LIBS) mfluajit_LDFLAGS = -export-dynamic $(LUAJIT_LDEXTRA) nodist_mfluajit_nowin_SOURCES = $(dist_mfluajit_SOURCES) mfluajit_nowin_CPPFLAGS = $(mfluajit_CPPFLAGS) -DMFNOWIN $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES) -mfluajit_nowin_LDADD = libmfluajit.a libmfluaotfcc.a $(LDADD) $(windowlib) $(LUAJIT_LIBS) +mfluajit_nowin_LDADD = libmfluajit.a libmfluaotfcc.a libmfluapotrace.a libmfluajitlpeg.a $(LDADD) $(windowlib) $(LUAJIT_LIBS) mfluajit_nowin_LDFLAGS = -export-dynamic $(LUAJIT_LDEXTRA) # We must create mfluajitd.h and mfluadir/mflua_version.h before compiling mfluajitextra.c. @@ -56,7 +55,7 @@ $(mfluajit_OBJECTS) $(mfluajit_nowin_OBJECTS): mfluajitd.h mfluadir/mflua_versio ## mfluajit and mfluajit-nowin compile mfluajitextra.c with different CPPFLAGS. ## Automake, however, does not support CPPFLAGS for individual source files. ## To avoid compiling everything twice, the common objects are in a library. -EXTRA_LIBRARIES += libmfluajit.a libmfluaotfcc.a +EXTRA_LIBRARIES += libmfluajit.a libmfluaotfcc.a libmfluapotrace.a libmfluajitlpeg.a # MFLuaJIT C sources mfluajit_c_h = mfluajitini.c mfluajit0.c mfluajitcoerce.h mfluajitd.h @@ -77,9 +76,9 @@ mfluajit-pool.c: mfluajit.pool mfluajitd.h $(makecpool_stamp) # Tangling MFLuaJIT mfluajit.p mfluajit.pool: mfluajit-tangle - $(texmf_tangle) mfluajit mfluajit + @$(texmf_tangle) mfluajit mfluajit mfluajit-tangle: tangle$(EXEEXT) mfluajit.web mfluajit.ch tangle-sh - $(texmf_tangle) mfluajit mfluajit + @$(texmf_tangle) mfluajit mfluajit # Generate mfluajit.web mfluajit.web: tie$(EXEEXT) $(mfluajit_web_srcs) @@ -134,5 +133,3 @@ EXTRA_DIST += \ mfluadir/mfluatrap/mflua_ttx_backend.lua \ mfluadir/mfluatrap/texmf.cnf \ mfluadir/mfluatrap/mfluatrap.diffs - -# (end of mfluajit.am) diff --git a/Build/source/texk/web2c/mfluajitdir/am/mfluajitlpeg.am b/Build/source/texk/web2c/mfluajitdir/am/mfluajitlpeg.am new file mode 100644 index 00000000000..41c4661735f --- /dev/null +++ b/Build/source/texk/web2c/mfluajitdir/am/mfluajitlpeg.am @@ -0,0 +1,25 @@ +## texk/web2c/mfluajitdir/am/mfluajitlpeg.am: Makefile fragment for libmfluajitlpeg. +## +## Copyright (C) 2022 Luigi Scarso <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. + +## mfluajitlpeg +## +EXTRA_LIBRARIES += libmfluajitlpeg.a + +$(libmfluajitlpeg_a_OBJECTS): $(LUA_DEPEND) + +libmfluajitlpeg_a_CPPFLAGS = \ + -I$(top_srcdir)/mfluadir/luapeg \ + $(LUAJIT_INCLUDES) + + +libmfluajitlpeg_a_CFLAGS = # $(WARNING_CFLAGS) + + +libmfluajitlpeg_a_SOURCES = \ + mfluadir/luapeg/lpeg.c \ + mfluadir/luapeg/lpeg.h + + + |