From f5c4d1df6475f098e051b5c8a71ce506a2c0d802 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 12 Nov 2012 12:02:25 +0000 Subject: texk/web2c build system: Replace o_tangle => al_tangle git-svn-id: svn://tug.org/texlive/trunk@28237 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ChangeLog | 4 ++++ Build/source/texk/web2c/Makefile.am | 1 - Build/source/texk/web2c/Makefile.in | 6 +++--- Build/source/texk/web2c/alephdir/ChangeLog | 4 ++++ Build/source/texk/web2c/alephdir/am/aleph.am | 8 +++++--- 5 files changed, 16 insertions(+), 7 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index f842d6d14c8..561bf161ad0 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,7 @@ +2012-11-12 Peter Breitenlohner + + * Makefile.am: Drop o_tangle, no longer used. + 2012-11-11 Peter Breitenlohner * tex.ch: Move native buffer printing code from here ... diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am index bd99710effc..df72e01d9ec 100644 --- a/Build/source/texk/web2c/Makefile.am +++ b/Build/source/texk/web2c/Makefile.am @@ -114,7 +114,6 @@ tie = WEBINPUTS=.:$(srcdir) $(buildenv) $(TIE) # Calling tangle & Co. via tangle-sh (several output files) texmf_tangle = WEBINPUTS=.:$(srcdir) $(SHELL) ./tangle-sh $@ $(TANGLE) -o_tangle = WEBINPUTS=.:$(srcdir) $(SHELL) ./tangle-sh $@ $(OTANGLE) # For trip, trap, and other tests DIFF = diff diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 872f0679975..1d693493c5a 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -1732,7 +1732,6 @@ tie = WEBINPUTS=.:$(srcdir) $(buildenv) $(TIE) # Calling tangle & Co. via tangle-sh (several output files) texmf_tangle = WEBINPUTS=.:$(srcdir) $(SHELL) ./tangle-sh $@ $(TANGLE) -o_tangle = WEBINPUTS=.:$(srcdir) $(SHELL) ./tangle-sh $@ $(OTANGLE) # For trip, trap, and other tests DIFF = diff @@ -2674,6 +2673,7 @@ OMFONTS_tests = omegaware/level1.test omegaware/ofonts.test \ omegaware/omfonts.test omegaware/realnum.test omegaware/repeat.test \ omegaware/selectfont.test omegaware/specialhex.test +al_tangle = WEBINPUTS=.:$(srcdir) $(SHELL) ./tangle-sh $@ $(OTANGLE) # With --enable-ipc, Aleph may need to link with -lsocket. aleph_LDADD = $(LDADD) $(ipc_socketlibs) @@ -10366,9 +10366,9 @@ aleph-pool.c: aleph.pool alephd.h $(makecpool_stamp) # Tangling Aleph aleph.p aleph.pool: aleph-tangle - @$(o_tangle) aleph aleph + @$(al_tangle) aleph aleph aleph-tangle: otangle$(EXEEXT) aleph.web aleph.ch tangle-sh - @$(o_tangle) aleph aleph + @$(al_tangle) aleph aleph aleph.web: tie$(EXEEXT) $(aleph_web_srcs) $(tie) -m aleph.web $(aleph_web_srcs) aleph.ch: tie$(EXEEXT) aleph.web $(aleph_ch_srcs) diff --git a/Build/source/texk/web2c/alephdir/ChangeLog b/Build/source/texk/web2c/alephdir/ChangeLog index c8017bc61db..f47a90321df 100644 --- a/Build/source/texk/web2c/alephdir/ChangeLog +++ b/Build/source/texk/web2c/alephdir/ChangeLog @@ -1,3 +1,7 @@ +2012-11-12 Peter Breitenlohner + + * am/aleph.am: Define al_tangle and use it instead of o_tangle. + 2012-10-05 Peter Breitenlohner * aleph.c ({allocate,undump}{font,ocp}table): Correctly specify diff --git a/Build/source/texk/web2c/alephdir/am/aleph.am b/Build/source/texk/web2c/alephdir/am/aleph.am index 28649b0e814..0368e34594b 100644 --- a/Build/source/texk/web2c/alephdir/am/aleph.am +++ b/Build/source/texk/web2c/alephdir/am/aleph.am @@ -1,6 +1,6 @@ ## texk/web2c/alephdir/am/aleph.am: Makefile fragment for Aleph. ## -## Copyright (C) 2009-2011 Peter Breitenlohner +## Copyright (C) 2009-2012 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## Aleph @@ -10,6 +10,8 @@ bin_PROGRAMS += aleph endif ALEPH EXTRA_PROGRAMS += aleph +al_tangle = WEBINPUTS=.:$(srcdir) $(SHELL) ./tangle-sh $@ $(OTANGLE) + # With --enable-ipc, Aleph may need to link with -lsocket. aleph_LDADD = $(LDADD) $(ipc_socketlibs) @@ -37,9 +39,9 @@ aleph-pool.c: aleph.pool alephd.h $(makecpool_stamp) # Tangling Aleph aleph.p aleph.pool: aleph-tangle - @$(o_tangle) aleph aleph + @$(al_tangle) aleph aleph aleph-tangle: otangle$(EXEEXT) aleph.web aleph.ch tangle-sh - @$(o_tangle) aleph aleph + @$(al_tangle) aleph aleph # Generate aleph.web aleph_web_srcs = \ -- cgit v1.2.3