diff options
Diffstat (limited to 'Build/source/texk/dviljk')
| -rw-r--r-- | Build/source/texk/dviljk/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/texk/dviljk/Makefile.am | 13 | ||||
| -rw-r--r-- | Build/source/texk/dviljk/Makefile.in | 13 | ||||
| -rw-r--r-- | Build/source/texk/dviljk/aclocal.m4 | 6 | ||||
| -rw-r--r-- | Build/source/texk/dviljk/win32/Makefile.in | 2 |
5 files changed, 20 insertions, 18 deletions
diff --git a/Build/source/texk/dviljk/ChangeLog b/Build/source/texk/dviljk/ChangeLog index a70c472f153..ed9cc7b7b03 100644 --- a/Build/source/texk/dviljk/ChangeLog +++ b/Build/source/texk/dviljk/ChangeLog @@ -1,3 +1,7 @@ +2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Avoid use of deprecated INCLUDES. + 2012-10-03 Peter Breitenlohner <peb@mppmu.mpg.de> * dvi2xx.c [WIN32]: Avoid segmentation fault for missing WINDIR. diff --git a/Build/source/texk/dviljk/Makefile.am b/Build/source/texk/dviljk/Makefile.am index b875ff94b78..0a4a67f9393 100644 --- a/Build/source/texk/dviljk/Makefile.am +++ b/Build/source/texk/dviljk/Makefile.am @@ -1,12 +1,11 @@ ## Makefile.am for the TeX Live subdirectory texk/dviljk/ ## -## Copyright (C) 2009-2011 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 -INCLUDES = $(KPATHSEA_INCLUDES) -AM_CPPFLAGS = -DKPATHSEA +AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) noinst_LIBRARIES = libdvilj.a @@ -32,19 +31,19 @@ dvi2xx_sources = \ dvi2xx.c \ dvi2xx.h -dvilj_CPPFLAGS = -DKPATHSEA -DLJ +dvilj_CPPFLAGS = $(AM_CPPFLAGS) -DLJ dvilj_SOURCES = $(dvi2xx_sources) $(dvilj_OBJECTS): libdvilj.a -dvilj2p_CPPFLAGS = -DKPATHSEA -DLJ2P +dvilj2p_CPPFLAGS = $(AM_CPPFLAGS) -DLJ2P dvilj2p_SOURCES = $(dvi2xx_sources) $(dvilj2p_OBJECTS): libdvilj.a -dvilj4_CPPFLAGS = -DKPATHSEA -DLJ4 +dvilj4_CPPFLAGS = $(AM_CPPFLAGS) -DLJ4 dvilj4_SOURCES = $(dvi2xx_sources) $(dvilj4_OBJECTS): libdvilj.a -dvilj4l_CPPFLAGS = -DKPATHSEA -DLJ4 -DLJ4L +dvilj4l_CPPFLAGS = $(AM_CPPFLAGS) -DLJ4 -DLJ4L dvilj4l_SOURCES = $(dvi2xx_sources) $(dvilj4l_OBJECTS): libdvilj.a diff --git a/Build/source/texk/dviljk/Makefile.in b/Build/source/texk/dviljk/Makefile.in index 05616a6d5db..8bc9f861731 100644 --- a/Build/source/texk/dviljk/Makefile.in +++ b/Build/source/texk/dviljk/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. @@ -358,8 +358,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -INCLUDES = $(KPATHSEA_INCLUDES) -AM_CPPFLAGS = -DKPATHSEA +AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) noinst_LIBRARIES = libdvilj.a libdvilj_a_SOURCES = \ @@ -374,13 +373,13 @@ dvi2xx_sources = \ dvi2xx.c \ dvi2xx.h -dvilj_CPPFLAGS = -DKPATHSEA -DLJ +dvilj_CPPFLAGS = $(AM_CPPFLAGS) -DLJ dvilj_SOURCES = $(dvi2xx_sources) -dvilj2p_CPPFLAGS = -DKPATHSEA -DLJ2P +dvilj2p_CPPFLAGS = $(AM_CPPFLAGS) -DLJ2P dvilj2p_SOURCES = $(dvi2xx_sources) -dvilj4_CPPFLAGS = -DKPATHSEA -DLJ4 +dvilj4_CPPFLAGS = $(AM_CPPFLAGS) -DLJ4 dvilj4_SOURCES = $(dvi2xx_sources) -dvilj4l_CPPFLAGS = -DKPATHSEA -DLJ4 -DLJ4L +dvilj4l_CPPFLAGS = $(AM_CPPFLAGS) -DLJ4 -DLJ4L dvilj4l_SOURCES = $(dvi2xx_sources) LDADD = libdvilj.a $(KPATHSEA_LIBS) dvilj6_CPPFLAGS = -DEXEPROG=\"dvilj4.exe\" diff --git a/Build/source/texk/dviljk/aclocal.m4 b/Build/source/texk/dviljk/aclocal.m4 index c6d64cffddb..19f62da85ee 100644 --- a/Build/source/texk/dviljk/aclocal.m4 +++ b/Build/source/texk/dviljk/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/dviljk/win32/Makefile.in b/Build/source/texk/dviljk/win32/Makefile.in index 993b057f028..2cd80829662 100644 --- a/Build/source/texk/dviljk/win32/Makefile.in +++ b/Build/source/texk/dviljk/win32/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. |