no need for inimflua[jit]; we create only inimf and initex

git-svn-id: svn://tug.org/texlive/trunk@40249 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 189 insertions, 191 deletions

diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 705a15aee51..a7382f532a0 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -117,13 +117,13 @@ noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
 	$(am__EXEEXT_37) $(am__EXEEXT_38)
 TESTS = tangle.test $(am__EXEEXT_41) ctiedir/ctie.test \
 	cwebdir/cweave.test tiedir/tie.test $(am__append_6) \
-	$(am__append_16) $(am__append_26) $(am__append_36) \
-	$(am__append_44) $(am__append_57) $(am__append_58) \
-	$(am__append_60) $(am__append_65) $(am__append_68) \
-	$(am__append_70) $(am__append_75) $(am__append_78) \
-	$(am__append_80) $(am__append_85) $(am__append_96) \
-	$(am__append_97) $(am__append_104) $(am__append_106) \
-	$(am__append_108) $(am__append_142) libmd5/md5.test
+	$(am__append_16) $(am__append_25) $(am__append_34) \
+	$(am__append_42) $(am__append_55) $(am__append_56) \
+	$(am__append_58) $(am__append_63) $(am__append_66) \
+	$(am__append_68) $(am__append_73) $(am__append_76) \
+	$(am__append_78) $(am__append_83) $(am__append_94) \
+	$(am__append_95) $(am__append_102) $(am__append_104) \
+	$(am__append_106) $(am__append_140) libmd5/md5.test
 @WEB_TRUE@am__append_1 = $(web_programs)
 @WEB_TRUE@am__append_2 = $(web_tests)
 @TEX_TRUE@am__append_3 = tex
@@ -148,193 +148,191 @@ TESTS = tangle.test $(am__EXEEXT_41) ctiedir/ctie.test \
 @MFLUA_TRUE@@WIN32_TRUE@am__append_22 = install-mflua-links
 @MFLUA_TRUE@@WIN32_TRUE@am__append_23 = uninstall-mflua-links
 @MFLUAN_FALSE@@MFLUA_TRUE@@WIN32_FALSE@am__append_24 = mflua$(EXEEXT):mflua-nowin
-@MFLUA_TRUE@@WIN32_FALSE@am__append_25 = mflua$(EXEEXT):inimflua
-@MFLUA_TRUE@am__append_26 = $(mflua_tests)
-@MFLUA_TRUE@am__append_27 = mfluatrap.diffs
-@MFLUA_TRUE@am__append_28 = mfluatrap-clean
-@MFLUAJIT_TRUE@am__append_29 = mfluajit
-@MFLUAJITN_TRUE@@MFLUAJIT_TRUE@am__append_30 = mfluajit-nowin
-@MFLUAJIT_TRUE@@WIN32_TRUE@am__append_31 = call_mfluajit
-@MFLUAJIT_TRUE@@WIN32_TRUE@am__append_32 = install-mfluajit-links
-@MFLUAJIT_TRUE@@WIN32_TRUE@am__append_33 = uninstall-mfluajit-links
-@MFLUAJITN_FALSE@@MFLUAJIT_TRUE@@WIN32_FALSE@am__append_34 = mfluajit$(EXEEXT):mfluajit-nowin
-@MFLUAJIT_TRUE@@WIN32_FALSE@am__append_35 = mfluajit$(EXEEXT):inimfluajit
-@MFLUAJIT_TRUE@am__append_36 = $(mfluajit_tests)
-@MFLUAJIT_TRUE@am__append_37 = mfluajittrap.diffs
-@MFLUAJIT_TRUE@am__append_38 = mfluajittrap-clean
-@MP_TRUE@am__append_39 = mpost
-@MP_TRUE@@WIN32_TRUE@am__append_40 = call_mpost
-@MP_TRUE@@WIN32_TRUE@am__append_41 = install-mpost-links
-@MP_TRUE@@WIN32_TRUE@am__append_42 = uninstall-mpost-links
-@MP_TRUE@@WIN32_FALSE@am__append_43 = mpost$(EXEEXT):dvitomp mpost$(EXEEXT):mfplain
-@MP_TRUE@am__append_44 = $(mp_tests)
-@MP_TRUE@am__append_45 = mptrap.diffs
-@MP_TRUE@am__append_46 = mptrap-clean
-@PMP_TRUE@am__append_47 = pmpost
-@PMP_TRUE@@WIN32_TRUE@am__append_48 = call_pmpost
-@PMP_TRUE@@WIN32_TRUE@am__append_49 = install-pmpost-links
-@PMP_TRUE@@WIN32_TRUE@am__append_50 = uninstall-pmpost-links
-@PMP_TRUE@@WIN32_FALSE@am__append_51 = pmpost$(EXEEXT):pdvitomp
-@UPMP_TRUE@am__append_52 = upmpost
-@UPMP_TRUE@@WIN32_TRUE@am__append_53 = call_upmpost
-@UPMP_TRUE@@WIN32_TRUE@am__append_54 = install-upmpost-links
-@UPMP_TRUE@@WIN32_TRUE@am__append_55 = uninstall-upmpost-links
-@UPMP_TRUE@@WIN32_FALSE@am__append_56 = upmpost$(EXEEXT):updvitomp
-@PMP_TRUE@am__append_57 = $(pmpost_tests)
-@UPMP_TRUE@am__append_58 = $(upmpost_tests)
-@ETEX_TRUE@am__append_59 = etex
-@ETEX_TRUE@am__append_60 = $(etex_tests)
-@ETEX_TRUE@am__append_61 = etrip.diffs
-@ETEX_TRUE@am__append_62 = etrip-clean
-@PTEX_TRUE@am__append_63 = ptex
-@PWEB_TRUE@am__append_64 = $(pweb_programs)
-@PTEX_TRUE@am__append_65 = $(ptex_tests)
-@PTEX_TRUE@am__append_66 = ptrip.diffs
-@PTEX_TRUE@am__append_67 = ptrip-clean
-@PWEB_TRUE@am__append_68 = $(pweb_tests)
-@EPTEX_TRUE@am__append_69 = eptex
-@EPTEX_TRUE@am__append_70 = $(eptex_tests)
-@EPTEX_TRUE@am__append_71 = eptrip.diffs
-@EPTEX_TRUE@am__append_72 = eptrip-clean
-@UPTEX_TRUE@am__append_73 = uptex
-@UPWEB_TRUE@am__append_74 = $(upweb_programs)
-@UPTEX_TRUE@am__append_75 = $(uptex_tests)
-@UPTEX_TRUE@am__append_76 = uptrip.diffs
-@UPTEX_TRUE@am__append_77 = uptrip-clean
-@UPWEB_TRUE@am__append_78 = $(upweb_tests)
-@EUPTEX_TRUE@am__append_79 = euptex
-@EUPTEX_TRUE@am__append_80 = $(euptex_tests)
-@EUPTEX_TRUE@am__append_81 = euptrip.diffs
-@EUPTEX_TRUE@am__append_82 = euptrip-clean
-@MINGW32_TRUE@am__append_83 = \
+@MFLUA_TRUE@am__append_25 = $(mflua_tests)
+@MFLUA_TRUE@am__append_26 = mfluatrap.diffs
+@MFLUA_TRUE@am__append_27 = mfluatrap-clean
+@MFLUAJIT_TRUE@am__append_28 = mfluajit
+@MFLUAJITN_TRUE@@MFLUAJIT_TRUE@am__append_29 = mfluajit-nowin
+@MFLUAJIT_TRUE@@WIN32_TRUE@am__append_30 = call_mfluajit
+@MFLUAJIT_TRUE@@WIN32_TRUE@am__append_31 = install-mfluajit-links
+@MFLUAJIT_TRUE@@WIN32_TRUE@am__append_32 = uninstall-mfluajit-links
+@MFLUAJITN_FALSE@@MFLUAJIT_TRUE@@WIN32_FALSE@am__append_33 = mfluajit$(EXEEXT):mfluajit-nowin
+@MFLUAJIT_TRUE@am__append_34 = $(mfluajit_tests)
+@MFLUAJIT_TRUE@am__append_35 = mfluajittrap.diffs
+@MFLUAJIT_TRUE@am__append_36 = mfluajittrap-clean
+@MP_TRUE@am__append_37 = mpost
+@MP_TRUE@@WIN32_TRUE@am__append_38 = call_mpost
+@MP_TRUE@@WIN32_TRUE@am__append_39 = install-mpost-links
+@MP_TRUE@@WIN32_TRUE@am__append_40 = uninstall-mpost-links
+@MP_TRUE@@WIN32_FALSE@am__append_41 = mpost$(EXEEXT):dvitomp mpost$(EXEEXT):mfplain
+@MP_TRUE@am__append_42 = $(mp_tests)
+@MP_TRUE@am__append_43 = mptrap.diffs
+@MP_TRUE@am__append_44 = mptrap-clean
+@PMP_TRUE@am__append_45 = pmpost
+@PMP_TRUE@@WIN32_TRUE@am__append_46 = call_pmpost
+@PMP_TRUE@@WIN32_TRUE@am__append_47 = install-pmpost-links
+@PMP_TRUE@@WIN32_TRUE@am__append_48 = uninstall-pmpost-links
+@PMP_TRUE@@WIN32_FALSE@am__append_49 = pmpost$(EXEEXT):pdvitomp
+@UPMP_TRUE@am__append_50 = upmpost
+@UPMP_TRUE@@WIN32_TRUE@am__append_51 = call_upmpost
+@UPMP_TRUE@@WIN32_TRUE@am__append_52 = install-upmpost-links
+@UPMP_TRUE@@WIN32_TRUE@am__append_53 = uninstall-upmpost-links
+@UPMP_TRUE@@WIN32_FALSE@am__append_54 = upmpost$(EXEEXT):updvitomp
+@PMP_TRUE@am__append_55 = $(pmpost_tests)
+@UPMP_TRUE@am__append_56 = $(upmpost_tests)
+@ETEX_TRUE@am__append_57 = etex
+@ETEX_TRUE@am__append_58 = $(etex_tests)
+@ETEX_TRUE@am__append_59 = etrip.diffs
+@ETEX_TRUE@am__append_60 = etrip-clean
+@PTEX_TRUE@am__append_61 = ptex
+@PWEB_TRUE@am__append_62 = $(pweb_programs)
+@PTEX_TRUE@am__append_63 = $(ptex_tests)
+@PTEX_TRUE@am__append_64 = ptrip.diffs
+@PTEX_TRUE@am__append_65 = ptrip-clean
+@PWEB_TRUE@am__append_66 = $(pweb_tests)
+@EPTEX_TRUE@am__append_67 = eptex
+@EPTEX_TRUE@am__append_68 = $(eptex_tests)
+@EPTEX_TRUE@am__append_69 = eptrip.diffs
+@EPTEX_TRUE@am__append_70 = eptrip-clean
+@UPTEX_TRUE@am__append_71 = uptex
+@UPWEB_TRUE@am__append_72 = $(upweb_programs)
+@UPTEX_TRUE@am__append_73 = $(uptex_tests)
+@UPTEX_TRUE@am__append_74 = uptrip.diffs
+@UPTEX_TRUE@am__append_75 = uptrip-clean
+@UPWEB_TRUE@am__append_76 = $(upweb_tests)
+@EUPTEX_TRUE@am__append_77 = euptex
+@EUPTEX_TRUE@am__append_78 = $(euptex_tests)
+@EUPTEX_TRUE@am__append_79 = euptrip.diffs
+@EUPTEX_TRUE@am__append_80 = euptrip-clean
+@MINGW32_TRUE@am__append_81 = \
 @MINGW32_TRUE@	pdftexdir/regex/regex.c \
 @MINGW32_TRUE@	pdftexdir/regex/regex.h
 
-@PDFTEX_TRUE@am__append_84 = pdftex ttf2afm pdftosrc
-@PDFTEX_TRUE@am__append_85 = $(pdftex_tests) $(ttf2afm_tests) \
+@PDFTEX_TRUE@am__append_82 = pdftex ttf2afm pdftosrc
+@PDFTEX_TRUE@am__append_83 = $(pdftex_tests) $(ttf2afm_tests) \
 @PDFTEX_TRUE@	$(pdftosrc_tests)
-@LUATEX_TRUE@am__append_86 = luatex
-@LUATEX_TRUE@@WIN32_TRUE@am__append_87 = call_luatex
-@LUATEX_TRUE@@WIN32_TRUE@am__append_88 = install-luatex-links
-@LUATEX_TRUE@@WIN32_TRUE@am__append_89 = uninstall-luatex-links
-@LUATEX_TRUE@@WIN32_FALSE@am__append_90 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
-@LUAJITTEX_TRUE@am__append_91 = luajittex
-@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_92 = call_luajittex
-@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_93 = install-luajittex-links
-@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_94 = uninstall-luajittex-links
-@LUAJITTEX_TRUE@@WIN32_FALSE@am__append_95 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
-@LUATEX_TRUE@am__append_96 = $(luatex_tests)
-@LUAJITTEX_TRUE@am__append_97 = $(luajittex_tests)
-@XETEX_TRUE@am__append_98 = xetex
-@XETEX_MACOSX_TRUE@am__append_99 = -DXETEX_MAC
-@XETEX_MACOSX_FALSE@am__append_100 = $(FONTCONFIG_INCLUDES)
-@XETEX_MACOSX_FALSE@am__append_101 = $(FONTCONFIG_LIBS)
-@XETEX_MACOSX_TRUE@am__append_102 = \
+@LUATEX_TRUE@am__append_84 = luatex
+@LUATEX_TRUE@@WIN32_TRUE@am__append_85 = call_luatex
+@LUATEX_TRUE@@WIN32_TRUE@am__append_86 = install-luatex-links
+@LUATEX_TRUE@@WIN32_TRUE@am__append_87 = uninstall-luatex-links
+@LUATEX_TRUE@@WIN32_FALSE@am__append_88 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
+@LUAJITTEX_TRUE@am__append_89 = luajittex
+@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_90 = call_luajittex
+@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_91 = install-luajittex-links
+@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_92 = uninstall-luajittex-links
+@LUAJITTEX_TRUE@@WIN32_FALSE@am__append_93 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
+@LUATEX_TRUE@am__append_94 = $(luatex_tests)
+@LUAJITTEX_TRUE@am__append_95 = $(luajittex_tests)
+@XETEX_TRUE@am__append_96 = xetex
+@XETEX_MACOSX_TRUE@am__append_97 = -DXETEX_MAC
+@XETEX_MACOSX_FALSE@am__append_98 = $(FONTCONFIG_INCLUDES)
+@XETEX_MACOSX_FALSE@am__append_99 = $(FONTCONFIG_LIBS)
+@XETEX_MACOSX_TRUE@am__append_100 = \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontInst_Mac.cpp \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontInst_Mac.h \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontMgr_Mac.mm \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontMgr_Mac.h \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeX_mac.c
 
-@XETEX_MACOSX_FALSE@am__append_103 = \
+@XETEX_MACOSX_FALSE@am__append_101 = \
 @XETEX_MACOSX_FALSE@	xetexdir/XeTeXFontMgr_FC.cpp \
 @XETEX_MACOSX_FALSE@	xetexdir/XeTeXFontMgr_FC.h
 
-@XETEX_TRUE@am__append_104 = $(xetex_tests)
-@OTANGLE_TRUE@am__append_105 = $(omegaware_programs)
-@OTANGLE_TRUE@am__append_106 = $(OTANGLE_tests) $(OMFONTS_tests)
-@ALEPH_TRUE@am__append_107 = aleph
-@ALEPH_TRUE@am__append_108 = $(aleph_tests)
-@SYNCTEX_TRUE@am__append_109 = synctex
-@SYNCTEX_TRUE@am__append_110 = $(LTLIBSYNCTEX)
-@SYNCTEX_TRUE@am__append_111 = $(LIBSYNCTEX)
-@MINGW32_TRUE@am__append_112 = -lshlwapi
-@MINGW32_TRUE@am__append_113 = -lshlwapi
-@TEX_SYNCTEX_TRUE@am__append_114 = -I$(srcdir)/synctexdir \
+@XETEX_TRUE@am__append_102 = $(xetex_tests)
+@OTANGLE_TRUE@am__append_103 = $(omegaware_programs)
+@OTANGLE_TRUE@am__append_104 = $(OTANGLE_tests) $(OMFONTS_tests)
+@ALEPH_TRUE@am__append_105 = aleph
+@ALEPH_TRUE@am__append_106 = $(aleph_tests)
+@SYNCTEX_TRUE@am__append_107 = synctex
+@SYNCTEX_TRUE@am__append_108 = $(LTLIBSYNCTEX)
+@SYNCTEX_TRUE@am__append_109 = $(LIBSYNCTEX)
+@MINGW32_TRUE@am__append_110 = -lshlwapi
+@MINGW32_TRUE@am__append_111 = -lshlwapi
+@TEX_SYNCTEX_TRUE@am__append_112 = -I$(srcdir)/synctexdir \
 @TEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @TEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
-@TEX_SYNCTEX_TRUE@am__append_115 = $(ZLIB_LIBS)
-@TEX_SYNCTEX_TRUE@am__append_116 = $(ZLIB_DEPEND)
-@TEX_SYNCTEX_TRUE@am__append_117 = \
+@TEX_SYNCTEX_TRUE@am__append_113 = $(ZLIB_LIBS)
+@TEX_SYNCTEX_TRUE@am__append_114 = $(ZLIB_DEPEND)
+@TEX_SYNCTEX_TRUE@am__append_115 = \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex-tex.h
 
-@ETEX_SYNCTEX_TRUE@am__append_118 = -I$(srcdir)/synctexdir \
+@ETEX_SYNCTEX_TRUE@am__append_116 = -I$(srcdir)/synctexdir \
 @ETEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @ETEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
-@ETEX_SYNCTEX_TRUE@am__append_119 = $(ZLIB_LIBS)
-@ETEX_SYNCTEX_TRUE@am__append_120 = $(ZLIB_DEPEND)
-@ETEX_SYNCTEX_TRUE@am__append_121 = \
+@ETEX_SYNCTEX_TRUE@am__append_117 = $(ZLIB_LIBS)
+@ETEX_SYNCTEX_TRUE@am__append_118 = $(ZLIB_DEPEND)
+@ETEX_SYNCTEX_TRUE@am__append_119 = \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-etex.h
 
-@PTEX_SYNCTEX_TRUE@am__append_122 = -I$(srcdir)/synctexdir \
+@PTEX_SYNCTEX_TRUE@am__append_120 = -I$(srcdir)/synctexdir \
 @PTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @PTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
-@PTEX_SYNCTEX_TRUE@am__append_123 = $(ZLIB_LIBS)
-@PTEX_SYNCTEX_TRUE@am__append_124 = $(ZLIB_DEPEND)
-@PTEX_SYNCTEX_TRUE@am__append_125 = \
+@PTEX_SYNCTEX_TRUE@am__append_121 = $(ZLIB_LIBS)
+@PTEX_SYNCTEX_TRUE@am__append_122 = $(ZLIB_DEPEND)
+@PTEX_SYNCTEX_TRUE@am__append_123 = \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @PTEX_SYNCTEX_TRUE@	synctexdir/synctex-ptex.h
 
-@UPTEX_SYNCTEX_TRUE@am__append_126 = -I$(srcdir)/synctexdir \
+@UPTEX_SYNCTEX_TRUE@am__append_124 = -I$(srcdir)/synctexdir \
 @UPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @UPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-uptex.h\"
-@UPTEX_SYNCTEX_TRUE@am__append_127 = $(ZLIB_LIBS)
-@UPTEX_SYNCTEX_TRUE@am__append_128 = $(ZLIB_DEPEND)
-@UPTEX_SYNCTEX_TRUE@am__append_129 = \
+@UPTEX_SYNCTEX_TRUE@am__append_125 = $(ZLIB_LIBS)
+@UPTEX_SYNCTEX_TRUE@am__append_126 = $(ZLIB_DEPEND)
+@UPTEX_SYNCTEX_TRUE@am__append_127 = \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @UPTEX_SYNCTEX_TRUE@	synctexdir/synctex-uptex.h
 
-@EPTEX_SYNCTEX_TRUE@am__append_130 = -I$(srcdir)/synctexdir \
+@EPTEX_SYNCTEX_TRUE@am__append_128 = -I$(srcdir)/synctexdir \
 @EPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @EPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
-@EPTEX_SYNCTEX_TRUE@am__append_131 = $(ZLIB_LIBS)
-@EPTEX_SYNCTEX_TRUE@am__append_132 = $(ZLIB_DEPEND)
-@EPTEX_SYNCTEX_TRUE@am__append_133 = \
+@EPTEX_SYNCTEX_TRUE@am__append_129 = $(ZLIB_LIBS)
+@EPTEX_SYNCTEX_TRUE@am__append_130 = $(ZLIB_DEPEND)
+@EPTEX_SYNCTEX_TRUE@am__append_131 = \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-eptex.h
 
-@EUPTEX_SYNCTEX_TRUE@am__append_134 = -I$(srcdir)/synctexdir \
+@EUPTEX_SYNCTEX_TRUE@am__append_132 = -I$(srcdir)/synctexdir \
 @EUPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @EUPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-euptex.h\"
-@EUPTEX_SYNCTEX_TRUE@am__append_135 = $(ZLIB_LIBS)
-@EUPTEX_SYNCTEX_TRUE@am__append_136 = $(ZLIB_DEPEND)
-@EUPTEX_SYNCTEX_TRUE@am__append_137 = \
+@EUPTEX_SYNCTEX_TRUE@am__append_133 = $(ZLIB_LIBS)
+@EUPTEX_SYNCTEX_TRUE@am__append_134 = $(ZLIB_DEPEND)
+@EUPTEX_SYNCTEX_TRUE@am__append_135 = \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex-euptex.h
 
-@PDFTEX_SYNCTEX_TRUE@am__append_138 = -I$(srcdir)/synctexdir \
+@PDFTEX_SYNCTEX_TRUE@am__append_136 = -I$(srcdir)/synctexdir \
 @PDFTEX_SYNCTEX_TRUE@	-D__SyncTeX__ \
 @PDFTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
-@PDFTEX_SYNCTEX_TRUE@am__append_139 = \
+@PDFTEX_SYNCTEX_TRUE@am__append_137 = \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-pdftex.h
 
-@XETEX_SYNCTEX_TRUE@am__append_140 = -I$(srcdir)/synctexdir \
+@XETEX_SYNCTEX_TRUE@am__append_138 = -I$(srcdir)/synctexdir \
 @XETEX_SYNCTEX_TRUE@	-D__SyncTeX__ \
 @XETEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
-@XETEX_SYNCTEX_TRUE@am__append_141 = \
+@XETEX_SYNCTEX_TRUE@am__append_139 = \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex-xetex.h
 
-@SYNCTEX_TRUE@am__append_142 = $(synctex_tests)
+@SYNCTEX_TRUE@am__append_140 = $(synctex_tests)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
@@ -2105,8 +2103,8 @@ EXTRA_LIBRARIES = libmf.a libmflua.a libmfluajit.a libmputil.a \
 	libff.a libluatex.a libluajittex.a libxetex.a libsynctex.a \
 	libmd5.a
 EXTRA_LTLIBRARIES = libsynctex.la
-lib_LIBRARIES = $(am__append_111)
-lib_LTLIBRARIES = $(am__append_110)
+lib_LIBRARIES = $(am__append_109)
+lib_LTLIBRARIES = $(am__append_108)
 dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
 nodist_man_MANS = 
 TEST_EXTENSIONS = .pl .test
@@ -2491,24 +2489,24 @@ DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \
 	omegaware/tests/*yarabic* $(nodist_aleph_SOURCES) aleph.web \
 	aleph.ch aleph-web2c aleph.p aleph.pool aleph-tangle
 CLEANFILES = $(EXTRA_PROGRAMS) $(EXTRA_LIBRARIES) $(EXTRA_LTLIBRARIES)
-TRIPTRAP_CLEAN = $(am__append_8) $(am__append_18) $(am__append_28) \
-	$(am__append_38) $(am__append_46) $(am__append_62) \
-	$(am__append_67) $(am__append_72) $(am__append_77) \
-	$(am__append_82)
-TRIPTRAP = $(am__append_7) $(am__append_17) $(am__append_27) \
-	$(am__append_37) $(am__append_45) $(am__append_61) \
-	$(am__append_66) $(am__append_71) $(am__append_76) \
-	$(am__append_81)
+TRIPTRAP_CLEAN = $(am__append_8) $(am__append_18) $(am__append_27) \
+	$(am__append_36) $(am__append_44) $(am__append_60) \
+	$(am__append_65) $(am__append_70) $(am__append_75) \
+	$(am__append_80)
+TRIPTRAP = $(am__append_7) $(am__append_17) $(am__append_26) \
+	$(am__append_35) $(am__append_43) $(am__append_59) \
+	$(am__append_64) $(am__append_69) $(am__append_74) \
+	$(am__append_79)
 bin_links = $(am__append_5) $(am__append_14) $(am__append_15) \
-	$(am__append_24) $(am__append_25) $(am__append_34) \
-	$(am__append_35) $(am__append_43) $(am__append_51) \
-	$(am__append_56) $(am__append_90) $(am__append_95)
-install_exe_links = $(am__append_12) $(am__append_22) $(am__append_32) \
-	$(am__append_41) $(am__append_49) $(am__append_54) \
-	$(am__append_88) $(am__append_93)
+	$(am__append_24) $(am__append_33) $(am__append_41) \
+	$(am__append_49) $(am__append_54) $(am__append_88) \
+	$(am__append_93)
+install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \
+	$(am__append_39) $(am__append_47) $(am__append_52) \
+	$(am__append_86) $(am__append_91)
 uninstall_exe_links = $(am__append_13) $(am__append_23) \
-	$(am__append_33) $(am__append_42) $(am__append_50) \
-	$(am__append_55) $(am__append_89) $(am__append_94)
+	$(am__append_32) $(am__append_40) $(am__append_48) \
+	$(am__append_53) $(am__append_87) $(am__append_92)
 NEVER_DIST = `find . $(NEVER_NAMES)` cwebdir/cweave.log \
 	cwebdir/cweave.trs ctiedir/ctie.log ctiedir/ctie.trs \
 	tiedir/tie.log tiedir/tie.trs
@@ -2618,18 +2616,18 @@ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
 initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
 nodist_initex_SOURCES = callexe.c
 initex_LDADD = 
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_114)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_112)
 
 # With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_115)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_113)
 
 # TeX C sources
 tex_c_h = texini.c tex0.c texcoerce.h texd.h
 nodist_tex_SOURCES = $(tex_c_h) tex-pool.c
-dist_tex_SOURCES = texextra.c $(am__append_117)
+dist_tex_SOURCES = texextra.c $(am__append_115)
 
 # We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_116)
+tex_prereq = texd.h $(am__append_114)
 tex_ch_srcs = \
 	tex.web \
 	tex.ch \
@@ -2820,19 +2818,19 @@ libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \
 	mplibdir/pngout.w mplibdir/mpmath.w mplibdir/mpmathbinary.w \
 	mplibdir/mpmathdecimal.w mplibdir/mpmathdouble.w \
 	mplibdir/mpstrings.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_118)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_116)
 
 # With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_119)
+etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_117)
 
 # 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 $(am__append_121)
+	etexdir/etex_version.h $(am__append_119)
 
 # We must create etexd.h and etexdir/etex_version.h before building the etex_OBJECTS.
-etex_prereq = etexd.h etexdir/etex_version.h $(am__append_120)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_118)
 etex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch
@@ -2858,20 +2856,20 @@ pweb_programs = pbibtex pdvitype ppltotf ptftopl
 pproglib = lib/libp.a
 libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h
 libkanji_a_CPPFLAGS = $(ptex_cppflags)
-ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_122)
+ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_120)
 
 # With --enable-ipc, pTeX may need to link with -lsocket.
-ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_123)
+ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_121)
 ptex_DEPENDENCIES = $(ptex_dependencies)
 
 # pTeX C sources
 ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h
 nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c
 dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h \
-	ptexdir/ptex_version.h $(am__append_125)
+	ptexdir/ptex_version.h $(am__append_123)
 
 # We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS.
-ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_124)
+ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_122)
 ptex_web_srcs = \
 	tex.web \
 	tex.ch
@@ -2911,22 +2909,22 @@ pweb_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \
 	ptexdir/pbibtex-longline-test.pl ptexdir/pbibtex-mem.test \
 	ptexdir/nissya.test ptexdir/sample.test ptexdir/yokotate.test
 eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/libmd5 \
-	$(am__append_130)
+	$(am__append_128)
 
 # With --enable-ipc, e-pTeX may need to link with -lsocket.
 eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
-	$(ipc_socketlibs) libmd5.a $(am__append_131)
+	$(ipc_socketlibs) libmd5.a $(am__append_129)
 eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a
 
 # e-pTeX C sources
 eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h
 nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c
 dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h \
-	eptexdir/eptex_version.h $(am__append_133)
+	eptexdir/eptex_version.h $(am__append_131)
 
 # We must create eptexd.h and eptexdir/eptex_version.h before building the eptex_OBJECTS.
 eptex_prereq = eptexd.h etexdir/etex_version.h ptexdir/ptex_version.h \
-	eptexdir/eptex_version.h $(am__append_132)
+	eptexdir/eptex_version.h $(am__append_130)
 eptex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
@@ -2956,21 +2954,21 @@ up_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/uptexdir:$(srcdir) $(buildenv)
 upweb_programs = upbibtex updvitype uppltotf uptftopl
 libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h uptexdir/kanji_dump.c
 libukanji_a_CPPFLAGS = $(uptex_cppflags)
-uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_126)
+uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_124)
 
 # With --enable-ipc, upTeX may need to link with -lsocket.
-uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_127)
+uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_125)
 uptex_DEPENDENCIES = $(uptex_dependencies)
 
 # upTeX C sources
 uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h
 nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c
 dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h \
-	uptexdir/uptex_version.h $(am__append_129)
+	uptexdir/uptex_version.h $(am__append_127)
 
 # We must create uptexd.h and uptexdir/uptex_version.h before building the uptex_OBJECTS.
 uptex_prereq = uptexd.h ptexdir/ptex_version.h \
-	uptexdir/uptex_version.h $(am__append_128)
+	uptexdir/uptex_version.h $(am__append_126)
 uptex_web_srcs = \
 	tex.web \
 	tex.ch
@@ -3012,23 +3010,23 @@ upweb_tests = \
 	uptexdir/yokotate.test
 
 euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) \
-	-I$(srcdir)/libmd5 $(am__append_134)
+	-I$(srcdir)/libmd5 $(am__append_132)
 
 # With --enable-ipc, e-upTeX may need to link with -lsocket.
 euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
-	$(ipc_socketlibs) libmd5.a $(am__append_135)
+	$(ipc_socketlibs) libmd5.a $(am__append_133)
 euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a
 
 # e-upTeX C sources
 euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h
 nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c
 dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \
-	$(am__append_137)
+	$(am__append_135)
 
 # We must create euptexd.h and [eu]ptexdir/[eu]ptex_version.h before building the euptex_OBJECTS.
 euptex_prereq = euptexd.h etexdir/etex_version.h \
 	ptexdir/ptex_version.h eptexdir/eptex_version.h \
-	uptexdir/uptex_version.h $(am__append_136)
+	uptexdir/uptex_version.h $(am__append_134)
 euptex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
@@ -3068,7 +3066,7 @@ libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \
 	pdftexdir/writejbig2.c pdftexdir/writejpg.c \
 	pdftexdir/writepng.c pdftexdir/writet1.c pdftexdir/writet3.c \
 	pdftexdir/writettf.c pdftexdir/writettf.h pdftexdir/writezip.c \
-	$(am__append_83)
+	$(am__append_81)
 @MINGW32_TRUE@REGEX_INCLUDES = -I$(srcdir)/pdftexdir/regex
 EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \
 	pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \
@@ -3084,7 +3082,7 @@ pdftex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) \
 # Force Automake to use CXXLD for linking
 nodist_EXTRA_pdftex_SOURCES = dummy.cxx
 pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_138)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_136)
 pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
 
 # With --enable-ipc, pdfTeX may need to link with -lsocket.
@@ -3097,7 +3095,7 @@ pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h
 nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c
 dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
 	pdftexdir/pdftex_version.h pdftexdir/etex_version.h \
-	$(am__append_139)
+	$(am__append_137)
 pdftex_ch_srcs = \
 	pdftexdir/pdftex.web \
 	pdftexdir/tex.ch0 \
@@ -3554,17 +3552,17 @@ libxetex = libxetex.a
 xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \
 	$(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(HARFBUZZ_INCLUDES) \
 	$(GRAPHITE2_INCLUDES) $(POPPLER_INCLUDES) $(LIBPNG_INCLUDES) \
-	$(ZLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_99) \
-	$(am__append_100)
+	$(ZLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_97) \
+	$(am__append_98)
 xetex_ldadd = $(libxetex) $(HARFBUZZ_LIBS) $(GRAPHITE2_LIBS) \
 	$(ICU_LIBS) $(TECKIT_LIBS) $(POPPLER_LIBS) $(LIBPNG_LIBS) \
-	$(FREETYPE2_LIBS) $(ZLIB_LIBS) libmd5.a $(am__append_101)
+	$(FREETYPE2_LIBS) $(ZLIB_LIBS) libmd5.a $(am__append_99)
 xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
 	$(TECKIT_DEPEND) $(HARFBUZZ_DEPEND) $(GRAPHITE2_DEPEND) \
 	$(POPPLER_DEPEND) $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) \
 	$(ZLIB_DEPEND) libmd5.a
 @XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_140)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_138)
 xetex_CFLAGS = $(WARNING_CFLAGS)
 xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
 xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -3575,7 +3573,7 @@ xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h
 nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c
 dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
 	xetexdir/etex_version.h xetexdir/xetex_version.h \
-	$(am__append_141)
+	$(am__append_139)
 xetex_ch_srcs = \
 	xetexdir/xetex.web \
 	xetexdir/tex.ch0 \
@@ -3602,7 +3600,7 @@ libxetex_a_SOURCES = xetexdir/MathTable.h xetexdir/XeTeXFontInst.cpp \
 	xetexdir/image/jpegimage.h xetexdir/image/mfileio.c \
 	xetexdir/image/mfileio.h xetexdir/image/numbers.c \
 	xetexdir/image/numbers.h xetexdir/image/pngimage.c \
-	xetexdir/image/pngimage.h $(am__append_102) $(am__append_103)
+	xetexdir/image/pngimage.h $(am__append_100) $(am__append_101)
 
 # We must create xetexd.h etc. before building the libxetex_a_OBJECTS.
 libxetex_prereq = xetexd.h $(xetex_dependencies)
@@ -3706,12 +3704,12 @@ synctex_SOURCES = \
 	synctexdir/synctex_main.c
 
 synctex_CPPFLAGS = -I$(srcdir)/synctexdir
-synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_112)
+synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_110)
 libsynctex = $(LTLIBSYNCTEX) $(LIBSYNCTEX)
 libsynctex_la_CPPFLAGS = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -DSYNCTEX_USE_LOCAL_HEADER
 libsynctex_a_CPPFLAGS = $(libsynctex_la_CPPFLAGS)
 libsynctex_la_LDFLAGS = -rpath @libdir@ -bindir @bindir@ -no-undefined -version-info $(SYNCTEX_LT_VERSINFO)
-libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_113)
+libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_111)
 libsynctex_la_SOURCES = \
 	synctexdir/synctex_parser.c \
 	synctexdir/synctex_parser_local.h \
@@ -14417,10 +14415,8 @@ trap-clean:
 .PHONY: install-mflua-links uninstall-mflua-links
 @WIN32_TRUE@install-mflua-links: call_mflua$(EXEEXT)
 @MFLUAN_FALSE@@WIN32_TRUE@	$(INSTALL_PROGRAM) call_mflua$(EXEEXT) $(DESTDIR)$(bindir)/mflua-nowin$(EXEEXT)
-@WIN32_TRUE@	$(INSTALL_PROGRAM) call_mflua$(EXEEXT) $(DESTDIR)$(bindir)/inimflua$(EXEEXT)
 @WIN32_TRUE@uninstall-mflua-links:
 @MFLUAN_FALSE@@WIN32_TRUE@	rm -f $(DESTDIR)$(bindir)/mflua-nowin$(EXEEXT)
-@WIN32_TRUE@	rm -f $(DESTDIR)$(bindir)/inimflua$(EXEEXT)
 
 # We must create mfluad.h and mfluadir/mflua_version.h before compiling mfluaextra.c.
 $(mflua_OBJECTS) $(mflua_nowin_OBJECTS): mfluad.h mfluadir/mflua_version.h
@@ -14465,10 +14461,8 @@ mfluatrap-clean:
 .PHONY: install-mfluajit-links uninstall-mfluajit-links
 @WIN32_TRUE@install-mfluajit-links: call_mfluajit$(EXEEXT)
 @MFLUAJITN_FALSE@@WIN32_TRUE@	$(INSTALL_PROGRAM) call_mfluajit$(EXEEXT) $(DESTDIR)$(bindir)/mfluajit-nowin$(EXEEXT)
-@WIN32_TRUE@	$(INSTALL_PROGRAM) call_mfluajit$(EXEEXT) $(DESTDIR)$(bindir)/inimfluajit$(EXEEXT)
 @WIN32_TRUE@uninstall-mfluajit-links:
 @MFLUAJITN_FALSE@@WIN32_TRUE@	rm -f $(DESTDIR)$(bindir)/mfluajit-nowin$(EXEEXT)
-@WIN32_TRUE@	rm -f $(DESTDIR)$(bindir)/inimfluajit$(EXEEXT)
 
 # We must create mfluajitd.h and mfluadir/mflua_version.h before compiling mfluajitextra.c.
 $(mfluajit_OBJECTS) $(mfluajit_nowin_OBJECTS): mfluajitd.h mfluadir/mflua_version.h
diff --git a/Build/source/texk/web2c/mfluadir/ChangeLog b/Build/source/texk/web2c/mfluadir/ChangeLog
index 907fab09a12..bf2aef70182 100644
--- a/Build/source/texk/web2c/mfluadir/ChangeLog
+++ b/Build/source/texk/web2c/mfluadir/ChangeLog
@@ -1,6 +1,10 @@
+2016-04-05  Karl Berry  <karl@tug.org>
+
+	* am/mflua.am: no need for inimflua.
+
 2016-03-22  Luigi Scarso <luigi.scarso@gmail.com>
 
-	mflua.c: return if a lua file is not found. 
+	* mflua.c: return if a lua file is not found. 
 
 2015-09-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
diff --git a/Build/source/texk/web2c/mfluadir/am/mflua.am b/Build/source/texk/web2c/mfluadir/am/mflua.am
index 3b859fd8d28..ee9744df910 100644
--- a/Build/source/texk/web2c/mfluadir/am/mflua.am
+++ b/Build/source/texk/web2c/mfluadir/am/mflua.am
@@ -1,6 +1,7 @@
 ## texk/web2c/mfluadir/am/mflua.am: Makefile fragment for MFLua.
 ##
-## Copyright (C) 2015 Peter Breitenlohner <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.
 
 ## MFLua
@@ -18,7 +19,6 @@ else !WIN32
 if !MFLUAN
 bin_links += mflua$(EXEEXT):mflua-nowin
 endif !MFLUAN
-bin_links += mflua$(EXEEXT):inimflua
 endif !WIN32
 endif MFLUA
 EXTRA_PROGRAMS += mflua mflua-nowin
@@ -34,12 +34,10 @@ install-mflua-links: call_mflua$(EXEEXT)
 if !MFLUAN
 	$(INSTALL_PROGRAM) call_mflua$(EXEEXT) $(DESTDIR)$(bindir)/mflua-nowin$(EXEEXT)
 endif !MFLUAN
-	$(INSTALL_PROGRAM) call_mflua$(EXEEXT) $(DESTDIR)$(bindir)/inimflua$(EXEEXT)
 uninstall-mflua-links:
 if !MFLUAN
 	rm -f $(DESTDIR)$(bindir)/mflua-nowin$(EXEEXT)
 endif !MFLUAN
-	rm -f $(DESTDIR)$(bindir)/inimflua$(EXEEXT)
 endif WIN32
 
 dist_mflua_SOURCES = mfluadir/mfluaextra.c mfluadir/mfluaextra.h mfluadir/mflua_version.h
diff --git a/Build/source/texk/web2c/mfluajitdir/ChangeLog b/Build/source/texk/web2c/mfluajitdir/ChangeLog
index f1cdcbba19b..80c6e0f8d63 100644
--- a/Build/source/texk/web2c/mfluajitdir/ChangeLog
+++ b/Build/source/texk/web2c/mfluajitdir/ChangeLog
@@ -1,3 +1,7 @@
+2016-04-05  Karl Berry  <karl@tug.org>
+
+	* am/mflua.am: no need for inimfluajit.
+
 2015-09-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/mfluajit.am: Fix dependencies.
diff --git a/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am b/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am
index b2cf7a4fa90..ef385c893ae 100644
--- a/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am
+++ b/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am
@@ -1,6 +1,7 @@
 ## texk/web2c/mfluajitdir/am/mfluajit.am: Makefile fragment for MFLuaJIT.
 ##
-## Copyright (C) 2015 Peter Breitenlohner <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.
 
 ## MFLuaJIT
@@ -18,7 +19,6 @@ else !WIN32
 if !MFLUAJITN
 bin_links += mfluajit$(EXEEXT):mfluajit-nowin
 endif !MFLUAJITN
-bin_links += mfluajit$(EXEEXT):inimfluajit
 endif !WIN32
 endif MFLUAJIT
 EXTRA_PROGRAMS += mfluajit mfluajit-nowin
@@ -34,12 +34,10 @@ install-mfluajit-links: call_mfluajit$(EXEEXT)
 if !MFLUAJITN
 	$(INSTALL_PROGRAM) call_mfluajit$(EXEEXT) $(DESTDIR)$(bindir)/mfluajit-nowin$(EXEEXT)
 endif !MFLUAJITN
-	$(INSTALL_PROGRAM) call_mfluajit$(EXEEXT) $(DESTDIR)$(bindir)/inimfluajit$(EXEEXT)
 uninstall-mfluajit-links:
 if !MFLUAJITN
 	rm -f $(DESTDIR)$(bindir)/mfluajit-nowin$(EXEEXT)
 endif !MFLUAJITN
-	rm -f $(DESTDIR)$(bindir)/inimfluajit$(EXEEXT)
 endif WIN32
 
 dist_mfluajit_SOURCES = mfluajitdir/mfluajitextra.c mfluajitdir/mfluajitextra.h mfluadir/mflua_version.h