diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-11-20 11:21:26 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-11-20 11:21:26 +0000 |
commit | 6c35e87bdc5a3f64833dbbc42e7d42e683db9d5b (patch) | |
tree | 3d6c2b1c91966d75a1815cfb28d1599814261399 /Build/source/texk/detex | |
parent | c1c530d70568b0a4bca08c3c96acee24bf44f7b1 (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/detex')
-rw-r--r-- | Build/source/texk/detex/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/detex/Makefile.am | 5 | ||||
-rw-r--r-- | Build/source/texk/detex/Makefile.in | 5 | ||||
-rw-r--r-- | Build/source/texk/detex/aclocal.m4 | 6 |
4 files changed, 11 insertions, 9 deletions
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]))]) |