diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-09-16 09:01:26 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-09-16 09:01:26 +0000 |
| commit | ed35ca7560a0e1ec82107722d95212d02e0f6120 (patch) | |
| tree | 14fd43985a1c2a418f80fa2c33ebacae4fe833d5 /Build/source/texk/web2c/luatexdir | |
| parent | 4394fcebb4df6385e6d02bea16726df0dd9df005 (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/luatexdir')
| -rw-r--r-- | Build/source/texk/web2c/luatexdir/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/texk/web2c/luatexdir/am/luatex.am | 23 |
2 files changed, 13 insertions, 14 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 7dca1a603e8..8602a488d12 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,7 @@ +2014-09-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/luatex.am: Factor out common *_LDADD and *_DEPENDENCIES. + 2014-08-19 Peter Breitenlohner <peb@mppmu.mpg.de> * image/writepng.w: Avoid PNG warnings. diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am index aa0c9b68145..fc6399bd010 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatex.am +++ b/Build/source/texk/web2c/luatexdir/am/luatex.am @@ -44,24 +44,19 @@ luajittex_CPPFLAGS = $(luatex_preflags) $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES) $(l luatex_CXXFLAGS = $(WARNING_CXXFLAGS) luajittex_CXXFLAGS = $(WARNING_CXXFLAGS) -luatex_ldadd = libluatex.a libff.a libunilib.a libluamisc.a libluasocket.a $(LUA_LIBS) -luatex_ldadd += libmd5.a libmplib.a $(MPFR_LIBS) $(GMP_LIBS) $(CAIRO_LIBS) $(PIXMAN_LIBS) -luatex_ldadd += $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(POPPLER_LIBS) - -luajittex_ldadd = libluajittex.a libjitff.a libunilib.a libluajitmisc.a libluajitsocket.a $(LUAJIT_LIBS) -luajittex_ldadd += libmd5.a libmplib.a $(MPFR_LIBS) $(GMP_LIBS) $(CAIRO_LIBS) $(PIXMAN_LIBS) -luajittex_ldadd += $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(POPPLER_LIBS) - luatex_LDFLAGS = -export-dynamic luajittex_LDFLAGS = -export-dynamic $(LUAJIT_LDEXTRA) -luatex_LDADD = $(luatex_ldadd) $(LDADD) $(LIBADD_DLOPEN) $(lua_socketlibs) -luajittex_LDADD = $(luajittex_ldadd) $(LDADD) $(LIBADD_DLOPEN) $(lua_socketlibs) +luatex_postldadd = libmplib.a $(MPFR_LIBS) $(GMP_LIBS) $(CAIRO_LIBS) $(PIXMAN_LIBS) +luatex_postldadd += $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(POPPLER_LIBS) +luatex_postldadd += $(LDADD) libmputil.a libunilib.a libmd5.a $(lua_socketlibs) + +luatex_LDADD = libluatex.a libff.a libluamisc.a libluasocket.a $(LUA_LIBS) $(luatex_postldadd) +luajittex_LDADD = libluajittex.a libjitff.a libluajitmisc.a libluajitsocket.a $(LUAJIT_LIBS) $(luatex_postldadd) -luatex_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) libluatex.a -luatex_DEPENDENCIES += $(LIBPNG_DEPEND) libmd5.a libmplib.a -luajittex_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) libluajittex.a -luajittex_DEPENDENCIES += $(LIBPNG_DEPEND) libmd5.a libmplib.a +luatex_depend = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) +luatex_DEPENDENCIES = $(luatex_depend) libluatex.a +luajittex_DEPENDENCIES = $(luatex_depend) libluajittex.a $(luatex_OBJECTS): libluatex.a libmplib.a $(luajittex_OBJECTS): libluajittex.a libmplib.a |