From 35b900f339f9ca5d181ccd4fd4256d91cc641461 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 8 Jan 2010 15:05:46 +0000 Subject: texk/web2c: minor build fixes git-svn-id: svn://tug.org/texlive/trunk@16641 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/Makefile.in | 83 +++++++++++++----------- Build/source/texk/web2c/luatexdir/am/luatex.am | 2 +- Build/source/texk/web2c/pdftexdir/am/pdftex.am | 3 + Build/source/texk/web2c/synctexdir/am/synctex.am | 4 +- 4 files changed, 50 insertions(+), 42 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index c064ab9f83a..c2d48b23193 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -150,12 +150,8 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ @OTANGLE_TRUE@am__append_33 = $(omegaware_tools) @OMFONTS_FALSE@@OTANGLE_TRUE@am__append_34 = $(omegaware_font_tools) -@OTANGLE_TRUE@am__append_35 = omegaware/odvicopy.test omegaware/odvitype.test \ -@OTANGLE_TRUE@ omegaware/otangle.test - -@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_36 = omegaware/level1.test omegaware/ofonts.test \ -@OMFONTS_FALSE@@OTANGLE_TRUE@ omegaware/omfonts.test omegaware/specialhex.test - +@OTANGLE_TRUE@am__append_35 = $(OTANGLE_tests) +@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_36 = $(OMFONTS_tests) @OTANGLE_TRUE@am__append_37 = pltotf tftopl @ALEPH_TRUE@am__append_38 = aleph @TEX_SYNCTEX_TRUE@am__append_39 = -I$(srcdir)/synctexdir \ @@ -173,7 +169,7 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ @ETEX_SYNCTEX_TRUE@ synctex-e.c @PDFTEX_SYNCTEX_TRUE@am__append_47 = -I$(srcdir)/synctexdir \ -@PDFTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ +@PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__ @PDFTEX_SYNCTEX_TRUE@am__append_48 = \ @PDFTEX_SYNCTEX_TRUE@ synctex-pdf.c @@ -1288,32 +1284,30 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \ xetexdir/LICENSE.txt xetexdir/xetex.mk omegaware/README \ omegaware/ChangeLog $(odvicopy_sources) $(odvitype_sources) \ $(ofm2opl_sources) $(opl2ofm_sources) $(otangle_sources) \ - $(ovf2ovp_sources) $(ovp2ovf_sources) omegaware/level1.test \ - omegaware/odvicopy.test omegaware/odvitype.test \ - omegaware/ofonts.test omegaware/omfonts.test \ - omegaware/otangle.test omegaware/specialhex.test \ - omegaware/tests/level1.opl omegaware/tests/ofontd1.dvi \ - omegaware/tests/ofontd1.typ omegaware/tests/ofontd2.dvi \ - omegaware/tests/ofontd2.typ omegaware/tests/ofontd3.dvi \ - omegaware/tests/ofontd3.typ omegaware/tests/ofontr1.vf \ - omegaware/tests/ofontr2.ovf omegaware/tests/ofontr3.ovf \ - omegaware/tests/ofontv4.vf omegaware/tests/ofontv5.ovf \ - omegaware/tests/ofontv6.ovf omegaware/tests/ofontd0.dtl \ - omegaware/tests/ofontd0.dvi omegaware/tests/ofontd0.typ \ - omegaware/tests/ofontr0.tfm omegaware/tests/ofontr1.tfm \ - omegaware/tests/ofontr2.ofm omegaware/tests/ofontr3.ofm \ - omegaware/tests/ofontv4.tfm omegaware/tests/ofontv5.ofm \ - omegaware/tests/ofontv6.ofm omegaware/tests/ofontr0.pl \ - omegaware/tests/ofontr1.pl omegaware/tests/ofontr1.vpl \ - omegaware/tests/ofontr2.opl omegaware/tests/ofontr2.ovp \ - omegaware/tests/ofontr3.opl omegaware/tests/ofontr3.ovp \ - omegaware/tests/ofontv4.pl omegaware/tests/ofontv4.vpl \ - omegaware/tests/ofontv5.opl omegaware/tests/ofontv5.ovp \ - omegaware/tests/ofontv6.opl omegaware/tests/ofontv6.ovp \ - omegaware/tests/Cherokee.pl omegaware/tests/OCherokee.ovp \ - omegaware/tests/specialhex.ovp $(aleph_web_srcs) \ - $(aleph_ch_srcs) lib/texmfmp.c alephdir/ChangeLog \ - alephdir/Makefile alephdir/aleph.defines \ + $(ovf2ovp_sources) $(ovp2ovf_sources) $(OTANGLE_tests) \ + $(OMFONTS_tests) omegaware/tests/level1.opl \ + omegaware/tests/ofontd1.dvi omegaware/tests/ofontd1.typ \ + omegaware/tests/ofontd2.dvi omegaware/tests/ofontd2.typ \ + omegaware/tests/ofontd3.dvi omegaware/tests/ofontd3.typ \ + omegaware/tests/ofontr1.vf omegaware/tests/ofontr2.ovf \ + omegaware/tests/ofontr3.ovf omegaware/tests/ofontv4.vf \ + omegaware/tests/ofontv5.ovf omegaware/tests/ofontv6.ovf \ + omegaware/tests/ofontd0.dtl omegaware/tests/ofontd0.dvi \ + omegaware/tests/ofontd0.typ omegaware/tests/ofontr0.tfm \ + omegaware/tests/ofontr1.tfm omegaware/tests/ofontr2.ofm \ + omegaware/tests/ofontr3.ofm omegaware/tests/ofontv4.tfm \ + omegaware/tests/ofontv5.ofm omegaware/tests/ofontv6.ofm \ + omegaware/tests/ofontr0.pl omegaware/tests/ofontr1.pl \ + omegaware/tests/ofontr1.vpl omegaware/tests/ofontr2.opl \ + omegaware/tests/ofontr2.ovp omegaware/tests/ofontr3.opl \ + omegaware/tests/ofontr3.ovp omegaware/tests/ofontv4.pl \ + omegaware/tests/ofontv4.vpl omegaware/tests/ofontv5.opl \ + omegaware/tests/ofontv5.ovp omegaware/tests/ofontv6.opl \ + omegaware/tests/ofontv6.ovp omegaware/tests/Cherokee.pl \ + omegaware/tests/OCherokee.ovp omegaware/tests/repeat.opl \ + omegaware/tests/repeated.opl omegaware/tests/specialhex.ovp \ + $(aleph_web_srcs) $(aleph_ch_srcs) lib/texmfmp.c \ + alephdir/ChangeLog alephdir/Makefile alephdir/aleph.defines \ alephdir/aleph.version alephdir/eomega.ech alephdir/etex.ch \ alephdir/omega.ch0 alephdir/omega.ch1 alephdir/omega.ch2 \ alephdir/omxml.ch alephdir/aleph-pool.h alephdir/aleph.mk \ @@ -1366,10 +1360,11 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \ omegaware/tests/Cherokee.tfm omegaware/tests/OCherokee.ofm \ omegaware/tests/OCherokee.opl omegaware/tests/OCherokee.ovf \ omegaware/tests/xCherokee.* omegaware/tests/xOCherokee.* \ - cftest.p omegaware/tests/specialhex.ofm \ - omegaware/tests/specialhex.opl omegaware/tests/specialhex.ovf \ - omegaware/tests/xspecialhex.* $(nodist_aleph_SOURCES) \ - aleph.web aleph.ch aleph-web2c aleph.p aleph.pool aleph-tangle + cftest.p omegaware/tests/xrepeated.* \ + omegaware/tests/specialhex.ofm omegaware/tests/specialhex.opl \ + omegaware/tests/specialhex.ovf omegaware/tests/xspecialhex.* \ + $(nodist_aleph_SOURCES) aleph.web aleph.ch aleph-web2c aleph.p \ + aleph.pool aleph-tangle CLEANFILES = web2c = $(SHELL) ./web2c-sh $@ makecpool = web2c/makecpool @@ -2105,6 +2100,13 @@ nodist_ovf2ovp_SOURCES = ovf2ovp.c ovf2ovp.h ovf2ovp_sources = omegaware/ovf2ovp.web omegaware/ovf2ovp.ch nodist_ovp2ovf_SOURCES = ovp2ovf.c ovp2ovf.h ovp2ovf_sources = omegaware/ovp2ovf.web omegaware/ovp2ovf.ch +OTANGLE_tests = omegaware/odvicopy.test omegaware/odvitype.test \ + omegaware/otangle.test + +OMFONTS_tests = omegaware/level1.test omegaware/ofonts.test \ + omegaware/omfonts.test omegaware/repeat.test \ + omegaware/specialhex.test + # With --enable-ipc, Aleph may need to link with -lsocket. aleph_LDADD = $(LDADD) $(ipc_socketlibs) @@ -8274,6 +8276,9 @@ etrip-clean: rm -f etrip.fot etrip.log etrip.dvi etrip.out etrip.typ rm -f tripos.tex 8terminal.tex rm -rf tfm + +# We must create libpdftex.a (and zlib) before building the pdftex_OBJECTS. +$(pdftex_OBJECTS): libpdftex.a $(ZLIB_DEPEND) $(pdftex_c_h): pdftex-web2c @$(web2c) pdftex pdftex-web2c: pdftex.p $(web2c_texmf) pdftexdir/pdftex.defines @@ -8304,7 +8309,7 @@ $(libpdftex_a_OBJECTS): pdftexd.h $(pdftosrc_OBJECTS): $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND) libpdftex.a -# We must create libluatex.a and libmplib.a before building the etex_OBJECTS. +# We must create libluatex.a and libmplib.a before building the luatex_OBJECTS. $(luatex_OBJECTS): libluatex.a libmplib.a $(luatex_c_h): luatex-web2c @$(web2c) luatex @@ -8463,7 +8468,7 @@ synctex.c: texd.h synctexdir/synctex.c $(dist_tex_SOURCES) synctex-e.c: etexd.h synctexdir/synctex.c $(dist_etex_SOURCES) sed s/TEX-OR-MF-OR-MP/etex/ $(srcdir)/synctexdir/synctex.c >$@ -synctex-pdf.c: pdftexd.h synctexdir/synctex.c $(dist_pdftex_SOURCES) $(ZLIB_DEPEND) +synctex-pdf.c: pdftexd.h synctexdir/synctex.c $(dist_pdftex_SOURCES) sed s/TEX-OR-MF-OR-MP/pdftex/ $(srcdir)/synctexdir/synctex.c >$@ synctex-xe.c: xetexd.h synctexdir/synctex.c $(dist_xetex_SOURCES) diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am index d26b6975a10..19975de2574 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatex.am +++ b/Build/source/texk/web2c/luatexdir/am/luatex.am @@ -32,7 +32,7 @@ luatex_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) libluatex.a luatex_DEPENDENCIES += $(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(XPDF_DEPEND) luatex_DEPENDENCIES += $(OBSDCOMPAT_DEPEND) libmd5.a libmplib.a -# We must create libluatex.a and libmplib.a before building the etex_OBJECTS. +# We must create libluatex.a and libmplib.a before building the luatex_OBJECTS. $(luatex_OBJECTS): libluatex.a libmplib.a luatex_c_h = luatexini.c luatex0.c luatexcoerce.h luatexd.h diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am index e73d21a2c0d..755759ad2b8 100644 --- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am +++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am @@ -36,6 +36,9 @@ pdftex_LDADD = libpdftex.a $(pdftex_ldadd) $(LDADD) $(ipc_socketlibs) pdftex_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a +# We must create libpdftex.a (and zlib) before building the pdftex_OBJECTS. +$(pdftex_OBJECTS): libpdftex.a $(ZLIB_DEPEND) + pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c pdftexextra.c pdftexdir/pdftexextra.h $(pdftex_c_h): pdftex-web2c diff --git a/Build/source/texk/web2c/synctexdir/am/synctex.am b/Build/source/texk/web2c/synctexdir/am/synctex.am index 78d59df3f83..730f4b27edd 100644 --- a/Build/source/texk/web2c/synctexdir/am/synctex.am +++ b/Build/source/texk/web2c/synctexdir/am/synctex.am @@ -123,7 +123,7 @@ EXTRA_DIST += \ if PDFTEX_SYNCTEX -pdftex_CPPFLAGS += -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) +pdftex_CPPFLAGS += -I$(srcdir)/synctexdir pdftex_ch_synctex = \ synctexdir/synctex-mem.ch0 \ @@ -148,7 +148,7 @@ pdftex_CPPFLAGS += -D__SyncTeX__ endif PDFTEX_SYNCTEX -synctex-pdf.c: pdftexd.h synctexdir/synctex.c $(dist_pdftex_SOURCES) $(ZLIB_DEPEND) +synctex-pdf.c: pdftexd.h synctexdir/synctex.c $(dist_pdftex_SOURCES) sed s/TEX-OR-MF-OR-MP/pdftex/ $(srcdir)/synctexdir/synctex.c >$@ EXTRA_DIST += \ -- cgit v1.2.3