summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-10-04 15:41:38 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-10-04 15:41:38 +0000
commit3817bdb7c9936db23e18b74cf16fb234c1957a32 (patch)
tree04a776540153c27aed626b361f0c381c3981c675 /Build/source
parent37b29e92d678aeb977a53c3ec164cac174fb282e (diff)
Bug fix: Make sure that 'make distcheck' removes all generated files
but keeps all distributed ones git-svn-id: svn://tug.org/texlive/trunk@24189 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/libs/teckit/ChangeLog4
-rw-r--r--Build/source/libs/teckit/Makefile.am4
-rw-r--r--Build/source/libs/teckit/Makefile.in2
-rw-r--r--Build/source/libs/zziplib/ChangeLog4
-rw-r--r--Build/source/libs/zziplib/Makefile.am4
-rw-r--r--Build/source/libs/zziplib/Makefile.in2
-rw-r--r--Build/source/texk/bibtexu/ChangeLog4
-rw-r--r--Build/source/texk/bibtexu/Makefile.am5
-rw-r--r--Build/source/texk/bibtexu/Makefile.in3
-rw-r--r--Build/source/texk/dvipng/ChangeLog4
-rw-r--r--Build/source/texk/dvipng/Makefile.am2
-rw-r--r--Build/source/texk/dvipng/Makefile.in2
-rw-r--r--Build/source/texk/dvipsk/ChangeLog5
-rw-r--r--Build/source/texk/dvipsk/Makefile.am51
-rw-r--r--Build/source/texk/dvipsk/Makefile.in48
-rw-r--r--Build/source/texk/dvisvgm/ChangeLog4
-rw-r--r--Build/source/texk/dvisvgm/Makefile.am2
-rw-r--r--Build/source/texk/dvisvgm/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/Makefile.am2
-rw-r--r--Build/source/texk/lcdf-typetools/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/ChangeLog4
-rw-r--r--Build/source/texk/web2c/ChangeLog4
-rw-r--r--Build/source/texk/web2c/Makefile.am2
-rw-r--r--Build/source/texk/web2c/Makefile.in195
-rw-r--r--Build/source/texk/web2c/am/texmf.am3
-rw-r--r--Build/source/texk/web2c/am/web.am2
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog3
-rw-r--r--Build/source/texk/web2c/luatexdir/am/txt2zlib.am6
-rw-r--r--Build/source/texk/web2c/web2c/ChangeLog4
-rw-r--r--Build/source/texk/web2c/web2c/Makefile.am5
-rw-r--r--Build/source/texk/web2c/web2c/Makefile.in25
-rw-r--r--Build/source/utils/tpic2pdftex/ChangeLog5
-rw-r--r--Build/source/utils/tpic2pdftex/Makefile.am10
-rw-r--r--Build/source/utils/tpic2pdftex/Makefile.in45
34 files changed, 264 insertions, 205 deletions
diff --git a/Build/source/libs/teckit/ChangeLog b/Build/source/libs/teckit/ChangeLog
index 79f33b616a4..37f02a074ac 100644
--- a/Build/source/libs/teckit/ChangeLog
+++ b/Build/source/libs/teckit/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-04 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (DISTCLEANFILES): Add CXXLD.sh.
+
2009-10-18 Peter Breitenlohner <peb@mppmu.mpg.de>
Reorganize the TECkit build system.
diff --git a/Build/source/libs/teckit/Makefile.am b/Build/source/libs/teckit/Makefile.am
index e9b34f4666f..38828e11f65 100644
--- a/Build/source/libs/teckit/Makefile.am
+++ b/Build/source/libs/teckit/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory libs/teckit/
##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
@@ -59,7 +59,7 @@ config.force: $(ZLIB_DEPEND)
echo timestamp >config.force
$(SHELL) ./config.status --recheck
-DISTCLEANFILES = config.force
+DISTCLEANFILES = config.force CXXLD.sh
## Rebuild zlib
@ZLIB_RULE@
diff --git a/Build/source/libs/teckit/Makefile.in b/Build/source/libs/teckit/Makefile.in
index 08a441865d3..87ca0e21680 100644
--- a/Build/source/libs/teckit/Makefile.in
+++ b/Build/source/libs/teckit/Makefile.in
@@ -282,7 +282,7 @@ nodist_libTECkit_Compiler_a_SOURCES = \
nodist_libTECkit_a_SOURCES = \
$(TECKIT_TREE)/source/Engine.cpp
-DISTCLEANFILES = config.force
+DISTCLEANFILES = config.force CXXLD.sh
@build_TRUE@TESTS = teckit.test
CLEANFILES = xtex-text.tec
all: config.h
diff --git a/Build/source/libs/zziplib/ChangeLog b/Build/source/libs/zziplib/ChangeLog
index 25e2b1f7154..aaa6e3f6cd7 100644
--- a/Build/source/libs/zziplib/ChangeLog
+++ b/Build/source/libs/zziplib/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-04 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (DISTCLEANFILES): Add _configs.sed.
+
2011-01-07 Peter Breitenlohner <peb@mppmu.mpg.de>
Import zziplib-0.13.60.
diff --git a/Build/source/libs/zziplib/Makefile.am b/Build/source/libs/zziplib/Makefile.am
index 675f2faa2b6..6bc182eb000 100644
--- a/Build/source/libs/zziplib/Makefile.am
+++ b/Build/source/libs/zziplib/Makefile.am
@@ -1,6 +1,6 @@
## Proxy Makefile.am to build zziplib for TeX Live.
##
-## Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2010, 2011 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -56,7 +56,7 @@ config.force: $(ZLIB_DEPEND)
echo timestamp >config.force
$(SHELL) ./config.status --recheck
-DISTCLEANFILES = config.force include/_msvc.in
+DISTCLEANFILES = config.force include/_msvc.in _configs.sed
## Rebuild zlib
@ZLIB_RULE@
diff --git a/Build/source/libs/zziplib/Makefile.in b/Build/source/libs/zziplib/Makefile.in
index a6e976e4969..6d9222d21d1 100644
--- a/Build/source/libs/zziplib/Makefile.in
+++ b/Build/source/libs/zziplib/Makefile.in
@@ -263,7 +263,7 @@ nodist_libzzip_a_SOURCES = \
$(ZZIPLIB_TREE)/zzip/write.c \
$(ZZIPLIB_TREE)/zzip/zip.c
-DISTCLEANFILES = config.force include/_msvc.in
+DISTCLEANFILES = config.force include/_msvc.in _configs.sed
TESTS_ENVIRONMENT = ZZIPLIB_TREE=$(ZZIPLIB_TREE)
@build_TRUE@TESTS = zziplib.test
@build_TRUE@dist_check_SCRIPTS = zziplib.test
diff --git a/Build/source/texk/bibtexu/ChangeLog b/Build/source/texk/bibtexu/ChangeLog
index e600d91d4bd..28c26b6af7d 100644
--- a/Build/source/texk/bibtexu/ChangeLog
+++ b/Build/source/texk/bibtexu/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-04 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (DISTCLEANFILES): Add CXXLD.sh.
+
2011-04-18 Peter Breitenlohner <peb@mppmu.mpg.de>
Avoid 'differ in signedness' warnings.
diff --git a/Build/source/texk/bibtexu/Makefile.am b/Build/source/texk/bibtexu/Makefile.am
index a151e5b3af6..680a9b5b34d 100644
--- a/Build/source/texk/bibtexu/Makefile.am
+++ b/Build/source/texk/bibtexu/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/bibtexu/
##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
@@ -58,11 +58,12 @@ dist_btdoc_DATA = \
csfile.txt \
file_id.diz
+DISTCLEANFILES = CXXLD.sh
+
## Tests.
##
TESTS = tests/bibtex.test tests/bibtexu.test
EXTRA_DIST = $(TESTS)
-DISTCLEANFILES =
## tests/bibtex.test
DISTCLEANFILES += tests/xexampl.aux tests/xexampl.bbl tests/xexampl.blg
diff --git a/Build/source/texk/bibtexu/Makefile.in b/Build/source/texk/bibtexu/Makefile.in
index 6561ab26a6a..4b1b751dd1d 100644
--- a/Build/source/texk/bibtexu/Makefile.in
+++ b/Build/source/texk/bibtexu/Makefile.in
@@ -311,11 +311,12 @@ dist_btdoc_DATA = \
csfile.txt \
file_id.diz
+DISTCLEANFILES = CXXLD.sh tests/xexampl.aux tests/xexampl.bbl \
+ tests/xexampl.blg
TESTS = tests/bibtex.test tests/bibtexu.test
EXTRA_DIST = $(TESTS) bt371csf.zip dos-dj.mak dos-emx.mak os2.mak \
unix.mak csf/00readme.txt csf/COPYING csf/HISTORY \
csf/file_id.diz
-DISTCLEANFILES = tests/xexampl.aux tests/xexampl.bbl tests/xexampl.blg
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog
index 33e48d88924..86e774ddc14 100644
--- a/Build/source/texk/dvipng/ChangeLog
+++ b/Build/source/texk/dvipng/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-04 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (CLEANFILES): Adapt to 'new' test script.
+
2011-05-30 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Use ../am/bin_links.am for $(bindir) links.
diff --git a/Build/source/texk/dvipng/Makefile.am b/Build/source/texk/dvipng/Makefile.am
index e40ab1e6dab..bdbff49a2f5 100644
--- a/Build/source/texk/dvipng/Makefile.am
+++ b/Build/source/texk/dvipng/Makefile.am
@@ -126,5 +126,5 @@ TESTS = dvipng.test
EXTRA_DIST += dvipng.test dvipng-test.dvi
-CLEANFILES = missfont.log test_dvipng.aux test_dvipng.dvi test_dvipng.log test_dvipng*.png
+CLEANFILES = dvipng-test*.png
diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in
index 8d2e7fcd03e..2b076e7720e 100644
--- a/Build/source/texk/dvipng/Makefile.in
+++ b/Build/source/texk/dvipng/Makefile.in
@@ -358,7 +358,7 @@ dvigif_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
dvigif_LDADD =
bin_links = dvipng$(EXEEXT):dvigif
TESTS = dvipng.test
-CLEANFILES = missfont.log test_dvipng.aux test_dvipng.dvi test_dvipng.log test_dvipng*.png
+CLEANFILES = dvipng-test*.png
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index 5bdb01fe436..93e09a6e6bb 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-04 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (EXTRA_DIST, DISTCLEANFILES): Make sure that
+ 'make distclean' removes all generated files.
+
2011-07-26 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* bbox.c, dopage.c, dvips.c, pprescan.c, scanpage.c, dvips.1,
diff --git a/Build/source/texk/dvipsk/Makefile.am b/Build/source/texk/dvipsk/Makefile.am
index 68de421793e..9475e154f66 100644
--- a/Build/source/texk/dvipsk/Makefile.am
+++ b/Build/source/texk/dvipsk/Makefile.am
@@ -121,20 +121,10 @@ TESTS_ENVIRONMENT += TEXFONTMAPS=$(srcdir)/testdata
TESTS_ENVIRONMENT += TEXPSHEADERS=$(srcdir)/testdata
EXTRA_DIST += \
- NEWS \
- TODO \
- afm2tfm-test.pl \
- beginfontk1.test \
- dvips.test \
- eepic-nan.test \
- pfbincl.test \
- quotecmd-test.pl \
+ $(TESTS) \
testdata/8r.enc \
testdata/ad.enc \
testdata/alt-rule.pro \
- testdata/beginfontk1.dvi \
- testdata/beginfontk1.eps \
- testdata/beginfontk1.tex \
testdata/cmex10.pfb \
testdata/cmex10.tfm \
testdata/cmmi10.pfb \
@@ -147,16 +137,6 @@ EXTRA_DIST += \
testdata/cmtt10.tfm \
testdata/config.pdf \
testdata/config.ps \
- testdata/dvipstst.tex \
- testdata/dvipstst.xdv \
- testdata/dvipstst.xps \
- testdata/eepic-nan.dvi \
- testdata/eepic-nan.tex \
- testdata/intoverflow.dvi \
- testdata/pfbincl.eps \
- testdata/pfbincl.tex \
- testdata/pfbincl.xdv \
- testdata/pfbincl.xps \
testdata/psfonts.map \
testdata/ptmbi.vf \
testdata/ptmbi8r.tfm \
@@ -164,15 +144,34 @@ EXTRA_DIST += \
testdata/ptmr8r.tfm \
testdata/ptmri.vf \
testdata/ptmri8r.tfm \
- testdata/quotecmd.dvi \
- testdata/quotecmd.tex \
testdata/special.pro \
testdata/tex.pro \
testdata/texc.pro \
- testdata/texps.pro \
- testdata/vfnameoverflow.dvi
+ testdata/texps.pro
+
+## afm2tfm-test.pl
+DISTCLEANFILES += afmtest.tfm
+## beginfontk1.test
+EXTRA_DIST += testdata/beginfontk1.dvi testdata/beginfontk1.eps testdata/beginfontk1.tex
+DISTCLEANFILES += beginfontk1.ps
+## dvips.test
+EXTRA_DIST += testdata/dvipstst.tex testdata/dvipstst.xdv testdata/dvipstst.xps
+DISTCLEANFILES += dvipstst.ps missfont.log mtest.ps
+## eepic-nan.test
+EXTRA_DIST += testdata/eepic-nan.dvi testdata/eepic-nan.tex
+DISTCLEANFILES += eepic-nan.ps
+## pfbincl.test
+EXTRA_DIST += testdata/pfbincl.eps testdata/pfbincl.tex testdata/pfbincl.xdv testdata/pfbincl.xps
+DISTCLEANFILES += pfbincl.ps
+## quotecmd-test.pl
+EXTRA_DIST += testdata/quotecmd.dvi testdata/quotecmd.tex
+DISTCLEANFILES += *badnews*
-CLEANFILES += dvipstst.ps missfont.log mtest.ps pfbincl.ps
+EXTRA_DIST += \
+ NEWS \
+ TODO \
+ testdata/intoverflow.dvi \
+ testdata/vfnameoverflow.dvi
## Not used
##
diff --git a/Build/source/texk/dvipsk/Makefile.in b/Build/source/texk/dvipsk/Makefile.in
index ff31a6217ae..c8d915f50a0 100644
--- a/Build/source/texk/dvipsk/Makefile.in
+++ b/Build/source/texk/dvipsk/Makefile.in
@@ -368,7 +368,8 @@ LDADD = $(KPATHSEA_LIBS)
dist_man1_MANS = afm2tfm.1 dvips.1
info_TEXINFOS = dvips.texi
dvips_TEXINFOS = contrib/config.proto dvips.help
-DISTCLEANFILES = $(DVIS) $(PSS)
+DISTCLEANFILES = $(DVIS) $(PSS) afmtest.tfm beginfontk1.ps dvipstst.ps \
+ missfont.log mtest.ps eepic-nan.ps pfbincl.ps *badnews*
prolog_DATA = $(prologues)
dist_prologues = \
color.lpro \
@@ -382,33 +383,30 @@ dist_prologues = \
prologdir = ${prefix}/texmf/dvips/base
prologues = $(dist_prologues:.lpro=.pro) texc.pro
SUFFIXES = .pro .lpro
-EXTRA_DIST = $(dist_prologues) texc.script NEWS TODO afm2tfm-test.pl \
- beginfontk1.test dvips.test eepic-nan.test pfbincl.test \
- quotecmd-test.pl testdata/8r.enc testdata/ad.enc \
- testdata/alt-rule.pro testdata/beginfontk1.dvi \
+EXTRA_DIST = $(dist_prologues) texc.script $(TESTS) testdata/8r.enc \
+ testdata/ad.enc testdata/alt-rule.pro testdata/cmex10.pfb \
+ testdata/cmex10.tfm testdata/cmmi10.pfb testdata/cmmi10.tfm \
+ testdata/cmr10.pfb testdata/cmr10.tfm testdata/cmsy10.pfb \
+ testdata/cmsy10.tfm testdata/cmtt10.pfb testdata/cmtt10.tfm \
+ testdata/config.pdf testdata/config.ps testdata/psfonts.map \
+ testdata/ptmbi.vf testdata/ptmbi8r.tfm testdata/ptmr.vf \
+ testdata/ptmr8r.tfm testdata/ptmri.vf testdata/ptmri8r.tfm \
+ testdata/special.pro testdata/tex.pro testdata/texc.pro \
+ testdata/texps.pro testdata/beginfontk1.dvi \
testdata/beginfontk1.eps testdata/beginfontk1.tex \
- testdata/cmex10.pfb testdata/cmex10.tfm testdata/cmmi10.pfb \
- testdata/cmmi10.tfm testdata/cmr10.pfb testdata/cmr10.tfm \
- testdata/cmsy10.pfb testdata/cmsy10.tfm testdata/cmtt10.pfb \
- testdata/cmtt10.tfm testdata/config.pdf testdata/config.ps \
testdata/dvipstst.tex testdata/dvipstst.xdv \
testdata/dvipstst.xps testdata/eepic-nan.dvi \
- testdata/eepic-nan.tex testdata/intoverflow.dvi \
- testdata/pfbincl.eps testdata/pfbincl.tex testdata/pfbincl.xdv \
- testdata/pfbincl.xps testdata/psfonts.map testdata/ptmbi.vf \
- testdata/ptmbi8r.tfm testdata/ptmr.vf testdata/ptmr8r.tfm \
- testdata/ptmri.vf testdata/ptmri8r.tfm testdata/quotecmd.dvi \
- testdata/quotecmd.tex testdata/special.pro testdata/tex.pro \
- testdata/texc.pro testdata/texps.pro \
- testdata/vfnameoverflow.dvi atari cmfonts.map config.ps \
- contrib/PSTricks contrib/afm-extra contrib/colorsep.lpro \
- contrib/configs contrib/crop.lpr contrib/latex209 \
- contrib/treen.sh contrib/treen2.sh contrib/volker \
- contrib/whichinpath cyrfonts.map eufonts.map flib.c \
- hps/CHANGES_HPS.txt hps/README_HPS.txt lafonts.map makefont.c \
- mvs psfonts.map tex vmcms vms
-CLEANFILES = $(prologues) texc.lpro dvipstst.ps missfont.log mtest.ps \
- pfbincl.ps
+ testdata/eepic-nan.tex testdata/pfbincl.eps \
+ testdata/pfbincl.tex testdata/pfbincl.xdv testdata/pfbincl.xps \
+ testdata/quotecmd.dvi testdata/quotecmd.tex NEWS TODO \
+ testdata/intoverflow.dvi testdata/vfnameoverflow.dvi atari \
+ cmfonts.map config.ps contrib/PSTricks contrib/afm-extra \
+ contrib/colorsep.lpro contrib/configs contrib/crop.lpr \
+ contrib/latex209 contrib/treen.sh contrib/treen2.sh \
+ contrib/volker contrib/whichinpath cyrfonts.map eufonts.map \
+ flib.c hps/CHANGES_HPS.txt hps/README_HPS.txt lafonts.map \
+ makefont.c mvs psfonts.map tex vmcms vms
+CLEANFILES = $(prologues) texc.lpro
TESTS = afm2tfm-test.pl beginfontk1.test dvips.test eepic-nan.test \
pfbincl.test quotecmd-test.pl
TESTS_ENVIRONMENT = TEXMFCNF=$(srcdir)/../kpathsea \
diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog
index d764bf48b4a..92d4568981f 100644
--- a/Build/source/texk/dvisvgm/ChangeLog
+++ b/Build/source/texk/dvisvgm/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-04 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (DISTCLEANFILES): Add CXXLD.sh.
+
2011-05-31 Peter Breitenlohner <peb@mppmu.mpg.de>
* version.ac: Imported release 1.0.8.
diff --git a/Build/source/texk/dvisvgm/Makefile.am b/Build/source/texk/dvisvgm/Makefile.am
index 96b7540791b..7eba4d55772 100644
--- a/Build/source/texk/dvisvgm/Makefile.am
+++ b/Build/source/texk/dvisvgm/Makefile.am
@@ -123,7 +123,7 @@ config.force: $(dvisvgm_dependencies)
echo timestamp >config.force
$(SHELL) ./config.status --recheck
-DISTCLEANFILES = config.force
+DISTCLEANFILES = config.force CXXLD.sh
## Rebuild libkpathsea
@KPATHSEA_RULE@
diff --git a/Build/source/texk/dvisvgm/Makefile.in b/Build/source/texk/dvisvgm/Makefile.in
index 1805b53323e..a6a9130997a 100644
--- a/Build/source/texk/dvisvgm/Makefile.in
+++ b/Build/source/texk/dvisvgm/Makefile.in
@@ -397,7 +397,7 @@ nodist_libpotrace_a_SOURCES = \
$(DVISVGM_TREE)/potracelib/potracelib.c \
$(DVISVGM_TREE)/potracelib/trace.c
-DISTCLEANFILES = config.force
+DISTCLEANFILES = config.force CXXLD.sh
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
diff --git a/Build/source/texk/lcdf-typetools/Makefile.am b/Build/source/texk/lcdf-typetools/Makefile.am
index 68ea02b9644..ea44b449974 100644
--- a/Build/source/texk/lcdf-typetools/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/Makefile.am
@@ -12,7 +12,7 @@ config.force: $(KPATHSEA_DEPEND)
echo timestamp >config.force
$(SHELL) ./config.status --recheck
-DISTCLEANFILES = config.force
+DISTCLEANFILES = config.force CXXLD.sh
if texlive_build
glyphlistdir = ${prefix}/texmf-dist/fonts/map/glyphlist
diff --git a/Build/source/texk/lcdf-typetools/Makefile.in b/Build/source/texk/lcdf-typetools/Makefile.in
index d3a61de461d..de292eb65fb 100644
--- a/Build/source/texk/lcdf-typetools/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/Makefile.in
@@ -276,7 +276,7 @@ ACLOCAL_AMFLAGS = -I ../../m4 -I m4
DISTCHECK_CONFIGURE_FLAGS = --without-kpathsea
SUBDIRS = . liblcdf libefont @SELECTED_SUBDIRS@
DIST_SUBDIRS = liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42
-DISTCLEANFILES = config.force
+DISTCLEANFILES = config.force CXXLD.sh
@texlive_build_FALSE@glyphlistdir = $(pkgdatadir)
@texlive_build_TRUE@glyphlistdir = ${prefix}/texmf-dist/fonts/map/glyphlist
@texlive_build_FALSE@encdir = $(pkgdatadir)
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/ChangeLog b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/ChangeLog
index e1d144c5299..ae98136a45b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/ChangeLog
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-04 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (DISTCLEANFILES): Add CXXLD.sh.
+
2011-09-25 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-01-const (new): Avoid cast from const to non-const.
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 9f013ced715..a944ff886f3 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -2,6 +2,10 @@
* am/web.am (DISTCLEANFILES): Preserve distributed files.
+ * Makefile.am (DISTCLEANFILES): Add CXXLD.sh.
+ * am/texmf.am (DISTCLEANFILES): Add write18-quote.log.
+ * am/web.am (DISTCLEANFILES): Add longline.{aux,bbl,bib,blg}.
+
2011-09-30 Peter Breitenlohner <peb@mp.mpg.de>
* tex.ch (print_file_line): Bug fix: avoid uninitialized lineno.
diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index 4f105df3392..676be50ab57 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -29,7 +29,7 @@ check_PROGRAMS =
TESTS =
EXTRA_LIBRARIES =
EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h
-DISTCLEANFILES = $(EXTRA_LIBRARIES)
+DISTCLEANFILES = $(EXTRA_LIBRARIES) CXXLD.sh
CLEANFILES =
TRIPTRAP_CLEAN =
TRIPTRAP =
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 1de40f65859..825a8dfc28d 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -50,18 +50,18 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_7) \
$(am__EXEEXT_24) $(am__EXEEXT_25) $(am__EXEEXT_26) \
synctex$(EXEEXT)
noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
- $(am__EXEEXT_36) $(am__EXEEXT_37)
+ $(am__EXEEXT_36) $(am__EXEEXT_37) $(am__EXEEXT_38)
check_PROGRAMS = $(am__EXEEXT_27) $(am__EXEEXT_28) $(am__EXEEXT_29) \
$(am__EXEEXT_30) $(am__EXEEXT_31) $(am__EXEEXT_32) \
$(am__EXEEXT_33) $(am__EXEEXT_34) $(am__EXEEXT_35) \
md5main$(EXEEXT)
-TESTS = tangle.test $(am__EXEEXT_40) ctiedir/ctie.test \
+TESTS = tangle.test $(am__EXEEXT_41) ctiedir/ctie.test \
cwebdir/cweave.test tiedir/tie.test $(am__append_6) \
$(am__append_14) $(am__append_23) $(am__append_28) \
$(am__append_34) $(am__append_38) $(am__append_40) \
$(am__append_46) $(am__append_50) $(am__append_52) \
- $(am__append_57) $(am__append_64) $(am__append_78) \
- $(am__append_81) $(am__append_82) libmd5/md5.test
+ $(am__append_57) $(am__append_64) $(am__append_79) \
+ $(am__append_82) $(am__append_83) libmd5/md5.test
DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
$(srcdir)/../../build-aux/config.guess \
$(srcdir)/../../build-aux/config.sub \
@@ -166,22 +166,23 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
@LUATEX_TRUE@@WIN32_FALSE@am__append_63 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
@LUATEX_TRUE@am__append_64 = $(luatex_tests)
@MINGW32_FALSE@am__append_65 = -DLUA_USE_POSIX
-@XETEX_TRUE@am__append_66 = xetex
-@XETEX_MACOSX_TRUE@am__append_67 = -DXETEX_MAC
-@XETEX_MACOSX_TRUE@am__append_68 = libxetexmm.a
-@XETEX_MACOSX_FALSE@am__append_69 = -DXETEX_OTHER $(POPPLER_INCLUDES) \
+@LUATEX_TRUE@@cross_FALSE@am__append_66 = txt2zlib
+@XETEX_TRUE@am__append_67 = xetex
+@XETEX_MACOSX_TRUE@am__append_68 = -DXETEX_MAC
+@XETEX_MACOSX_TRUE@am__append_69 = libxetexmm.a
+@XETEX_MACOSX_FALSE@am__append_70 = -DXETEX_OTHER $(POPPLER_INCLUDES) \
@XETEX_MACOSX_FALSE@ $(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES)
-@XETEX_MACOSX_FALSE@am__append_70 = $(POPPLER_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
-@XETEX_MACOSX_FALSE@am__append_71 = $(POPPLER_DEPEND) $(LIBPNG_DEPEND)
-@XETEX_GRAPHITE_TRUE@am__append_72 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES)
-@XETEX_GRAPHITE_TRUE@am__append_73 = $(GRAPHITE_LIBS)
-@XETEX_GRAPHITE_TRUE@am__append_74 = $(GRAPHITE_DEPEND)
-@XETEX_MACOSX_TRUE@am__append_75 = \
+@XETEX_MACOSX_FALSE@am__append_71 = $(POPPLER_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
+@XETEX_MACOSX_FALSE@am__append_72 = $(POPPLER_DEPEND) $(LIBPNG_DEPEND)
+@XETEX_GRAPHITE_TRUE@am__append_73 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES)
+@XETEX_GRAPHITE_TRUE@am__append_74 = $(GRAPHITE_LIBS)
+@XETEX_GRAPHITE_TRUE@am__append_75 = $(GRAPHITE_DEPEND)
+@XETEX_MACOSX_TRUE@am__append_76 = \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.cpp \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.h \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeX_mac.c
-@XETEX_MACOSX_FALSE@am__append_76 = \
+@XETEX_MACOSX_FALSE@am__append_77 = \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.cpp \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.h \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeX_pic.c \
@@ -198,96 +199,96 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
@XETEX_MACOSX_FALSE@ xetexdir/pngimage.c \
@XETEX_MACOSX_FALSE@ xetexdir/pngimage.h
-@XETEX_GRAPHITE_TRUE@am__append_77 = \
+@XETEX_GRAPHITE_TRUE@am__append_78 = \
@XETEX_GRAPHITE_TRUE@ xetexdir/XeTeXGrLayout.cpp \
@XETEX_GRAPHITE_TRUE@ xetexdir/XeTeXGrLayout.h
-@XETEX_TRUE@am__append_78 = $(xetex_tests)
-@OTANGLE_TRUE@am__append_79 = $(omegaware_tools)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_80 = $(omegaware_font_tools)
-@OTANGLE_TRUE@am__append_81 = $(OTANGLE_tests)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_82 = $(OMFONTS_tests)
-@OTANGLE_TRUE@am__append_83 = pltotf tftopl
-@ALEPH_TRUE@am__append_84 = aleph
-@TEX_SYNCTEX_TRUE@am__append_85 = -I$(srcdir)/synctexdir \
+@XETEX_TRUE@am__append_79 = $(xetex_tests)
+@OTANGLE_TRUE@am__append_80 = $(omegaware_tools)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_81 = $(omegaware_font_tools)
+@OTANGLE_TRUE@am__append_82 = $(OTANGLE_tests)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_83 = $(OMFONTS_tests)
+@OTANGLE_TRUE@am__append_84 = pltotf tftopl
+@ALEPH_TRUE@am__append_85 = aleph
+@TEX_SYNCTEX_TRUE@am__append_86 = -I$(srcdir)/synctexdir \
@TEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@TEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
-@TEX_SYNCTEX_TRUE@am__append_86 = $(ZLIB_LIBS)
-@TEX_SYNCTEX_TRUE@am__append_87 = $(ZLIB_DEPEND)
-@TEX_SYNCTEX_TRUE@am__append_88 = \
+@TEX_SYNCTEX_TRUE@am__append_87 = $(ZLIB_LIBS)
+@TEX_SYNCTEX_TRUE@am__append_88 = $(ZLIB_DEPEND)
+@TEX_SYNCTEX_TRUE@am__append_89 = \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex-tex.h
-@ETEX_SYNCTEX_TRUE@am__append_89 = -I$(srcdir)/synctexdir \
+@ETEX_SYNCTEX_TRUE@am__append_90 = -I$(srcdir)/synctexdir \
@ETEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@ETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
-@ETEX_SYNCTEX_TRUE@am__append_90 = $(ZLIB_LIBS)
-@ETEX_SYNCTEX_TRUE@am__append_91 = $(ZLIB_DEPEND)
-@ETEX_SYNCTEX_TRUE@am__append_92 = \
+@ETEX_SYNCTEX_TRUE@am__append_91 = $(ZLIB_LIBS)
+@ETEX_SYNCTEX_TRUE@am__append_92 = $(ZLIB_DEPEND)
+@ETEX_SYNCTEX_TRUE@am__append_93 = \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-etex.h
-@PTEX_SYNCTEX_TRUE@am__append_93 = -I$(srcdir)/synctexdir \
+@PTEX_SYNCTEX_TRUE@am__append_94 = -I$(srcdir)/synctexdir \
@PTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@PTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
-@PTEX_SYNCTEX_TRUE@am__append_94 = $(ZLIB_LIBS)
-@PTEX_SYNCTEX_TRUE@am__append_95 = $(ZLIB_DEPEND)
-@PTEX_SYNCTEX_TRUE@am__append_96 = \
+@PTEX_SYNCTEX_TRUE@am__append_95 = $(ZLIB_LIBS)
+@PTEX_SYNCTEX_TRUE@am__append_96 = $(ZLIB_DEPEND)
+@PTEX_SYNCTEX_TRUE@am__append_97 = \
@PTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@PTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-ptex.h
-@UPTEX_SYNCTEX_TRUE@am__append_97 = -I$(srcdir)/synctexdir \
+@UPTEX_SYNCTEX_TRUE@am__append_98 = -I$(srcdir)/synctexdir \
@UPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@UPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-uptex.h\"
-@UPTEX_SYNCTEX_TRUE@am__append_98 = $(ZLIB_LIBS)
-@UPTEX_SYNCTEX_TRUE@am__append_99 = $(ZLIB_DEPEND)
-@UPTEX_SYNCTEX_TRUE@am__append_100 = \
+@UPTEX_SYNCTEX_TRUE@am__append_99 = $(ZLIB_LIBS)
+@UPTEX_SYNCTEX_TRUE@am__append_100 = $(ZLIB_DEPEND)
+@UPTEX_SYNCTEX_TRUE@am__append_101 = \
@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-uptex.h
-@EPTEX_SYNCTEX_TRUE@am__append_101 = -I$(srcdir)/synctexdir \
+@EPTEX_SYNCTEX_TRUE@am__append_102 = -I$(srcdir)/synctexdir \
@EPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@EPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
-@EPTEX_SYNCTEX_TRUE@am__append_102 = $(ZLIB_LIBS)
-@EPTEX_SYNCTEX_TRUE@am__append_103 = $(ZLIB_DEPEND)
-@EPTEX_SYNCTEX_TRUE@am__append_104 = \
+@EPTEX_SYNCTEX_TRUE@am__append_103 = $(ZLIB_LIBS)
+@EPTEX_SYNCTEX_TRUE@am__append_104 = $(ZLIB_DEPEND)
+@EPTEX_SYNCTEX_TRUE@am__append_105 = \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-eptex.h
-@EUPTEX_SYNCTEX_TRUE@am__append_105 = -I$(srcdir)/synctexdir \
+@EUPTEX_SYNCTEX_TRUE@am__append_106 = -I$(srcdir)/synctexdir \
@EUPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@EUPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-euptex.h\"
-@EUPTEX_SYNCTEX_TRUE@am__append_106 = $(ZLIB_LIBS)
-@EUPTEX_SYNCTEX_TRUE@am__append_107 = $(ZLIB_DEPEND)
-@EUPTEX_SYNCTEX_TRUE@am__append_108 = \
+@EUPTEX_SYNCTEX_TRUE@am__append_107 = $(ZLIB_LIBS)
+@EUPTEX_SYNCTEX_TRUE@am__append_108 = $(ZLIB_DEPEND)
+@EUPTEX_SYNCTEX_TRUE@am__append_109 = \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-euptex.h
-@PDFTEX_SYNCTEX_TRUE@am__append_109 = -I$(srcdir)/synctexdir \
+@PDFTEX_SYNCTEX_TRUE@am__append_110 = -I$(srcdir)/synctexdir \
@PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@PDFTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
-@PDFTEX_SYNCTEX_TRUE@am__append_110 = \
+@PDFTEX_SYNCTEX_TRUE@am__append_111 = \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-pdftex.h
-@XETEX_SYNCTEX_TRUE@am__append_111 = -I$(srcdir)/synctexdir \
+@XETEX_SYNCTEX_TRUE@am__append_112 = -I$(srcdir)/synctexdir \
@XETEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@XETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
-@XETEX_SYNCTEX_TRUE@am__append_112 = \
+@XETEX_SYNCTEX_TRUE@am__append_113 = \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@@ -652,6 +653,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
@OTANGLE_TRUE@am__EXEEXT_35 = pltotf$(EXEEXT) tftopl$(EXEEXT)
@MP_TRUE@@WIN32_TRUE@am__EXEEXT_36 = call_mpost$(EXEEXT)
@LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_37 = call_luatex$(EXEEXT)
+@LUATEX_TRUE@@cross_FALSE@am__EXEEXT_38 = txt2zlib$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
dist_aleph_OBJECTS = aleph-aleph.$(OBJEXT) aleph-alephbis.$(OBJEXT) \
aleph-alephextra.$(OBJEXT)
@@ -1092,13 +1094,13 @@ ETAGS = etags
CTAGS = ctags
am__tty_colors = \
red=; grn=; lgn=; blu=; std=
-am__EXEEXT_38 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
+am__EXEEXT_39 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
gftopk.test gftype.test mft.test patgen.test pktogf.test \
pktype.test pltotf.test pooltype.test tftopl.test vftovp.test \
vptovf.test weave.test
-am__EXEEXT_39 = $(am__EXEEXT_38) tests/bibtex-openout-test.pl \
+am__EXEEXT_40 = $(am__EXEEXT_39) tests/bibtex-openout-test.pl \
tests/bibtex-longline-test.pl tests/bibtex-mem.test
-@WEB_TRUE@am__EXEEXT_40 = $(am__EXEEXT_39)
+@WEB_TRUE@am__EXEEXT_41 = $(am__EXEEXT_40)
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
@@ -1578,13 +1580,14 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
synctexdir/synctex-pdf-rec.ch2 synctexdir/synctex-xe-mem.ch2 \
synctexdir/synctex-xe-rec.ch2 synctexdir/synctex-xe-rec.ch3 \
libmd5/md5.test
-DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
- tangle-web2c tangleboot.c tangleboot.h tangleboot.p \
+DISTCLEANFILES = $(EXTRA_LIBRARIES) CXXLD.sh tangle.c tangle.h \
+ tangle.p tangle-web2c tangleboot.c tangleboot.h tangleboot.p \
tangleboot-web2c ctangle.c cweb.c cweb.h ctangle-ctangle \
common-ctangle ctangleboot.c cwebboot.c cwebboot.h cftest.p \
$(web_programs:=.c) $(web_programs:=.h) $(web_programs:=.p) \
$(web_programs:=-web2c) tests/xexampl.aux tests/xexampl.bbl \
- tests/xexampl.blg tests/memtest.bib tests/memtest?.* \
+ tests/xexampl.blg longline.aux longline.bbl longline.bib \
+ longline.blg tests/memtest.bib tests/memtest?.* \
tests/xstory.dvi tests/xpplr.dvi tests/xstory.dvityp \
tests/xpagenum.typ cmr10.dvi tests/xcmr10.dvi cmr10.pk \
tests/xcmr10.pk tests/xcmr10.gft1 tests/xcmr10.gft2 io.tex \
@@ -1594,10 +1597,10 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
tests/xptmr.tfm tests/xptmr.vf pooltype.tex ctie.c cweave.c \
tie.c ctie.outc ctie.outm common.tex common.scn common.idx \
tie.outc tie.outm $(nodist_tex_SOURCES) tex-final.ch tex-web2c \
- tex.p tex.pool tex-tangle trip.diffs mftrap.diffs \
- $(nodist_libmf_a_SOURCES) mf-final.ch mf-web2c mf.p mf.pool \
- mf-tangle $(nodist_mpost_SOURCES) mpxout-tangle mptrap.diffs \
- ptmr.mpx tests/xptmr.mpx tests/xstory.mpx \
+ tex.p tex.pool tex-tangle trip.diffs write18-quote.log \
+ mftrap.diffs $(nodist_libmf_a_SOURCES) mf-final.ch mf-web2c \
+ mf.p mf.pool mf-tangle $(nodist_mpost_SOURCES) mpxout-tangle \
+ mptrap.diffs ptmr.mpx tests/xptmr.mpx tests/xstory.mpx \
$(nodist_libmplib_a_SOURCES) mp-tangle mpmath-tangle \
psout-tangle svgout-tangle $(nodist_etex_SOURCES) etex.web \
etex.ch etex-web2c etex.p etex.pool etex-tangle etrip.diffs \
@@ -1730,18 +1733,18 @@ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
initex_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
initex_LDADD =
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_85)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_86)
# With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_86)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_87)
# TeX C sources
tex_c_h = texini.c tex0.c texcoerce.h texd.h
nodist_tex_SOURCES = $(tex_c_h) tex-pool.c
-dist_tex_SOURCES = texextra.c $(am__append_88)
+dist_tex_SOURCES = texextra.c $(am__append_89)
# We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_87)
+tex_prereq = texd.h $(am__append_88)
tex_ch_srcs = \
tex.web \
tex.ch \
@@ -1809,19 +1812,19 @@ psout_c_h = mppsout.h psout.c mplibps.h
svgout_c_h = mplibsvg.h mpsvgout.h svgout.c
libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \
mplibdir/mpmath.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_89)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_90)
# With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_90)
+etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_91)
# e-TeX C sources
etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexdir/etex_version.h
dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \
- $(am__append_92)
+ $(am__append_93)
# We must create etexd.h and etexdir/etex_version.h before building the etex_OBJECTS.
-etex_prereq = etexd.h etexdir/etex_version.h $(am__append_91)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_92)
etex_web_srcs = \
tex.web \
etexdir/etex.ch
@@ -1856,20 +1859,20 @@ pweb_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \
pproglib = lib/libp.a
libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h
libkanji_a_CPPFLAGS = $(ptex_cppflags)
-ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_93)
+ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_94)
# With --enable-ipc, pTeX may need to link with -lsocket.
-ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_94)
+ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_95)
ptex_DEPENDENCIES = $(ptex_dependencies)
# pTeX C sources
ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h
nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c ptexdir/ptex_version.h
dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h \
- $(am__append_96)
+ $(am__append_97)
# We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS.
-ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_95)
+ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_96)
ptex_web_srcs = \
tex.web \
tex.ch
@@ -1903,23 +1906,23 @@ ptftopl_DEPENDENCIES = $(ptex_dependencies)
# e-pTeX Tests
#
eptex_tests = eptexdir/eptrip.test
-eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_101)
+eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_102)
# With --enable-ipc, e-pTeX may need to link with -lsocket.
eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
- $(ipc_socketlibs) $(am__append_102)
+ $(ipc_socketlibs) $(am__append_103)
eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
# e-pTeX C sources
eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h
nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c eptexdir/etex_version.h eptexdir/eptex_version.h eptexdir/ptex_version.h
dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h \
- $(am__append_104)
+ $(am__append_105)
# We must create eptexd.h and eptexdir/[ep]tex_version.h before building the eptex_OBJECTS.
eptex_prereq = eptexd.h eptexdir/etex_version.h \
eptexdir/eptex_version.h eptexdir/ptex_version.h \
- $(am__append_103)
+ $(am__append_104)
eptex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -1955,21 +1958,21 @@ upweb_tests = \
libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h uptexdir/kanji_dump.c
libukanji_a_CPPFLAGS = $(uptex_cppflags)
-uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_97)
+uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_98)
# With --enable-ipc, upTeX may need to link with -lsocket.
-uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_98)
+uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_99)
uptex_DEPENDENCIES = $(uptex_dependencies)
# upTeX C sources
uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h
nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c uptexdir/ptex_version.h uptexdir/uptex_version.h
dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h \
- $(am__append_100)
+ $(am__append_101)
# We must create uptexd.h and uptexdir/*ptex_version.h before building the uptex_OBJECTS.
uptex_prereq = uptexd.h uptexdir/ptex_version.h \
- uptexdir/uptex_version.h $(am__append_99)
+ uptexdir/uptex_version.h $(am__append_100)
uptex_web_srcs = \
tex.web \
tex.ch
@@ -2004,11 +2007,11 @@ uptftopl_DEPENDENCIES = $(uptex_dependencies)
# e-upTeX Tests
#
euptex_tests = euptexdir/euptrip.test
-euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_105)
+euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_106)
# With --enable-ipc, e-upTeX may need to link with -lsocket.
euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
- $(ipc_socketlibs) $(am__append_106)
+ $(ipc_socketlibs) $(am__append_107)
euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
# e-upTeX C sources
@@ -2017,12 +2020,12 @@ nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c euptexdir/etex_version.h \
euptexdir/eptex_version.h euptexdir/ptex_version.h euptexdir/uptex_version.h
dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \
- $(am__append_108)
+ $(am__append_109)
# We must create euptexd.h and euptexdir/*tex_version.h before building the euptex_OBJECTS.
euptex_prereq = euptexd.h euptexdir/etex_version.h \
euptexdir/eptex_version.h euptexdir/ptex_version.h \
- euptexdir/uptex_version.h $(am__append_107)
+ euptexdir/uptex_version.h $(am__append_108)
euptex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -2059,7 +2062,7 @@ pdftex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) \
# Force Automake to use CXXLD for linking
nodist_EXTRA_pdftex_SOURCES = dummy.cxx
pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir $(SHELL) ./tangle-sh $@ $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_109)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_110)
pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
# With --enable-ipc, pdfTeX may need to link with -lsocket.
@@ -2073,7 +2076,7 @@ nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c \
pdftexdir/etex_version.h pdftexdir/pdftex_version.h
dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
- $(am__append_110)
+ $(am__append_111)
pdftex_ch_srcs = \
pdftexdir/pdftex.web \
pdftexdir/tex.ch0 \
@@ -2519,17 +2522,17 @@ txt2zlib_LDADD = $(ZLIB_LIBS)
# Force Automake to use CXXLD for linking
nodist_EXTRA_xetex_SOURCES = dummy.cxx
-libxetex = libxetex.a $(am__append_68)
+libxetex = libxetex.a $(am__append_69)
xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \
- $(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(am__append_67) \
- $(am__append_69) $(am__append_72) $(ZLIB_INCLUDES)
-xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_70) \
- $(am__append_73) $(FREETYPE2_LIBS) $(ZLIB_LIBS)
+ $(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(am__append_68) \
+ $(am__append_70) $(am__append_73) $(ZLIB_INCLUDES)
+xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_71) \
+ $(am__append_74) $(FREETYPE2_LIBS) $(ZLIB_LIBS)
xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
- $(TECKIT_DEPEND) $(am__append_71) $(am__append_74) \
+ $(TECKIT_DEPEND) $(am__append_72) $(am__append_75) \
$(FREETYPE2_DEPEND) $(ZLIB_DEPEND)
@XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework Carbon -framework Cocoa -framework QuickTime
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_111)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_112)
xetex_CFLAGS = # $(WARNING_CFLAGS)
xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -2541,7 +2544,7 @@ nodist_xetex_SOURCES = $(xetex_c_h) xetex_pool.c \
xetexdir/etex_version.h xetexdir/xetex_version.h
dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
- $(am__append_112)
+ $(am__append_113)
xetex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -2572,7 +2575,7 @@ libxetex_a_SOURCES = xetexdir/MathTable.h xetexdir/FontTableCache.cpp \
xetexdir/XeTeX_ext.h xetexdir/XeTeXswap.h xetexdir/cmaps.cpp \
xetexdir/cmaps.h xetexdir/sfnt.h xetexdir/trans.c \
xetexdir/trans.h xetexdir/hz.cpp xetexdir/xetex.h \
- $(am__append_75) $(am__append_76) $(am__append_77)
+ $(am__append_76) $(am__append_77) $(am__append_78)
# We must create xetexd.h etc. before building the libxetex_a_OBJECTS.
libxetex_prereq = xetexd.h $(xetex_dependencies)
diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am
index 8d36a3647a8..83485b2141a 100644
--- a/Build/source/texk/web2c/am/texmf.am
+++ b/Build/source/texk/web2c/am/texmf.am
@@ -84,6 +84,9 @@ TRIPTRAP_CLEAN += trip-clean
endif TEX
DISTCLEANFILES += trip.diffs
+## tests/write18-quote-test.pl
+DISTCLEANFILES += write18-quote.log
+
# trip.test
trip.diffs: tex$(EXEEXT)
$(triptrap_diffs) $@
diff --git a/Build/source/texk/web2c/am/web.am b/Build/source/texk/web2c/am/web.am
index c615abd4bea..60c0746828a 100644
--- a/Build/source/texk/web2c/am/web.am
+++ b/Build/source/texk/web2c/am/web.am
@@ -159,6 +159,8 @@ EXTRA_DIST += $(web_tests)
## bibtex.test
DISTCLEANFILES += tests/xexampl.aux tests/xexampl.bbl tests/xexampl.blg
+## tests/bibtex-longline-test.pl
+DISTCLEANFILES += longline.aux longline.bbl longline.bib longline.blg
## tests/bibtex-mem.test
EXTRA_DIST += tests/memdata1.bst tests/memdata2.bst tests/memdata3.bst
DISTCLEANFILES += tests/memtest.bib tests/memtest?.*
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 1400bbc68a5..80099dff764 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -2,6 +2,9 @@
* am/libluatex.am: Avoid to `clean' ../mplibdir/lmplib.c.
+ * am/txt2zlib.am (noinst_PROGRAMS): Conditionally add txt2zlib,
+ such that txt2zlib$(EXEEXT) gets cleaned.
+
2011-09-30 Peter Breitenlohner <peb@mppmu.mpg.de>
* tex/printing.w (print_file_line): Bug fix: avoid uninitialized
diff --git a/Build/source/texk/web2c/luatexdir/am/txt2zlib.am b/Build/source/texk/web2c/luatexdir/am/txt2zlib.am
index 8f83b9c74c7..42bc7be964f 100644
--- a/Build/source/texk/web2c/luatexdir/am/txt2zlib.am
+++ b/Build/source/texk/web2c/luatexdir/am/txt2zlib.am
@@ -3,6 +3,11 @@
## Copyright (C) 2010, 2011 Hartmut Henkel <hartmut@luatex.org>
## You may freely use, modify and/or distribute this file.
+if LUATEX
+if !cross
+noinst_PROGRAMS += txt2zlib
+endif !cross
+endif LUATEX
EXTRA_PROGRAMS += txt2zlib
nodist_txt2zlib_SOURCES = txt2zlib.c
@@ -13,4 +18,3 @@ txt2zlib_LDADD = $(ZLIB_LIBS)
DISTCLEANFILES += txt2zlib.c
-
diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog
index 2d531b4d011..d54bc8f00d9 100644
--- a/Build/source/texk/web2c/web2c/ChangeLog
+++ b/Build/source/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-04 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Add distclean-local to remove kpathsea/ and w2c/.
+
2011-08-17 Peter Breitenlohner <peb@mppmu.mpg.de>
* common.defines: Remove ETEXHELP, LUATEXHELP, PDFTEXHELP.
diff --git a/Build/source/texk/web2c/web2c/Makefile.am b/Build/source/texk/web2c/web2c/Makefile.am
index 087a39e7532..c0874c4d348 100644
--- a/Build/source/texk/web2c/web2c/Makefile.am
+++ b/Build/source/texk/web2c/web2c/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/web2c/web2c/
##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../../m4
@@ -73,3 +73,6 @@ stamp-makecpool: makecpool$(EXEEXT)
echo timestamp >$@
CLEANFILES = $(nodist_noinst_DATA)
+
+distclean-local:
+ rm -rf kpathsea w2c
diff --git a/Build/source/texk/web2c/web2c/Makefile.in b/Build/source/texk/web2c/web2c/Makefile.in
index 5e2df348d38..ff620061931 100644
--- a/Build/source/texk/web2c/web2c/Makefile.in
+++ b/Build/source/texk/web2c/web2c/Makefile.in
@@ -666,7 +666,7 @@ distclean: distclean-am
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
- distclean-hdr distclean-libtool distclean-tags
+ distclean-hdr distclean-libtool distclean-local distclean-tags
dvi: dvi-am
@@ -737,16 +737,16 @@ uninstall-am:
dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \
dist-xz dist-zip distcheck distclean distclean-compile \
distclean-generic distclean-hdr distclean-libtool \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am
+ distclean-local distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am
# Don't include our <c-auto.h>.
@@ -772,6 +772,9 @@ stamp-splitup: splitup$(EXEEXT)
stamp-makecpool: makecpool$(EXEEXT)
echo timestamp >$@
+distclean-local:
+ rm -rf kpathsea w2c
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/Build/source/utils/tpic2pdftex/ChangeLog b/Build/source/utils/tpic2pdftex/ChangeLog
index 83786b17c1c..5f61b06318e 100644
--- a/Build/source/utils/tpic2pdftex/ChangeLog
+++ b/Build/source/utils/tpic2pdftex/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-04 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (EXTRA_DIST): Add tpic2pdftex and tpic2pdftex.1,
+ for 'make dist' on Windows and MinGW.
+
2011-06-10 Peter Breitenlohner <peb@mppmu.mpg.de>
* tpic2pdftex: Fix a syntax error (typo).
diff --git a/Build/source/utils/tpic2pdftex/Makefile.am b/Build/source/utils/tpic2pdftex/Makefile.am
index 8cf97afc6f4..c3099484126 100644
--- a/Build/source/utils/tpic2pdftex/Makefile.am
+++ b/Build/source/utils/tpic2pdftex/Makefile.am
@@ -1,15 +1,15 @@
## Makefile.am for the TeX Live subdirectory utils/tpic2pdftex/
##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
if !WIN32
-dist_bin_SCRIPTS = tpic2pdftex
-
-dist_man1_MANS = tpic2pdftex.1
+bin_SCRIPTS = tpic2pdftex
+man1_MANS = tpic2pdftex.1
endif !WIN32
+EXTRA_DIST = tpic2pdftex tpic2pdftex.1
pic_files = beamerexample.pic example.pic
tpic_files = $(pic_files:.pic=.tpic)
@@ -46,5 +46,5 @@ CLEANFILES = $(pic_files:.pic=.log) *.aux *.nav *.out *.snm *.toc
DISTCLEANFILES = $(pdf_files) $(tex_files) $(tpic_files)
-EXTRA_DIST = $(exp_files) $(pic_files)
+EXTRA_DIST += $(exp_files) $(pic_files)
diff --git a/Build/source/utils/tpic2pdftex/Makefile.in b/Build/source/utils/tpic2pdftex/Makefile.in
index dd787b781bc..89c3754d8bd 100644
--- a/Build/source/utils/tpic2pdftex/Makefile.in
+++ b/Build/source/utils/tpic2pdftex/Makefile.in
@@ -33,9 +33,8 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = .
-DIST_COMMON = README $(am__configure_deps) \
- $(am__dist_bin_SCRIPTS_DIST) $(dist_check_SCRIPTS) \
- $(dist_man1_MANS) $(srcdir)/../../build-aux/install-sh \
+DIST_COMMON = README $(am__configure_deps) $(dist_check_SCRIPTS) \
+ $(srcdir)/../../build-aux/install-sh \
$(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(top_srcdir)/configure \
../../build-aux/config.guess ../../build-aux/config.sub \
@@ -52,7 +51,6 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-am__dist_bin_SCRIPTS_DIST = tpic2pdftex
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +73,12 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
-SCRIPTS = $(dist_bin_SCRIPTS)
+SCRIPTS = $(bin_SCRIPTS)
SOURCES =
DIST_SOURCES =
man1dir = $(mandir)/man1
NROFF = nroff
-MANS = $(dist_man1_MANS)
+MANS = $(man1_MANS)
am__tty_colors = \
red=; grn=; lgn=; blu=; std=
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -179,8 +177,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-@WIN32_FALSE@dist_bin_SCRIPTS = tpic2pdftex
-@WIN32_FALSE@dist_man1_MANS = tpic2pdftex.1
+@WIN32_FALSE@bin_SCRIPTS = tpic2pdftex
+@WIN32_FALSE@man1_MANS = tpic2pdftex.1
+EXTRA_DIST = tpic2pdftex tpic2pdftex.1 $(exp_files) $(pic_files)
pic_files = beamerexample.pic example.pic
tpic_files = $(pic_files:.pic=.tpic)
tex_files = $(pic_files:.pic=.tex)
@@ -190,7 +189,6 @@ dist_check_SCRIPTS = tpic2pdftex.test
exp_files = $(pic_files:.pic=.exp)
CLEANFILES = $(pic_files:.pic=.log) *.aux *.nav *.out *.snm *.toc
DISTCLEANFILES = $(pdf_files) $(tex_files) $(tpic_files)
-EXTRA_DIST = $(exp_files) $(pic_files)
all: all-am
.SUFFIXES:
@@ -228,10 +226,10 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
-install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
+install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -254,18 +252,18 @@ install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
} \
; done
-uninstall-dist_binSCRIPTS:
+uninstall-binSCRIPTS:
@$(NORMAL_UNINSTALL)
- @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
files=`for p in $$list; do echo "$$p"; done | \
sed -e 's,.*/,,;$(transform)'`; \
test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(bindir)" && rm -f $$files
-install-man1: $(dist_man1_MANS)
+install-man1: $(man1_MANS)
@$(NORMAL_INSTALL)
test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
- @list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+ @list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
{ for i in $$list; do echo "$$i"; done; \
} | while read p; do \
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
@@ -289,7 +287,7 @@ install-man1: $(dist_man1_MANS)
uninstall-man1:
@$(NORMAL_UNINSTALL)
- @list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+ @list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
files=`{ for i in $$list; do echo "$$i"; done; \
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
@@ -618,7 +616,7 @@ install-dvi: install-dvi-am
install-dvi-am:
-install-exec-am: install-dist_binSCRIPTS
+install-exec-am: install-binSCRIPTS
install-html: install-html-am
@@ -658,7 +656,7 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_binSCRIPTS uninstall-man
+uninstall-am: uninstall-binSCRIPTS uninstall-man
uninstall-man: uninstall-man1
@@ -669,15 +667,14 @@ uninstall-man: uninstall-man1
dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
distclean-generic distcleancheck distdir distuninstallcheck \
dvi dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dist_binSCRIPTS \
- install-dvi install-dvi-am install-exec install-exec-am \
- install-html install-html-am install-info install-info-am \
- install-man install-man1 install-pdf install-pdf-am install-ps \
+ install-binSCRIPTS install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-man1 install-pdf install-pdf-am install-ps \
install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-dist_binSCRIPTS uninstall-man \
- uninstall-man1
+ uninstall-am uninstall-binSCRIPTS uninstall-man uninstall-man1
doc: $(pdf_files)