texlive[65178] Build/source/texk/web2c: (u)pTeX: replace binaries of
commits+takuji at tug.org
commits+takuji at tug.org
Sat Dec 3 13:54:04 CET 2022
Revision: 65178
http://tug.org/svn/texlive?view=revision&revision=65178
Author: takuji
Date: 2022-12-03 13:54:04 +0100 (Sat, 03 Dec 2022)
Log Message:
-----------
(u)pTeX: replace binaries of pTeX tools to symbolic links of upTeX tools
Modified Paths:
--------------
trunk/Build/source/texk/web2c/Makefile.in
trunk/Build/source/texk/web2c/ptexdir/ChangeLog
trunk/Build/source/texk/web2c/ptexdir/am/ptex.am
trunk/Build/source/texk/web2c/uptexdir/ChangeLog
trunk/Build/source/texk/web2c/uptexdir/am/uptex.am
Modified: trunk/Build/source/texk/web2c/Makefile.in
===================================================================
--- trunk/Build/source/texk/web2c/Makefile.in 2022-12-03 12:53:58 UTC (rev 65177)
+++ trunk/Build/source/texk/web2c/Makefile.in 2022-12-03 12:54:04 UTC (rev 65178)
@@ -95,41 +95,39 @@
EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEEXT) \
mf-nowin$(EXEEXT) mflua$(EXEEXT) mflua-nowin$(EXEEXT) \
mfluajit$(EXEEXT) mfluajit-nowin$(EXEEXT) mpost$(EXEEXT) \
- pmpost$(EXEEXT) upmpost$(EXEEXT) etex$(EXEEXT) ptex$(EXEEXT) \
- $(am__EXEEXT_2) eptex$(EXEEXT) uptex$(EXEEXT) $(am__EXEEXT_3) \
- euptex$(EXEEXT) pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
- pdftosrc$(EXEEXT) luatex$(EXEEXT) luajittex$(EXEEXT) \
- luahbtex$(EXEEXT) luajithbtex$(EXEEXT) xetex$(EXEEXT) \
- $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT) \
+ pmpost$(EXEEXT) upmpost$(EXEEXT) etex$(EXEEXT) eptex$(EXEEXT) \
+ uptex$(EXEEXT) $(am__EXEEXT_2) euptex$(EXEEXT) pdftex$(EXEEXT) \
+ ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) luatex$(EXEEXT) \
+ luajittex$(EXEEXT) luahbtex$(EXEEXT) luajithbtex$(EXEEXT) \
+ xetex$(EXEEXT) $(am__EXEEXT_3) aleph$(EXEEXT) synctex$(EXEEXT) \
md5main$(EXEEXT)
-bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
+bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_4) \
ctie$(EXEEXT) cweave$(EXEEXT) ctwill$(EXEEXT) \
ctwill-refsort$(EXEEXT) ctwill-twinx$(EXEEXT) tie$(EXEEXT) \
- $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8) \
- $(am__EXEEXT_9) $(am__EXEEXT_10) $(am__EXEEXT_11) \
- $(am__EXEEXT_12) $(am__EXEEXT_13) $(am__EXEEXT_14) \
- $(am__EXEEXT_15) $(am__EXEEXT_16) $(am__EXEEXT_17) \
- $(am__EXEEXT_18) $(am__EXEEXT_19) $(am__EXEEXT_20) \
- $(am__EXEEXT_21) $(am__EXEEXT_22) $(am__EXEEXT_23) \
- $(am__EXEEXT_24) $(am__EXEEXT_25) $(am__EXEEXT_26) \
- $(am__EXEEXT_27) $(am__EXEEXT_28) $(am__EXEEXT_29) \
- $(am__EXEEXT_30) $(am__EXEEXT_31) $(am__EXEEXT_32) \
- $(am__EXEEXT_33)
+ $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \
+ $(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) \
+ $(am__EXEEXT_11) $(am__EXEEXT_12) $(am__EXEEXT_13) \
+ $(am__EXEEXT_14) $(am__EXEEXT_15) $(am__EXEEXT_16) \
+ $(am__EXEEXT_17) $(am__EXEEXT_18) $(am__EXEEXT_19) \
+ $(am__EXEEXT_20) $(am__EXEEXT_21) $(am__EXEEXT_22) \
+ $(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \
+ $(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \
+ $(am__EXEEXT_29) $(am__EXEEXT_30) $(am__EXEEXT_31)
noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
- $(am__EXEEXT_34) $(am__EXEEXT_35) $(am__EXEEXT_36) \
- $(am__EXEEXT_37) $(am__EXEEXT_38) $(am__EXEEXT_39) \
- $(am__EXEEXT_40) $(am__EXEEXT_41) $(am__EXEEXT_42) \
- $(am__EXEEXT_43) $(am__EXEEXT_44)
-TESTS = tangle.test $(am__EXEEXT_47) ctiedir/ctie.test \
+ $(am__EXEEXT_32) $(am__EXEEXT_33) $(am__EXEEXT_34) \
+ $(am__EXEEXT_35) $(am__EXEEXT_36) $(am__EXEEXT_37) \
+ $(am__EXEEXT_38) $(am__EXEEXT_39) $(am__EXEEXT_40) \
+ $(am__EXEEXT_41) $(am__EXEEXT_42)
+TESTS = tangle.test $(am__EXEEXT_45) ctiedir/ctie.test \
cwebdir/cweave.test tiedir/tie.test $(am__append_6) \
$(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_86) \
- $(am__append_107) $(am__append_108) $(am__append_109) \
- $(am__append_110) $(am__append_118) $(am__append_120) \
- $(am__append_122) $(am__append_157) libmd5/md5.test
+ $(am__append_58) $(am__append_62) $(am__EXEEXT_46) \
+ $(am__append_67) $(am__append_72) $(am__append_75) \
+ $(am__append_77) $(am__append_82) $(am__append_85) \
+ $(am__append_106) $(am__append_107) $(am__append_108) \
+ $(am__append_109) $(am__append_117) $(am__append_119) \
+ $(am__append_121) $(am__append_156) libmd5/md5.test
@WEB_TRUE at am__append_1 = $(web_programs)
@WEB_TRUE at am__append_2 = $(web_tests)
@TEX_TRUE at am__append_3 = tex
@@ -195,67 +193,66 @@
@ETEX_TRUE at am__append_59 = etrip.diffs
@ETEX_TRUE at am__append_60 = etrip-clean
@PTEX_TRUE at am__append_61 = ptex
- at PWEB_TRUE@am__append_62 = $(pweb_programs)
- at PTEX_TRUE@am__append_63 = $(ptex_tests)
- at PTEX_TRUE@am__append_64 = ptrip.diffs
- at PTEX_TRUE@am__append_65 = ptrip-clean
- at PWEB_TRUE@am__append_66 = $(pweb_tests)
- at EPTEX_TRUE@am__append_67 = eptex
- at EPTEX_TRUE@am__append_68 = $(eptex_tests)
- at EPTEX_TRUE@am__append_69 = eptrip.diffs
- at EPTEX_TRUE@am__append_70 = eptrip-clean
- at UPTEX_TRUE@am__append_71 = uptex
- at UPWEB_TRUE@am__append_72 = $(upweb_programs)
- at UPTEX_TRUE@am__append_73 = $(uptex_tests)
- at UPTEX_TRUE@am__append_74 = uptrip.diffs
- at UPTEX_TRUE@am__append_75 = uptrip-clean
- at UPWEB_TRUE@am__append_76 = $(upweb_tests)
- at EUPTEX_TRUE@am__append_77 = euptex
- at EUPTEX_TRUE@am__append_78 = $(euptex_tests)
- at EUPTEX_TRUE@am__append_79 = euptrip.diffs
- at EUPTEX_TRUE@am__append_80 = euptrip-clean
- at HITEX_TRUE@am__append_81 = hitex hishrink histretch
- at HITEX_TRUE@am__append_82 = himktables
- at HITEX_TRUE@am__append_83 = $(hitex_tests)
- at MINGW32_TRUE@am__append_84 = \
+ at PTEX_TRUE@am__append_62 = $(ptex_tests)
+ at PTEX_TRUE@am__append_63 = ptrip.diffs
+ at PTEX_TRUE@am__append_64 = ptrip-clean
+ at PWEB_TRUE@am__append_65 = $(pweb_tests)
+ at EPTEX_TRUE@am__append_66 = eptex
+ at EPTEX_TRUE@am__append_67 = $(eptex_tests)
+ at EPTEX_TRUE@am__append_68 = eptrip.diffs
+ at EPTEX_TRUE@am__append_69 = eptrip-clean
+ at UPTEX_TRUE@am__append_70 = uptex
+ at UPWEB_TRUE@am__append_71 = $(upweb_programs)
+ at UPTEX_TRUE@am__append_72 = $(uptex_tests)
+ at UPTEX_TRUE@am__append_73 = uptrip.diffs
+ at UPTEX_TRUE@am__append_74 = uptrip-clean
+ at UPWEB_TRUE@am__append_75 = $(upweb_tests)
+ at EUPTEX_TRUE@am__append_76 = euptex
+ at EUPTEX_TRUE@am__append_77 = $(euptex_tests)
+ at EUPTEX_TRUE@am__append_78 = euptrip.diffs
+ at EUPTEX_TRUE@am__append_79 = euptrip-clean
+ at HITEX_TRUE@am__append_80 = hitex hishrink histretch
+ at HITEX_TRUE@am__append_81 = himktables
+ at HITEX_TRUE@am__append_82 = $(hitex_tests)
+ at MINGW32_TRUE@am__append_83 = \
@MINGW32_TRUE@ pdftexdir/regex/regex.c \
@MINGW32_TRUE@ pdftexdir/regex/regex.h
- at PDFTEX_TRUE@am__append_85 = pdftex ttf2afm pdftosrc
- at PDFTEX_TRUE@am__append_86 = $(pdftex_tests) $(ttf2afm_tests) \
+ at PDFTEX_TRUE@am__append_84 = pdftex ttf2afm pdftosrc
+ at PDFTEX_TRUE@am__append_85 = $(pdftex_tests) $(ttf2afm_tests) \
@PDFTEX_TRUE@ $(pdftosrc_tests)
- at LUATEX_TRUE@am__append_87 = luatex
- at LUATEX_TRUE@@WIN32_TRUE at am__append_88 = call_luatex
- at LUATEX_TRUE@@WIN32_TRUE at am__append_89 = install-luatex-links
- at LUATEX_TRUE@@WIN32_TRUE at am__append_90 = uninstall-luatex-links
- at LUATEX_TRUE@@WIN32_FALSE at am__append_91 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
- at LUAHBTEX_TRUE@am__append_92 = luahbtex
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_93 = call_luahbtex
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_94 = install-luahbtex-links
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_95 = uninstall-luahbtex-links
+ at LUATEX_TRUE@am__append_86 = luatex
+ at LUATEX_TRUE@@WIN32_TRUE at am__append_87 = call_luatex
+ at LUATEX_TRUE@@WIN32_TRUE at am__append_88 = install-luatex-links
+ at LUATEX_TRUE@@WIN32_TRUE at am__append_89 = uninstall-luatex-links
+ at LUATEX_TRUE@@WIN32_FALSE at am__append_90 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
+ at LUAHBTEX_TRUE@am__append_91 = luahbtex
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_92 = call_luahbtex
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_93 = install-luahbtex-links
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_94 = uninstall-luahbtex-links
# keep texlua[c] as links to luatex unless luatex is not installed.
- at LUAHBTEX_TRUE@@LUATEX_FALSE@@WIN32_FALSE at am__append_96 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac
- at LUAJITTEX_TRUE@am__append_97 = luajittex
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_98 = call_luajittex
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_99 = install-luajittex-links
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_100 = uninstall-luajittex-links
- at LUAJITTEX_TRUE@@WIN32_FALSE at am__append_101 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
- at LUAJITHBTEX_TRUE@am__append_102 = luajithbtex
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_103 = call_luajithbtex
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_104 = install-luajithbtex-links
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_105 = uninstall-luajithbtex-links
+ at LUAHBTEX_TRUE@@LUATEX_FALSE@@WIN32_FALSE at am__append_95 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac
+ at LUAJITTEX_TRUE@am__append_96 = luajittex
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_97 = call_luajittex
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_98 = install-luajittex-links
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_99 = uninstall-luajittex-links
+ at LUAJITTEX_TRUE@@WIN32_FALSE at am__append_100 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
+ at LUAJITHBTEX_TRUE@am__append_101 = luajithbtex
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_102 = call_luajithbtex
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_103 = install-luajithbtex-links
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_104 = uninstall-luajithbtex-links
# keep texluajit[c] as links to luajittex unless luajittex is not installed.
- at LUAJITHBTEX_TRUE@@LUAJITTEX_FALSE@@WIN32_FALSE at am__append_106 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc
- at LUATEX_TRUE@am__append_107 = $(luatex_tests)
- at LUAHBTEX_TRUE@am__append_108 = $(luahbtex_tests)
- at LUAJITTEX_TRUE@am__append_109 = $(luajittex_tests)
- at LUAJITHBTEX_TRUE@am__append_110 = $(luajithbtex_tests)
- at XETEX_TRUE@am__append_111 = xetex
- at XETEX_MACOSX_TRUE@am__append_112 = -DXETEX_MAC
- at XETEX_MACOSX_TRUE@am__append_113 = -std=c++11
- at XETEX_MACOSX_FALSE@am__append_114 = $(FONTCONFIG_INCLUDES)
- at XETEX_MACOSX_FALSE@am__append_115 = $(FONTCONFIG_LIBS)
- at XETEX_MACOSX_TRUE@am__append_116 = \
+ at LUAJITHBTEX_TRUE@@LUAJITTEX_FALSE@@WIN32_FALSE at am__append_105 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc
+ at LUATEX_TRUE@am__append_106 = $(luatex_tests)
+ at LUAHBTEX_TRUE@am__append_107 = $(luahbtex_tests)
+ at LUAJITTEX_TRUE@am__append_108 = $(luajittex_tests)
+ at LUAJITHBTEX_TRUE@am__append_109 = $(luajithbtex_tests)
+ at XETEX_TRUE@am__append_110 = xetex
+ at XETEX_MACOSX_TRUE@am__append_111 = -DXETEX_MAC
+ at XETEX_MACOSX_TRUE@am__append_112 = -std=c++11
+ at XETEX_MACOSX_FALSE@am__append_113 = $(FONTCONFIG_INCLUDES)
+ at XETEX_MACOSX_FALSE@am__append_114 = $(FONTCONFIG_LIBS)
+ at XETEX_MACOSX_TRUE@am__append_115 = \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.cpp \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.h \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontMgr_Mac.mm \
@@ -262,106 +259,106 @@
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontMgr_Mac.h \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeX_mac.c
- at XETEX_MACOSX_FALSE@am__append_117 = \
+ at XETEX_MACOSX_FALSE@am__append_116 = \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.cpp \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.h
- at XETEX_TRUE@am__append_118 = $(xetex_tests)
- at OTANGLE_TRUE@am__append_119 = $(omegaware_programs)
- at OTANGLE_TRUE@am__append_120 = $(OTANGLE_tests) $(OMFONTS_tests)
- at ALEPH_TRUE@am__append_121 = aleph
- at ALEPH_TRUE@am__append_122 = $(aleph_tests)
- at SYNCTEX_TRUE@am__append_123 = synctex
- at SYNCTEX_TRUE@am__append_124 = $(LTLIBSYNCTEX)
- at SYNCTEX_TRUE@am__append_125 = $(LIBSYNCTEX)
- at MINGW32_TRUE@am__append_126 = $(KPATHSEA_INCLUDES)
- at MINGW32_TRUE@am__append_127 = -lshlwapi $(KPATHSEA_LIBS)
- at MINGW32_TRUE@am__append_128 = -lshlwapi
- at TEX_SYNCTEX_TRUE@am__append_129 = -I$(srcdir)/synctexdir \
+ at XETEX_TRUE@am__append_117 = $(xetex_tests)
+ at OTANGLE_TRUE@am__append_118 = $(omegaware_programs)
+ at OTANGLE_TRUE@am__append_119 = $(OTANGLE_tests) $(OMFONTS_tests)
+ at ALEPH_TRUE@am__append_120 = aleph
+ at ALEPH_TRUE@am__append_121 = $(aleph_tests)
+ at SYNCTEX_TRUE@am__append_122 = synctex
+ at SYNCTEX_TRUE@am__append_123 = $(LTLIBSYNCTEX)
+ at SYNCTEX_TRUE@am__append_124 = $(LIBSYNCTEX)
+ at MINGW32_TRUE@am__append_125 = $(KPATHSEA_INCLUDES)
+ at MINGW32_TRUE@am__append_126 = -lshlwapi $(KPATHSEA_LIBS)
+ at MINGW32_TRUE@am__append_127 = -lshlwapi
+ at TEX_SYNCTEX_TRUE@am__append_128 = -I$(srcdir)/synctexdir \
@TEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@TEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
- at TEX_SYNCTEX_TRUE@am__append_130 = $(ZLIB_LIBS)
- at TEX_SYNCTEX_TRUE@am__append_131 = $(ZLIB_DEPEND)
- at TEX_SYNCTEX_TRUE@am__append_132 = \
+ at TEX_SYNCTEX_TRUE@am__append_129 = $(ZLIB_LIBS)
+ at TEX_SYNCTEX_TRUE@am__append_130 = $(ZLIB_DEPEND)
+ at TEX_SYNCTEX_TRUE@am__append_131 = \
@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
- at ETEX_SYNCTEX_TRUE@am__append_133 = -I$(srcdir)/synctexdir \
+ at ETEX_SYNCTEX_TRUE@am__append_132 = -I$(srcdir)/synctexdir \
@ETEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@ETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
- at ETEX_SYNCTEX_TRUE@am__append_134 = $(ZLIB_LIBS)
- at ETEX_SYNCTEX_TRUE@am__append_135 = $(ZLIB_DEPEND)
- at ETEX_SYNCTEX_TRUE@am__append_136 = \
+ at ETEX_SYNCTEX_TRUE@am__append_133 = $(ZLIB_LIBS)
+ at ETEX_SYNCTEX_TRUE@am__append_134 = $(ZLIB_DEPEND)
+ at ETEX_SYNCTEX_TRUE@am__append_135 = \
@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
- at PTEX_SYNCTEX_TRUE@am__append_137 = -I$(srcdir)/synctexdir \
+ at PTEX_SYNCTEX_TRUE@am__append_136 = -I$(srcdir)/synctexdir \
@PTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@PTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
- at PTEX_SYNCTEX_TRUE@am__append_138 = $(ZLIB_LIBS)
- at PTEX_SYNCTEX_TRUE@am__append_139 = $(ZLIB_DEPEND)
- at PTEX_SYNCTEX_TRUE@am__append_140 = \
+ at PTEX_SYNCTEX_TRUE@am__append_137 = $(ZLIB_LIBS)
+ at PTEX_SYNCTEX_TRUE@am__append_138 = $(ZLIB_DEPEND)
+ at PTEX_SYNCTEX_TRUE@am__append_139 = \
@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
- at UPTEX_SYNCTEX_TRUE@am__append_141 = -I$(srcdir)/synctexdir \
+ at UPTEX_SYNCTEX_TRUE@am__append_140 = -I$(srcdir)/synctexdir \
@UPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@UPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-uptex.h\"
- at UPTEX_SYNCTEX_TRUE@am__append_142 = $(ZLIB_LIBS)
- at UPTEX_SYNCTEX_TRUE@am__append_143 = $(ZLIB_DEPEND)
- at UPTEX_SYNCTEX_TRUE@am__append_144 = \
+ at UPTEX_SYNCTEX_TRUE@am__append_141 = $(ZLIB_LIBS)
+ at UPTEX_SYNCTEX_TRUE@am__append_142 = $(ZLIB_DEPEND)
+ at UPTEX_SYNCTEX_TRUE@am__append_143 = \
@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
- at EPTEX_SYNCTEX_TRUE@am__append_145 = -I$(srcdir)/synctexdir \
+ at EPTEX_SYNCTEX_TRUE@am__append_144 = -I$(srcdir)/synctexdir \
@EPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@EPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
- at EPTEX_SYNCTEX_TRUE@am__append_146 = $(ZLIB_LIBS)
- at EPTEX_SYNCTEX_TRUE@am__append_147 = $(ZLIB_DEPEND)
- at EPTEX_SYNCTEX_TRUE@am__append_148 = \
+ at EPTEX_SYNCTEX_TRUE@am__append_145 = $(ZLIB_LIBS)
+ at EPTEX_SYNCTEX_TRUE@am__append_146 = $(ZLIB_DEPEND)
+ at EPTEX_SYNCTEX_TRUE@am__append_147 = \
@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
- at EUPTEX_SYNCTEX_TRUE@am__append_149 = -I$(srcdir)/synctexdir \
+ at EUPTEX_SYNCTEX_TRUE@am__append_148 = -I$(srcdir)/synctexdir \
@EUPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@EUPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-euptex.h\"
- at EUPTEX_SYNCTEX_TRUE@am__append_150 = $(ZLIB_LIBS)
- at EUPTEX_SYNCTEX_TRUE@am__append_151 = $(ZLIB_DEPEND)
- at EUPTEX_SYNCTEX_TRUE@am__append_152 = \
+ at EUPTEX_SYNCTEX_TRUE@am__append_149 = $(ZLIB_LIBS)
+ at EUPTEX_SYNCTEX_TRUE@am__append_150 = $(ZLIB_DEPEND)
+ at EUPTEX_SYNCTEX_TRUE@am__append_151 = \
@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
- at PDFTEX_SYNCTEX_TRUE@am__append_153 = -I$(srcdir)/synctexdir \
+ at PDFTEX_SYNCTEX_TRUE@am__append_152 = -I$(srcdir)/synctexdir \
@PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@PDFTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
- at PDFTEX_SYNCTEX_TRUE@am__append_154 = \
+ at PDFTEX_SYNCTEX_TRUE@am__append_153 = \
@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
- at XETEX_SYNCTEX_TRUE@am__append_155 = -I$(srcdir)/synctexdir \
+ at XETEX_SYNCTEX_TRUE@am__append_154 = -I$(srcdir)/synctexdir \
@XETEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@XETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
- at XETEX_SYNCTEX_TRUE@am__append_156 = \
+ at XETEX_SYNCTEX_TRUE@am__append_155 = \
@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
- at SYNCTEX_TRUE@am__append_157 = $(synctex_tests)
+ at SYNCTEX_TRUE@am__append_156 = $(synctex_tests)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
@@ -425,60 +422,57 @@
patgen$(EXEEXT) pktogf$(EXEEXT) pktype$(EXEEXT) \
pltotf$(EXEEXT) pooltype$(EXEEXT) tftopl$(EXEEXT) \
vftovp$(EXEEXT) vptovf$(EXEEXT) weave$(EXEEXT) twill$(EXEEXT)
-am__EXEEXT_2 = pbibtex$(EXEEXT) pdvitype$(EXEEXT) ppltotf$(EXEEXT) \
- ptftopl$(EXEEXT)
-am__EXEEXT_3 = upbibtex$(EXEEXT) updvitype$(EXEEXT) uppltotf$(EXEEXT) \
+am__EXEEXT_2 = upbibtex$(EXEEXT) updvitype$(EXEEXT) uppltotf$(EXEEXT) \
uptftopl$(EXEEXT)
-am__EXEEXT_4 = odvicopy$(EXEEXT) odvitype$(EXEEXT) otangle$(EXEEXT) \
+am__EXEEXT_3 = odvicopy$(EXEEXT) odvitype$(EXEEXT) otangle$(EXEEXT) \
wofm2opl$(EXEEXT) wopl2ofm$(EXEEXT) wovf2ovp$(EXEEXT) \
wovp2ovf$(EXEEXT)
- at WEB_TRUE@am__EXEEXT_5 = $(am__EXEEXT_1)
- at TEX_TRUE@am__EXEEXT_6 = tex$(EXEEXT)
- at TEX_TRUE@@WIN32_TRUE at am__EXEEXT_7 = initex$(EXEEXT)
- at MF_TRUE@am__EXEEXT_8 = mf$(EXEEXT)
- at MFN_TRUE@@MF_TRUE at am__EXEEXT_9 = mf-nowin$(EXEEXT)
- at MFLUA_TRUE@am__EXEEXT_10 = mflua$(EXEEXT)
- at MFLUAN_TRUE@@MFLUA_TRUE at am__EXEEXT_11 = mflua-nowin$(EXEEXT)
- at MFLUAJIT_TRUE@am__EXEEXT_12 = mfluajit$(EXEEXT)
- at MFLUAJITN_TRUE@@MFLUAJIT_TRUE at am__EXEEXT_13 = \
+ at WEB_TRUE@am__EXEEXT_4 = $(am__EXEEXT_1)
+ at TEX_TRUE@am__EXEEXT_5 = tex$(EXEEXT)
+ at TEX_TRUE@@WIN32_TRUE at am__EXEEXT_6 = initex$(EXEEXT)
+ at MF_TRUE@am__EXEEXT_7 = mf$(EXEEXT)
+ at MFN_TRUE@@MF_TRUE at am__EXEEXT_8 = mf-nowin$(EXEEXT)
+ at MFLUA_TRUE@am__EXEEXT_9 = mflua$(EXEEXT)
+ at MFLUAN_TRUE@@MFLUA_TRUE at am__EXEEXT_10 = mflua-nowin$(EXEEXT)
+ at MFLUAJIT_TRUE@am__EXEEXT_11 = mfluajit$(EXEEXT)
+ at MFLUAJITN_TRUE@@MFLUAJIT_TRUE at am__EXEEXT_12 = \
@MFLUAJITN_TRUE@@MFLUAJIT_TRUE@ mfluajit-nowin$(EXEEXT)
- at MP_TRUE@am__EXEEXT_14 = mpost$(EXEEXT)
- at PMP_TRUE@am__EXEEXT_15 = pmpost$(EXEEXT)
- at UPMP_TRUE@am__EXEEXT_16 = upmpost$(EXEEXT)
- at ETEX_TRUE@am__EXEEXT_17 = etex$(EXEEXT)
- at PTEX_TRUE@am__EXEEXT_18 = ptex$(EXEEXT)
- at PWEB_TRUE@am__EXEEXT_19 = $(am__EXEEXT_2)
- at EPTEX_TRUE@am__EXEEXT_20 = eptex$(EXEEXT)
- at UPTEX_TRUE@am__EXEEXT_21 = uptex$(EXEEXT)
- at UPWEB_TRUE@am__EXEEXT_22 = $(am__EXEEXT_3)
- at EUPTEX_TRUE@am__EXEEXT_23 = euptex$(EXEEXT)
- at HITEX_TRUE@am__EXEEXT_24 = hitex$(EXEEXT) hishrink$(EXEEXT) \
+ at MP_TRUE@am__EXEEXT_13 = mpost$(EXEEXT)
+ at PMP_TRUE@am__EXEEXT_14 = pmpost$(EXEEXT)
+ at UPMP_TRUE@am__EXEEXT_15 = upmpost$(EXEEXT)
+ at ETEX_TRUE@am__EXEEXT_16 = etex$(EXEEXT)
+ at PTEX_TRUE@am__EXEEXT_17 = ptex$(EXEEXT)
+ at EPTEX_TRUE@am__EXEEXT_18 = eptex$(EXEEXT)
+ at UPTEX_TRUE@am__EXEEXT_19 = uptex$(EXEEXT)
+ at UPWEB_TRUE@am__EXEEXT_20 = $(am__EXEEXT_2)
+ at EUPTEX_TRUE@am__EXEEXT_21 = euptex$(EXEEXT)
+ at HITEX_TRUE@am__EXEEXT_22 = hitex$(EXEEXT) hishrink$(EXEEXT) \
@HITEX_TRUE@ histretch$(EXEEXT)
- at PDFTEX_TRUE@am__EXEEXT_25 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
+ at PDFTEX_TRUE@am__EXEEXT_23 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
@PDFTEX_TRUE@ pdftosrc$(EXEEXT)
- at LUATEX_TRUE@am__EXEEXT_26 = luatex$(EXEEXT)
- at LUAHBTEX_TRUE@am__EXEEXT_27 = luahbtex$(EXEEXT)
- at LUAJITTEX_TRUE@am__EXEEXT_28 = luajittex$(EXEEXT)
- at LUAJITHBTEX_TRUE@am__EXEEXT_29 = luajithbtex$(EXEEXT)
- at XETEX_TRUE@am__EXEEXT_30 = xetex$(EXEEXT)
- at OTANGLE_TRUE@am__EXEEXT_31 = $(am__EXEEXT_4)
- at ALEPH_TRUE@am__EXEEXT_32 = aleph$(EXEEXT)
- at SYNCTEX_TRUE@am__EXEEXT_33 = synctex$(EXEEXT)
+ at LUATEX_TRUE@am__EXEEXT_24 = luatex$(EXEEXT)
+ at LUAHBTEX_TRUE@am__EXEEXT_25 = luahbtex$(EXEEXT)
+ at LUAJITTEX_TRUE@am__EXEEXT_26 = luajittex$(EXEEXT)
+ at LUAJITHBTEX_TRUE@am__EXEEXT_27 = luajithbtex$(EXEEXT)
+ at XETEX_TRUE@am__EXEEXT_28 = xetex$(EXEEXT)
+ at OTANGLE_TRUE@am__EXEEXT_29 = $(am__EXEEXT_3)
+ at ALEPH_TRUE@am__EXEEXT_30 = aleph$(EXEEXT)
+ at SYNCTEX_TRUE@am__EXEEXT_31 = synctex$(EXEEXT)
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \
"$(DESTDIR)$(libdir)" "$(DESTDIR)$(man1dir)" \
"$(DESTDIR)$(man5dir)" "$(DESTDIR)$(pkgconfigdir)" \
"$(DESTDIR)$(syncincludedir)"
- at MF_TRUE@@WIN32_TRUE at am__EXEEXT_34 = call_mf$(EXEEXT)
- at MFLUA_TRUE@@WIN32_TRUE at am__EXEEXT_35 = call_mflua$(EXEEXT)
- at MFLUAJIT_TRUE@@WIN32_TRUE at am__EXEEXT_36 = call_mfluajit$(EXEEXT)
- at MP_TRUE@@WIN32_TRUE at am__EXEEXT_37 = call_mpost$(EXEEXT)
- at PMP_TRUE@@WIN32_TRUE at am__EXEEXT_38 = call_pmpost$(EXEEXT)
- at UPMP_TRUE@@WIN32_TRUE at am__EXEEXT_39 = call_upmpost$(EXEEXT)
- at HITEX_TRUE@am__EXEEXT_40 = himktables$(EXEEXT)
- at LUATEX_TRUE@@WIN32_TRUE at am__EXEEXT_41 = call_luatex$(EXEEXT)
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_42 = call_luahbtex$(EXEEXT)
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__EXEEXT_43 = call_luajittex$(EXEEXT)
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_44 = \
+ at MF_TRUE@@WIN32_TRUE at am__EXEEXT_32 = call_mf$(EXEEXT)
+ at MFLUA_TRUE@@WIN32_TRUE at am__EXEEXT_33 = call_mflua$(EXEEXT)
+ at MFLUAJIT_TRUE@@WIN32_TRUE at am__EXEEXT_34 = call_mfluajit$(EXEEXT)
+ at MP_TRUE@@WIN32_TRUE at am__EXEEXT_35 = call_mpost$(EXEEXT)
+ at PMP_TRUE@@WIN32_TRUE at am__EXEEXT_36 = call_pmpost$(EXEEXT)
+ at UPMP_TRUE@@WIN32_TRUE at am__EXEEXT_37 = call_upmpost$(EXEEXT)
+ at HITEX_TRUE@am__EXEEXT_38 = himktables$(EXEEXT)
+ at LUATEX_TRUE@@WIN32_TRUE at am__EXEEXT_39 = call_luatex$(EXEEXT)
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_40 = call_luahbtex$(EXEEXT)
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__EXEEXT_41 = call_luajittex$(EXEEXT)
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_42 = \
@LUAJITHBTEX_TRUE@@WIN32_TRUE@ call_luajithbtex$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -1524,11 +1518,6 @@
patgen_OBJECTS = $(nodist_patgen_OBJECTS)
patgen_LDADD = $(LDADD)
patgen_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am_pbibtex_OBJECTS =
-nodist_pbibtex_OBJECTS = pbibtex-pbibtex.$(OBJEXT)
-pbibtex_OBJECTS = $(am_pbibtex_OBJECTS) $(nodist_pbibtex_OBJECTS)
-am__DEPENDENCIES_10 = libkanji.a $(pproglib) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
am__dist_pdftex_SOURCES_DIST = pdftexdir/pdftexextra.c \
pdftexdir/pdftexextra.h pdftexdir/pdftex_version.h \
pdftexdir/etex_version.h synctexdir/synctex.c \
@@ -1541,7 +1530,7 @@
am__objects_46 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT)
nodist_pdftex_OBJECTS = $(am__objects_46) pdftex-pdftex-pool.$(OBJEXT)
pdftex_OBJECTS = $(dist_pdftex_OBJECTS) $(nodist_pdftex_OBJECTS)
-am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) libmd5.a
pdftex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftex_CXXFLAGS) \
@@ -1551,9 +1540,6 @@
pdftosrc_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftosrc_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_pdvitype_OBJECTS =
-nodist_pdvitype_OBJECTS = pdvitype-pdvitype.$(OBJEXT)
-pdvitype_OBJECTS = $(am_pdvitype_OBJECTS) $(nodist_pdvitype_OBJECTS)
nodist_pktogf_OBJECTS = pktogf.$(OBJEXT)
pktogf_OBJECTS = $(nodist_pktogf_OBJECTS)
pktogf_LDADD = $(LDADD)
@@ -1590,9 +1576,6 @@
pooltype_OBJECTS = $(nodist_pooltype_OBJECTS)
pooltype_LDADD = $(LDADD)
pooltype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am_ppltotf_OBJECTS =
-nodist_ppltotf_OBJECTS = ppltotf-ppltotf.$(OBJEXT)
-ppltotf_OBJECTS = $(am_ppltotf_OBJECTS) $(nodist_ppltotf_OBJECTS)
am__dist_ptex_SOURCES_DIST = ptexdir/ptexextra.c ptexdir/ptexextra.h \
ptexdir/ptex_version.h synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
@@ -1602,10 +1585,9 @@
am__objects_58 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
nodist_ptex_OBJECTS = $(am__objects_58) ptex-ptex-pool.$(OBJEXT)
ptex_OBJECTS = $(dist_ptex_OBJECTS) $(nodist_ptex_OBJECTS)
+am__DEPENDENCIES_11 = libkanji.a $(pproglib) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
@PTEX_SYNCTEX_TRUE at am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1)
-am_ptftopl_OBJECTS =
-nodist_ptftopl_OBJECTS = ptftopl-ptftopl.$(OBJEXT)
-ptftopl_OBJECTS = $(am_ptftopl_OBJECTS) $(nodist_ptftopl_OBJECTS)
am_synctex_OBJECTS = synctexdir/synctex-synctex_main.$(OBJEXT)
synctex_OBJECTS = $(am_synctex_OBJECTS)
am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -1822,13 +1804,11 @@
./$(DEPDIR)/ofm2opl.Po ./$(DEPDIR)/opl2ofm.Po \
./$(DEPDIR)/otangle.Po ./$(DEPDIR)/ovf2ovp.Po \
./$(DEPDIR)/ovp2ovf.Po ./$(DEPDIR)/patgen.Po \
- ./$(DEPDIR)/pbibtex-pbibtex.Po ./$(DEPDIR)/pdftex-dummy.Po \
- ./$(DEPDIR)/pdftex-pdftex-pool.Po \
+ ./$(DEPDIR)/pdftex-dummy.Po ./$(DEPDIR)/pdftex-pdftex-pool.Po \
./$(DEPDIR)/pdftex-pdftex0.Po ./$(DEPDIR)/pdftex-pdftexini.Po \
- ./$(DEPDIR)/pdftosrc-dummy.Po ./$(DEPDIR)/pdvitype-pdvitype.Po \
- ./$(DEPDIR)/pktogf.Po ./$(DEPDIR)/pktype.Po \
- ./$(DEPDIR)/pltotf.Po ./$(DEPDIR)/pmpost-pmp.Po \
- ./$(DEPDIR)/pmpost-pmpmath.Po \
+ ./$(DEPDIR)/pdftosrc-dummy.Po ./$(DEPDIR)/pktogf.Po \
+ ./$(DEPDIR)/pktype.Po ./$(DEPDIR)/pltotf.Po \
+ ./$(DEPDIR)/pmpost-pmp.Po ./$(DEPDIR)/pmpost-pmpmath.Po \
./$(DEPDIR)/pmpost-pmpmathbinary.Po \
./$(DEPDIR)/pmpost-pmpmathdecimal.Po \
./$(DEPDIR)/pmpost-pmpmathdouble.Po \
@@ -1836,9 +1816,8 @@
./$(DEPDIR)/pmpost-pmpxout.Po ./$(DEPDIR)/pmpost-ppngout.Po \
./$(DEPDIR)/pmpost-ppsout.Po ./$(DEPDIR)/pmpost-psvgout.Po \
./$(DEPDIR)/pmpost-ptfmin.Po ./$(DEPDIR)/pooltype.Po \
- ./$(DEPDIR)/ppltotf-ppltotf.Po ./$(DEPDIR)/ptex-ptex-pool.Po \
- ./$(DEPDIR)/ptex-ptex0.Po ./$(DEPDIR)/ptex-ptexini.Po \
- ./$(DEPDIR)/ptftopl-ptftopl.Po ./$(DEPDIR)/tangle.Po \
+ ./$(DEPDIR)/ptex-ptex-pool.Po ./$(DEPDIR)/ptex-ptex0.Po \
+ ./$(DEPDIR)/ptex-ptexini.Po ./$(DEPDIR)/tangle.Po \
./$(DEPDIR)/tangleboot.Po ./$(DEPDIR)/tex-tex-pool.Po \
./$(DEPDIR)/tex-tex0.Po ./$(DEPDIR)/tex-texextra.Po \
./$(DEPDIR)/tex-texini.Po ./$(DEPDIR)/tftopl.Po \
@@ -2551,16 +2530,12 @@
$(nodist_mft_SOURCES) $(nodist_mpost_SOURCES) \
$(nodist_odvicopy_SOURCES) $(nodist_odvitype_SOURCES) \
$(nodist_otangle_SOURCES) $(nodist_patgen_SOURCES) \
- $(pbibtex_SOURCES) $(nodist_pbibtex_SOURCES) \
$(dist_pdftex_SOURCES) $(nodist_pdftex_SOURCES) \
$(nodist_EXTRA_pdftex_SOURCES) $(pdftosrc_SOURCES) \
- $(nodist_EXTRA_pdftosrc_SOURCES) $(pdvitype_SOURCES) \
- $(nodist_pdvitype_SOURCES) $(nodist_pktogf_SOURCES) \
+ $(nodist_EXTRA_pdftosrc_SOURCES) $(nodist_pktogf_SOURCES) \
$(nodist_pktype_SOURCES) $(nodist_pltotf_SOURCES) \
$(nodist_pmpost_SOURCES) $(nodist_pooltype_SOURCES) \
- $(ppltotf_SOURCES) $(nodist_ppltotf_SOURCES) \
- $(dist_ptex_SOURCES) $(nodist_ptex_SOURCES) $(ptftopl_SOURCES) \
- $(nodist_ptftopl_SOURCES) $(synctex_SOURCES) \
+ $(dist_ptex_SOURCES) $(nodist_ptex_SOURCES) $(synctex_SOURCES) \
$(nodist_tangle_SOURCES) $(nodist_tangleboot_SOURCES) \
$(dist_tex_SOURCES) $(nodist_tex_SOURCES) \
$(nodist_tftopl_SOURCES) $(nodist_tie_SOURCES) \
@@ -2591,12 +2566,11 @@
$(gftodvi_SOURCES) himktables.c $(md5main_SOURCES) \
$(dist_mf_SOURCES) $(dist_mf_nowin_SOURCES) \
$(dist_mflua_SOURCES) $(dist_mfluajit_SOURCES) \
- $(pbibtex_SOURCES) $(am__dist_pdftex_SOURCES_DIST) \
- $(pdftosrc_SOURCES) $(pdvitype_SOURCES) $(ppltotf_SOURCES) \
- $(am__dist_ptex_SOURCES_DIST) $(ptftopl_SOURCES) \
- $(synctex_SOURCES) $(am__dist_tex_SOURCES_DIST) \
- $(ttf2afm_SOURCES) $(EXTRA_ttf2afm_SOURCES) \
- $(upbibtex_SOURCES) $(updvitype_SOURCES) $(uppltotf_SOURCES) \
+ $(am__dist_pdftex_SOURCES_DIST) $(pdftosrc_SOURCES) \
+ $(am__dist_ptex_SOURCES_DIST) $(synctex_SOURCES) \
+ $(am__dist_tex_SOURCES_DIST) $(ttf2afm_SOURCES) \
+ $(EXTRA_ttf2afm_SOURCES) $(upbibtex_SOURCES) \
+ $(updvitype_SOURCES) $(uppltotf_SOURCES) \
$(am__dist_uptex_SOURCES_DIST) $(uptftopl_SOURCES) \
$(am__dist_xetex_SOURCES_DIST)
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
@@ -2804,14 +2778,15 @@
bases=`echo $$bases`
AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
RECHECK_LOGS = $(TEST_LOGS)
-am__EXEEXT_45 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
+am__EXEEXT_43 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
gftopk.test gftype.test mft.test patgen.test pktogf.test \
pktype.test pltotf.test pooltype.test tftopl.test vftovp.test \
vptovf.test weave.test twill.test
-am__EXEEXT_46 = $(am__EXEEXT_45) tests/bibtex-openout-test.pl \
+am__EXEEXT_44 = $(am__EXEEXT_43) tests/bibtex-openout-test.pl \
tests/bibtex-longline-test.pl tests/bibtex-mem.test \
tests/bibtex-bigauth.test tests/bibtex-auxinclude.test
- at WEB_TRUE@am__EXEEXT_47 = $(am__EXEEXT_46)
+ at WEB_TRUE@am__EXEEXT_45 = $(am__EXEEXT_44)
+am__EXEEXT_46 =
TEST_SUITE_LOG = test-suite.log
am__test_logs1 = $(TESTS:=.log)
am__test_logs2 = $(am__test_logs1:@EXEEXT at .log=.log)
@@ -3038,7 +3013,7 @@
NMEDIT = @NMEDIT@
OBJCXX = @OBJCXX@
OBJCXXDEPMODE = @OBJCXXDEPMODE@
-OBJCXXFLAGS = @OBJCXXFLAGS@ $(am__append_113)
+OBJCXXFLAGS = @OBJCXXFLAGS@ $(am__append_112)
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTANGLE = @OTANGLE@
@@ -3185,11 +3160,71 @@
libluaharfbuzz.a libluajitharfbuzz.a libxetex.a libsynctex.a \
libmd5.a
EXTRA_LTLIBRARIES = libsynctex.la
-lib_LIBRARIES = $(am__append_125)
-lib_LTLIBRARIES = $(am__append_124)
+lib_LIBRARIES = $(am__append_124)
+lib_LTLIBRARIES = $(am__append_123)
dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
nodist_man_MANS =
TEST_EXTENSIONS = .pl .test
+
+#nodist_pbibtex_SOURCES = pbibtex.c pbibtex.h
+#pbibtex_SOURCES = ptexdir/kanji.h
+#pbibtex_CPPFLAGS = $(ptex_cppflags)
+#pbibtex_LDADD = $(ptex_ldadd)
+#pbibtex_DEPENDENCIES = $(ptex_dependencies)
+#pbibtex.c pbibtex.h: pbibtex-web2c
+# @$(web2c) pbibtex
+#pbibtex-web2c: pbibtex.p $(web2c_depend) ptexdir/ptex.defines web2c/cvtbib.sed
+# @$(web2c) pbibtex
+#pbibtex.p: tangle$(EXEEXT) pbibtex.web ptexdir/pbibtex.ch
+# $(p_tangle) pbibtex pbibtex
+#pbibtex.web: tie$(EXEEXT) bibtex.web bibtex.ch
+# $(tie_m) bibtex.web bibtex.ch
+#EXTRA_DIST += ptexdir/pbibtex.ch web2c/cvtbib.sed
+
+#nodist_pdvitype_SOURCES = pdvitype.c pdvitype.h
+#pdvitype_SOURCES = ptexdir/kanji.h
+#pdvitype_CPPFLAGS = $(ptex_cppflags) -DHEX_CHAR_CODE
+#pdvitype_LDADD = $(ptex_ldadd)
+#pdvitype_DEPENDENCIES = $(ptex_dependencies)
+#pdvitype.c pdvitype.h: pdvitype-web2c
+# @$(web2c) pdvitype
+#pdvitype-web2c: pdvitype.p $(web2c_depend) ptexdir/ptex.defines
+# @$(web2c) pdvitype
+#pdvitype.p: tangle$(EXEEXT) pdvitype.web ptexdir/pdvitype.ch
+# $(p_tangle) pdvitype pdvitype
+#pdvitype.web: tie$(EXEEXT) dvitype.web dvitype.ch
+# $(tie_m) dvitype.web dvitype.ch
+#EXTRA_DIST += ptexdir/pdvitype.ch
+
+#nodist_ppltotf_SOURCES = ppltotf.c ppltotf.h
+#ppltotf_SOURCES = ptexdir/kanji.h
+#ppltotf_CPPFLAGS = $(ptex_cppflags) -DPRESERVE_PUTC
+#ppltotf_LDADD = $(ptex_ldadd)
+#ppltotf_DEPENDENCIES = $(ptex_dependencies)
+#ppltotf.c ppltotf.h: ppltotf-web2c
+# @$(web2c) ppltotf
+#ppltotf-web2c: ppltotf.p $(web2c_depend) ptexdir/ptex.defines
+# @$(web2c) ppltotf
+#ppltotf.p: tangle$(EXEEXT) ppltotf.web ptexdir/ppltotf.ch
+# $(p_tangle) ppltotf ppltotf
+#ppltotf.web: tie$(EXEEXT) pltotf.web pltotf.ch
+# $(tie_m) pltotf.web pltotf.ch
+#EXTRA_DIST += ptexdir/ppltotf.ch
+
+#nodist_ptftopl_SOURCES = ptftopl.c ptftopl.h
+#ptftopl_SOURCES = ptexdir/kanji.h
+#ptftopl_CPPFLAGS = $(ptex_cppflags)
+#ptftopl_LDADD = $(ptex_ldadd)
+#ptftopl_DEPENDENCIES = $(ptex_dependencies)
+#ptftopl.c ptftopl.h: ptftopl-web2c
+# @$(web2c) ptftopl
+#ptftopl-web2c: ptftopl.p $(web2c_depend) ptexdir/ptex.defines
+# @$(web2c) ptftopl
+#ptftopl.p: tangle$(EXEEXT) ptftopl.web ptexdir/ptftopl.ch
+# $(p_tangle) ptftopl ptftopl
+#ptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch
+# $(tie_m) tftopl.web tftopl.ch
+#EXTRA_DIST += ptexdir/ptftopl.ch
#
# 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
@@ -3269,38 +3304,36 @@
etexdir/etrip/etrip3.in etexdir/etrip/etripin.log \
etexdir/etrip/etripman.tex etexdir/etrip/texmf.cnf \
etexdir/etrip/trip2.in $(ptex_web_srcs) $(ptex_ch_srcs) \
- ptexdir/ptex.defines ptexdir/pbibtex.ch web2c/cvtbib.sed \
- ptexdir/pdvitype.ch ptexdir/ppltotf.ch ptexdir/ptftopl.ch \
- ptexdir/COPYRIGHT ptexdir/COPYRIGHT.jis ptexdir/ChangeLog \
- ptexdir/Changes.txt ptexdir/INSTALL.txt ptexdir/README.txt \
- $(ptex_tests) $(pweb_tests) ptexdir/tests/nissya_bib.aux \
- ptexdir/tests/nissya.bst ptexdir/tests/sample.bib \
- ptexdir/tests/nissya_bib.bbl tests/testfield.bst \
- tests/enc-asc.bib tests/enc-jis.bib tests/enc-sjis.bib \
- tests/enc-euc.bib tests/enc-utf8.bib tests/enc-utf8a.bib \
- tests/enc-utf8b.bib tests/enc-amb0.bib tests/enc-amb1.bib \
- tests/enc-amb2.bib tests/enc.aux tests/enc-e.aux \
- tests/enc-s.aux tests/enc-u.aux tests/enc-p.bbl \
- tests/enc-ep.bbl tests/enc-sp.bbl tests/enc-up.bbl \
- tests/memdata1.bst tests/memdata2.bst tests/memdata3.bst \
- ptexdir/tests/ptex3.tex ptexdir/tests/ptex3.dvi \
- ptexdir/tests/ptex4.tex ptexdir/tests/ptex4.dvi \
- ptexdir/tests/ptex3a-jis.typ ptexdir/tests/ptex3a-utf8.typ \
- ptexdir/tests/ptex4a-jis.typ ptexdir/tests/ptex4a-utf8.typ \
- ptexdir/tests/goth10.tfm ptexdir/tests/sample.dvi \
- ptexdir/tests/samplea.typ ptexdir/tests/min10.pl \
- ptexdir/tests/min10.tfm ptexdir/tests/tmin10.pl \
- ptexdir/tests/tmin10.tfm ptexdir/tests/chcode.pl \
- ptexdir/tests/chcode-jis.pl ptexdir/tests/chcode.tfm \
- ptexdir/tests/chcode-utf8.pl ptexdir/tests/chcode-euc.pl \
- ptexdir/tests/chcode-sjis.pl ptexdir/tests/skipjfmp.pl \
- ptexdir/tests/skipjfmp.tfm ptexdir/ptrip/ptrip.diffs \
- ptexdir/ptrip/texmf.cnf $(eptex_web_srcs) $(eptex_ch_srcs) \
- eptexdir/eptex.defines eptexdir/ChangeLog eptexdir/Changes.txt \
- eptexdir/README.txt $(eptex_tests) \
- eptexdir/eptrip/eptrip.diffs eptexdir/eptrip/eptrip.log \
- eptexdir/eptrip/eptrip.tex eptexdir/eptrip/texmf.cnf \
- eptexdir/pdfprimitive.test \
+ ptexdir/ptex.defines ptexdir/COPYRIGHT ptexdir/COPYRIGHT.jis \
+ ptexdir/ChangeLog ptexdir/Changes.txt ptexdir/INSTALL.txt \
+ ptexdir/README.txt $(ptex_tests) $(pweb_tests) \
+ ptexdir/tests/nissya_bib.aux ptexdir/tests/nissya.bst \
+ ptexdir/tests/sample.bib ptexdir/tests/nissya_bib.bbl \
+ tests/testfield.bst tests/enc-asc.bib tests/enc-jis.bib \
+ tests/enc-sjis.bib tests/enc-euc.bib tests/enc-utf8.bib \
+ tests/enc-utf8a.bib tests/enc-utf8b.bib tests/enc-amb0.bib \
+ tests/enc-amb1.bib tests/enc-amb2.bib tests/enc.aux \
+ tests/enc-e.aux tests/enc-s.aux tests/enc-u.aux \
+ tests/enc-p.bbl tests/enc-ep.bbl tests/enc-sp.bbl \
+ tests/enc-up.bbl tests/memdata1.bst tests/memdata2.bst \
+ tests/memdata3.bst ptexdir/tests/ptex3.tex \
+ ptexdir/tests/ptex3.dvi ptexdir/tests/ptex4.tex \
+ ptexdir/tests/ptex4.dvi ptexdir/tests/ptex3a-jis.typ \
+ ptexdir/tests/ptex3a-utf8.typ ptexdir/tests/ptex4a-jis.typ \
+ ptexdir/tests/ptex4a-utf8.typ ptexdir/tests/goth10.tfm \
+ ptexdir/tests/sample.dvi ptexdir/tests/samplea.typ \
+ ptexdir/tests/min10.pl ptexdir/tests/min10.tfm \
+ ptexdir/tests/tmin10.pl ptexdir/tests/tmin10.tfm \
+ ptexdir/tests/chcode.pl ptexdir/tests/chcode-jis.pl \
+ ptexdir/tests/chcode.tfm ptexdir/tests/chcode-utf8.pl \
+ ptexdir/tests/chcode-euc.pl ptexdir/tests/chcode-sjis.pl \
+ ptexdir/tests/skipjfmp.pl ptexdir/tests/skipjfmp.tfm \
+ ptexdir/ptrip/ptrip.diffs ptexdir/ptrip/texmf.cnf \
+ $(eptex_web_srcs) $(eptex_ch_srcs) eptexdir/eptex.defines \
+ eptexdir/ChangeLog eptexdir/Changes.txt eptexdir/README.txt \
+ $(eptex_tests) eptexdir/eptrip/eptrip.diffs \
+ eptexdir/eptrip/eptrip.log eptexdir/eptrip/eptrip.tex \
+ eptexdir/eptrip/texmf.cnf eptexdir/pdfprimitive.test \
eptexdir/tests/pdfprimitive-test.tex \
eptexdir/tests/pdfprimitive-eptex.log $(uptex_web_srcs) \
$(uptex_ch_srcs) uptexdir/uptex.defines uptexdir/upbibtex.ch \
@@ -3687,24 +3720,26 @@
CLEANFILES = $(EXTRA_PROGRAMS) $(EXTRA_LIBRARIES) $(EXTRA_LTLIBRARIES)
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)
+ $(am__append_64) $(am__append_69) $(am__append_74) \
+ $(am__append_79)
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)
+ $(am__append_63) $(am__append_68) $(am__append_73) \
+ $(am__append_78)
bin_links = $(am__append_5) $(am__append_14) $(am__append_15) \
$(am__append_24) $(am__append_33) $(am__append_41) \
- $(am__append_49) $(am__append_54) $(am__append_91) \
- $(am__append_96) $(am__append_101) $(am__append_106)
+ $(am__append_49) $(am__append_54) upbibtex$(EXEEXT):pbibtex \
+ updvitype$(EXEEXT):pdvitype uppltotf$(EXEEXT):ppltotf \
+ uptftopl$(EXEEXT):ptftopl $(am__append_90) $(am__append_95) \
+ $(am__append_100) $(am__append_105)
install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \
$(am__append_39) $(am__append_47) $(am__append_52) \
- $(am__append_89) $(am__append_94) $(am__append_99) \
- $(am__append_104)
+ $(am__append_88) $(am__append_93) $(am__append_98) \
+ $(am__append_103)
uninstall_exe_links = $(am__append_13) $(am__append_23) \
$(am__append_32) $(am__append_40) $(am__append_48) \
- $(am__append_53) $(am__append_90) $(am__append_95) \
- $(am__append_100) $(am__append_105)
+ $(am__append_53) $(am__append_89) $(am__append_94) \
+ $(am__append_99) $(am__append_104)
NEVER_DIST = `find . $(NEVER_NAMES)` cwebdir/cweave.log \
cwebdir/cweave.trs cwebdir/ctwill.log cwebdir/ctwill.trs \
cwebdir/refsort.log cwebdir/refsort.trs cwebdir/twinx.log \
@@ -3880,18 +3915,18 @@
initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
nodist_initex_SOURCES = callexe.c
initex_LDADD =
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_129)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_128)
# With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_130)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_129)
# 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_132)
+dist_tex_SOURCES = texextra.c $(am__append_131)
# We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_131)
+tex_prereq = texd.h $(am__append_130)
tex_ch_srcs = \
tex.web \
tex.ch \
@@ -4387,10 +4422,10 @@
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) $(ZLIB_INCLUDES) $(am__append_133)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(am__append_132)
# With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ZLIB_LIBS) $(ipc_socketlibs) $(am__append_134)
+etex_LDADD = $(LDADD) $(ZLIB_LIBS) $(ipc_socketlibs) $(am__append_133)
etex_DEPENDENCIES = $(ZLIB_DEPEND)
# e-TeX C sources
@@ -4397,11 +4432,11 @@
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_136)
+ etexdir/etex_version.h $(am__append_135)
# 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_135)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_134)
etex_web_srcs = \
tex.web \
etexdir/etex.ch
@@ -4426,14 +4461,19 @@
ptex_ldadd = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) $(ZLIB_LIBS)
ptex_dependencies = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(ZLIB_DEPEND) $(default_dependencies)
p_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/ptexdir:$(srcdir) $(buildenv) $(TANGLE)
-pweb_programs = pbibtex pdvitype ppltotf ptftopl
+
+#pweb_programs = pbibtex pdvitype ppltotf ptftopl
pproglib = lib/libp.a
libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h ptexdir/kanji_dump.c
libkanji_a_CPPFLAGS = $(ptex_cppflags)
-ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_137)
+#if PWEB
+#bin_PROGRAMS += $(pweb_programs)
+#endif PWEB
+#EXTRA_PROGRAMS += ptex $(pweb_programs)
+ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_136)
# With --enable-ipc, pTeX may need to link with -lsocket.
-ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_138)
+ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_137)
ptex_DEPENDENCIES = $(ptex_dependencies)
# pTeX C sources
@@ -4440,10 +4480,10 @@
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_140)
+ ptexdir/ptex_version.h $(am__append_139)
# 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_139)
+ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_138)
ptex_web_srcs = \
tex.web \
tex.ch \
@@ -4456,43 +4496,16 @@
$(ptex_ch_synctex) \
tex-binpool.ch
-nodist_pbibtex_SOURCES = pbibtex.c pbibtex.h
-pbibtex_SOURCES = ptexdir/kanji.h
-pbibtex_CPPFLAGS = $(ptex_cppflags)
-pbibtex_LDADD = $(ptex_ldadd)
-pbibtex_DEPENDENCIES = $(ptex_dependencies)
-nodist_pdvitype_SOURCES = pdvitype.c pdvitype.h
-pdvitype_SOURCES = ptexdir/kanji.h
-pdvitype_CPPFLAGS = $(ptex_cppflags) -DHEX_CHAR_CODE
-pdvitype_LDADD = $(ptex_ldadd)
-pdvitype_DEPENDENCIES = $(ptex_dependencies)
-nodist_ppltotf_SOURCES = ppltotf.c ppltotf.h
-ppltotf_SOURCES = ptexdir/kanji.h
-ppltotf_CPPFLAGS = $(ptex_cppflags) -DPRESERVE_PUTC
-ppltotf_LDADD = $(ptex_ldadd)
-ppltotf_DEPENDENCIES = $(ptex_dependencies)
-nodist_ptftopl_SOURCES = ptftopl.c ptftopl.h
-ptftopl_SOURCES = ptexdir/kanji.h
-ptftopl_CPPFLAGS = $(ptex_cppflags)
-ptftopl_LDADD = $(ptex_ldadd)
-ptftopl_DEPENDENCIES = $(ptex_dependencies)
# pTeX Tests
#
ptex_tests = ptexdir/ptriptest.test ptexdir/pver.test
-# ppPLtoTF/pTFtoPL
-pweb_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \
- ptexdir/ppltotf.test ptexdir/ptftopl.test \
- ptexdir/pbibtex-openout-test.pl \
- ptexdir/pbibtex-longline-test.pl ptexdir/pbibtex-mem.test \
- ptexdir/nissya.test ptexdir/sample.test ptexdir/yokotate.test \
- ptexdir/skipjfmp.test
eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/libmd5 \
- $(ZLIB_INCLUDES) $(am__append_145)
+ $(ZLIB_INCLUDES) $(am__append_144)
# With --enable-ipc, e-pTeX may need to link with -lsocket.
eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
- $(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_146)
+ $(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_145)
eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a $(ZLIB_DEPEND)
# e-pTeX C sources
@@ -4499,11 +4512,11 @@
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_148)
+ eptexdir/eptex_version.h $(am__append_147)
# 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_147)
+ eptexdir/eptex_version.h $(am__append_146)
eptex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -4539,10 +4552,10 @@
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_141)
+uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_140)
# With --enable-ipc, upTeX may need to link with -lsocket.
-uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_142)
+uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_141)
uptex_DEPENDENCIES = $(uptex_dependencies)
# upTeX C sources
@@ -4549,11 +4562,11 @@
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_144)
+ uptexdir/uptex_version.h $(am__append_143)
# 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_143)
+ uptexdir/uptex_version.h $(am__append_142)
uptex_web_srcs = \
tex.web \
tex.ch \
@@ -4599,11 +4612,11 @@
uptexdir/yokotate.test uptexdir/skipjfmp.test \
uptexdir/newjfm.test uptexdir/uparse.test uptexdir/gkhuge.test
euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) \
- -I$(srcdir)/libmd5 $(ZLIB_INCLUDES) $(am__append_149)
+ -I$(srcdir)/libmd5 $(ZLIB_INCLUDES) $(am__append_148)
# With --enable-ipc, e-upTeX may need to link with -lsocket.
euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
- $(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_150)
+ $(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_149)
euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a $(ZLIB_DEPEND)
# e-upTeX C sources
@@ -4610,12 +4623,12 @@
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_152)
+ $(am__append_151)
# 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_151)
+ uptexdir/uptex_version.h $(am__append_150)
euptex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -4727,7 +4740,7 @@
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_84)
+ $(am__append_83)
@MINGW32_TRUE at REGEX_INCLUDES = -I$(srcdir)/pdftexdir/regex
EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \
pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \
@@ -4743,7 +4756,7 @@
# 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_153)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_152)
pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
# With --enable-ipc, pdfTeX may need to link with -lsocket.
@@ -4756,7 +4769,7 @@
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_154)
+ $(am__append_153)
pdftex_ch_srcs = \
pdftexdir/pdftex.web \
pdftexdir/tex.ch0 \
@@ -5432,18 +5445,18 @@
xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \
$(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(HARFBUZZ_INCLUDES) \
$(GRAPHITE2_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) \
- $(PPLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_112) \
- $(am__append_114)
+ $(PPLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_111) \
+ $(am__append_113)
xetex_ldadd = $(libxetex) $(HARFBUZZ_LIBS) $(GRAPHITE2_LIBS) \
$(ICU_LIBS) $(ICU_LIBS_EXTRA) $(TECKIT_LIBS) $(LIBPNG_LIBS) \
$(FREETYPE2_LIBS) $(PPLIB_LIBS) $(ZLIB_LIBS) libmd5.a \
- $(am__append_115)
+ $(am__append_114)
xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
$(TECKIT_DEPEND) $(HARFBUZZ_DEPEND) $(GRAPHITE2_DEPEND) \
$(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) $(ZLIB_DEPEND) \
$(PPLIB_DEPEND) libmd5.a
@XETEX_MACOSX_TRUE at xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_155)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_154)
xetex_CFLAGS = $(WARNING_CFLAGS)
xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -5452,7 +5465,7 @@
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_156)
+ $(am__append_155)
xetex_ch_srcs = \
xetexdir/xetex.web \
xetexdir/tex.ch0 \
@@ -5484,7 +5497,7 @@
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_116) $(am__append_117)
+ xetexdir/image/pngimage.h $(am__append_115) $(am__append_116)
# We must create xetexd.h etc. before building the libxetex_a_OBJECTS.
libxetex_prereq = xetexd.h $(xetex_dependencies)
@@ -5588,13 +5601,13 @@
synctex_SOURCES = \
synctexdir/synctex_main.c
-synctex_CPPFLAGS = -I$(srcdir)/synctexdir $(am__append_126)
-synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_127)
+synctex_CPPFLAGS = -I$(srcdir)/synctexdir $(am__append_125)
+synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_126)
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_128)
+libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_127)
libsynctex_la_SOURCES = \
synctexdir/synctex_parser.c \
synctexdir/synctex_parser_local.h \
@@ -8310,10 +8323,6 @@
patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES)
@rm -f patgen$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(patgen_OBJECTS) $(patgen_LDADD) $(LIBS)
-
-pbibtex$(EXEEXT): $(pbibtex_OBJECTS) $(pbibtex_DEPENDENCIES) $(EXTRA_pbibtex_DEPENDENCIES)
- @rm -f pbibtex$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(pbibtex_OBJECTS) $(pbibtex_LDADD) $(LIBS)
pdftexdir/pdftex-pdftexextra.$(OBJEXT): pdftexdir/$(am__dirstamp) \
pdftexdir/$(DEPDIR)/$(am__dirstamp)
synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
@@ -8329,10 +8338,6 @@
@rm -f pdftosrc$(EXEEXT)
$(AM_V_CXXLD)$(pdftosrc_LINK) $(pdftosrc_OBJECTS) $(pdftosrc_LDADD) $(LIBS)
-pdvitype$(EXEEXT): $(pdvitype_OBJECTS) $(pdvitype_DEPENDENCIES) $(EXTRA_pdvitype_DEPENDENCIES)
- @rm -f pdvitype$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(pdvitype_OBJECTS) $(pdvitype_LDADD) $(LIBS)
-
pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES)
@rm -f pktogf$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(pktogf_OBJECTS) $(pktogf_LDADD) $(LIBS)
@@ -8352,10 +8357,6 @@
pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES)
@rm -f pooltype$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(pooltype_OBJECTS) $(pooltype_LDADD) $(LIBS)
-
-ppltotf$(EXEEXT): $(ppltotf_OBJECTS) $(ppltotf_DEPENDENCIES) $(EXTRA_ppltotf_DEPENDENCIES)
- @rm -f ppltotf$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(ppltotf_OBJECTS) $(ppltotf_LDADD) $(LIBS)
ptexdir/ptex-ptexextra.$(OBJEXT): ptexdir/$(am__dirstamp) \
ptexdir/$(DEPDIR)/$(am__dirstamp)
synctexdir/ptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
@@ -8364,10 +8365,6 @@
ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES)
@rm -f ptex$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(ptex_OBJECTS) $(ptex_LDADD) $(LIBS)
-
-ptftopl$(EXEEXT): $(ptftopl_OBJECTS) $(ptftopl_DEPENDENCIES) $(EXTRA_ptftopl_DEPENDENCIES)
- @rm -f ptftopl$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(ptftopl_OBJECTS) $(ptftopl_LDADD) $(LIBS)
synctexdir/synctex-synctex_main.$(OBJEXT): synctexdir/$(am__dirstamp) \
synctexdir/$(DEPDIR)/$(am__dirstamp)
@@ -8637,13 +8634,11 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ovf2ovp.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ovp2ovf.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/patgen.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pbibtex-pbibtex.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdftex-dummy.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdftex-pdftex-pool.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdftex-pdftex0.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdftex-pdftexini.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdftosrc-dummy.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdvitype-pdvitype.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pktogf.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pktype.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pltotf.Po at am__quote@ # am--include-marker
@@ -8660,11 +8655,9 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-psvgout.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-ptfmin.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pooltype.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ppltotf-ppltotf.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptex-ptex-pool.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptex-ptex0.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptex-ptexini.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptftopl-ptftopl.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tangle.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tangleboot.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tex-tex-pool.Po at am__quote@ # am--include-marker
@@ -17952,20 +17945,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpost-mpxout.obj `if test -f 'mpxout.c'; then $(CYGPATH_W) 'mpxout.c'; else $(CYGPATH_W) '$(srcdir)/mpxout.c'; fi`
-pbibtex-pbibtex.o: pbibtex.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pbibtex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pbibtex-pbibtex.o -MD -MP -MF $(DEPDIR)/pbibtex-pbibtex.Tpo -c -o pbibtex-pbibtex.o `test -f 'pbibtex.c' || echo '$(srcdir)/'`pbibtex.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pbibtex-pbibtex.Tpo $(DEPDIR)/pbibtex-pbibtex.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pbibtex.c' object='pbibtex-pbibtex.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pbibtex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pbibtex-pbibtex.o `test -f 'pbibtex.c' || echo '$(srcdir)/'`pbibtex.c
-
-pbibtex-pbibtex.obj: pbibtex.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pbibtex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pbibtex-pbibtex.obj -MD -MP -MF $(DEPDIR)/pbibtex-pbibtex.Tpo -c -o pbibtex-pbibtex.obj `if test -f 'pbibtex.c'; then $(CYGPATH_W) 'pbibtex.c'; else $(CYGPATH_W) '$(srcdir)/pbibtex.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pbibtex-pbibtex.Tpo $(DEPDIR)/pbibtex-pbibtex.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pbibtex.c' object='pbibtex-pbibtex.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pbibtex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pbibtex-pbibtex.obj `if test -f 'pbibtex.c'; then $(CYGPATH_W) 'pbibtex.c'; else $(CYGPATH_W) '$(srcdir)/pbibtex.c'; fi`
-
pdftexdir/pdftex-pdftexextra.o: pdftexdir/pdftexextra.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/pdftex-pdftexextra.o -MD -MP -MF pdftexdir/$(DEPDIR)/pdftex-pdftexextra.Tpo -c -o pdftexdir/pdftex-pdftexextra.o `test -f 'pdftexdir/pdftexextra.c' || echo '$(srcdir)/'`pdftexdir/pdftexextra.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/pdftex-pdftexextra.Tpo pdftexdir/$(DEPDIR)/pdftex-pdftexextra.Po
@@ -18036,20 +18015,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftex-pdftex-pool.obj `if test -f 'pdftex-pool.c'; then $(CYGPATH_W) 'pdftex-pool.c'; else $(CYGPATH_W) '$(srcdir)/pdftex-pool.c'; fi`
-pdvitype-pdvitype.o: pdvitype.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdvitype-pdvitype.o -MD -MP -MF $(DEPDIR)/pdvitype-pdvitype.Tpo -c -o pdvitype-pdvitype.o `test -f 'pdvitype.c' || echo '$(srcdir)/'`pdvitype.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pdvitype-pdvitype.Tpo $(DEPDIR)/pdvitype-pdvitype.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdvitype.c' object='pdvitype-pdvitype.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdvitype-pdvitype.o `test -f 'pdvitype.c' || echo '$(srcdir)/'`pdvitype.c
-
-pdvitype-pdvitype.obj: pdvitype.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdvitype-pdvitype.obj -MD -MP -MF $(DEPDIR)/pdvitype-pdvitype.Tpo -c -o pdvitype-pdvitype.obj `if test -f 'pdvitype.c'; then $(CYGPATH_W) 'pdvitype.c'; else $(CYGPATH_W) '$(srcdir)/pdvitype.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pdvitype-pdvitype.Tpo $(DEPDIR)/pdvitype-pdvitype.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdvitype.c' object='pdvitype-pdvitype.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdvitype-pdvitype.obj `if test -f 'pdvitype.c'; then $(CYGPATH_W) 'pdvitype.c'; else $(CYGPATH_W) '$(srcdir)/pdvitype.c'; fi`
-
pmpost-pmp.o: pmp.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmp.o -MD -MP -MF $(DEPDIR)/pmpost-pmp.Tpo -c -o pmpost-pmp.o `test -f 'pmp.c' || echo '$(srcdir)/'`pmp.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmp.Tpo $(DEPDIR)/pmpost-pmp.Po
@@ -18218,20 +18183,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-ptfmin.obj `if test -f 'ptfmin.c'; then $(CYGPATH_W) 'ptfmin.c'; else $(CYGPATH_W) '$(srcdir)/ptfmin.c'; fi`
-ppltotf-ppltotf.o: ppltotf.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppltotf-ppltotf.o -MD -MP -MF $(DEPDIR)/ppltotf-ppltotf.Tpo -c -o ppltotf-ppltotf.o `test -f 'ppltotf.c' || echo '$(srcdir)/'`ppltotf.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ppltotf-ppltotf.Tpo $(DEPDIR)/ppltotf-ppltotf.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ppltotf.c' object='ppltotf-ppltotf.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppltotf-ppltotf.o `test -f 'ppltotf.c' || echo '$(srcdir)/'`ppltotf.c
-
-ppltotf-ppltotf.obj: ppltotf.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppltotf-ppltotf.obj -MD -MP -MF $(DEPDIR)/ppltotf-ppltotf.Tpo -c -o ppltotf-ppltotf.obj `if test -f 'ppltotf.c'; then $(CYGPATH_W) 'ppltotf.c'; else $(CYGPATH_W) '$(srcdir)/ppltotf.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ppltotf-ppltotf.Tpo $(DEPDIR)/ppltotf-ppltotf.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ppltotf.c' object='ppltotf-ppltotf.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppltotf-ppltotf.obj `if test -f 'ppltotf.c'; then $(CYGPATH_W) 'ppltotf.c'; else $(CYGPATH_W) '$(srcdir)/ppltotf.c'; fi`
-
ptexdir/ptex-ptexextra.o: ptexdir/ptexextra.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptexdir/ptex-ptexextra.o -MD -MP -MF ptexdir/$(DEPDIR)/ptex-ptexextra.Tpo -c -o ptexdir/ptex-ptexextra.o `test -f 'ptexdir/ptexextra.c' || echo '$(srcdir)/'`ptexdir/ptexextra.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ptexdir/$(DEPDIR)/ptex-ptexextra.Tpo ptexdir/$(DEPDIR)/ptex-ptexextra.Po
@@ -18302,20 +18253,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptex-pool.obj `if test -f 'ptex-pool.c'; then $(CYGPATH_W) 'ptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/ptex-pool.c'; fi`
-ptftopl-ptftopl.o: ptftopl.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptftopl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptftopl-ptftopl.o -MD -MP -MF $(DEPDIR)/ptftopl-ptftopl.Tpo -c -o ptftopl-ptftopl.o `test -f 'ptftopl.c' || echo '$(srcdir)/'`ptftopl.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptftopl-ptftopl.Tpo $(DEPDIR)/ptftopl-ptftopl.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptftopl.c' object='ptftopl-ptftopl.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptftopl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptftopl-ptftopl.o `test -f 'ptftopl.c' || echo '$(srcdir)/'`ptftopl.c
-
-ptftopl-ptftopl.obj: ptftopl.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptftopl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptftopl-ptftopl.obj -MD -MP -MF $(DEPDIR)/ptftopl-ptftopl.Tpo -c -o ptftopl-ptftopl.obj `if test -f 'ptftopl.c'; then $(CYGPATH_W) 'ptftopl.c'; else $(CYGPATH_W) '$(srcdir)/ptftopl.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptftopl-ptftopl.Tpo $(DEPDIR)/ptftopl-ptftopl.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptftopl.c' object='ptftopl-ptftopl.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptftopl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptftopl-ptftopl.obj `if test -f 'ptftopl.c'; then $(CYGPATH_W) 'ptftopl.c'; else $(CYGPATH_W) '$(srcdir)/ptftopl.c'; fi`
-
synctexdir/synctex-synctex_main.o: synctexdir/synctex_main.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(synctex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/synctex-synctex_main.o -MD -MP -MF synctexdir/$(DEPDIR)/synctex-synctex_main.Tpo -c -o synctexdir/synctex-synctex_main.o `test -f 'synctexdir/synctex_main.c' || echo '$(srcdir)/'`synctexdir/synctex_main.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/synctex-synctex_main.Tpo synctexdir/$(DEPDIR)/synctex-synctex_main.Po
@@ -20024,13 +19961,11 @@
-rm -f ./$(DEPDIR)/ovf2ovp.Po
-rm -f ./$(DEPDIR)/ovp2ovf.Po
-rm -f ./$(DEPDIR)/patgen.Po
- -rm -f ./$(DEPDIR)/pbibtex-pbibtex.Po
-rm -f ./$(DEPDIR)/pdftex-dummy.Po
-rm -f ./$(DEPDIR)/pdftex-pdftex-pool.Po
-rm -f ./$(DEPDIR)/pdftex-pdftex0.Po
-rm -f ./$(DEPDIR)/pdftex-pdftexini.Po
-rm -f ./$(DEPDIR)/pdftosrc-dummy.Po
- -rm -f ./$(DEPDIR)/pdvitype-pdvitype.Po
-rm -f ./$(DEPDIR)/pktogf.Po
-rm -f ./$(DEPDIR)/pktype.Po
-rm -f ./$(DEPDIR)/pltotf.Po
@@ -20047,11 +19982,9 @@
-rm -f ./$(DEPDIR)/pmpost-psvgout.Po
-rm -f ./$(DEPDIR)/pmpost-ptfmin.Po
-rm -f ./$(DEPDIR)/pooltype.Po
- -rm -f ./$(DEPDIR)/ppltotf-ppltotf.Po
-rm -f ./$(DEPDIR)/ptex-ptex-pool.Po
-rm -f ./$(DEPDIR)/ptex-ptex0.Po
-rm -f ./$(DEPDIR)/ptex-ptexini.Po
- -rm -f ./$(DEPDIR)/ptftopl-ptftopl.Po
-rm -f ./$(DEPDIR)/tangle.Po
-rm -f ./$(DEPDIR)/tangleboot.Po
-rm -f ./$(DEPDIR)/tex-tex-pool.Po
@@ -20808,13 +20741,11 @@
-rm -f ./$(DEPDIR)/ovf2ovp.Po
-rm -f ./$(DEPDIR)/ovp2ovf.Po
-rm -f ./$(DEPDIR)/patgen.Po
- -rm -f ./$(DEPDIR)/pbibtex-pbibtex.Po
-rm -f ./$(DEPDIR)/pdftex-dummy.Po
-rm -f ./$(DEPDIR)/pdftex-pdftex-pool.Po
-rm -f ./$(DEPDIR)/pdftex-pdftex0.Po
-rm -f ./$(DEPDIR)/pdftex-pdftexini.Po
-rm -f ./$(DEPDIR)/pdftosrc-dummy.Po
- -rm -f ./$(DEPDIR)/pdvitype-pdvitype.Po
-rm -f ./$(DEPDIR)/pktogf.Po
-rm -f ./$(DEPDIR)/pktype.Po
-rm -f ./$(DEPDIR)/pltotf.Po
@@ -20831,11 +20762,9 @@
-rm -f ./$(DEPDIR)/pmpost-psvgout.Po
-rm -f ./$(DEPDIR)/pmpost-ptfmin.Po
-rm -f ./$(DEPDIR)/pooltype.Po
- -rm -f ./$(DEPDIR)/ppltotf-ppltotf.Po
-rm -f ./$(DEPDIR)/ptex-ptex-pool.Po
-rm -f ./$(DEPDIR)/ptex-ptex0.Po
-rm -f ./$(DEPDIR)/ptex-ptexini.Po
- -rm -f ./$(DEPDIR)/ptftopl-ptftopl.Po
-rm -f ./$(DEPDIR)/tangle.Po
-rm -f ./$(DEPDIR)/tangleboot.Po
-rm -f ./$(DEPDIR)/tex-tex-pool.Po
@@ -22148,40 +22077,21 @@
# Generate ptex.ch
ptex.ch: tie$(EXEEXT) ptex.web $(ptex_ch_srcs)
$(tie_c) ptex.web $(ptex_ch_srcs)
-pbibtex.c pbibtex.h: pbibtex-web2c
- @$(web2c) pbibtex
-pbibtex-web2c: pbibtex.p $(web2c_depend) ptexdir/ptex.defines web2c/cvtbib.sed
- @$(web2c) pbibtex
-pbibtex.p: tangle$(EXEEXT) pbibtex.web ptexdir/pbibtex.ch
- $(p_tangle) pbibtex pbibtex
-pbibtex.web: tie$(EXEEXT) bibtex.web bibtex.ch
- $(tie_m) bibtex.web bibtex.ch
-pdvitype.c pdvitype.h: pdvitype-web2c
- @$(web2c) pdvitype
-pdvitype-web2c: pdvitype.p $(web2c_depend) ptexdir/ptex.defines
- @$(web2c) pdvitype
-pdvitype.p: tangle$(EXEEXT) pdvitype.web ptexdir/pdvitype.ch
- $(p_tangle) pdvitype pdvitype
-pdvitype.web: tie$(EXEEXT) dvitype.web dvitype.ch
- $(tie_m) dvitype.web dvitype.ch
-ppltotf.c ppltotf.h: ppltotf-web2c
- @$(web2c) ppltotf
-ppltotf-web2c: ppltotf.p $(web2c_depend) ptexdir/ptex.defines
- @$(web2c) ppltotf
-ppltotf.p: tangle$(EXEEXT) ppltotf.web ptexdir/ppltotf.ch
- $(p_tangle) ppltotf ppltotf
-ppltotf.web: tie$(EXEEXT) pltotf.web pltotf.ch
- $(tie_m) pltotf.web pltotf.ch
-ptftopl.c ptftopl.h: ptftopl-web2c
- @$(web2c) ptftopl
-ptftopl-web2c: ptftopl.p $(web2c_depend) ptexdir/ptex.defines
- @$(web2c) ptftopl
-ptftopl.p: tangle$(EXEEXT) ptftopl.web ptexdir/ptftopl.ch
- $(p_tangle) ptftopl ptftopl
-ptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch
- $(tie_m) tftopl.web tftopl.ch
ptexdir/ptriptest.log: ptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
ptexdir/pver.log: ptex$(EXEEXT)
+#pweb_tests = \
+# ptexdir/pbibtex.test \
+# ptexdir/pdvitype.test \
+# ptexdir/ppltotf.test \
+# ptexdir/ptftopl.test
+#pweb_tests += \
+# ptexdir/pbibtex-openout-test.pl ptexdir/pbibtex-longline-test.pl \
+# ptexdir/pbibtex-mem.test ptexdir/nissya.test
+#pweb_tests += \
+# ptexdir/sample.test
+# ppPLtoTF/pTFtoPL
+#pweb_tests += \
+# ptexdir/yokotate.test ptexdir/skipjfmp.test
ptexdir/pbibtex.log: pbibtex$(EXEEXT)
ptexdir/pdvitype.log: pdvitype$(EXEEXT)
ptexdir/ppltotf.log: ppltotf$(EXEEXT)
Modified: trunk/Build/source/texk/web2c/ptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/ChangeLog 2022-12-03 12:53:58 UTC (rev 65177)
+++ trunk/Build/source/texk/web2c/ptexdir/ChangeLog 2022-12-03 12:54:04 UTC (rev 65178)
@@ -1,6 +1,15 @@
+2022-12-03 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ am/ptex.am:
+ Merge change files/binaries for pTeX tools into upTeX tools.
+ Now pTeX tools (pbibtex, pdvitype, ppltotf, ptftopl) run
+ as the compatible mode.
+ https://github.com/texjporg/tex-jp-build/issues/32
+ https://github.com/texjporg/tex-jp-build/issues/154
+
2022-11-27 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
- * tests/{nissya,pdvitype,yokotate}.test, tests/nissya_bib.bbl,
+ * {nissya,pdvitype,yokotate}.test, tests/nissya_bib.bbl,
tests/chcode.pl, tests/chcode-{jis,utf8,euc,sjis}.pl, tests/chcode.tfm,
tests/ptex[34].{tex,dvi}, tests/ptex[34]a-{jis,utf8}.typ, am/ptex.am:
Add tests for pTeX compatible mode of tools for upTeX.
@@ -32,7 +41,7 @@
Check options before initialization of kpathsearch parameters.
This change prevents unwanted looking for texmf.cnf.
https://github.com/texjporg/tex-jp-build/issues/145
- * tests/pbibtex.test, am/ptex.am:
+ * pbibtex.test, am/ptex.am:
Update tests for pBibTeX.
2022-09-01 Hironori Kitagawa <h_kitagawa2001 at yahoo.co.jp>
@@ -46,7 +55,7 @@
* kanji.[ch], pbibtex.ch:
Support guessing input file encodings.
https://github.com/texjporg/tex-jp-build/issues/142
- * tests/pbibtex.test, am/ptex.am:
+ * pbibtex.test, am/ptex.am:
Add tests for guess encodings & pBibTeX.
2022-05-15 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
Modified: trunk/Build/source/texk/web2c/ptexdir/am/ptex.am
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/am/ptex.am 2022-12-03 12:53:58 UTC (rev 65177)
+++ trunk/Build/source/texk/web2c/ptexdir/am/ptex.am 2022-12-03 12:54:04 UTC (rev 65178)
@@ -10,7 +10,7 @@
ptex_dependencies = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(ZLIB_DEPEND) $(default_dependencies)
p_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/ptexdir:$(srcdir) $(buildenv) $(TANGLE)
-pweb_programs = pbibtex pdvitype ppltotf ptftopl
+#pweb_programs = pbibtex pdvitype ppltotf ptftopl
## pTeX library
##
@@ -30,10 +30,10 @@
if PTEX
bin_PROGRAMS += ptex
endif PTEX
-if PWEB
-bin_PROGRAMS += $(pweb_programs)
-endif PWEB
-EXTRA_PROGRAMS += ptex $(pweb_programs)
+#if PWEB
+#bin_PROGRAMS += $(pweb_programs)
+#endif PWEB
+#EXTRA_PROGRAMS += ptex $(pweb_programs)
ptex_CPPFLAGS = $(ptex_cppflags)
@@ -94,71 +94,71 @@
## pBibTeX
##
-nodist_pbibtex_SOURCES = pbibtex.c pbibtex.h
-pbibtex_SOURCES = ptexdir/kanji.h
-pbibtex_CPPFLAGS = $(ptex_cppflags)
-pbibtex_LDADD = $(ptex_ldadd)
-pbibtex_DEPENDENCIES = $(ptex_dependencies)
-pbibtex.c pbibtex.h: pbibtex-web2c
- @$(web2c) pbibtex
-pbibtex-web2c: pbibtex.p $(web2c_depend) ptexdir/ptex.defines web2c/cvtbib.sed
- @$(web2c) pbibtex
-pbibtex.p: tangle$(EXEEXT) pbibtex.web ptexdir/pbibtex.ch
- $(p_tangle) pbibtex pbibtex
-pbibtex.web: tie$(EXEEXT) bibtex.web bibtex.ch
- $(tie_m) bibtex.web bibtex.ch
-EXTRA_DIST += ptexdir/pbibtex.ch web2c/cvtbib.sed
+#nodist_pbibtex_SOURCES = pbibtex.c pbibtex.h
+#pbibtex_SOURCES = ptexdir/kanji.h
+#pbibtex_CPPFLAGS = $(ptex_cppflags)
+#pbibtex_LDADD = $(ptex_ldadd)
+#pbibtex_DEPENDENCIES = $(ptex_dependencies)
+#pbibtex.c pbibtex.h: pbibtex-web2c
+# @$(web2c) pbibtex
+#pbibtex-web2c: pbibtex.p $(web2c_depend) ptexdir/ptex.defines web2c/cvtbib.sed
+# @$(web2c) pbibtex
+#pbibtex.p: tangle$(EXEEXT) pbibtex.web ptexdir/pbibtex.ch
+# $(p_tangle) pbibtex pbibtex
+#pbibtex.web: tie$(EXEEXT) bibtex.web bibtex.ch
+# $(tie_m) bibtex.web bibtex.ch
+#EXTRA_DIST += ptexdir/pbibtex.ch web2c/cvtbib.sed
## pDVItype
##
-nodist_pdvitype_SOURCES = pdvitype.c pdvitype.h
-pdvitype_SOURCES = ptexdir/kanji.h
-pdvitype_CPPFLAGS = $(ptex_cppflags) -DHEX_CHAR_CODE
-pdvitype_LDADD = $(ptex_ldadd)
-pdvitype_DEPENDENCIES = $(ptex_dependencies)
-pdvitype.c pdvitype.h: pdvitype-web2c
- @$(web2c) pdvitype
-pdvitype-web2c: pdvitype.p $(web2c_depend) ptexdir/ptex.defines
- @$(web2c) pdvitype
-pdvitype.p: tangle$(EXEEXT) pdvitype.web ptexdir/pdvitype.ch
- $(p_tangle) pdvitype pdvitype
-pdvitype.web: tie$(EXEEXT) dvitype.web dvitype.ch
- $(tie_m) dvitype.web dvitype.ch
-EXTRA_DIST += ptexdir/pdvitype.ch
+#nodist_pdvitype_SOURCES = pdvitype.c pdvitype.h
+#pdvitype_SOURCES = ptexdir/kanji.h
+#pdvitype_CPPFLAGS = $(ptex_cppflags) -DHEX_CHAR_CODE
+#pdvitype_LDADD = $(ptex_ldadd)
+#pdvitype_DEPENDENCIES = $(ptex_dependencies)
+#pdvitype.c pdvitype.h: pdvitype-web2c
+# @$(web2c) pdvitype
+#pdvitype-web2c: pdvitype.p $(web2c_depend) ptexdir/ptex.defines
+# @$(web2c) pdvitype
+#pdvitype.p: tangle$(EXEEXT) pdvitype.web ptexdir/pdvitype.ch
+# $(p_tangle) pdvitype pdvitype
+#pdvitype.web: tie$(EXEEXT) dvitype.web dvitype.ch
+# $(tie_m) dvitype.web dvitype.ch
+#EXTRA_DIST += ptexdir/pdvitype.ch
## pPLtoTF
##
-nodist_ppltotf_SOURCES = ppltotf.c ppltotf.h
-ppltotf_SOURCES = ptexdir/kanji.h
-ppltotf_CPPFLAGS = $(ptex_cppflags) -DPRESERVE_PUTC
-ppltotf_LDADD = $(ptex_ldadd)
-ppltotf_DEPENDENCIES = $(ptex_dependencies)
-ppltotf.c ppltotf.h: ppltotf-web2c
- @$(web2c) ppltotf
-ppltotf-web2c: ppltotf.p $(web2c_depend) ptexdir/ptex.defines
- @$(web2c) ppltotf
-ppltotf.p: tangle$(EXEEXT) ppltotf.web ptexdir/ppltotf.ch
- $(p_tangle) ppltotf ppltotf
-ppltotf.web: tie$(EXEEXT) pltotf.web pltotf.ch
- $(tie_m) pltotf.web pltotf.ch
-EXTRA_DIST += ptexdir/ppltotf.ch
+#nodist_ppltotf_SOURCES = ppltotf.c ppltotf.h
+#ppltotf_SOURCES = ptexdir/kanji.h
+#ppltotf_CPPFLAGS = $(ptex_cppflags) -DPRESERVE_PUTC
+#ppltotf_LDADD = $(ptex_ldadd)
+#ppltotf_DEPENDENCIES = $(ptex_dependencies)
+#ppltotf.c ppltotf.h: ppltotf-web2c
+# @$(web2c) ppltotf
+#ppltotf-web2c: ppltotf.p $(web2c_depend) ptexdir/ptex.defines
+# @$(web2c) ppltotf
+#ppltotf.p: tangle$(EXEEXT) ppltotf.web ptexdir/ppltotf.ch
+# $(p_tangle) ppltotf ppltotf
+#ppltotf.web: tie$(EXEEXT) pltotf.web pltotf.ch
+# $(tie_m) pltotf.web pltotf.ch
+#EXTRA_DIST += ptexdir/ppltotf.ch
## pTFtoPL
##
-nodist_ptftopl_SOURCES = ptftopl.c ptftopl.h
-ptftopl_SOURCES = ptexdir/kanji.h
-ptftopl_CPPFLAGS = $(ptex_cppflags)
-ptftopl_LDADD = $(ptex_ldadd)
-ptftopl_DEPENDENCIES = $(ptex_dependencies)
-ptftopl.c ptftopl.h: ptftopl-web2c
- @$(web2c) ptftopl
-ptftopl-web2c: ptftopl.p $(web2c_depend) ptexdir/ptex.defines
- @$(web2c) ptftopl
-ptftopl.p: tangle$(EXEEXT) ptftopl.web ptexdir/ptftopl.ch
- $(p_tangle) ptftopl ptftopl
-ptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch
- $(tie_m) tftopl.web tftopl.ch
-EXTRA_DIST += ptexdir/ptftopl.ch
+#nodist_ptftopl_SOURCES = ptftopl.c ptftopl.h
+#ptftopl_SOURCES = ptexdir/kanji.h
+#ptftopl_CPPFLAGS = $(ptex_cppflags)
+#ptftopl_LDADD = $(ptex_ldadd)
+#ptftopl_DEPENDENCIES = $(ptex_dependencies)
+#ptftopl.c ptftopl.h: ptftopl-web2c
+# @$(web2c) ptftopl
+#ptftopl-web2c: ptftopl.p $(web2c_depend) ptexdir/ptex.defines
+# @$(web2c) ptftopl
+#ptftopl.p: tangle$(EXEEXT) ptftopl.web ptexdir/ptftopl.ch
+# $(p_tangle) ptftopl ptftopl
+#ptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch
+# $(tie_m) tftopl.web tftopl.ch
+#EXTRA_DIST += ptexdir/ptftopl.ch
##
EXTRA_DIST += \
@@ -174,21 +174,21 @@
ptex_tests = ptexdir/ptriptest.test ptexdir/pver.test
ptexdir/ptriptest.log: ptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
ptexdir/pver.log: ptex$(EXEEXT)
-pweb_tests = \
- ptexdir/pbibtex.test \
- ptexdir/pdvitype.test \
- ptexdir/ppltotf.test \
- ptexdir/ptftopl.test
+#pweb_tests = \
+# ptexdir/pbibtex.test \
+# ptexdir/pdvitype.test \
+# ptexdir/ppltotf.test \
+# ptexdir/ptftopl.test
## pBibTeX
-pweb_tests += \
- ptexdir/pbibtex-openout-test.pl ptexdir/pbibtex-longline-test.pl \
- ptexdir/pbibtex-mem.test ptexdir/nissya.test
+#pweb_tests += \
+# ptexdir/pbibtex-openout-test.pl ptexdir/pbibtex-longline-test.pl \
+# ptexdir/pbibtex-mem.test ptexdir/nissya.test
## pDviType
-pweb_tests += \
- ptexdir/sample.test
+#pweb_tests += \
+# ptexdir/sample.test
# ppPLtoTF/pTFtoPL
-pweb_tests += \
- ptexdir/yokotate.test ptexdir/skipjfmp.test
+#pweb_tests += \
+# ptexdir/yokotate.test ptexdir/skipjfmp.test
ptexdir/pbibtex.log: pbibtex$(EXEEXT)
ptexdir/pdvitype.log: pdvitype$(EXEEXT)
ptexdir/ppltotf.log: ppltotf$(EXEEXT)
Modified: trunk/Build/source/texk/web2c/uptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/ChangeLog 2022-12-03 12:53:58 UTC (rev 65177)
+++ trunk/Build/source/texk/web2c/uptexdir/ChangeLog 2022-12-03 12:54:04 UTC (rev 65178)
@@ -1,6 +1,16 @@
+2022-12-03 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * up{bibtex,dvitype,pltotf,tftopl}.ch, am/uptex.am:
+ Merge change files/binaries for pTeX tools into upTeX tools.
+ Now pTeX tools (pbibtex, pdvitype, ppltotf, ptftopl) run
+ as the compatible mode.
+ * upbibtex.ch: version j0.36-u1.29
+ https://github.com/texjporg/tex-jp-build/issues/32
+ https://github.com/texjporg/tex-jp-build/issues/154
+
2022-11-27 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
- * tests/{nissya,sample,skipjfmp,upbibtex-mem,updvitype,yokotate}.test,
+ * {nissya,sample,skipjfmp,upbibtex-mem,updvitype,yokotate}.test,
upbibtex-{longline,openout}-test.pl,
tests/uptex[34].{tex,dvi}, tests/uptex[34]a.typ, am/uptex.am:
Add tests for pTeX compatible mode of tools for upTeX.
@@ -26,7 +36,7 @@
Check options before initialization of kpathsearch parameters.
This change prevents unwanted looking for texmf.cnf.
https://github.com/texjporg/tex-jp-build/issues/145
- * tests/upbibtex.test, am/uptex.am:
+ * upbibtex.test, am/uptex.am:
Update tests for upBibTeX.
2022-09-01 Hironori Kitagawa <h_kitagawa2001 at yahoo.co.jp>
@@ -49,7 +59,7 @@
* kanji.[ch], upbibtex.ch:
Support guessing input file encodings.
https://github.com/texjporg/tex-jp-build/issues/142
- * tests/upbibtex.test, am/uptex.am:
+ * upbibtex.test, am/uptex.am:
Add tests for guess encodings & upBibTeX.
2022-05-15 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
Modified: trunk/Build/source/texk/web2c/uptexdir/am/uptex.am
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/am/uptex.am 2022-12-03 12:53:58 UTC (rev 65177)
+++ trunk/Build/source/texk/web2c/uptexdir/am/uptex.am 2022-12-03 12:54:04 UTC (rev 65178)
@@ -102,6 +102,7 @@
upbibtex.web: tie$(EXEEXT) bibtex.web bibtex.ch
$(tie_m) bibtex.web bibtex.ch
EXTRA_DIST += uptexdir/upbibtex.ch
+bin_links += upbibtex$(EXEEXT):pbibtex
## upDVItype
##
@@ -119,6 +120,7 @@
updvitype.web: tie$(EXEEXT) dvitype.web dvitype.ch
$(tie_m) dvitype.web dvitype.ch
EXTRA_DIST += uptexdir/updvitype.ch
+bin_links += updvitype$(EXEEXT):pdvitype
## upPLtoTF
##
@@ -136,6 +138,7 @@
uppltotf.web: tie$(EXEEXT) pltotf.web pltotf.ch
$(tie_m) pltotf.web pltotf.ch
EXTRA_DIST += uptexdir/uppltotf.ch
+bin_links += uppltotf$(EXEEXT):ppltotf
## upTFtoPL
##
@@ -153,6 +156,7 @@
uptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch
$(tie_m) tftopl.web tftopl.ch
EXTRA_DIST += uptexdir/uptftopl.ch
+bin_links += uptftopl$(EXEEXT):ptftopl
##
EXTRA_DIST += \
More information about the tex-live-commits
mailing list.