summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/mplibdir
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-04-06 09:03:08 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-04-06 09:03:08 +0000
commit9c5752a901c06e32f553c3156ef8c07363bda70d (patch)
tree64b976ec96dfaa2255e603c218050c244ba2e40f /Build/source/texk/web2c/mplibdir
parent424d849da9188e78fc2c7fc09b7545cdc953e5c5 (diff)
Fix MetaPost build rules: avoid to rebuild again and again
git-svn-id: svn://tug.org/texlive/trunk@21998 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/mplibdir')
-rw-r--r--Build/source/texk/web2c/mplibdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/mplibdir/am/libmplib.am23
-rw-r--r--Build/source/texk/web2c/mplibdir/am/mplib.am2
3 files changed, 16 insertions, 13 deletions
diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog
index 3c15243c617..ae4323e9685 100644
--- a/Build/source/texk/web2c/mplibdir/ChangeLog
+++ b/Build/source/texk/web2c/mplibdir/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-06 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/libmplib.am: Only one rule for tfmin.w => tfmin.c.
+
2011-04-05 Taco Hoekwater <taco@luatex.org>
* mp.w, mpost.w: import metapost 1.504
diff --git a/Build/source/texk/web2c/mplibdir/am/libmplib.am b/Build/source/texk/web2c/mplibdir/am/libmplib.am
index c4e32f2f602..f55b1b1e54c 100644
--- a/Build/source/texk/web2c/mplibdir/am/libmplib.am
+++ b/Build/source/texk/web2c/mplibdir/am/libmplib.am
@@ -11,23 +11,27 @@ libmplib_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
## libmplib C sources
libmplib_a_SOURCES = mplibdir/avl.h mplibdir/avl.c
-nodist_libmplib_a_SOURCES = $(mp_c_h) $(psout_c_h) $(svgout_c_h) $(tfmin_c_h) $(mpmath_c_h)
+nodist_libmplib_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(psout_c_h) $(svgout_c_h) $(tfmin_c_h)
mp_c_h = mp.c mplib.h mpmp.h
+mpmath_c_h = mpmath.h mpmath.c
psout_c_h = mppsout.h psout.c mplibps.h
svgout_c_h = mplibsvg.h mpsvgout.h svgout.c
-mpmath_c_h = mpmath.h mpmath.c
-tfmin_c_h = mptfmin.h tfmin.c
-$(mpmath_c_h): mpmath-tangle
- @$(mp_ctangle_sh) mpmath
-mpmath-tangle: ctangle$(EXEEXT) mplibdir/mpmath.w tangle-sh
- @$(mp_ctangle_sh) mpmath
+# Creating one file: just one rule
+tfmin.c: ctangle$(EXEEXT) mplibdir/tfmin.w
+ $(mp_ctangle) tfmin.w
+# Creating several files: need stamp file and two rules with identical recipes
$(mp_c_h): mp-tangle
@$(mp_ctangle_sh) mp
mp-tangle: ctangle$(EXEEXT) mplibdir/mp.w tangle-sh
@$(mp_ctangle_sh) mp
+$(mpmath_c_h): mpmath-tangle
+ @$(mp_ctangle_sh) mpmath
+mpmath-tangle: ctangle$(EXEEXT) mplibdir/mpmath.w tangle-sh
+ @$(mp_ctangle_sh) mpmath
+
$(psout_c_h): psout-tangle
@$(mp_ctangle_sh) psout
psout-tangle: ctangle$(EXEEXT) mplibdir/psout.w tangle-sh
@@ -38,11 +42,6 @@ $(svgout_c_h): svgout-tangle
svgout-tangle: ctangle$(EXEEXT) mplibdir/svgout.w tangle-sh
@$(mp_ctangle_sh) svgout
-$(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
libmplib_web += mplibdir/mpmath.w mplibdir/tfmin.w
diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am
index 16a6fac4e2c..ceed30b9227 100644
--- a/Build/source/texk/web2c/mplibdir/am/mplib.am
+++ b/Build/source/texk/web2c/mplibdir/am/mplib.am
@@ -25,7 +25,7 @@ dvitomp_LDADD =
# Creating one file: just one rule
mp_ctangle = CWEBINPUTS=$(srcdir)/mplibdir $(ctangle)
-# Creating several files: need stamp file and two identical rules
+# Creating several files: need stamp file and two rules with identical recipes
mp_ctangle_sh = CWEBINPUTS=$(srcdir)/mplibdir $(SHELL) ./tangle-sh $@ $(CTANGLE)
## MetaPost C sources