diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-01-07 12:07:12 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-01-07 12:07:12 +0000 |
| commit | 1c2a7c6d12cd8d1cb6ca50cd0a71d2a1605fc4d4 (patch) | |
| tree | 4117cd024fa1de1fd9f28aa9050b2c8b6e7f5f0f /Build/source/texk/web2c/am | |
| parent | 9e12f984a50b65e418bec2d5f33536d5857e8d95 (diff) | |
Reorganize build system for TeX & MF engines
No more sed substitutions for *extra.[ch], they are now distributed
and #include lib/texmfmp.c resp. the generated */*_version.h
git-svn-id: svn://tug.org/texlive/trunk@20964 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/am')
| -rw-r--r-- | Build/source/texk/web2c/am/texmf.am | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am index 7c16c38e6f8..1d2c32900d5 100644 --- a/Build/source/texk/web2c/am/texmf.am +++ b/Build/source/texk/web2c/am/texmf.am @@ -1,6 +1,6 @@ ## texk/web2c/am/texmf.am: Makefile fragment for TeX and MF. ## -## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## Common for MF and TeX @@ -27,7 +27,8 @@ tex_LDADD = $(LDADD) $(ipc_socketlibs) # TeX C sources tex_c_h = texini.c tex0.c texcoerce.h texd.h -nodist_tex_SOURCES = $(tex_c_h) tex-pool.c texextra.c +nodist_tex_SOURCES = $(tex_c_h) tex-pool.c +dist_tex_SOURCES = texextra.c # We must create texd.h before building the tex_OBJECTS. tex_prereq = texd.h @@ -41,9 +42,6 @@ tex-web2c: tex.p $(web2c_texmf) tex-pool.c: tex.pool texd.h $(makecpool_stamp) $(makecpool) tex >$@ || rm -f $@ -texextra.c: lib/texmfmp.c texd.h - sed s/TEX-OR-MF-OR-MP/tex/ $(srcdir)/lib/texmfmp.c >$@ - # Tangling TeX tex.p tex.pool: tex-tangle @$(texmf_tangle) tex tex-final @@ -59,7 +57,7 @@ tex_ch_srcs = \ $(tex_ch_synctex) \ tex-binpool.ch ## -EXTRA_DIST += $(tex_ch_srcs) lib/texmfmp.c +EXTRA_DIST += $(tex_ch_srcs) DISTCLEANFILES += $(nodist_tex_SOURCES) tex-final.ch tex-web2c \ tex.p tex.pool tex-tangle @@ -96,15 +94,18 @@ endif MF EXTRA_PROGRAMS += mf mf-nowin DISTCLEANFILES += mftrap.diffs -nodist_mf_SOURCES = mfextra.c +dist_mf_SOURCES = mfextra.c mf_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) mf_CFLAGS = $(WARNING_CFLAGS) mf_LDADD = libmf.a $(LDADD) $(windowlib) $(mf_x_libs) -nodist_mf_nowin_SOURCES = mfextra.c +dist_mf_nowin_SOURCES = mfextra.c mf_nowin_CPPFLAGS = $(mf_CPPFLAGS) -DMFNOWIN mf_nowin_CFLAGS = $(WARNING_CFLAGS) mf_nowin_LDADD = libmf.a $(LDADD) $(windowlib) +# We must create mfd.h before compiling mfextra.c. +$(mf_OBJECTS) $(mf_nowin_OBJECTS): mfd.h + windowlib = window/libwindow.a $(windowlib): mfd.h $(srcdir)/window/*.c cd window && $(MAKE) $(AM_MAKEFLAGS) libwindow.a @@ -142,9 +143,6 @@ mf-web2c: mf.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mf-pool.c: mf.pool mfd.h $(makecpool_stamp) $(makecpool) mf >$@ || rm -f $@ -mfextra.c: lib/texmfmp.c mfd.h - sed s/TEX-OR-MF-OR-MP/mf/ $(srcdir)/lib/texmfmp.c >$@ - # Tangling Metafont mf.p mf.pool: mf-tangle @$(texmf_tangle) mf mf-final @@ -159,9 +157,9 @@ mf_ch_src = \ mf.ch \ mf-binpool.ch ## -EXTRA_DIST += $(mf_ch_src) mftalk.h lib/texmfmp.c +EXTRA_DIST += $(mf_ch_src) mftalk.h -DISTCLEANFILES += $(nodist_libmf_a_SOURCES) mfextra.c mf-final.ch mf-web2c \ +DISTCLEANFILES += $(nodist_libmf_a_SOURCES) mf-final.ch mf-web2c \ mf.p mf.pool mf-tangle # Metafont tests |