diff options
Diffstat (limited to 'Build/source/texk/ptexenc')
-rw-r--r-- | Build/source/texk/ptexenc/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/ptexenc/Makefile.am | 4 | ||||
-rw-r--r-- | Build/source/texk/ptexenc/Makefile.in | 6 | ||||
-rw-r--r-- | Build/source/texk/ptexenc/aclocal.m4 | 6 |
4 files changed, 12 insertions, 8 deletions
diff --git a/Build/source/texk/ptexenc/ChangeLog b/Build/source/texk/ptexenc/ChangeLog index 9e209cb0bf1..d377de77ba2 100644 --- a/Build/source/texk/ptexenc/ChangeLog +++ b/Build/source/texk/ptexenc/ChangeLog @@ -1,3 +1,7 @@ +2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Avoid use of deprecated INCLUDES. + 2012-09-04 Peter Breitenlohner <peb@mppmu.mpg.de> * ptexenc.c: Define ptexenc_version_string as PTEXENCVERSION. diff --git a/Build/source/texk/ptexenc/Makefile.am b/Build/source/texk/ptexenc/Makefile.am index 299711bf896..3c0adc35afe 100644 --- a/Build/source/texk/ptexenc/Makefile.am +++ b/Build/source/texk/ptexenc/Makefile.am @@ -9,12 +9,12 @@ ACLOCAL_AMFLAGS = -I ../../m4 .PHONY: rebuild rebuild: all -INCLUDES = $(KPATHSEA_INCLUDES) +AM_CPPFLAGS = $(KPATHSEA_INCLUDES) AM_CFLAGS = $(WARNING_CFLAGS) lib_LTLIBRARIES = libptexenc.la -libptexenc_la_CPPFLAGS = -DMAKE_PTENC_DLL +libptexenc_la_CPPFLAGS = $(AM_CPPFLAGS) -DMAKE_PTENC_DLL libptexenc_la_LDFLAGS = -no-undefined -version-info $(PTEXENC_LT_VERSINFO) diff --git a/Build/source/texk/ptexenc/Makefile.in b/Build/source/texk/ptexenc/Makefile.in index 9ef0ae67edf..3f72e508616 100644 --- a/Build/source/texk/ptexenc/Makefile.in +++ b/Build/source/texk/ptexenc/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. @@ -285,10 +285,10 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -INCLUDES = $(KPATHSEA_INCLUDES) +AM_CPPFLAGS = $(KPATHSEA_INCLUDES) AM_CFLAGS = $(WARNING_CFLAGS) lib_LTLIBRARIES = libptexenc.la -libptexenc_la_CPPFLAGS = -DMAKE_PTENC_DLL +libptexenc_la_CPPFLAGS = $(AM_CPPFLAGS) -DMAKE_PTENC_DLL libptexenc_la_LDFLAGS = -no-undefined -version-info $(PTEXENC_LT_VERSINFO) # Note: jisx0208.h is a copy of ../../libs/gd/gd-2.0.35/jisx0208.h. diff --git a/Build/source/texk/ptexenc/aclocal.m4 b/Build/source/texk/ptexenc/aclocal.m4 index a378403b5dc..38af38c1916 100644 --- a/Build/source/texk/ptexenc/aclocal.m4 +++ b/Build/source/texk/ptexenc/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]))]) |