summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/mplibdir
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-09-16 09:01:26 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-09-16 09:01:26 +0000
commited35ca7560a0e1ec82107722d95212d02e0f6120 (patch)
tree14fd43985a1c2a418f80fa2c33ebacae4fe833d5 /Build/source/texk/web2c/mplibdir
parent4394fcebb4df6385e6d02bea16726df0dd9df005 (diff)
Build system: Add texk/web2c/pmpostdir/ for pMetaPost and upMetaPost
git-svn-id: svn://tug.org/texlive/trunk@35184 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/mplibdir')
-rw-r--r--Build/source/texk/web2c/mplibdir/ChangeLog7
-rw-r--r--Build/source/texk/web2c/mplibdir/am/libmplib.am2
-rw-r--r--Build/source/texk/web2c/mplibdir/am/libmputil.am15
-rw-r--r--Build/source/texk/web2c/mplibdir/am/mplib.am3
4 files changed, 23 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog
index e7297c08285..67951d562e5 100644
--- a/Build/source/texk/web2c/mplibdir/ChangeLog
+++ b/Build/source/texk/web2c/mplibdir/ChangeLog
@@ -1,3 +1,10 @@
+2014-09-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/libmplib.am: Build a separate library libmputil.a from
+ distributed *.[ch] files. Move respective rules from here ...
+ * am/libmputil.am (new): ... to here.
+ * am/mplib.am (mpost_LDADD): Add libmputil.a.
+
2014-09-06 Peter Breitenlohner <peb@mppmu.mpg.de>
* mpxout.w (bad_dvi_two): Correctly use mpx_abort().
diff --git a/Build/source/texk/web2c/mplibdir/am/libmplib.am b/Build/source/texk/web2c/mplibdir/am/libmplib.am
index e8c98dfe096..ca2d8e4c969 100644
--- a/Build/source/texk/web2c/mplibdir/am/libmplib.am
+++ b/Build/source/texk/web2c/mplibdir/am/libmplib.am
@@ -11,8 +11,6 @@ libmplib_a_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(CAIRO_INCLUDES) $(PIXMA
$(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
## libmplib C sources
-libmplib_a_SOURCES = mplibdir/avl.h mplibdir/avl.c mplibdir/decNumber.c mplibdir/decNumber.h \
- mplibdir/decNumberLocal.h mplibdir/decContext.h mplibdir/decContext.c
nodist_libmplib_a_SOURCES = tfmin.c $(mp_c_h) $(mpmath_c_h) $(mpmathbinary_c_h) $(mpmathdecimal_c_h) \
$(mpmathdouble_c_h) $(mpstrings_c_h) $(pngout_c_h) $(psout_c_h) $(svgout_c_h)
mp_c_h = mp.c mplib.h mpmp.h
diff --git a/Build/source/texk/web2c/mplibdir/am/libmputil.am b/Build/source/texk/web2c/mplibdir/am/libmputil.am
new file mode 100644
index 00000000000..09ace983a0b
--- /dev/null
+++ b/Build/source/texk/web2c/mplibdir/am/libmputil.am
@@ -0,0 +1,15 @@
+## texk/web2c/mplibdir/am/libmplib.am: Makefile fragment for libmplib.
+##
+## Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+
+## libmplib.a, used by MetaPost and luaTeX
+##
+EXTRA_LIBRARIES += libmputil.a
+
+libmputil_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
+
+## libmputil C sources
+libmputil_a_SOURCES = mplibdir/avl.h mplibdir/avl.c mplibdir/decNumber.c mplibdir/decNumber.h \
+ mplibdir/decNumberLocal.h mplibdir/decContext.h mplibdir/decContext.c
+
diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am
index 7b152f20b15..041bf67d012 100644
--- a/Build/source/texk/web2c/mplibdir/am/mplib.am
+++ b/Build/source/texk/web2c/mplibdir/am/mplib.am
@@ -18,9 +18,8 @@ endif MP
EXTRA_PROGRAMS += mpost
mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir
-mpost_DEPENDENCIES = libmplib.a
mpost_LDADD = libmplib.a $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \
- $(CAIRO_LIBS) $(PIXMAN_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS)
+ $(CAIRO_LIBS) $(PIXMAN_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) libmputil.a
call_mpost_CPPFLAGS = -DEXEPROG=\"mpost.exe\"
nodist_call_mpost_SOURCES = callexe.c