diff options
author | Martin Schröder <martin@oneiros.de> | 2006-12-27 00:52:58 +0000 |
---|---|---|
committer | Martin Schröder <martin@oneiros.de> | 2006-12-27 00:52:58 +0000 |
commit | 68449d47e27f3046fe6e2211d1a20507923077b3 (patch) | |
tree | c3a626cf3f61d72cdce8bd625133d8462e22a530 | |
parent | 8ae28df11b769a45b2373c4067f5cfff540000cb (diff) |
Fix problems introduced by merging pdftex 1.40
git-svn-id: svn://tug.org/texlive/trunk@2966 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Build/source/texk/web2c/Makefile.in | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/depend.mk | 13 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/omfonts.c | 3 | ||||
-rwxr-xr-x | Build/source/texk/web2c/web2c/convert | 2 |
4 files changed, 6 insertions, 18 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 49a3e985fb5..7e48950b166 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -426,9 +426,9 @@ dvitype_args = -output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*' # # Metafont -mf_c = mfini.c mf0.c mf1.c mf2.c -mf_o = mfini.o mf0.o mf1.o mf2.o mfextra.o -mfn_o = mfini.o mf0.o mf1.o mf2.o mfnowin.o +mf_c = mfini.c mf0.c mf1.c +mf_o = mfini.o mf0.o mf1.o mfextra.o +mfn_o = mfini.o mf0.o mf1.o mfnowin.o mf: $(mf_o) $(windowlib) $(kpathsea_link) $(mf_o) $(windowlink) $(LOADLIBES) mf-nowin: $(mfn_o) window/trap.o diff --git a/Build/source/texk/web2c/depend.mk b/Build/source/texk/web2c/depend.mk index b09e7126ff1..471b1a35914 100644 --- a/Build/source/texk/web2c/depend.mk +++ b/Build/source/texk/web2c/depend.mk @@ -352,19 +352,6 @@ mf1.o: mf1.c mfd.h texmfmp.h cpascal.h config.h $(kpathsea_srcdir)/config.h \ $(kpathsea_srcdir)/proginit.h $(kpathsea_srcdir)/tex-file.h help.h \ $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h \ $(kpathsea_srcdir)/tex-make.h texmfmem.h mfcoerce.h -mf2.o: mf2.c mfd.h texmfmp.h cpascal.h config.h $(kpathsea_srcdir)/config.h \ - $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/c-std.h \ - $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h \ - $(kpathsea_srcdir)/c-errno.h \ - $(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ - $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ - ../web2c/c-auto.h $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \ - $(kpathsea_srcdir)/getopt.h \ - $(kpathsea_srcdir)/proginit.h $(kpathsea_srcdir)/tex-file.h help.h \ - $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h \ - $(kpathsea_srcdir)/tex-make.h texmfmem.h mfcoerce.h mfextra.o: mfextra.c mfd.h texmfmp.h cpascal.h config.h \ $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \ diff --git a/Build/source/texk/web2c/omegafonts/omfonts.c b/Build/source/texk/web2c/omegafonts/omfonts.c index bfbbf7f429f..5d24af51b3a 100644 --- a/Build/source/texk/web2c/omegafonts/omfonts.c +++ b/Build/source/texk/web2c/omegafonts/omfonts.c @@ -178,7 +178,8 @@ main (int argc, string *argv) usagehelp (name_help, NULL); } else if (!strcmp(long_options[option_index ].name, "version")) { printversionandexit(name_msg, nil, - "J. Plaice, Y. Haralambous, D.E. Knuth"); + "J. Plaice, Y. Haralambous, D.E. Knuth", + nil); } else if (!strcmp(long_options[option_index ].name, "char-format")) { if (!strcmp(optarg, "ascii")) char_format = CHAR_CODE_ASCII; else if (!strcmp(optarg, "num")) char_format = CHAR_CODE_NUM; diff --git a/Build/source/texk/web2c/web2c/convert b/Build/source/texk/web2c/web2c/convert index 32b7bd78b6a..48d1f004304 100755 --- a/Build/source/texk/web2c/web2c/convert +++ b/Build/source/texk/web2c/web2c/convert @@ -57,7 +57,7 @@ case $basefile in hfile=texmfmp.h midcmd="| sed -f $srcdir/web2c/cvtmf2.sed" postcmd="| ./web2c/splitup $splitup_options $basefile" - cfile=${basefile}2.c # last output file, or thereabouts + cfile=${basefile}1.c # last output file, or thereabouts output= output_files="$basefile[0-9].c ${basefile}ini.c ${basefile}d.h \ ${basefile}coerce.h" |