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/cjkutils/ChangeLog | 4 ++++ Build/source/texk/cjkutils/Makefile.am | 9 ++++----- Build/source/texk/cjkutils/Makefile.in | 9 ++++----- Build/source/texk/cjkutils/aclocal.m4 | 6 +++--- 4 files changed, 15 insertions(+), 13 deletions(-) (limited to 'Build/source/texk/cjkutils') 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 + + * Makefile.am: Avoid use of deprecated INCLUDES. + 2012-05-11 Peter Breitenlohner 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 +## Copyright (C) 2009-2012 Peter Breitenlohner ## 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]))]) -- cgit v1.2.3