diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-04-20 06:33:49 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-04-20 06:33:49 +0000 |
commit | c069df30824ac859800243880e32f7dbdd6a9735 (patch) | |
tree | 79aa9f28ec870179384b1408e6d70e33ec703bec /Build/source/texk/web2c/ptexdir | |
parent | 24b38822a35c7e7092f43ae7899072b8a41be5be (diff) |
build system: some cleanup and better pTeX integration
git-svn-id: svn://tug.org/texlive/trunk@17940 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/ptexdir')
-rw-r--r-- | Build/source/texk/web2c/ptexdir/ChangeLog | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/ptexdir/am/ptex.am | 21 |
2 files changed, 10 insertions, 13 deletions
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index 09af5986fdd..db627a6cf5a 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -13,7 +13,7 @@ * pbibtex.defines (removed): Using ptex.defines. * ptex-include.ch (removed): Now done in ../texmfmp.h. - * am/ptex.am: Adjusted. + * am/ptex.am: Adjust and replace lib/lib.a by ../lib/libp.a. 2010-04-17 Peter Breitenlohner <peb@mppmu.mpg.de> diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am index 9d0b5180824..876474fee69 100644 --- a/Build/source/texk/web2c/ptexdir/am/ptex.am +++ b/Build/source/texk/web2c/ptexdir/am/ptex.am @@ -3,18 +3,6 @@ ## Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. -## pTeX library -## - -sub_dirs += ptexdir/lib -pproglib = ptexdir/lib/lib.a - -# Rebuild $(pproglib) -$(pproglib): $(KPATHSEA_DEPEND) ${srcdir}/ptexdir/lib/*.c - cd ptexdir/lib && $(MAKE) $(AM_MAKEFLAGS) -## Rebuild libptexenc -@PTEXENC_RULE@ - ptex_cppflags = $(PTEXENC_INCLUDES) ptex_ldadd = $(pproglib) $(PTEXENC_LIBS) $(LDADD) @@ -25,6 +13,15 @@ p_tangle = WEBINPUTS=.:$(srcdir)/ptexdir:$(srcdir) $(buildenv) $(TANGLE) DISTCLEANFILES += $(pweb_programs:=.c) $(pweb_programs:=.h) \ $(pweb_programs:=.p) $(pweb_programs:=-web2c) $(pweb_programs:=.web) +## pTeX library +## +pproglib = lib/libp.a +# Rebuild $(pproglib) +$(pproglib): $(KPATHSEA_DEPEND) ${srcdir}/lib/*.c + cd lib && $(MAKE) $(AM_MAKEFLAGS) +## Rebuild libptexenc +@PTEXENC_RULE@ + ## pTeX ## if PTEX |