summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-11-20 11:21:26 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-11-20 11:21:26 +0000
commit6c35e87bdc5a3f64833dbbc42e7d42e683db9d5b (patch)
tree3d6c2b1c91966d75a1815cfb28d1599814261399 /Build/source/texk
parentc1c530d70568b0a4bca08c3c96acee24bf44f7b1 (diff)
automake 1.12.5
*/Makefile.am: Avoid use of deprecated INCLUDES web2c: Add (c)tangleboot dependencies git-svn-id: svn://tug.org/texlive/trunk@28314 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/Makefile.in2
-rw-r--r--Build/source/texk/aclocal.m46
-rw-r--r--Build/source/texk/afm2pl/ChangeLog4
-rw-r--r--Build/source/texk/afm2pl/Makefile.am4
-rw-r--r--Build/source/texk/afm2pl/Makefile.in4
-rw-r--r--Build/source/texk/afm2pl/aclocal.m46
-rw-r--r--Build/source/texk/bibtex8/ChangeLog4
-rw-r--r--Build/source/texk/bibtex8/Makefile.am5
-rw-r--r--Build/source/texk/bibtex8/Makefile.in5
-rw-r--r--Build/source/texk/bibtex8/aclocal.m46
-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.in5
-rw-r--r--Build/source/texk/bibtexu/aclocal.m46
-rw-r--r--Build/source/texk/chktex/Makefile.in2
-rw-r--r--Build/source/texk/chktex/aclocal.m46
-rw-r--r--Build/source/texk/cjkutils/ChangeLog4
-rw-r--r--Build/source/texk/cjkutils/Makefile.am9
-rw-r--r--Build/source/texk/cjkutils/Makefile.in9
-rw-r--r--Build/source/texk/cjkutils/aclocal.m46
-rw-r--r--Build/source/texk/detex/ChangeLog4
-rw-r--r--Build/source/texk/detex/Makefile.am5
-rw-r--r--Build/source/texk/detex/Makefile.in5
-rw-r--r--Build/source/texk/detex/aclocal.m46
-rw-r--r--Build/source/texk/devnag/Makefile.in2
-rw-r--r--Build/source/texk/devnag/aclocal.m46
-rw-r--r--Build/source/texk/devnag/src/Makefile.in2
-rw-r--r--Build/source/texk/dtl/Makefile.in2
-rw-r--r--Build/source/texk/dtl/aclocal.m46
-rw-r--r--Build/source/texk/dvi2tty/ChangeLog4
-rw-r--r--Build/source/texk/dvi2tty/Makefile.am3
-rw-r--r--Build/source/texk/dvi2tty/Makefile.in5
-rw-r--r--Build/source/texk/dvi2tty/aclocal.m46
-rw-r--r--Build/source/texk/dvidvi/ChangeLog4
-rw-r--r--Build/source/texk/dvidvi/Makefile.am5
-rw-r--r--Build/source/texk/dvidvi/Makefile.in5
-rw-r--r--Build/source/texk/dvidvi/aclocal.m46
-rw-r--r--Build/source/texk/dviljk/ChangeLog4
-rw-r--r--Build/source/texk/dviljk/Makefile.am13
-rw-r--r--Build/source/texk/dviljk/Makefile.in13
-rw-r--r--Build/source/texk/dviljk/aclocal.m46
-rw-r--r--Build/source/texk/dviljk/win32/Makefile.in2
-rw-r--r--Build/source/texk/dvipdfmx/Makefile.in2
-rw-r--r--Build/source/texk/dvipdfmx/aclocal.m46
-rw-r--r--Build/source/texk/dvipdfmx/data/Makefile.in2
-rw-r--r--Build/source/texk/dvipdfmx/man/Makefile.in2
-rw-r--r--Build/source/texk/dvipdfmx/src/Makefile.in2
-rw-r--r--Build/source/texk/dvipng/Makefile.in2
-rw-r--r--Build/source/texk/dvipng/aclocal.m46
-rw-r--r--Build/source/texk/dvipng/doc/Makefile.in2
-rw-r--r--Build/source/texk/dvipng/help/Makefile.in2
-rw-r--r--Build/source/texk/dvipos/ChangeLog4
-rw-r--r--Build/source/texk/dvipos/Makefile.am5
-rw-r--r--Build/source/texk/dvipos/Makefile.in5
-rw-r--r--Build/source/texk/dvipos/aclocal.m46
-rw-r--r--Build/source/texk/dvipsk/ChangeLog4
-rw-r--r--Build/source/texk/dvipsk/Makefile.am3
-rw-r--r--Build/source/texk/dvipsk/Makefile.in5
-rw-r--r--Build/source/texk/dvipsk/aclocal.m46
-rw-r--r--Build/source/texk/dvipsk/squeeze/Makefile.in2
-rw-r--r--Build/source/texk/dvipsk/squeeze/aclocal.m46
-rw-r--r--Build/source/texk/dvisvgm/ChangeLog4
-rw-r--r--Build/source/texk/dvisvgm/Makefile.am12
-rw-r--r--Build/source/texk/dvisvgm/Makefile.in12
-rw-r--r--Build/source/texk/dvisvgm/aclocal.m46
-rw-r--r--Build/source/texk/gsftopk/ChangeLog4
-rw-r--r--Build/source/texk/gsftopk/Makefile.am5
-rw-r--r--Build/source/texk/gsftopk/Makefile.in5
-rw-r--r--Build/source/texk/gsftopk/aclocal.m46
-rw-r--r--Build/source/texk/kpathsea/ChangeLog4
-rw-r--r--Build/source/texk/kpathsea/Makefile.am6
-rw-r--r--Build/source/texk/kpathsea/Makefile.in8
-rw-r--r--Build/source/texk/kpathsea/aclocal.m46
-rw-r--r--Build/source/texk/kpathsea/doc/Makefile.in2
-rw-r--r--Build/source/texk/kpathsea/man/Makefile.in2
-rw-r--r--Build/source/texk/kpathsea/win32/Makefile.in2
-rw-r--r--Build/source/texk/lacheck/Makefile.in2
-rw-r--r--Build/source/texk/lacheck/aclocal.m46
-rw-r--r--Build/source/texk/lcdf-typetools/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/aclocal.m46
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/Makefile.in2
-rw-r--r--Build/source/texk/makeindexk/ChangeLog4
-rw-r--r--Build/source/texk/makeindexk/Makefile.am3
-rw-r--r--Build/source/texk/makeindexk/Makefile.in5
-rw-r--r--Build/source/texk/makeindexk/aclocal.m46
-rw-r--r--Build/source/texk/makejvf/ChangeLog4
-rw-r--r--Build/source/texk/makejvf/Makefile.am2
-rw-r--r--Build/source/texk/makejvf/Makefile.in4
-rw-r--r--Build/source/texk/makejvf/aclocal.m46
-rw-r--r--Build/source/texk/mendexk/ChangeLog4
-rw-r--r--Build/source/texk/mendexk/Makefile.am2
-rw-r--r--Build/source/texk/mendexk/Makefile.in4
-rw-r--r--Build/source/texk/mendexk/aclocal.m46
-rw-r--r--Build/source/texk/ps2pkm/ChangeLog4
-rw-r--r--Build/source/texk/ps2pkm/Makefile.am3
-rw-r--r--Build/source/texk/ps2pkm/Makefile.in5
-rw-r--r--Build/source/texk/ps2pkm/aclocal.m46
-rw-r--r--Build/source/texk/ptexenc/ChangeLog4
-rw-r--r--Build/source/texk/ptexenc/Makefile.am4
-rw-r--r--Build/source/texk/ptexenc/Makefile.in6
-rw-r--r--Build/source/texk/ptexenc/aclocal.m46
-rw-r--r--Build/source/texk/seetexk/ChangeLog4
-rw-r--r--Build/source/texk/seetexk/Makefile.am3
-rw-r--r--Build/source/texk/seetexk/Makefile.in5
-rw-r--r--Build/source/texk/seetexk/aclocal.m46
-rw-r--r--Build/source/texk/tetex/Makefile.in2
-rw-r--r--Build/source/texk/tetex/aclocal.m46
-rw-r--r--Build/source/texk/tex4htk/ChangeLog4
-rw-r--r--Build/source/texk/tex4htk/Makefile.am5
-rw-r--r--Build/source/texk/tex4htk/Makefile.in5
-rw-r--r--Build/source/texk/tex4htk/aclocal.m46
-rw-r--r--Build/source/texk/texlive/Makefile.in2
-rw-r--r--Build/source/texk/texlive/aclocal.m46
-rw-r--r--Build/source/texk/texlive/context/Makefile.in2
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.am1
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.in1
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/m-tx/m-tx.lua175
-rw-r--r--Build/source/texk/texlive/linked_scripts/scripts.lst2
-rw-r--r--Build/source/texk/ttf2pk/ChangeLog4
-rw-r--r--Build/source/texk/ttf2pk/Makefile.am4
-rw-r--r--Build/source/texk/ttf2pk/Makefile.in6
-rw-r--r--Build/source/texk/ttf2pk/aclocal.m46
-rw-r--r--Build/source/texk/ttf2pk2/ChangeLog4
-rw-r--r--Build/source/texk/ttf2pk2/Makefile.am4
-rw-r--r--Build/source/texk/ttf2pk2/Makefile.in6
-rw-r--r--Build/source/texk/ttf2pk2/aclocal.m46
-rw-r--r--Build/source/texk/ttfdump/ChangeLog4
-rw-r--r--Build/source/texk/ttfdump/Makefile.am3
-rw-r--r--Build/source/texk/ttfdump/Makefile.in5
-rw-r--r--Build/source/texk/ttfdump/aclocal.m46
-rw-r--r--Build/source/texk/web2c/ChangeLog5
-rw-r--r--Build/source/texk/web2c/Makefile.in5
-rw-r--r--Build/source/texk/web2c/aclocal.m46
-rw-r--r--Build/source/texk/web2c/am/bootstrap.am3
-rw-r--r--Build/source/texk/web2c/doc/Makefile.in2
-rw-r--r--Build/source/texk/web2c/lib/Makefile.in2
-rw-r--r--Build/source/texk/web2c/man/Makefile.in2
-rw-r--r--Build/source/texk/web2c/omegafonts/Makefile.in2
-rw-r--r--Build/source/texk/web2c/otps/Makefile.in2
-rw-r--r--Build/source/texk/web2c/otps/win32/Makefile.in2
-rw-r--r--Build/source/texk/web2c/web2c/Makefile.in2
-rw-r--r--Build/source/texk/web2c/web2c/aclocal.m46
-rw-r--r--Build/source/texk/web2c/window/Makefile.in2
-rw-r--r--Build/source/texk/xdv2pdf/ChangeLog4
-rw-r--r--Build/source/texk/xdv2pdf/Makefile.am5
-rw-r--r--Build/source/texk/xdv2pdf/Makefile.in5
-rw-r--r--Build/source/texk/xdv2pdf/aclocal.m46
-rw-r--r--Build/source/texk/xdvik/ChangeLog.TL4
-rw-r--r--Build/source/texk/xdvik/Makefile.am2
-rw-r--r--Build/source/texk/xdvik/Makefile.in4
-rw-r--r--Build/source/texk/xdvik/aclocal.m46
-rw-r--r--Build/source/texk/xdvik/squeeze/Makefile.in2
-rw-r--r--Build/source/texk/xdvik/squeeze/aclocal.m46
-rw-r--r--Build/source/texk/xdvik/tests/Makefile.am4
-rw-r--r--Build/source/texk/xdvik/tests/Makefile.in4
-rw-r--r--Build/source/texk/xdvipdfmx/ChangeLog4
-rw-r--r--Build/source/texk/xdvipdfmx/Makefile.in2
-rw-r--r--Build/source/texk/xdvipdfmx/aclocal.m46
-rw-r--r--Build/source/texk/xdvipdfmx/src/Makefile.am5
-rw-r--r--Build/source/texk/xdvipdfmx/src/Makefile.in5
173 files changed, 584 insertions, 328 deletions
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in
index f0bb4f52031..30ad287976e 100644
--- a/Build/source/texk/Makefile.in
+++ b/Build/source/texk/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/aclocal.m4 b/Build/source/texk/aclocal.m4
index f45fa1bb23b..b4de49d7f48 100644
--- a/Build/source/texk/aclocal.m4
+++ b/Build/source/texk/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/afm2pl/ChangeLog b/Build/source/texk/afm2pl/ChangeLog
index f6490edec76..72805e39e29 100644
--- a/Build/source/texk/afm2pl/ChangeLog
+++ b/Build/source/texk/afm2pl/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-03-12 Peter Breitenlohner <peb@mppmu.mpg.de>
* afm2pl.c (readargs): Correct the fdims array size (3 => 5).
diff --git a/Build/source/texk/afm2pl/Makefile.am b/Build/source/texk/afm2pl/Makefile.am
index 93e246a0249..426f752a1b7 100644
--- a/Build/source/texk/afm2pl/Makefile.am
+++ b/Build/source/texk/afm2pl/Makefile.am
@@ -1,11 +1,11 @@
## Makefile.am for the TeX Live subdirectory texk/afm2pl/
##
-## Copyright (C) 2009, 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = afm2pl
diff --git a/Build/source/texk/afm2pl/Makefile.in b/Build/source/texk/afm2pl/Makefile.in
index 20e17dd16d0..29543885aa9 100644
--- a/Build/source/texk/afm2pl/Makefile.in
+++ b/Build/source/texk/afm2pl/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -285,7 +285,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
afm2pl_SOURCES = afm2pl.c
DISTCLEANFILES = config.force logo10.*
diff --git a/Build/source/texk/afm2pl/aclocal.m4 b/Build/source/texk/afm2pl/aclocal.m4
index ae3b389ff17..3ee540fca73 100644
--- a/Build/source/texk/afm2pl/aclocal.m4
+++ b/Build/source/texk/afm2pl/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/bibtex8/ChangeLog b/Build/source/texk/bibtex8/ChangeLog
index c530050fb40..cabfb1a00ff 100644
--- a/Build/source/texk/bibtex8/ChangeLog
+++ b/Build/source/texk/bibtex8/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-10-11 Peter Breitenlohner <peb@mppmu.mpg.de>
* utils.c (c8read_csf): DEFAULT_BIBTEX_CSFILE is set to
diff --git a/Build/source/texk/bibtex8/Makefile.am b/Build/source/texk/bibtex8/Makefile.am
index fff00562cc4..1456cf1c4a8 100644
--- a/Build/source/texk/bibtex8/Makefile.am
+++ b/Build/source/texk/bibtex8/Makefile.am
@@ -1,12 +1,11 @@
## Makefile.am for the TeX Live subdirectory texk/bibtex8/
##
-## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DUNIX -DKPATHSEA -DSUPPORT_8BIT
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA -DSUPPORT_8BIT
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = bibtex8
diff --git a/Build/source/texk/bibtex8/Makefile.in b/Build/source/texk/bibtex8/Makefile.in
index 81d01ba20fe..28d5002b301 100644
--- a/Build/source/texk/bibtex8/Makefile.in
+++ b/Build/source/texk/bibtex8/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -288,8 +288,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DUNIX -DKPATHSEA -DSUPPORT_8BIT
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA -DSUPPORT_8BIT
AM_CFLAGS = $(WARNING_CFLAGS)
bibtex8_SOURCES = \
bibtex-1.c \
diff --git a/Build/source/texk/bibtex8/aclocal.m4 b/Build/source/texk/bibtex8/aclocal.m4
index ae3b389ff17..3ee540fca73 100644
--- a/Build/source/texk/bibtex8/aclocal.m4
+++ b/Build/source/texk/bibtex8/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/bibtexu/ChangeLog b/Build/source/texk/bibtexu/ChangeLog
index 641564910b2..1df017a2a3d 100644
--- a/Build/source/texk/bibtexu/ChangeLog
+++ b/Build/source/texk/bibtexu/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-10-11 Peter Breitenlohner <peb@mppmu.mpg.de>
* utils.c (c8read_csf): DEFAULT_BIBTEX_CSFILE is set to
diff --git a/Build/source/texk/bibtexu/Makefile.am b/Build/source/texk/bibtexu/Makefile.am
index 8c5c029ed3d..395d95923a3 100644
--- a/Build/source/texk/bibtexu/Makefile.am
+++ b/Build/source/texk/bibtexu/Makefile.am
@@ -1,12 +1,11 @@
## Makefile.am for the TeX Live subdirectory texk/bibtexu/
##
-## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES) $(ICU_INCLUDES)
-AM_CPPFLAGS = -DUNIX -DKPATHSEA -DSUPPORT_8BIT
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(ICU_INCLUDES) -DUNIX -DKPATHSEA -DSUPPORT_8BIT
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = bibtexu
diff --git a/Build/source/texk/bibtexu/Makefile.in b/Build/source/texk/bibtexu/Makefile.in
index d1c14420963..2822b7735ee 100644
--- a/Build/source/texk/bibtexu/Makefile.in
+++ b/Build/source/texk/bibtexu/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -309,8 +309,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES) $(ICU_INCLUDES)
-AM_CPPFLAGS = -DUNIX -DKPATHSEA -DSUPPORT_8BIT
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(ICU_INCLUDES) -DUNIX -DKPATHSEA -DSUPPORT_8BIT
AM_CFLAGS = $(WARNING_CFLAGS)
# Force Automake to use CXXLD for linking
diff --git a/Build/source/texk/bibtexu/aclocal.m4 b/Build/source/texk/bibtexu/aclocal.m4
index 3c34b823148..a6ffc947233 100644
--- a/Build/source/texk/bibtexu/aclocal.m4
+++ b/Build/source/texk/bibtexu/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/chktex/Makefile.in b/Build/source/texk/chktex/Makefile.in
index a9a5e3fd87c..7d301d1c718 100644
--- a/Build/source/texk/chktex/Makefile.in
+++ b/Build/source/texk/chktex/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/chktex/aclocal.m4 b/Build/source/texk/chktex/aclocal.m4
index c6d64cffddb..19f62da85ee 100644
--- a/Build/source/texk/chktex/aclocal.m4
+++ b/Build/source/texk/chktex/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/cjkutils/ChangeLog b/Build/source/texk/cjkutils/ChangeLog
index bcce3438a2c..5159d687973 100644
--- a/Build/source/texk/cjkutils/ChangeLog
+++ b/Build/source/texk/cjkutils/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-05-11 Peter Breitenlohner <peb@mppmu.mpg.de>
Import cjk-4.8.3/utils as cjkutils-4.8.3.
diff --git a/Build/source/texk/cjkutils/Makefile.am b/Build/source/texk/cjkutils/Makefile.am
index 092205faacb..7b227c40b3b 100644
--- a/Build/source/texk/cjkutils/Makefile.am
+++ b/Build/source/texk/cjkutils/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/cjkutils/
##
-## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
@@ -26,8 +26,7 @@ config.force: $(KPATHSEA_DEPEND)
DISTCLEANFILES = config.force
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = $(XX_CPPFLAGS)
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(XX_CPPFLAGS)
AM_CFLAGS = $(XX_CFLAGS)
bin_PROGRAMS = \
@@ -43,7 +42,7 @@ hbf2gf_SOURCES = \
$(CJKUTILS_TREE)/hbf2gf/hbf.c \
$(CJKUTILS_TREE)/hbf2gf/hbf.h \
hbf2gf.c
-hbf2gf_CPPFLAGS = -I$(srcdir)/$(CJKUTILS_TREE)/hbf2gf -Dunix -DHAVE_LIBKPATHSEA $(AM_CPPFLAGS)
+hbf2gf_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/$(CJKUTILS_TREE)/hbf2gf -Dunix -DHAVE_LIBKPATHSEA
hbf2gf_DEPENDENCIES = $(KPATHSEA_DEPEND)
hbf2gf_LDADD = $(KPATHSEA_LIBS)
@@ -73,7 +72,7 @@ gbklatex_DEPENDENCIES = $(KPATHSEA_DEPEND)
gbklatex_LDADD = $(KPATHSEA_LIBS)
gbkpdflatex_SOURCES = $(gbklatex_SOURCES)
-gbkpdflatex_CPPFLAGS = -DLATEX=\"pdflatex\" $(AM_CPPFLAGS)
+gbkpdflatex_CPPFLAGS = $(AM_CPPFLAGS) -DLATEX=\"pdflatex\"
gbkpdflatex_DEPENDENCIES = $(gbklatex_DEPENDENCIES)
gbkpdflatex_LDADD = $(gbklatex_LDADD)
diff --git a/Build/source/texk/cjkutils/Makefile.in b/Build/source/texk/cjkutils/Makefile.in
index 57d4ea71bed..9b3c25c8020 100644
--- a/Build/source/texk/cjkutils/Makefile.in
+++ b/Build/source/texk/cjkutils/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -337,15 +337,14 @@ EXTRA_DIST = $(CJKUTILS_TREE) $(CJKUTILS_TREE)-PATCHES $(CWEB_TEX) \
tests/sjisconv.cjk
DISTCLEANFILES = config.force bg5conv.cjk cefconv.cjk cef5conv.cjk \
cefsconv.cjk extconv.cjk sjisconv.cjk
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = $(XX_CPPFLAGS)
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(XX_CPPFLAGS)
AM_CFLAGS = $(XX_CFLAGS)
hbf2gf_SOURCES = \
$(CJKUTILS_TREE)/hbf2gf/hbf.c \
$(CJKUTILS_TREE)/hbf2gf/hbf.h \
hbf2gf.c
-hbf2gf_CPPFLAGS = -I$(srcdir)/$(CJKUTILS_TREE)/hbf2gf -Dunix -DHAVE_LIBKPATHSEA $(AM_CPPFLAGS)
+hbf2gf_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/$(CJKUTILS_TREE)/hbf2gf -Dunix -DHAVE_LIBKPATHSEA
hbf2gf_DEPENDENCIES = $(KPATHSEA_DEPEND)
hbf2gf_LDADD = $(KPATHSEA_LIBS)
@WIN32_TRUE@HOOK_DST = bg5 cef5 cef cefs sjis
@@ -356,7 +355,7 @@ gbklatex_SOURCES = \
gbklatex_DEPENDENCIES = $(KPATHSEA_DEPEND)
gbklatex_LDADD = $(KPATHSEA_LIBS)
gbkpdflatex_SOURCES = $(gbklatex_SOURCES)
-gbkpdflatex_CPPFLAGS = -DLATEX=\"pdflatex\" $(AM_CPPFLAGS)
+gbkpdflatex_CPPFLAGS = $(AM_CPPFLAGS) -DLATEX=\"pdflatex\"
gbkpdflatex_DEPENDENCIES = $(gbklatex_DEPENDENCIES)
gbkpdflatex_LDADD = $(gbklatex_LDADD)
@WIN32_FALSE@bin_SCRIPTS = \
diff --git a/Build/source/texk/cjkutils/aclocal.m4 b/Build/source/texk/cjkutils/aclocal.m4
index c6d64cffddb..19f62da85ee 100644
--- a/Build/source/texk/cjkutils/aclocal.m4
+++ b/Build/source/texk/cjkutils/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/detex/ChangeLog b/Build/source/texk/detex/ChangeLog
index d836e489b14..b344a8731c5 100644
--- a/Build/source/texk/detex/ChangeLog
+++ b/Build/source/texk/detex/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2010-09-24 Peter Breitenlohner <peb@mppmu.mpg.de>
* Remove detex-2.7/ and detex-2.7-PATCHES/.
diff --git a/Build/source/texk/detex/Makefile.am b/Build/source/texk/detex/Makefile.am
index f24df275862..c4030b42ccc 100644
--- a/Build/source/texk/detex/Makefile.am
+++ b/Build/source/texk/detex/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/detex/
##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
@@ -14,8 +14,7 @@ EXTRA_DIST += $(DETEX_TREE)-PATCHES
dist-hook:
rm -rf `find $(distdir) -name .svn`
-INCLUDES = -I$(top_srcdir)/$(DETEX_TREE) $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DNO_MALLOC_DECL -DKPATHSEA -Dlint
+AM_CPPFLAGS = -I$(top_srcdir)/$(DETEX_TREE) $(KPATHSEA_INCLUDES) -DNO_MALLOC_DECL -DKPATHSEA -Dlint
AM_CFLAGS = $(WARNING_CFLAGS)
## The Makefile.in from 2002 by Thomas Esser applied the sed script
diff --git a/Build/source/texk/detex/Makefile.in b/Build/source/texk/detex/Makefile.in
index 00b88ab1d97..d9bf07a8f85 100644
--- a/Build/source/texk/detex/Makefile.in
+++ b/Build/source/texk/detex/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -297,8 +297,7 @@ top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
EXTRA_DIST = $(DETEX_TREE) $(DETEX_TREE)-PATCHES test.lout test.tex \
test.tout
-INCLUDES = -I$(top_srcdir)/$(DETEX_TREE) $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DNO_MALLOC_DECL -DKPATHSEA -Dlint
+AM_CPPFLAGS = -I$(top_srcdir)/$(DETEX_TREE) $(KPATHSEA_INCLUDES) -DNO_MALLOC_DECL -DKPATHSEA -Dlint
AM_CFLAGS = $(WARNING_CFLAGS)
detex_SOURCES = \
$(DETEX_TREE)/detex.h \
diff --git a/Build/source/texk/detex/aclocal.m4 b/Build/source/texk/detex/aclocal.m4
index ae3b389ff17..3ee540fca73 100644
--- a/Build/source/texk/detex/aclocal.m4
+++ b/Build/source/texk/detex/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/devnag/Makefile.in b/Build/source/texk/devnag/Makefile.in
index 19229bfd515..babcb4a4d43 100644
--- a/Build/source/texk/devnag/Makefile.in
+++ b/Build/source/texk/devnag/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/devnag/aclocal.m4 b/Build/source/texk/devnag/aclocal.m4
index a7ba883eeed..d9ad5fe21b5 100644
--- a/Build/source/texk/devnag/aclocal.m4
+++ b/Build/source/texk/devnag/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/devnag/src/Makefile.in b/Build/source/texk/devnag/src/Makefile.in
index 628f85b0143..7a02b4be817 100644
--- a/Build/source/texk/devnag/src/Makefile.in
+++ b/Build/source/texk/devnag/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/dtl/Makefile.in b/Build/source/texk/dtl/Makefile.in
index 7fcc032f021..113632ca0fb 100644
--- a/Build/source/texk/dtl/Makefile.in
+++ b/Build/source/texk/dtl/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/dtl/aclocal.m4 b/Build/source/texk/dtl/aclocal.m4
index ae3b389ff17..3ee540fca73 100644
--- a/Build/source/texk/dtl/aclocal.m4
+++ b/Build/source/texk/dtl/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/dvi2tty/ChangeLog b/Build/source/texk/dvi2tty/ChangeLog
index ae7990f2cbd..678d52ca9b2 100644
--- a/Build/source/texk/dvi2tty/ChangeLog
+++ b/Build/source/texk/dvi2tty/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-04-25 Peter Breitenlohner <peb@mppmu.mpg.de>
* dvi2tty.test: Add a copyright statement.
diff --git a/Build/source/texk/dvi2tty/Makefile.am b/Build/source/texk/dvi2tty/Makefile.am
index d1aa8dfc6aa..c63048782d5 100644
--- a/Build/source/texk/dvi2tty/Makefile.am
+++ b/Build/source/texk/dvi2tty/Makefile.am
@@ -17,8 +17,7 @@ EXTRA_DIST += $(DVI2TTY_TREE)-PATCHES
dist-hook:
rm -rf `find $(distdir) -name .svn`
-INCLUDES = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DKPATHSEA
+AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
LDADD = $(KPATHSEA_LIBS)
diff --git a/Build/source/texk/dvi2tty/Makefile.in b/Build/source/texk/dvi2tty/Makefile.in
index f612dcb4084..2b58fd8e132 100644
--- a/Build/source/texk/dvi2tty/Makefile.in
+++ b/Build/source/texk/dvi2tty/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -295,8 +295,7 @@ top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
EXTRA_DIST = $(DVI2TTY_TREE) $(DVI2TTY_TREE)-PATCHES $(TESTS) \
ligtest.dis ligtest.tty test.tty testc.tty tests.tty testu.tty
-INCLUDES = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DKPATHSEA
+AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
LDADD = $(KPATHSEA_LIBS)
disdvi_SOURCES = \
diff --git a/Build/source/texk/dvi2tty/aclocal.m4 b/Build/source/texk/dvi2tty/aclocal.m4
index 49440f655c5..d8842336438 100644
--- a/Build/source/texk/dvi2tty/aclocal.m4
+++ b/Build/source/texk/dvi2tty/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/dvidvi/ChangeLog b/Build/source/texk/dvidvi/ChangeLog
index 805c942ca4e..6a0f52d4ae3 100644
--- a/Build/source/texk/dvidvi/ChangeLog
+++ b/Build/source/texk/dvidvi/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-05-29 Peter Breitenlohner <peb@mppmu.mpg.de>
* dvidvi.c: Drop the problematic prototype for isatty(),
diff --git a/Build/source/texk/dvidvi/Makefile.am b/Build/source/texk/dvidvi/Makefile.am
index 9083f8f984c..73881629b74 100644
--- a/Build/source/texk/dvidvi/Makefile.am
+++ b/Build/source/texk/dvidvi/Makefile.am
@@ -1,12 +1,11 @@
## Makefile.am for the TeX Live subdirectory texk/dvidvi/
##
-## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DKPATHSEA -DUNIX
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA -DUNIX
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = dvidvi
diff --git a/Build/source/texk/dvidvi/Makefile.in b/Build/source/texk/dvidvi/Makefile.in
index ce7453d135b..c652f5f7d12 100644
--- a/Build/source/texk/dvidvi/Makefile.in
+++ b/Build/source/texk/dvidvi/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -283,8 +283,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DKPATHSEA -DUNIX
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA -DUNIX
AM_CFLAGS = $(WARNING_CFLAGS)
dvidvi_SOURCES = dvidvi.c
dist_man1_MANS = dvidvi.1
diff --git a/Build/source/texk/dvidvi/aclocal.m4 b/Build/source/texk/dvidvi/aclocal.m4
index ae3b389ff17..3ee540fca73 100644
--- a/Build/source/texk/dvidvi/aclocal.m4
+++ b/Build/source/texk/dvidvi/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/dviljk/ChangeLog b/Build/source/texk/dviljk/ChangeLog
index a70c472f153..ed9cc7b7b03 100644
--- a/Build/source/texk/dviljk/ChangeLog
+++ b/Build/source/texk/dviljk/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-10-03 Peter Breitenlohner <peb@mppmu.mpg.de>
* dvi2xx.c [WIN32]: Avoid segmentation fault for missing WINDIR.
diff --git a/Build/source/texk/dviljk/Makefile.am b/Build/source/texk/dviljk/Makefile.am
index b875ff94b78..0a4a67f9393 100644
--- a/Build/source/texk/dviljk/Makefile.am
+++ b/Build/source/texk/dviljk/Makefile.am
@@ -1,12 +1,11 @@
## Makefile.am for the TeX Live subdirectory texk/dviljk/
##
-## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DKPATHSEA
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
noinst_LIBRARIES = libdvilj.a
@@ -32,19 +31,19 @@ dvi2xx_sources = \
dvi2xx.c \
dvi2xx.h
-dvilj_CPPFLAGS = -DKPATHSEA -DLJ
+dvilj_CPPFLAGS = $(AM_CPPFLAGS) -DLJ
dvilj_SOURCES = $(dvi2xx_sources)
$(dvilj_OBJECTS): libdvilj.a
-dvilj2p_CPPFLAGS = -DKPATHSEA -DLJ2P
+dvilj2p_CPPFLAGS = $(AM_CPPFLAGS) -DLJ2P
dvilj2p_SOURCES = $(dvi2xx_sources)
$(dvilj2p_OBJECTS): libdvilj.a
-dvilj4_CPPFLAGS = -DKPATHSEA -DLJ4
+dvilj4_CPPFLAGS = $(AM_CPPFLAGS) -DLJ4
dvilj4_SOURCES = $(dvi2xx_sources)
$(dvilj4_OBJECTS): libdvilj.a
-dvilj4l_CPPFLAGS = -DKPATHSEA -DLJ4 -DLJ4L
+dvilj4l_CPPFLAGS = $(AM_CPPFLAGS) -DLJ4 -DLJ4L
dvilj4l_SOURCES = $(dvi2xx_sources)
$(dvilj4l_OBJECTS): libdvilj.a
diff --git a/Build/source/texk/dviljk/Makefile.in b/Build/source/texk/dviljk/Makefile.in
index 05616a6d5db..8bc9f861731 100644
--- a/Build/source/texk/dviljk/Makefile.in
+++ b/Build/source/texk/dviljk/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -358,8 +358,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DKPATHSEA
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
noinst_LIBRARIES = libdvilj.a
libdvilj_a_SOURCES = \
@@ -374,13 +373,13 @@ dvi2xx_sources = \
dvi2xx.c \
dvi2xx.h
-dvilj_CPPFLAGS = -DKPATHSEA -DLJ
+dvilj_CPPFLAGS = $(AM_CPPFLAGS) -DLJ
dvilj_SOURCES = $(dvi2xx_sources)
-dvilj2p_CPPFLAGS = -DKPATHSEA -DLJ2P
+dvilj2p_CPPFLAGS = $(AM_CPPFLAGS) -DLJ2P
dvilj2p_SOURCES = $(dvi2xx_sources)
-dvilj4_CPPFLAGS = -DKPATHSEA -DLJ4
+dvilj4_CPPFLAGS = $(AM_CPPFLAGS) -DLJ4
dvilj4_SOURCES = $(dvi2xx_sources)
-dvilj4l_CPPFLAGS = -DKPATHSEA -DLJ4 -DLJ4L
+dvilj4l_CPPFLAGS = $(AM_CPPFLAGS) -DLJ4 -DLJ4L
dvilj4l_SOURCES = $(dvi2xx_sources)
LDADD = libdvilj.a $(KPATHSEA_LIBS)
dvilj6_CPPFLAGS = -DEXEPROG=\"dvilj4.exe\"
diff --git a/Build/source/texk/dviljk/aclocal.m4 b/Build/source/texk/dviljk/aclocal.m4
index c6d64cffddb..19f62da85ee 100644
--- a/Build/source/texk/dviljk/aclocal.m4
+++ b/Build/source/texk/dviljk/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/dviljk/win32/Makefile.in b/Build/source/texk/dviljk/win32/Makefile.in
index 993b057f028..2cd80829662 100644
--- a/Build/source/texk/dviljk/win32/Makefile.in
+++ b/Build/source/texk/dviljk/win32/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/dvipdfmx/Makefile.in b/Build/source/texk/dvipdfmx/Makefile.in
index 7563550fe46..97097740863 100644
--- a/Build/source/texk/dvipdfmx/Makefile.in
+++ b/Build/source/texk/dvipdfmx/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/dvipdfmx/aclocal.m4 b/Build/source/texk/dvipdfmx/aclocal.m4
index 5eb7f3221f3..333d716bb5c 100644
--- a/Build/source/texk/dvipdfmx/aclocal.m4
+++ b/Build/source/texk/dvipdfmx/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/dvipdfmx/data/Makefile.in b/Build/source/texk/dvipdfmx/data/Makefile.in
index 512d8c06938..7efe91e8fad 100644
--- a/Build/source/texk/dvipdfmx/data/Makefile.in
+++ b/Build/source/texk/dvipdfmx/data/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/dvipdfmx/man/Makefile.in b/Build/source/texk/dvipdfmx/man/Makefile.in
index fcec31ee9c3..9ea3eb4162c 100644
--- a/Build/source/texk/dvipdfmx/man/Makefile.in
+++ b/Build/source/texk/dvipdfmx/man/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/dvipdfmx/src/Makefile.in b/Build/source/texk/dvipdfmx/src/Makefile.in
index 4a504664204..ba7a0ec954b 100644
--- a/Build/source/texk/dvipdfmx/src/Makefile.in
+++ b/Build/source/texk/dvipdfmx/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in
index ac7973fe61e..8f0762fe0ac 100644
--- a/Build/source/texk/dvipng/Makefile.in
+++ b/Build/source/texk/dvipng/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/dvipng/aclocal.m4 b/Build/source/texk/dvipng/aclocal.m4
index 3a7425a153f..5dd9480433f 100644
--- a/Build/source/texk/dvipng/aclocal.m4
+++ b/Build/source/texk/dvipng/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/dvipng/doc/Makefile.in b/Build/source/texk/dvipng/doc/Makefile.in
index efbda7db6d7..3cf8dd21112 100644
--- a/Build/source/texk/dvipng/doc/Makefile.in
+++ b/Build/source/texk/dvipng/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/dvipng/help/Makefile.in b/Build/source/texk/dvipng/help/Makefile.in
index bb062915b57..d57ef36cb11 100644
--- a/Build/source/texk/dvipng/help/Makefile.in
+++ b/Build/source/texk/dvipng/help/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/dvipos/ChangeLog b/Build/source/texk/dvipos/ChangeLog
index b6caa0e5367..bb015e2cf2c 100644
--- a/Build/source/texk/dvipos/ChangeLog
+++ b/Build/source/texk/dvipos/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-07-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* dvipos.c: Pass program name string to kpse_set_program_name.
diff --git a/Build/source/texk/dvipos/Makefile.am b/Build/source/texk/dvipos/Makefile.am
index bda8a83f4dd..669740c1918 100644
--- a/Build/source/texk/dvipos/Makefile.am
+++ b/Build/source/texk/dvipos/Makefile.am
@@ -1,12 +1,11 @@
## Makefile.am for the TeX Live subdirectory texk/dvipos/
##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DKPATHSEA
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = dvipos
diff --git a/Build/source/texk/dvipos/Makefile.in b/Build/source/texk/dvipos/Makefile.in
index db9fcbfaffe..555128dacaf 100644
--- a/Build/source/texk/dvipos/Makefile.in
+++ b/Build/source/texk/dvipos/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -281,8 +281,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DKPATHSEA
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
dvipos_SOURCES = \
dvicore.c \
diff --git a/Build/source/texk/dvipos/aclocal.m4 b/Build/source/texk/dvipos/aclocal.m4
index ae3b389ff17..3ee540fca73 100644
--- a/Build/source/texk/dvipos/aclocal.m4
+++ b/Build/source/texk/dvipos/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index eaca6c73096..7f981911ac2 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-08-10 Peter Breitenlohner <peb@mppmu.mpg.de>
* ptexmac.h: Drop unused definition of M_PI & Co.
diff --git a/Build/source/texk/dvipsk/Makefile.am b/Build/source/texk/dvipsk/Makefile.am
index ce603d64fbd..06814e00995 100644
--- a/Build/source/texk/dvipsk/Makefile.am
+++ b/Build/source/texk/dvipsk/Makefile.am
@@ -7,8 +7,7 @@ ACLOCAL_AMFLAGS = -I ../../m4
SUBDIRS = squeeze
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DUNIX -DKPATHSEA -DSHIFTLOWCHARS
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA -DSHIFTLOWCHARS
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = afm2tfm dvips
diff --git a/Build/source/texk/dvipsk/Makefile.in b/Build/source/texk/dvipsk/Makefile.in
index a598224e934..d95310cfbec 100644
--- a/Build/source/texk/dvipsk/Makefile.in
+++ b/Build/source/texk/dvipsk/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -355,8 +355,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
SUBDIRS = squeeze
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DUNIX -DKPATHSEA -DSHIFTLOWCHARS
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA -DSHIFTLOWCHARS
AM_CFLAGS = $(WARNING_CFLAGS)
afm2tfm_SOURCES = afm2tfm.c
dvips_SOURCES = \
diff --git a/Build/source/texk/dvipsk/aclocal.m4 b/Build/source/texk/dvipsk/aclocal.m4
index ae3b389ff17..3ee540fca73 100644
--- a/Build/source/texk/dvipsk/aclocal.m4
+++ b/Build/source/texk/dvipsk/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/dvipsk/squeeze/Makefile.in b/Build/source/texk/dvipsk/squeeze/Makefile.in
index 6394c6fcbc4..35d5f6c07ae 100644
--- a/Build/source/texk/dvipsk/squeeze/Makefile.in
+++ b/Build/source/texk/dvipsk/squeeze/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/dvipsk/squeeze/aclocal.m4 b/Build/source/texk/dvipsk/squeeze/aclocal.m4
index 08e75ec5fa0..ff241cca61b 100644
--- a/Build/source/texk/dvipsk/squeeze/aclocal.m4
+++ b/Build/source/texk/dvipsk/squeeze/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog
index 871fa5c954e..0bf85b05b8e 100644
--- a/Build/source/texk/dvisvgm/ChangeLog
+++ b/Build/source/texk/dvisvgm/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-09-28 Peter Breitenlohner <peb@mppmu.mpg.de>
* Imported release 1.0.12.
diff --git a/Build/source/texk/dvisvgm/Makefile.am b/Build/source/texk/dvisvgm/Makefile.am
index 84fdede2936..31639ed1b42 100644
--- a/Build/source/texk/dvisvgm/Makefile.am
+++ b/Build/source/texk/dvisvgm/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/dvisvgm/
##
-## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
#************************************************************************
@@ -24,12 +24,12 @@ EXTRA_DIST += $(DVISVGM_TREE)-PATCHES
dist-hook:
rm -rf `find $(distdir) -name .svn`
-INCLUDES = -I$(top_srcdir)/$(DVISVGM_TREE)/src
-INCLUDES += -I$(top_srcdir)/$(DVISVGM_TREE)/potracelib
-INCLUDES += $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES)
-INCLUDES += $(ZLIB_INCLUDES) $(LIBGS_INCLUDES)
+AM_CPPFLAGS = -I$(top_srcdir)/$(DVISVGM_TREE)/src
+AM_CPPFLAGS += -I$(top_srcdir)/$(DVISVGM_TREE)/potracelib
+AM_CPPFLAGS += $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES)
+AM_CPPFLAGS += $(ZLIB_INCLUDES) $(LIBGS_INCLUDES)
if WIN32
-AM_CPPFLAGS = -DTEXLIVEWIN32
+AM_CPPFLAGS += -DTEXLIVEWIN32
endif WIN32
AM_CFLAGS = $(WARNING_CFLAGS)
AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/Build/source/texk/dvisvgm/Makefile.in b/Build/source/texk/dvisvgm/Makefile.in
index fa41e66dfb5..768af9b69c1 100644
--- a/Build/source/texk/dvisvgm/Makefile.in
+++ b/Build/source/texk/dvisvgm/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -51,8 +51,9 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+@WIN32_TRUE@am__append_1 = -DTEXLIVEWIN32
bin_PROGRAMS = dvisvgm$(EXEEXT)
-@dlloader_TRUE@am__append_1 = \
+@dlloader_TRUE@am__append_2 = \
@dlloader_TRUE@ $(DVISVGM_TREE)/src/DLLoader.cpp
subdir = .
@@ -358,11 +359,10 @@ top_srcdir = @top_srcdir@
#************************************************************************
ACLOCAL_AMFLAGS = -I ../../m4
EXTRA_DIST = $(DVISVGM_TREE) $(DVISVGM_TREE)-PATCHES
-INCLUDES = -I$(top_srcdir)/$(DVISVGM_TREE)/src \
+AM_CPPFLAGS = -I$(top_srcdir)/$(DVISVGM_TREE)/src \
-I$(top_srcdir)/$(DVISVGM_TREE)/potracelib \
$(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(ZLIB_INCLUDES) \
- $(LIBGS_INCLUDES)
-@WIN32_TRUE@AM_CPPFLAGS = -DTEXLIVEWIN32
+ $(LIBGS_INCLUDES) $(am__append_1)
AM_CFLAGS = $(WARNING_CFLAGS)
AM_CXXFLAGS = $(WARNING_CXXFLAGS)
nodist_man_MANS = \
@@ -425,7 +425,7 @@ nodist_libdvisvgm_a_SOURCES = \
$(DVISVGM_TREE)/src/VFReader.cpp \
$(DVISVGM_TREE)/src/XMLDocument.cpp \
$(DVISVGM_TREE)/src/XMLNode.cpp \
- $(DVISVGM_TREE)/src/XMLString.cpp $(am__append_1)
+ $(DVISVGM_TREE)/src/XMLString.cpp $(am__append_2)
nodist_libpotrace_a_SOURCES = \
$(DVISVGM_TREE)/potracelib/curve.c \
$(DVISVGM_TREE)/potracelib/decompose.c \
diff --git a/Build/source/texk/dvisvgm/aclocal.m4 b/Build/source/texk/dvisvgm/aclocal.m4
index 0f38c6f3af0..d699f803263 100644
--- a/Build/source/texk/dvisvgm/aclocal.m4
+++ b/Build/source/texk/dvisvgm/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/gsftopk/ChangeLog b/Build/source/texk/gsftopk/ChangeLog
index ba2bed9c378..9d55718c9d2 100644
--- a/Build/source/texk/gsftopk/ChangeLog
+++ b/Build/source/texk/gsftopk/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-10-17 Peter Breitenlohner <peb@mppmu.mpg.de>
* gsftopk.c: Avoid MSVC warning.
diff --git a/Build/source/texk/gsftopk/Makefile.am b/Build/source/texk/gsftopk/Makefile.am
index db3d1510a1f..dd79410c82a 100644
--- a/Build/source/texk/gsftopk/Makefile.am
+++ b/Build/source/texk/gsftopk/Makefile.am
@@ -1,12 +1,11 @@
## Makefile.am for the TeX Live subdirectory texk/gsftopk/
##
-## Copyright (C) 2009, 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DKPATHSEA -Dlint
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA -Dlint
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = gsftopk
diff --git a/Build/source/texk/gsftopk/Makefile.in b/Build/source/texk/gsftopk/Makefile.in
index fc9e433464b..a78b1311cb9 100644
--- a/Build/source/texk/gsftopk/Makefile.in
+++ b/Build/source/texk/gsftopk/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -284,8 +284,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DKPATHSEA -Dlint
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA -Dlint
AM_CFLAGS = $(WARNING_CFLAGS)
gsftopk_SOURCES = \
gsftopk.c \
diff --git a/Build/source/texk/gsftopk/aclocal.m4 b/Build/source/texk/gsftopk/aclocal.m4
index ae3b389ff17..3ee540fca73 100644
--- a/Build/source/texk/gsftopk/aclocal.m4
+++ b/Build/source/texk/gsftopk/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 8207f8dabbf..ca38c166705 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-10-03 Peter Breitenlohner <peb@mppmu.mpg.de>
* mingw32.c: use stat in static int is_dir ().
diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am
index abef1d7646a..ded6f6accbc 100644
--- a/Build/source/texk/kpathsea/Makefile.am
+++ b/Build/source/texk/kpathsea/Makefile.am
@@ -14,12 +14,12 @@ SUBDIRS = . doc man
EXTRA_DIST = BUGS PROJECTS
-INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir)/..
+AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir)/..
AM_CFLAGS = $(WARNING_CFLAGS)
lib_LTLIBRARIES = libkpathsea.la
-libkpathsea_la_CPPFLAGS = -DMAKE_KPSE_DLL
+libkpathsea_la_CPPFLAGS = $(AM_CPPFLAGS) -DMAKE_KPSE_DLL
libkpathsea_la_LDFLAGS = -no-undefined -version-info $(KPSE_LT_VERSINFO)
@@ -229,7 +229,7 @@ kpsewhich_LDADD = libkpathsea.la
EXTRA_PROGRAMS = progname-test xdirtest
-progname_test_CPPFLAGS = -DMAKE_KPSE_DLL -DTEST
+progname_test_CPPFLAGS = $(AM_CPPFLAGS) -DMAKE_KPSE_DLL -DTEST
progname_test_SOURCES = progname.c
progname_test_LDADD = libkpathsea.la
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index f8f041a18aa..996ef7210f9 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -427,10 +427,10 @@ ACLOCAL_AMFLAGS = -I ../../m4
SUBDIRS = . doc man $(am__append_4)
EXTRA_DIST = BUGS PROJECTS putenv.c strcasecmp.c strtol.c strstr.c \
bsnl.awk cnf-to-paths.awk $(TESTS) mktex.cnf win32lib.h.mugica
-INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir)/..
+AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir)/..
AM_CFLAGS = $(WARNING_CFLAGS)
lib_LTLIBRARIES = libkpathsea.la
-libkpathsea_la_CPPFLAGS = -DMAKE_KPSE_DLL
+libkpathsea_la_CPPFLAGS = $(AM_CPPFLAGS) -DMAKE_KPSE_DLL
libkpathsea_la_LDFLAGS = -no-undefined -version-info $(KPSE_LT_VERSINFO)
libkpathsea_la_LIBADD = $(LTLIBOBJS)
BUILT_SOURCES = paths.h
@@ -515,7 +515,7 @@ DISTCLEANFILES = paths.h stamp-paths kpathsea.h
kpseaccess_SOURCES = access.c
kpsereadlink_SOURCES = readlink.c
kpsewhich_LDADD = libkpathsea.la
-progname_test_CPPFLAGS = -DMAKE_KPSE_DLL -DTEST
+progname_test_CPPFLAGS = $(AM_CPPFLAGS) -DMAKE_KPSE_DLL -DTEST
progname_test_SOURCES = progname.c
progname_test_LDADD = libkpathsea.la
xdirtest_LDADD = libkpathsea.la
diff --git a/Build/source/texk/kpathsea/aclocal.m4 b/Build/source/texk/kpathsea/aclocal.m4
index 2006a423297..4528b75cc5c 100644
--- a/Build/source/texk/kpathsea/aclocal.m4
+++ b/Build/source/texk/kpathsea/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/kpathsea/doc/Makefile.in b/Build/source/texk/kpathsea/doc/Makefile.in
index b633d1dae15..3eba34c843d 100644
--- a/Build/source/texk/kpathsea/doc/Makefile.in
+++ b/Build/source/texk/kpathsea/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/kpathsea/man/Makefile.in b/Build/source/texk/kpathsea/man/Makefile.in
index a95c80c9d33..9c708877863 100644
--- a/Build/source/texk/kpathsea/man/Makefile.in
+++ b/Build/source/texk/kpathsea/man/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/kpathsea/win32/Makefile.in b/Build/source/texk/kpathsea/win32/Makefile.in
index 4a62ea57c55..70e293965e3 100644
--- a/Build/source/texk/kpathsea/win32/Makefile.in
+++ b/Build/source/texk/kpathsea/win32/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/lacheck/Makefile.in b/Build/source/texk/lacheck/Makefile.in
index 536e0471e11..7abd21d04cb 100644
--- a/Build/source/texk/lacheck/Makefile.in
+++ b/Build/source/texk/lacheck/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/lacheck/aclocal.m4 b/Build/source/texk/lacheck/aclocal.m4
index 34d3b6c4f1f..574fbb701bc 100644
--- a/Build/source/texk/lacheck/aclocal.m4
+++ b/Build/source/texk/lacheck/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/lcdf-typetools/Makefile.in b/Build/source/texk/lcdf-typetools/Makefile.in
index baf570dcdca..7fde020575a 100644
--- a/Build/source/texk/lcdf-typetools/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/lcdf-typetools/aclocal.m4 b/Build/source/texk/lcdf-typetools/aclocal.m4
index 81f7dbce628..9f109e18217 100644
--- a/Build/source/texk/lcdf-typetools/aclocal.m4
+++ b/Build/source/texk/lcdf-typetools/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/Makefile.in
index b9af7ea6274..930f57092e5 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/Makefile.in
index 40006c95f55..e4bfc5e5e95 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/cfftot1/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/Makefile.in
index 5a43a6778fc..975d768be39 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/libefont/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/Makefile.in
index 87e3eb10557..6ad0901f5c1 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/liblcdf/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/Makefile.in
index f2bbc2c5fff..a0eb48819db 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmafm/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/Makefile.in
index abceddec4ae..1b648a98027 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/mmpfb/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/Makefile.in
index 6356745e2b1..8d42768937c 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otfinfo/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/Makefile.in
index f044107781a..32a0d99462d 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/otftotfm/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/Makefile.in
index 49acbec1a86..fa287f4b871 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1dotlessj/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/Makefile.in
index 883418c03e3..e8f9c1babb5 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1lint/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/Makefile.in
index bfddbd32f69..a986304620a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1rawafm/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/Makefile.in
index 932c448a9fc..b686a3c525a 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1reencode/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/Makefile.in
index 61a95af317e..0e2e059bb5b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/t1testpage/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/Makefile.in b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/Makefile.in
index c3ccb87f150..a34e3cabdcb 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.97/ttftotype42/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/makeindexk/ChangeLog b/Build/source/texk/makeindexk/ChangeLog
index cf38559a887..21cf05f2f04 100644
--- a/Build/source/texk/makeindexk/ChangeLog
+++ b/Build/source/texk/makeindexk/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-10-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* mkind.h: Drop duplicate '#include "c-auto.h"'.
diff --git a/Build/source/texk/makeindexk/Makefile.am b/Build/source/texk/makeindexk/Makefile.am
index a621eb2d3c9..4580372e209 100644
--- a/Build/source/texk/makeindexk/Makefile.am
+++ b/Build/source/texk/makeindexk/Makefile.am
@@ -5,8 +5,7 @@
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DUNIX -DKPATHSEA
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
if !WIN32
diff --git a/Build/source/texk/makeindexk/Makefile.in b/Build/source/texk/makeindexk/Makefile.in
index 04893be3dd8..de1f28aa84f 100644
--- a/Build/source/texk/makeindexk/Makefile.in
+++ b/Build/source/texk/makeindexk/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -293,8 +293,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DUNIX -DKPATHSEA
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
@WIN32_FALSE@dist_bin_SCRIPTS = mkindex
makeindex_SOURCES = \
diff --git a/Build/source/texk/makeindexk/aclocal.m4 b/Build/source/texk/makeindexk/aclocal.m4
index c6d64cffddb..19f62da85ee 100644
--- a/Build/source/texk/makeindexk/aclocal.m4
+++ b/Build/source/texk/makeindexk/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/makejvf/ChangeLog b/Build/source/texk/makejvf/ChangeLog
index 815a88ff753..063cd545467 100644
--- a/Build/source/texk/makejvf/ChangeLog
+++ b/Build/source/texk/makejvf/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-09-21 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* main.c (main): add break;.
diff --git a/Build/source/texk/makejvf/Makefile.am b/Build/source/texk/makejvf/Makefile.am
index 82498272198..db13189c9ea 100644
--- a/Build/source/texk/makejvf/Makefile.am
+++ b/Build/source/texk/makejvf/Makefile.am
@@ -5,7 +5,7 @@
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES)
+AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = makejvf
diff --git a/Build/source/texk/makejvf/Makefile.in b/Build/source/texk/makejvf/Makefile.in
index 4f6dab7a23a..bb7c195d878 100644
--- a/Build/source/texk/makejvf/Makefile.in
+++ b/Build/source/texk/makejvf/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -259,7 +259,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES)
+AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
makejvf_SOURCES = \
main.c makejvf.h tfmread.c tool.c uniblock.c uniblock.h write.c
diff --git a/Build/source/texk/makejvf/aclocal.m4 b/Build/source/texk/makejvf/aclocal.m4
index 49440f655c5..d8842336438 100644
--- a/Build/source/texk/makejvf/aclocal.m4
+++ b/Build/source/texk/makejvf/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/mendexk/ChangeLog b/Build/source/texk/mendexk/ChangeLog
index adb4c079f78..fe871138320 100644
--- a/Build/source/texk/mendexk/ChangeLog
+++ b/Build/source/texk/mendexk/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-10-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* convert.c: Move common #include's from here ...
diff --git a/Build/source/texk/mendexk/Makefile.am b/Build/source/texk/mendexk/Makefile.am
index 68e25da35d7..7514dcef800 100644
--- a/Build/source/texk/mendexk/Makefile.am
+++ b/Build/source/texk/mendexk/Makefile.am
@@ -5,7 +5,7 @@
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES)
+AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = mendex
diff --git a/Build/source/texk/mendexk/Makefile.in b/Build/source/texk/mendexk/Makefile.in
index e16fa23ad39..b475d4fd273 100644
--- a/Build/source/texk/mendexk/Makefile.in
+++ b/Build/source/texk/mendexk/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -286,7 +286,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES)
+AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
mendex_SOURCES = \
convert.c \
diff --git a/Build/source/texk/mendexk/aclocal.m4 b/Build/source/texk/mendexk/aclocal.m4
index 49440f655c5..d8842336438 100644
--- a/Build/source/texk/mendexk/aclocal.m4
+++ b/Build/source/texk/mendexk/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/ps2pkm/ChangeLog b/Build/source/texk/ps2pkm/ChangeLog
index fe6259c879f..35de344561c 100644
--- a/Build/source/texk/ps2pkm/ChangeLog
+++ b/Build/source/texk/ps2pkm/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-10-15 Peter Breitenlohner <peb@mppmu.mpg.de>
Remove TL vs W32TeX diffs (from Akira).
diff --git a/Build/source/texk/ps2pkm/Makefile.am b/Build/source/texk/ps2pkm/Makefile.am
index 61e45497f28..d912b2fa497 100644
--- a/Build/source/texk/ps2pkm/Makefile.am
+++ b/Build/source/texk/ps2pkm/Makefile.am
@@ -7,8 +7,7 @@ ACLOCAL_AMFLAGS = -I ../../m4
bin_PROGRAMS = mag pfb2pfa pk2bm ps2pk
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DUNIX -DKPATHSEA
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA
AM_CFLAGS = #$(WARNING_CFLAGS)
LDADD = $(KPATHSEA_LIBS)
diff --git a/Build/source/texk/ps2pkm/Makefile.in b/Build/source/texk/ps2pkm/Makefile.in
index 436dbf25f5e..187f82eaa23 100644
--- a/Build/source/texk/ps2pkm/Makefile.in
+++ b/Build/source/texk/ps2pkm/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -309,8 +309,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DUNIX -DKPATHSEA
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA
AM_CFLAGS = #$(WARNING_CFLAGS)
LDADD = $(KPATHSEA_LIBS)
pk2bm_CPPFLAGS =
diff --git a/Build/source/texk/ps2pkm/aclocal.m4 b/Build/source/texk/ps2pkm/aclocal.m4
index ae3b389ff17..3ee540fca73 100644
--- a/Build/source/texk/ps2pkm/aclocal.m4
+++ b/Build/source/texk/ps2pkm/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/ptexenc/ChangeLog b/Build/source/texk/ptexenc/ChangeLog
index 9e209cb0bf1..d377de77ba2 100644
--- a/Build/source/texk/ptexenc/ChangeLog
+++ b/Build/source/texk/ptexenc/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-09-04 Peter Breitenlohner <peb@mppmu.mpg.de>
* ptexenc.c: Define ptexenc_version_string as PTEXENCVERSION.
diff --git a/Build/source/texk/ptexenc/Makefile.am b/Build/source/texk/ptexenc/Makefile.am
index 299711bf896..3c0adc35afe 100644
--- a/Build/source/texk/ptexenc/Makefile.am
+++ b/Build/source/texk/ptexenc/Makefile.am
@@ -9,12 +9,12 @@ ACLOCAL_AMFLAGS = -I ../../m4
.PHONY: rebuild
rebuild: all
-INCLUDES = $(KPATHSEA_INCLUDES)
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
lib_LTLIBRARIES = libptexenc.la
-libptexenc_la_CPPFLAGS = -DMAKE_PTENC_DLL
+libptexenc_la_CPPFLAGS = $(AM_CPPFLAGS) -DMAKE_PTENC_DLL
libptexenc_la_LDFLAGS = -no-undefined -version-info $(PTEXENC_LT_VERSINFO)
diff --git a/Build/source/texk/ptexenc/Makefile.in b/Build/source/texk/ptexenc/Makefile.in
index 9ef0ae67edf..3f72e508616 100644
--- a/Build/source/texk/ptexenc/Makefile.in
+++ b/Build/source/texk/ptexenc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -285,10 +285,10 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
lib_LTLIBRARIES = libptexenc.la
-libptexenc_la_CPPFLAGS = -DMAKE_PTENC_DLL
+libptexenc_la_CPPFLAGS = $(AM_CPPFLAGS) -DMAKE_PTENC_DLL
libptexenc_la_LDFLAGS = -no-undefined -version-info $(PTEXENC_LT_VERSINFO)
# Note: jisx0208.h is a copy of ../../libs/gd/gd-2.0.35/jisx0208.h.
diff --git a/Build/source/texk/ptexenc/aclocal.m4 b/Build/source/texk/ptexenc/aclocal.m4
index a378403b5dc..38af38c1916 100644
--- a/Build/source/texk/ptexenc/aclocal.m4
+++ b/Build/source/texk/ptexenc/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/seetexk/ChangeLog b/Build/source/texk/seetexk/ChangeLog
index d73886d0175..c057addacb1 100644
--- a/Build/source/texk/seetexk/ChangeLog
+++ b/Build/source/texk/seetexk/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-07-25 Ken Brown <kbrow1i@gmail.com>
* seek.c (CopyFile): No special file mode handling for Cygwin.
diff --git a/Build/source/texk/seetexk/Makefile.am b/Build/source/texk/seetexk/Makefile.am
index 01a2b4e04ac..b8f0dbac369 100644
--- a/Build/source/texk/seetexk/Makefile.am
+++ b/Build/source/texk/seetexk/Makefile.am
@@ -5,8 +5,7 @@
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DUNIX -DKPATHSEA
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
noinst_LIBRARIES = libtex.a
diff --git a/Build/source/texk/seetexk/Makefile.in b/Build/source/texk/seetexk/Makefile.in
index 4f263200aaf..cab9b7814e1 100644
--- a/Build/source/texk/seetexk/Makefile.in
+++ b/Build/source/texk/seetexk/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -311,8 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DUNIX -DKPATHSEA
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
noinst_LIBRARIES = libtex.a
libtex_a_SOURCES = \
diff --git a/Build/source/texk/seetexk/aclocal.m4 b/Build/source/texk/seetexk/aclocal.m4
index ae3b389ff17..3ee540fca73 100644
--- a/Build/source/texk/seetexk/aclocal.m4
+++ b/Build/source/texk/seetexk/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in
index a18ade37509..3f0d2246f08 100644
--- a/Build/source/texk/tetex/Makefile.in
+++ b/Build/source/texk/tetex/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/tetex/aclocal.m4 b/Build/source/texk/tetex/aclocal.m4
index 0108fb84b2a..8da4b661610 100644
--- a/Build/source/texk/tetex/aclocal.m4
+++ b/Build/source/texk/tetex/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/tex4htk/ChangeLog b/Build/source/texk/tex4htk/ChangeLog
index bdbb1195d44..aecd7edf945 100644
--- a/Build/source/texk/tex4htk/ChangeLog
+++ b/Build/source/texk/tex4htk/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-07-25 Peter Breitenlohner <peb@mppmu.mpg.de>
* t4ht.c, tex4ht.c [WIN32]: More changes from W32TeX.
diff --git a/Build/source/texk/tex4htk/Makefile.am b/Build/source/texk/tex4htk/Makefile.am
index 6d0295ef9eb..e6d22850498 100644
--- a/Build/source/texk/tex4htk/Makefile.am
+++ b/Build/source/texk/tex4htk/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/tex4htk/
##
-## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
@@ -12,8 +12,7 @@ EXTRA_DIST = java
dist-hook:
rm -rf `find $(distdir) -name .svn`
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DANSI -DKPATHSEA
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DANSI -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = t4ht tex4ht
diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in
index 6be04876d6c..619713ca164 100644
--- a/Build/source/texk/tex4htk/Makefile.in
+++ b/Build/source/texk/tex4htk/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -307,8 +307,7 @@ EXTRA_DIST = java ../../build-aux/relpath dbcontext dblatex dbmcontext \
wxetex xhcontext xhlatex xhmcontext xhmex xhmlatex xhmmex \
xhmtex xhmtexi xhmxelatex xhmxetex xhtex xhtexi xhxelatex \
xhxetex xv4ht.java
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DANSI -DKPATHSEA
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DANSI -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
t4ht_SOURCES = t4ht.c
tex4ht_SOURCES = tex4ht.c
diff --git a/Build/source/texk/tex4htk/aclocal.m4 b/Build/source/texk/tex4htk/aclocal.m4
index c6d64cffddb..19f62da85ee 100644
--- a/Build/source/texk/tex4htk/aclocal.m4
+++ b/Build/source/texk/tex4htk/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/texlive/Makefile.in b/Build/source/texk/texlive/Makefile.in
index ab68ddde709..8c7ad97226b 100644
--- a/Build/source/texk/texlive/Makefile.in
+++ b/Build/source/texk/texlive/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/texlive/aclocal.m4 b/Build/source/texk/texlive/aclocal.m4
index 4c675ff6952..8062e341e3a 100644
--- a/Build/source/texk/texlive/aclocal.m4
+++ b/Build/source/texk/texlive/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/texlive/context/Makefile.in b/Build/source/texk/texlive/context/Makefile.in
index 9ef64aa0eea..80bfc6ed681 100644
--- a/Build/source/texk/texlive/context/Makefile.in
+++ b/Build/source/texk/texlive/context/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am
index 86a3f9dfe0c..f2df72715b9 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.am
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.am
@@ -139,6 +139,7 @@ texmf_dist_other_scripts = \
latexmk/latexmk.pl \
latexpand/latexpand \
luaotfload/mkluatexfontdb.lua \
+ m-tx/m-tx.lua \
match_parens/match_parens \
mathspic/mathspic.pl \
mf2pt1/mf2pt1.pl \
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index c9b823638e2..b6c40a624a2 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -325,6 +325,7 @@ texmf_dist_other_scripts = \
latexmk/latexmk.pl \
latexpand/latexpand \
luaotfload/mkluatexfontdb.lua \
+ m-tx/m-tx.lua \
match_parens/match_parens \
mathspic/mathspic.pl \
mf2pt1/mf2pt1.pl \
diff --git a/Build/source/texk/texlive/linked_scripts/m-tx/m-tx.lua b/Build/source/texk/texlive/linked_scripts/m-tx/m-tx.lua
new file mode 100755
index 00000000000..495777b6d57
--- /dev/null
+++ b/Build/source/texk/texlive/linked_scripts/m-tx/m-tx.lua
@@ -0,0 +1,175 @@
+#!/usr/bin/env texlua
+
+VERSION = "0.4"
+
+--[[
+ m-tx.lua: processes MusiXTeX files using prepmx and pmxab as pre-processors (and deletes intermediate files)
+
+ (c) Copyright 2011-2012 Bob Tennent rdt@cs.queensu.ca
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+--]]
+
+--[[
+
+ ChangeLog:
+
+ version 0.3 2012-04-09 RDT
+ Change name to m-tx to avoid clash with another program.
+
+ version 0.2 2011-11-28 RDT
+ Added -i (retain intermediate files) option
+
+ version 0.1.1 2011-07-18 RDT
+
+ Removed a file check that caused it to fail (only on Windows!)
+
+ version 0.1 2011-07-15 RDT
+
+--]]
+
+function usage()
+ print("Usage: [texlua] m-tx.lua { option | basename[.mtx] } ... ")
+ print("options: -v version")
+ print(" -h help")
+ print(" -l latex (or pdflatex)")
+ print(" -p pdfetex (or pdflatex)")
+ print(" -d dvipdfm")
+ print(" -s stop at dvi")
+ print(" -t stop at tex/mid")
+ print(" -m stop at pmx")
+ print(" -i retain intermediate files")
+ print(" -f restore default processing")
+end
+
+function whoami ()
+ print("This is m-tx.lua version ".. VERSION .. ".")
+end
+
+whoami()
+if #arg == 0 then
+ usage()
+ os.exit(0)
+end
+
+-- defaults:
+prepmx = "prepmx"
+pmx = "pmxab"
+tex = "etex"
+musixflx = "musixflx"
+dvi = "dvips"
+ps2pdf = "ps2pdf"
+intermediate = 1
+
+exit_code = 0
+narg = 1
+repeat
+ this_arg = arg[narg]
+ if this_arg == "-v" then
+ os.exit(0)
+ elseif this_arg == "-h" then
+ usage()
+ os.exit(0)
+ elseif this_arg == "-l" then
+ if tex == "pdfetex" then
+ tex = "pdflatex"
+ else
+ tex = "latex"
+ end
+ elseif this_arg == "-p" then
+ if tex == "latex" then
+ tex = "pdflatex"
+ else
+ tex = "pdfetex"
+ end
+ dvi = ""; ps2pdf = ""
+ elseif this_arg == "-d" then
+ dvi = "dvipdfm"; ps2pdf = ""
+ elseif this_arg == "-s" then
+ dvi = ""; ps2pdf = ""
+ elseif this_arg == "-i" then
+ intermediate = 0
+ elseif this_arg == "-f" then
+ pmx = "pmxab"; tex = "etex"; dvi = "dvips"; ps2pdf = "ps2pdf"; intermediate = 1
+ elseif this_arg == "-t" then
+ tex = ""; dvi = ""; ps2pdf = ""
+ elseif this_arg == "-m" then
+ pmx = ""; tex = ""; dvi = ""; ps2pdf = ""
+ else
+ filename = this_arg
+ if filename ~= "" and string.sub(filename, -4, -1) == ".mtx" then
+ filename = string.sub(filename, 1, -5)
+ end
+ print("Processing ".. filename .. ".mtx.")
+ OK = true
+ if ( os.execute(prepmx .. " " .. filename ) ~= 0 ) then
+ OK = false
+ end
+ if (OK and pmx ~= "") then
+ os.execute(pmx .. " " .. filename) -- does pmx return an error code?
+ pmxaerr = io.open("pmxaerr.dat", "r")
+ if (not pmxaerr) then
+ print("No log file.")
+ OK = false
+ else
+ linebuf = pmxaerr:read()
+ err = tonumber(linebuf)
+ if (err ~= 0) then
+ OK = false
+ end
+ pmxaerr:close()
+ end
+ end
+ os.remove( filename .. ".mx2" )
+ if ( OK ) and
+ (tex == "" or os.execute(tex .. " " .. filename) == 0) and
+ (tex == "" or os.execute(musixflx .. " " .. filename) == 0) and
+ (tex == "" or os.execute(tex .. " " .. filename) == 0) and
+ ((tex ~= "latex" and tex ~= "pdflatex")
+ or (os.execute(tex .. " " .. filename) == 0)) and
+ (dvi == "" or (os.execute(dvi .. " " .. filename) == 0)) and
+ (ps2pdf == "" or (os.execute(ps2pdf .. " " .. filename .. ".ps") == 0) )
+ then
+ if ps2pdf ~= "" then
+ print(filename .. ".pdf generated by " .. ps2pdf .. ".")
+ end
+ if intermediate == 1 then -- clean-up:
+ os.remove( "pmxaerr.dat" )
+ os.remove( filename .. ".mx1" )
+ os.remove( filename .. ".mx2" )
+ if pmx ~= "" then
+ os.remove( filename .. ".pmx" )
+ end
+ if dvi ~= "" then
+ os.remove( filename .. ".dvi" )
+ end
+ if ps2pdf ~= "" then
+ os.remove( filename .. ".ps" )
+ end
+ end
+ else
+ print("M-Tx/pmx/MusiXTeX processing of " .. filename .. ".mtx fails.\n")
+ exit_code = 2
+ --[[ uncomment for debugging
+ print("tex = ", tex)
+ print("dvi = ", dvi)
+ print("ps2pdf = ", ps2pdf)
+ --]]
+ end
+ end --if this_arg == ...
+ narg = narg+1
+until narg > #arg
+os.exit( exit_code )
diff --git a/Build/source/texk/texlive/linked_scripts/scripts.lst b/Build/source/texk/texlive/linked_scripts/scripts.lst
index ef447403826..7409c72c922 100644
--- a/Build/source/texk/texlive/linked_scripts/scripts.lst
+++ b/Build/source/texk/texlive/linked_scripts/scripts.lst
@@ -78,6 +78,7 @@ latexdiff/latexrevise.pl
latexmk/latexmk.pl
latexpand/latexpand
luaotfload/mkluatexfontdb.lua
+m-tx/m-tx.lua
match_parens/match_parens
mathspic/mathspic.pl
mf2pt1/mf2pt1.pl
@@ -92,6 +93,7 @@ pedigree-perl/pedigree.pl
perltex/perltex.pl
pkfix/pkfix.pl
pkfix-helper/pkfix-helper
+pmx/pmx2pdf.lua
pst2pdf/pst2pdf
purifyeps/purifyeps
splitindex/perl/splitindex.pl
diff --git a/Build/source/texk/ttf2pk/ChangeLog b/Build/source/texk/ttf2pk/ChangeLog
index c90d49dae82..8c899495a60 100644
--- a/Build/source/texk/ttf2pk/ChangeLog
+++ b/Build/source/texk/ttf2pk/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-09-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* tests/ttf2pk.cfg, tests/ttf2pk.test: Extend the test to cover
diff --git a/Build/source/texk/ttf2pk/Makefile.am b/Build/source/texk/ttf2pk/Makefile.am
index fbac54d74d6..e75b15844e9 100644
--- a/Build/source/texk/ttf2pk/Makefile.am
+++ b/Build/source/texk/ttf2pk/Makefile.am
@@ -5,8 +5,8 @@
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES) $(FREETYPE_INCLUDES)
-AM_CPPFLAGS = -DHAVE_LIBKPATHSEA
+AM_CPPFLAGS = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES) $(FREETYPE_INCLUDES)
+AM_CPPFLAGS += -DHAVE_LIBKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = ttf2pk ttf2tfm
diff --git a/Build/source/texk/ttf2pk/Makefile.in b/Build/source/texk/ttf2pk/Makefile.in
index 9bd82c70d64..9443ab615d4 100644
--- a/Build/source/texk/ttf2pk/Makefile.in
+++ b/Build/source/texk/ttf2pk/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -305,8 +305,8 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES) $(FREETYPE_INCLUDES)
-AM_CPPFLAGS = -DHAVE_LIBKPATHSEA
+AM_CPPFLAGS = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES) \
+ $(FREETYPE_INCLUDES) -DHAVE_LIBKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
common_sources = \
errormsg.c \
diff --git a/Build/source/texk/ttf2pk/aclocal.m4 b/Build/source/texk/ttf2pk/aclocal.m4
index 4e7f9a9ba98..cfe63b6a498 100644
--- a/Build/source/texk/ttf2pk/aclocal.m4
+++ b/Build/source/texk/ttf2pk/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/ttf2pk2/ChangeLog b/Build/source/texk/ttf2pk2/ChangeLog
index f0dfe1b50f6..120cc642990 100644
--- a/Build/source/texk/ttf2pk2/ChangeLog
+++ b/Build/source/texk/ttf2pk2/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-09-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* tests/ttf2pk.cfg, tests/ttf2pk.test: Extend the test to cover
diff --git a/Build/source/texk/ttf2pk2/Makefile.am b/Build/source/texk/ttf2pk2/Makefile.am
index fe7a373c6d4..dd496bbe1f4 100644
--- a/Build/source/texk/ttf2pk2/Makefile.am
+++ b/Build/source/texk/ttf2pk2/Makefile.am
@@ -5,8 +5,8 @@
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES)
-AM_CPPFLAGS = -DHAVE_LIBKPATHSEA
+AM_CPPFLAGS = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES)
+AM_CPPFLAGS += -DHAVE_LIBKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = ttf2pk ttf2tfm
diff --git a/Build/source/texk/ttf2pk2/Makefile.in b/Build/source/texk/ttf2pk2/Makefile.in
index 2aed8ddde0e..6e70c2102ab 100644
--- a/Build/source/texk/ttf2pk2/Makefile.in
+++ b/Build/source/texk/ttf2pk2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -312,8 +312,8 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES)
-AM_CPPFLAGS = -DHAVE_LIBKPATHSEA
+AM_CPPFLAGS = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES) \
+ $(FREETYPE2_INCLUDES) -DHAVE_LIBKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
common_sources = \
errormsg.c \
diff --git a/Build/source/texk/ttf2pk2/aclocal.m4 b/Build/source/texk/ttf2pk2/aclocal.m4
index 9110f71fddc..ab520b16a57 100644
--- a/Build/source/texk/ttf2pk2/aclocal.m4
+++ b/Build/source/texk/ttf2pk2/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/ttfdump/ChangeLog b/Build/source/texk/ttfdump/ChangeLog
index 8d4362e7c30..953055a7fac 100644
--- a/Build/source/texk/ttfdump/ChangeLog
+++ b/Build/source/texk/ttfdump/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-09-09 Peter Breitenlohner <peb@mppmu.mpg.de>
* include/tables.h, libttf/os2.c: Handle fields present only in
diff --git a/Build/source/texk/ttfdump/Makefile.am b/Build/source/texk/ttfdump/Makefile.am
index 20c82e32e31..5c050992c36 100644
--- a/Build/source/texk/ttfdump/Makefile.am
+++ b/Build/source/texk/ttfdump/Makefile.am
@@ -5,8 +5,7 @@
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DUNIX -DKPATHSEA
+AM_CPPFLAGS = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
noinst_LIBRARIES = libttf.a
diff --git a/Build/source/texk/ttfdump/Makefile.in b/Build/source/texk/ttfdump/Makefile.in
index 6477eb286eb..227c74ccf46 100644
--- a/Build/source/texk/ttfdump/Makefile.in
+++ b/Build/source/texk/ttfdump/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -301,8 +301,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DUNIX -DKPATHSEA
+AM_CPPFLAGS = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
noinst_LIBRARIES = libttf.a
libttf_a_SOURCES = \
diff --git a/Build/source/texk/ttfdump/aclocal.m4 b/Build/source/texk/ttfdump/aclocal.m4
index ae3b389ff17..3ee540fca73 100644
--- a/Build/source/texk/ttfdump/aclocal.m4
+++ b/Build/source/texk/ttfdump/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 1f7c95d9931..4821b16f039 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/bootstrap.am: Add dependency of (c)tangleboot_OBJECTS on
+ (c)tangleboot_DEPENDENCIES.
+
2012-11-13 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Also drop the unused otangle.
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index d4d6b3af061..c2b1ce6d593 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -9516,6 +9516,7 @@ tangleboot-web2c: tangleboot.p $(web2c_depend)
# tangleboot.pin is in the distribution
.pin.p:
cp -f $< $@
+$(tangleboot_OBJECTS): $(tangleboot_DEPENDENCIES)
$(ctangle_OBJECTS): cweb.h
ctangle.c: ctangle-ctangle
@$(ctangleboot) ctangle ctang-w2c
@@ -9525,7 +9526,7 @@ cweb.c cweb.h: common-ctangle
@$(ctangleboot) common comm-w2c cweb.c
common-ctangle: ctangleboot$(EXEEXT) cwebdir/common.w cwebdir/comm-w2c.ch ctangleboot-sh
@$(ctangleboot) common comm-w2c cweb.c
-$(ctangleboot_OBJECTS): cwebboot.h
+$(ctangleboot_OBJECTS): cwebboot.h $(ctangleboot_DEPENDENCIES)
# ctangleboot.cin and cwebboot.[ch]in are in the distribution
.cin.c:
cp -f $< $@
diff --git a/Build/source/texk/web2c/aclocal.m4 b/Build/source/texk/web2c/aclocal.m4
index 9c3444b37d1..e1256bb2264 100644
--- a/Build/source/texk/web2c/aclocal.m4
+++ b/Build/source/texk/web2c/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -141,7 +141,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -157,7 +157,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/web2c/am/bootstrap.am b/Build/source/texk/web2c/am/bootstrap.am
index bf166527a0d..c9cc6db4b8e 100644
--- a/Build/source/texk/web2c/am/bootstrap.am
+++ b/Build/source/texk/web2c/am/bootstrap.am
@@ -40,6 +40,7 @@ tangleboot-web2c: tangleboot.p $(web2c_depend)
# tangleboot.pin is in the distribution
.pin.p:
cp -f $< $@
+$(tangleboot_OBJECTS): $(tangleboot_DEPENDENCIES)
tangleboot_DEPENDENCIES = $(default_dependencies)
EXTRA_DIST += tangleboot.pin
DISTCLEANFILES += tangleboot.c tangleboot.h tangleboot.p tangleboot-web2c
@@ -67,7 +68,7 @@ DISTCLEANFILES += ctangle.c cweb.c cweb.h ctangle-ctangle common-ctangle
noinst_PROGRAMS += ctangleboot
nodist_ctangleboot_SOURCES = ctangleboot.c cwebboot.c
-$(ctangleboot_OBJECTS): cwebboot.h
+$(ctangleboot_OBJECTS): cwebboot.h $(ctangleboot_DEPENDENCIES)
# ctangleboot.cin and cwebboot.[ch]in are in the distribution
.cin.c:
cp -f $< $@
diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in
index 33a5ff6fac0..5b9b384dfcc 100644
--- a/Build/source/texk/web2c/doc/Makefile.in
+++ b/Build/source/texk/web2c/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in
index 153538edde8..7c3435596a7 100644
--- a/Build/source/texk/web2c/lib/Makefile.in
+++ b/Build/source/texk/web2c/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in
index 662ff8f5cd4..243dc0b1129 100644
--- a/Build/source/texk/web2c/man/Makefile.in
+++ b/Build/source/texk/web2c/man/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in
index 9a7badc0213..298233df957 100644
--- a/Build/source/texk/web2c/omegafonts/Makefile.in
+++ b/Build/source/texk/web2c/omegafonts/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in
index 122db00e243..577c9b049c4 100644
--- a/Build/source/texk/web2c/otps/Makefile.in
+++ b/Build/source/texk/web2c/otps/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/web2c/otps/win32/Makefile.in b/Build/source/texk/web2c/otps/win32/Makefile.in
index 144a950881c..d0641fb9401 100644
--- a/Build/source/texk/web2c/otps/win32/Makefile.in
+++ b/Build/source/texk/web2c/otps/win32/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/web2c/web2c/Makefile.in b/Build/source/texk/web2c/web2c/Makefile.in
index 3542e95be6a..02444510134 100644
--- a/Build/source/texk/web2c/web2c/Makefile.in
+++ b/Build/source/texk/web2c/web2c/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/web2c/web2c/aclocal.m4 b/Build/source/texk/web2c/web2c/aclocal.m4
index 330b0b1de54..89eabaf0783 100644
--- a/Build/source/texk/web2c/web2c/aclocal.m4
+++ b/Build/source/texk/web2c/web2c/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/web2c/window/Makefile.in b/Build/source/texk/web2c/window/Makefile.in
index 0b97705d3f0..ab5423c881f 100644
--- a/Build/source/texk/web2c/window/Makefile.in
+++ b/Build/source/texk/web2c/window/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/xdv2pdf/ChangeLog b/Build/source/texk/xdv2pdf/ChangeLog
index dea22420a2a..7ac84334ae5 100644
--- a/Build/source/texk/xdv2pdf/ChangeLog
+++ b/Build/source/texk/xdv2pdf/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2010-05-09 Peter Breitenlohner <peb@mppmu.mpg.de>
* xdv2pdf_main.c, xdv_kpse_formats.h (XDV2PDF_OLD_FORMATS):
diff --git a/Build/source/texk/xdv2pdf/Makefile.am b/Build/source/texk/xdv2pdf/Makefile.am
index 8c2520a930a..57811bf8ec6 100644
--- a/Build/source/texk/xdv2pdf/Makefile.am
+++ b/Build/source/texk/xdv2pdf/Makefile.am
@@ -1,12 +1,11 @@
## Makefile.am for the TeX Live subdirectory texk/xdv2pdf/
##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS =
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
## Not yet for C++ (too many warnings)
AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
diff --git a/Build/source/texk/xdv2pdf/Makefile.in b/Build/source/texk/xdv2pdf/Makefile.in
index a1af93ef09a..a96776ea6eb 100644
--- a/Build/source/texk/xdv2pdf/Makefile.in
+++ b/Build/source/texk/xdv2pdf/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -291,8 +291,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS =
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
AM_OBJCFLAGS = $(WARNING_OBJCFLAGS) -fobjc-exceptions
diff --git a/Build/source/texk/xdv2pdf/aclocal.m4 b/Build/source/texk/xdv2pdf/aclocal.m4
index 2e407ff0d1f..4b101042fca 100644
--- a/Build/source/texk/xdv2pdf/aclocal.m4
+++ b/Build/source/texk/xdv2pdf/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/xdvik/ChangeLog.TL b/Build/source/texk/xdvik/ChangeLog.TL
index 63f59446f46..23bfe538284 100644
--- a/Build/source/texk/xdvik/ChangeLog.TL
+++ b/Build/source/texk/xdvik/ChangeLog.TL
@@ -1,6 +1,10 @@
ChangeLog.TL: Changes for xdvik (TeX Live)
==================================================
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am, tests/Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-04-18 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Remove some obsolete comments.
diff --git a/Build/source/texk/xdvik/Makefile.am b/Build/source/texk/xdvik/Makefile.am
index fbb694ebc60..1fdcf6d16b0 100644
--- a/Build/source/texk/xdvik/Makefile.am
+++ b/Build/source/texk/xdvik/Makefile.am
@@ -11,7 +11,7 @@ SUBDIRS = squeeze . tests
include common.am
-INCLUDES = -I$(srcdir)/gui $(common_includes)
+AM_CPPFLAGS = -I$(srcdir)/gui $(common_includes)
## The object files created from ./*.c and gui/*.c are used for both
## ./xdvi-bin and tests/run_tests.
diff --git a/Build/source/texk/xdvik/Makefile.in b/Build/source/texk/xdvik/Makefile.in
index 8539a165a00..89f16c10b0b 100644
--- a/Build/source/texk/xdvik/Makefile.in
+++ b/Build/source/texk/xdvik/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -413,7 +413,7 @@ xdvi_x_libs = $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt \
common_ldadd = $(KPATHSEA_LIBS) $(T1LIB_LIBS) $(xdvi_x_libs)
common_dependencies = $(KPATHSEA_DEPEND) $(T1LIB_DEPEND)
libxdvi_dependencies = ${top_srcdir}/*.[ch] ${top_srcdir}/gui/*.[ch] ${top_builddir}/psheader.c
-INCLUDES = -I$(srcdir)/gui $(common_includes)
+AM_CPPFLAGS = -I$(srcdir)/gui $(common_includes)
noinst_LIBRARIES = libxdvi.a
nodist_libxdvi_a_SOURCES = psheader.c
libxdvi_a_SOURCES = alloc-debug.h browser.c browser.h c-openmx.h \
diff --git a/Build/source/texk/xdvik/aclocal.m4 b/Build/source/texk/xdvik/aclocal.m4
index bea34ce9e0c..c0ca24a6133 100644
--- a/Build/source/texk/xdvik/aclocal.m4
+++ b/Build/source/texk/xdvik/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/xdvik/squeeze/Makefile.in b/Build/source/texk/xdvik/squeeze/Makefile.in
index 6394c6fcbc4..35d5f6c07ae 100644
--- a/Build/source/texk/xdvik/squeeze/Makefile.in
+++ b/Build/source/texk/xdvik/squeeze/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/xdvik/squeeze/aclocal.m4 b/Build/source/texk/xdvik/squeeze/aclocal.m4
index 08e75ec5fa0..ff241cca61b 100644
--- a/Build/source/texk/xdvik/squeeze/aclocal.m4
+++ b/Build/source/texk/xdvik/squeeze/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/xdvik/tests/Makefile.am b/Build/source/texk/xdvik/tests/Makefile.am
index 20db3c08497..9c89699c1e3 100644
--- a/Build/source/texk/xdvik/tests/Makefile.am
+++ b/Build/source/texk/xdvik/tests/Makefile.am
@@ -1,11 +1,11 @@
## Makefile.am for the TeX Live subdirectory texk/xdvik/tests/
##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
include ../common.am
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gui $(common_includes)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/gui $(common_includes)
AM_CFLAGS = $(WARNING_CFLAGS)
check_PROGRAMS = run_tests
diff --git a/Build/source/texk/xdvik/tests/Makefile.in b/Build/source/texk/xdvik/tests/Makefile.in
index 8dfcb69dc90..1f734a2a543 100644
--- a/Build/source/texk/xdvik/tests/Makefile.in
+++ b/Build/source/texk/xdvik/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -275,7 +275,7 @@ xdvi_x_libs = $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt \
common_ldadd = $(KPATHSEA_LIBS) $(T1LIB_LIBS) $(xdvi_x_libs)
common_dependencies = $(KPATHSEA_DEPEND) $(T1LIB_DEPEND)
libxdvi_dependencies = ${top_srcdir}/*.[ch] ${top_srcdir}/gui/*.[ch] ${top_builddir}/psheader.c
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gui $(common_includes)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/gui $(common_includes)
AM_CFLAGS = $(WARNING_CFLAGS)
TESTS = $(check_PROGRAMS)
run_tests_SOURCES = \
diff --git a/Build/source/texk/xdvipdfmx/ChangeLog b/Build/source/texk/xdvipdfmx/ChangeLog
index 361e35cb182..2e5da29e6d8 100644
--- a/Build/source/texk/xdvipdfmx/ChangeLog
+++ b/Build/source/texk/xdvipdfmx/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * src/Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-09-21 Karl Berry <karl@tug.org>
* many files: remove useless $Header$ from old repo,
diff --git a/Build/source/texk/xdvipdfmx/Makefile.in b/Build/source/texk/xdvipdfmx/Makefile.in
index a32c4d78fd3..d9a1e96d65c 100644
--- a/Build/source/texk/xdvipdfmx/Makefile.in
+++ b/Build/source/texk/xdvipdfmx/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/Build/source/texk/xdvipdfmx/aclocal.m4 b/Build/source/texk/xdvipdfmx/aclocal.m4
index 20e12318894..63bef476ae6 100644
--- a/Build/source/texk/xdvipdfmx/aclocal.m4
+++ b/Build/source/texk/xdvipdfmx/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.12.4], [],
+m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
+[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/xdvipdfmx/src/Makefile.am b/Build/source/texk/xdvipdfmx/src/Makefile.am
index 159844a99e8..1ffc5647e0a 100644
--- a/Build/source/texk/xdvipdfmx/src/Makefile.am
+++ b/Build/source/texk/xdvipdfmx/src/Makefile.am
@@ -1,10 +1,9 @@
## Makefile.am for the TeX Live subdirectory texk/xdvipdfmx/src/
##
-## Copyright (C) 2009, 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
-INCLUDES = $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES)
-AM_CPPFLAGS =
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = xdvipdfmx
diff --git a/Build/source/texk/xdvipdfmx/src/Makefile.in b/Build/source/texk/xdvipdfmx/src/Makefile.in
index c136391ca88..0b0d2a8de8d 100644
--- a/Build/source/texk/xdvipdfmx/src/Makefile.in
+++ b/Build/source/texk/xdvipdfmx/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -257,8 +257,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES)
-AM_CPPFLAGS =
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
xdvipdfmx_SOURCES = \
agl.c bmpimage.c cff.c cff_dict.c cid.c cidtype0.c cidtype2.c \