From 6c35e87bdc5a3f64833dbbc42e7d42e683db9d5b Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 20 Nov 2012 11:21:26 +0000 Subject: 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 --- Build/source/texk/ps2pkm/ChangeLog | 4 ++++ Build/source/texk/ps2pkm/Makefile.am | 3 +-- Build/source/texk/ps2pkm/Makefile.in | 5 ++--- Build/source/texk/ps2pkm/aclocal.m4 | 6 +++--- 4 files changed, 10 insertions(+), 8 deletions(-) (limited to 'Build/source/texk/ps2pkm') 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 + + * Makefile.am: Avoid use of deprecated INCLUDES. + 2012-10-15 Peter Breitenlohner 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]))]) -- cgit v1.2.3