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/xdvik | |
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/xdvik')
-rw-r--r-- | Build/source/texk/xdvik/ChangeLog.TL | 4 | ||||
-rw-r--r-- | Build/source/texk/xdvik/Makefile.am | 2 | ||||
-rw-r--r-- | Build/source/texk/xdvik/Makefile.in | 4 | ||||
-rw-r--r-- | Build/source/texk/xdvik/aclocal.m4 | 6 | ||||
-rw-r--r-- | Build/source/texk/xdvik/squeeze/Makefile.in | 2 | ||||
-rw-r--r-- | Build/source/texk/xdvik/squeeze/aclocal.m4 | 6 | ||||
-rw-r--r-- | Build/source/texk/xdvik/tests/Makefile.am | 4 | ||||
-rw-r--r-- | Build/source/texk/xdvik/tests/Makefile.in | 4 |
8 files changed, 18 insertions, 14 deletions
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 = \ |