diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-11-10 10:27:09 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-11-10 10:27:09 +0000 |
commit | 5e8e9500102800e68c9e7fcac9e85c1668b71a36 (patch) | |
tree | 81d79ac70ffbb127e8063f18c8f55475ca169ee1 /Build/source/texk/web2c/mplibdir/am | |
parent | e6a9c88ada2f11dd61e4c4e39dff84944bed5787 (diff) |
towards TL2010: texk/web2c
git-svn-id: svn://tug.org/texlive/trunk@15964 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/mplibdir/am')
-rw-r--r-- | Build/source/texk/web2c/mplibdir/am/libmplib.am | 47 | ||||
-rw-r--r-- | Build/source/texk/web2c/mplibdir/am/mplib.am | 19 |
2 files changed, 36 insertions, 30 deletions
diff --git a/Build/source/texk/web2c/mplibdir/am/libmplib.am b/Build/source/texk/web2c/mplibdir/am/libmplib.am index bd8038d3de0..57bd47dae53 100644 --- a/Build/source/texk/web2c/mplibdir/am/libmplib.am +++ b/Build/source/texk/web2c/mplibdir/am/libmplib.am @@ -8,38 +8,41 @@ EXTRA_LIBRARIES += libmplib.a libmplib_a_CPPFLAGS = -I$(srcdir)/mplibdir +libmplib_a_CFLAGS = $(WARNING_CFLAGS) ## libmplib C sources libmplib_a_SOURCES = mplibdir/avl.h mplibdir/avl.c -nodist_libmplib_a_SOURCES = memio.c tfmin.c -nodist_libmplib_a_SOURCES += $(mp_c_h) $(psout_c_h) $(svgout_c_h) +nodist_libmplib_a_SOURCES = $(memio_c_h) $(mp_c_h) $(psout_c_h) $(svgout_c_h) $(tfmin_c_h) +memio_c_h = memio.c mpmemio.h mp_c_h = mp.c mplib.h mpmp.h psout_c_h = mppsout.h psout.c mplibps.h svgout_c_h = mplibsvg.h mpsvgout.h svgout.c +tfmin_c_h = mptfmin.h tfmin.c -memio.c: ctangle$(EXEEXT) mplibdir/memio.w - $(mp_ctangle) memio.w +$(memio_c_h): memio-tangle + @$(mp_ctangle_sh) memio +memio-tangle: ctangle$(EXEEXT) mplibdir/memio.w tangle-sh + @$(mp_ctangle_sh) memio -tfmin.c: ctangle$(EXEEXT) mplibdir/tfmin.w - $(mp_ctangle) tfmin.w +$(mp_c_h): mp-tangle + @$(mp_ctangle_sh) mp +mp-tangle: ctangle$(EXEEXT) mplibdir/mp.w tangle-sh + @$(mp_ctangle_sh) mp -$(mp_c_h): mp-ctangle -mp-ctangle: ctangle$(EXEEXT) mplibdir/mp.w - $(mp_ctangle) mp.w - echo timestamp >$@ - touch $(mp_c_h) +$(psout_c_h): psout-tangle + @$(mp_ctangle_sh) psout +psout-tangle: ctangle$(EXEEXT) mplibdir/psout.w tangle-sh + @$(mp_ctangle_sh) psout -$(psout_c_h): psout-ctangle -psout-ctangle: ctangle$(EXEEXT) mplibdir/psout.w - $(mp_ctangle) psout.w - echo timestamp >$@ - touch $(psout_c_h) +$(svgout_c_h): svgout-tangle + @$(mp_ctangle_sh) svgout +svgout-tangle: ctangle$(EXEEXT) mplibdir/svgout.w tangle-sh + @$(mp_ctangle_sh) svgout -$(svgout_c_h): svgout-ctangle -svgout-ctangle: ctangle$(EXEEXT) mplibdir/svgout.w - $(mp_ctangle) svgout.w - echo timestamp >$@ - touch $(svgout_c_h) +$(tfmin_c_h): tfmin-tangle + @$(mp_ctangle_sh) tfmin +tfmin-tangle: ctangle$(EXEEXT) mplibdir/tfmin.w tangle-sh + @$(mp_ctangle_sh) tfmin ## libmplib CWeb sources libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w @@ -50,7 +53,7 @@ $(libmplib_a_OBJECTS): $(nodist_libmplib_a_SOURCES) EXTRA_DIST += $(libmplib_web) DISTCLEANFILES += $(nodist_libmplib_a_SOURCES) \ - mp-ctangle psout-ctangle svgout-ctangle + memio-tangle mp-tangle psout-tangle svgout-tangle tfmin-tangle ## only used by luaTeX EXTRA_DIST += mplibdir/lmplib.c diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am index a4deeeb5c6d..64adde04a08 100644 --- a/Build/source/texk/web2c/mplibdir/am/mplib.am +++ b/Build/source/texk/web2c/mplibdir/am/mplib.am @@ -10,12 +10,16 @@ bin_PROGRAMS += mpost endif MP EXTRA_PROGRAMS += mpost -mp_ctangle = CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) - mpost_CPPFLAGS = -I$(srcdir)/mplibdir +mpost_CFLAGS = $(WARNING_CFLAGS) mpost_DEPENDENCIES = libmplib.a mpost_LDADD = libmplib.a $(KPATHSEA_LIBS) -lm +# Creating one file: just one rule +mp_ctangle = CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) +# Creating several files: need stamp file and two identical rules +mp_ctangle_sh = CWEBINPUTS=$(srcdir)/mplibdir $(SHELL) ./tangle-sh $@ $(CTANGLE) + ## MetaPost C sources nodist_mpost_SOURCES = mpost.c $(mpxout_c_h) mpxout_c_h = mpxout.c mpxout.h @@ -23,11 +27,10 @@ mpxout_c_h = mpxout.c mpxout.h mpost.c: ctangle$(EXEEXT) mplibdir/mpost.w $(mp_ctangle) mpost.w -$(mpxout_c_h): mpxout-ctangle -mpxout-ctangle: ctangle$(EXEEXT) mplibdir/mpxout.w - $(mp_ctangle) mpxout.w - echo timestamp >$@ - touch $(mpxout_c_h) +$(mpxout_c_h): mpxout-tangle + @$(mp_ctangle_sh) mpxout +mpxout-tangle: ctangle$(EXEEXT) mplibdir/mpxout.w tangle-sh + @$(mp_ctangle_sh) mpxout ## MetaPost CWeb sources mpost_web = mplibdir/mpost.w mplibdir/mpxout.w @@ -36,7 +39,7 @@ $(mpost_OBJECTS): $(nodist_mpost_SOURCES) libmplib.a EXTRA_DIST += mplibdir/ChangeLog $(mpost_web) -DISTCLEANFILES += $(nodist_mpost_SOURCES) mpxout-ctangle +DISTCLEANFILES += $(nodist_mpost_SOURCES) mpxout-tangle # Double-colon rules since we do something similar in luatexdir (maybe others). if MP |