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

4 files changed, 10 insertions, 6 deletions

diff --git a/Build/source/utils/xpdfopen/ChangeLog b/Build/source/utils/xpdfopen/ChangeLog
index f0ec83b2125..a68ea7bebb1 100644
--- a/Build/source/utils/xpdfopen/ChangeLog
+++ b/Build/source/utils/xpdfopen/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Avoid use of deprecated INCLUDES.
+
 2012-03-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* utils.c: Move extern decl from here ...
diff --git a/Build/source/utils/xpdfopen/Makefile.am b/Build/source/utils/xpdfopen/Makefile.am
index 96289a5738b..9c259383f83 100644
--- a/Build/source/utils/xpdfopen/Makefile.am
+++ b/Build/source/utils/xpdfopen/Makefile.am
@@ -5,8 +5,8 @@
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
+AM_CPPFLAGS = $(X_CFLAGS)
 AM_CFLAGS = $(WARNING_CFLAGS)
-INCLUDES = $(X_CFLAGS)
 
 LDADD = $(X_LIBS) -lX11 -lXmu $(X_EXTRA_LIBS)
 
diff --git a/Build/source/utils/xpdfopen/Makefile.in b/Build/source/utils/xpdfopen/Makefile.in
index 37d5d68d81e..965af8d4b2c 100644
--- a/Build/source/utils/xpdfopen/Makefile.in
+++ b/Build/source/utils/xpdfopen/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.
@@ -241,8 +241,8 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
+AM_CPPFLAGS = $(X_CFLAGS)
 AM_CFLAGS = $(WARNING_CFLAGS)
-INCLUDES = $(X_CFLAGS)
 LDADD = $(X_LIBS) -lX11 -lXmu $(X_EXTRA_LIBS)
 common_sources = sendx.c sendx.h utils.c utils.h xpdfopen.h
 pdfopen_SOURCES = pdfopen.c $(common_sources)
diff --git a/Build/source/utils/xpdfopen/aclocal.m4 b/Build/source/utils/xpdfopen/aclocal.m4
index a7ba883eeed..d9ad5fe21b5 100644
--- a/Build/source/utils/xpdfopen/aclocal.m4
+++ b/Build/source/utils/xpdfopen/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]))])