pdftex[797] branches/stable/source/src: sync with tl r47735
commits+karl at tug.org
commits+karl at tug.org
Thu May 17 19:02:02 CEST 2018
Revision: 797
http://tug.org/svn/pdftex?view=revision&revision=797
Author: karl
Date: 2018-05-17 19:02:02 +0200 (Thu, 17 May 2018)
Log Message:
-----------
sync with tl r47735
Revision Links:
--------------
http://tug.org/svn/pdftex?view=revision&revision=47735
Modified Paths:
--------------
branches/stable/source/src/Makefile.in
branches/stable/source/src/aclocal.m4
branches/stable/source/src/auxdir/auxsub/Makefile.in
branches/stable/source/src/auxdir/auxsub/aclocal.m4
branches/stable/source/src/auxdir/auxsub/configure
branches/stable/source/src/build-aux/config.sub
branches/stable/source/src/configure
branches/stable/source/src/doc/Makefile.in
branches/stable/source/src/doc/build-tools.txt
branches/stable/source/src/doc/tlbuild.info
branches/stable/source/src/libs/Makefile.in
branches/stable/source/src/libs/README
branches/stable/source/src/libs/aclocal.m4
branches/stable/source/src/libs/configure
branches/stable/source/src/libs/libpng/Makefile.in
branches/stable/source/src/libs/libpng/aclocal.m4
branches/stable/source/src/libs/libpng/configure
branches/stable/source/src/libs/libpng/include/Makefile.in
branches/stable/source/src/libs/poppler/ChangeLog
branches/stable/source/src/libs/poppler/Makefile.in
branches/stable/source/src/libs/poppler/TLpatches/ChangeLog
branches/stable/source/src/libs/poppler/TLpatches/TL-Changes
branches/stable/source/src/libs/poppler/TLpatches/patch-03-time
branches/stable/source/src/libs/poppler/aclocal.m4
branches/stable/source/src/libs/poppler/configure
branches/stable/source/src/libs/poppler/include/Makefile.in
branches/stable/source/src/libs/poppler/include/fofi/Makefile.in
branches/stable/source/src/libs/poppler/include/goo/Makefile.in
branches/stable/source/src/libs/poppler/poppler-src/CMakeLists.txt
branches/stable/source/src/libs/poppler/poppler-src/ChangeLog
branches/stable/source/src/libs/poppler/poppler-src/NEWS
branches/stable/source/src/libs/poppler/poppler-src/goo/GooHash.cc
branches/stable/source/src/libs/poppler/poppler-src/goo/GooHash.h
branches/stable/source/src/libs/poppler/poppler-src/goo/GooList.cc
branches/stable/source/src/libs/poppler/poppler-src/goo/GooList.h
branches/stable/source/src/libs/poppler/poppler-src/goo/GooString.cc
branches/stable/source/src/libs/poppler/poppler-src/goo/GooString.h
branches/stable/source/src/libs/poppler/poppler-src/goo/gfile.cc
branches/stable/source/src/libs/poppler/poppler-src/goo/gfile.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/CMap.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/CMap.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoOutputDev.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoOutputDev.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/Catalog.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/Catalog.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/CharCodeToUnicode.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/CharCodeToUnicode.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/DateInfo.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/DateInfo.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/FileSpec.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/FileSpec.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/FontInfo.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/Function.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/Gfx.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/Gfx.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxFont.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxFont.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxState.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/GlobalParams.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/GlobalParamsWin.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/JPEG2000Stream.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/Link.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/Link.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/MarkedContentOutputDev.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/MarkedContentOutputDev.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/Movie.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/Movie.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/Object.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/OptionalContent.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/OptionalContent.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/Outline.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/Outline.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/OutputDev.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/OutputDev.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/PDFDoc.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/PDFDoc.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/PDFDocEncoding.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/PSOutputDev.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/PSOutputDev.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/Page.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/Parser.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/Rendition.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/Rendition.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/Sound.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/Sound.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/SplashOutputDev.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/SplashOutputDev.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/Stream.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/Stream.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/StructElement.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/TextOutputDev.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/TextOutputDev.h
branches/stable/source/src/libs/poppler/poppler-src/poppler/UTF.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/UTF.h
branches/stable/source/src/libs/poppler/version.ac
branches/stable/source/src/libs/xpdf/Makefile.in
branches/stable/source/src/libs/xpdf/aclocal.m4
branches/stable/source/src/libs/xpdf/configure
branches/stable/source/src/libs/xpdf/fofi/Makefile.in
branches/stable/source/src/libs/xpdf/goo/Makefile.in
branches/stable/source/src/libs/xpdf/splash/Makefile.in
branches/stable/source/src/libs/xpdf/xpdf/Makefile.in
branches/stable/source/src/libs/zlib/Makefile.in
branches/stable/source/src/libs/zlib/aclocal.m4
branches/stable/source/src/libs/zlib/configure
branches/stable/source/src/libs/zlib/include/Makefile.in
branches/stable/source/src/texk/Makefile.in
branches/stable/source/src/texk/README
branches/stable/source/src/texk/aclocal.m4
branches/stable/source/src/texk/configure
branches/stable/source/src/texk/kpathsea/ChangeLog
branches/stable/source/src/texk/kpathsea/Makefile.in
branches/stable/source/src/texk/kpathsea/aclocal.m4
branches/stable/source/src/texk/kpathsea/c-auto.in
branches/stable/source/src/texk/kpathsea/configure
branches/stable/source/src/texk/kpathsea/doc/Makefile.in
branches/stable/source/src/texk/kpathsea/kpsewhich.c
branches/stable/source/src/texk/kpathsea/man/Makefile.in
branches/stable/source/src/texk/kpathsea/version.ac
branches/stable/source/src/texk/kpathsea/win32/Makefile.in
branches/stable/source/src/texk/web2c/ChangeLog
branches/stable/source/src/texk/web2c/Makefile.in
branches/stable/source/src/texk/web2c/aclocal.m4
branches/stable/source/src/texk/web2c/configure
branches/stable/source/src/texk/web2c/doc/Makefile.in
branches/stable/source/src/texk/web2c/lib/ChangeLog
branches/stable/source/src/texk/web2c/lib/Makefile.in
branches/stable/source/src/texk/web2c/lib/texmfmp.c
branches/stable/source/src/texk/web2c/man/Makefile.in
branches/stable/source/src/texk/web2c/omegafonts/Makefile.in
branches/stable/source/src/texk/web2c/otps/Makefile.in
branches/stable/source/src/texk/web2c/otps/win32/Makefile.in
branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc
branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
branches/stable/source/src/texk/web2c/pdftexdir/ptexlib.h
branches/stable/source/src/texk/web2c/synctexdir/ChangeLog
branches/stable/source/src/texk/web2c/synctexdir/synctex.c
branches/stable/source/src/texk/web2c/web2c/Makefile.in
branches/stable/source/src/texk/web2c/web2c/aclocal.m4
branches/stable/source/src/texk/web2c/web2c/configure
branches/stable/source/src/texk/web2c/window/Makefile.in
branches/stable/source/src/utils/Makefile.in
branches/stable/source/src/utils/README
branches/stable/source/src/utils/aclocal.m4
branches/stable/source/src/utils/configure
branches/stable/source/src/version.ac
Removed Paths:
-------------
branches/stable/source/src/libs/poppler/TLpatches/patch-05-w32
Modified: branches/stable/source/src/Makefile.in
===================================================================
--- branches/stable/source/src/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -259,7 +259,7 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- cscope distdir dist dist-all distcheck
+ cscope distdir distdir-am dist dist-all distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
@@ -495,7 +495,7 @@
recurse_this =
recurse_top =
-# $Id: recurse.am 43261 2017-02-17 22:37:44Z karl $
+# $Id: Makefile.in 47714 2018-05-14 18:07:32Z karl $
#
# Requires $(recurse_this) and $(recurse_top).
# Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).
@@ -544,8 +544,8 @@
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(srcdir)/am/dist_hook.am $(srcdir)/am/recurse.am $(am__empty):
@@ -673,7 +673,10 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
Modified: branches/stable/source/src/aclocal.m4
===================================================================
--- branches/stable/source/src/aclocal.m4 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/aclocal.m4 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
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.15.1], [],
+m4_if([$1], [1.16.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@
# 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.15.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -58,7 +58,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -141,7 +141,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -332,13 +332,12 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -346,49 +345,41 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ AS_CASE([$CONFIG_FILES],
+ [*\'*], [eval set x "$CONFIG_FILES"],
+ [*], [set x $CONFIG_FILES])
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`AS_DIRNAME(["$am_mf"])`
+ am_filepart=`AS_BASENAME(["$am_mf"])`
+ AM_RUN_LOG([cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles]) || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).])
+ fi
+ AS_UNSET([am_dirpart])
+ AS_UNSET([am_filepart])
+ AS_UNSET([am_mf])
+ AS_UNSET([am_rc])
+ rm -f conftest-deps.mk
}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -397,18 +388,17 @@
# -----------------------------
# This macro should only be invoked once -- use via AC_REQUIRE.
#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
+ [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -495,8 +485,8 @@
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms.
@@ -563,7 +553,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -605,7 +595,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -626,7 +616,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -648,7 +638,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -683,7 +673,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -691,49 +681,42 @@
# AM_MAKE_INCLUDE()
# -----------------
-# Check to see how make treats includes.
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+ AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+ ['0:this is the am__doit target'],
+ [AS_CASE([$s],
+ [BSD], [am__include='.include' am__quote='"'],
+ [am__include='include' am__quote=''])])
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT([${_am_result}])
+AC_SUBST([am__include])])
+AC_SUBST([am__quote])])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -772,7 +755,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -801,7 +784,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -848,7 +831,7 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -867,7 +850,7 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -948,7 +931,7 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1008,7 +991,7 @@
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1036,7 +1019,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1055,7 +1038,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Modified: branches/stable/source/src/auxdir/auxsub/Makefile.in
===================================================================
--- branches/stable/source/src/auxdir/auxsub/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/auxdir/auxsub/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -241,8 +241,8 @@
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -260,7 +260,10 @@
cscope cscopelist:
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
Modified: branches/stable/source/src/auxdir/auxsub/aclocal.m4
===================================================================
--- branches/stable/source/src/auxdir/auxsub/aclocal.m4 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/auxdir/auxsub/aclocal.m4 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
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.15.1], [],
+m4_if([$1], [1.16.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@
# 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.15.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -58,7 +58,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -143,7 +143,7 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -230,8 +230,8 @@
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms.
@@ -298,7 +298,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -340,7 +340,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -361,7 +361,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -383,7 +383,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -418,7 +418,7 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -457,7 +457,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -488,7 +488,7 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -569,7 +569,7 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -629,7 +629,7 @@
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -657,7 +657,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -676,7 +676,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Modified: branches/stable/source/src/auxdir/auxsub/configure
===================================================================
--- branches/stable/source/src/auxdir/auxsub/configure 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/auxdir/auxsub/configure 2018-05-17 17:02:02 UTC (rev 797)
@@ -1745,7 +1745,7 @@
-am__api_version='1.15'
+am__api_version='1.16'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2261,8 +2261,8 @@
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
# We need awk for the "check" target (and possibly the TAP driver). The
@@ -2313,7 +2313,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
Modified: branches/stable/source/src/build-aux/config.sub
===================================================================
--- branches/stable/source/src/build-aux/config.sub 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/build-aux/config.sub 2018-05-17 17:02:02 UTC (rev 797)
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2018-03-08'
+timestamp='2018-05-14'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -110,28 +110,52 @@
exit 1;;
esac
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
- linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
- kopensolaris*-gnu* | cloudabi*-eabi* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
- ;;
- android-linux)
- os=-linux-android
- basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
- ;;
- *)
- basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
- if [ "$basic_machine" != "$1" ]
- then os=`echo "$1" | sed 's/.*-/-/'`
- else os=; fi
- ;;
+# Split fields of configuration type
+IFS="-" read -r field1 field2 field3 field4 <<EOF
+$1
+EOF
+
+# Separate into logical components for further validation
+case $1 in
+ *-*-*-*-*)
+ echo Invalid configuration \`"$1"\': more than four components >&2
+ exit 1
+ ;;
+ *-*-*-*)
+ basic_machine=$field1-$field2
+ os=$field3-$field4
+ ;;
+ *-*-*)
+ # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
+ # parts
+ maybe_os=$field2-$field3
+ case $maybe_os in
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \
+ | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \
+ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
+ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
+ | storm-chaos* | os2-emx* | rtmk-nova*)
+ basic_machine=$field1
+ os=$maybe_os
+ ;;
+ android-linux)
+ basic_machine=$field1-unknown
+ os=linux-android
+ ;;
+ *)
+ basic_machine=$field1-$field2
+ os=$field3
+ ;;
+ esac
+ ;;
+ *-*)
+ basic_machine=$field1
+ os=$field2
+ ;;
+ *)
+ basic_machine=$1
+ os=
+ ;;
esac
### Let's recognize common machines as not being operating systems so
@@ -139,102 +163,102 @@
### recognize some manufacturers as not being operating systems, so we
### can provide default operating systems below.
case $os in
- -sun*os*)
+ sun*os*)
# Prevent following clause from handling this invalid input.
;;
- -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
- -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
- -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray | -microblaze*)
+ dec* | mips* | sequent* | encore* | pc532* | sgi* | sony* | \
+ att* | 7300* | 3300* | delta* | motorola* | sun[234]* | \
+ unicom* | ibm* | next | hp | isi* | apollo | altos* | \
+ convergent* | ncr* | news | 32* | 3600* | 3100* | hitachi* |\
+ c[123]* | convex* | sun | crds | omron* | dg | ultra | tti* | \
+ harris | dolphin | highlevel | gould | cbm | ns | masscomp | \
+ apple | axis | knuth | cray | microblaze*)
os=
basic_machine=$1
;;
- -bluegene*)
- os=-cnk
+ bluegene*)
+ os=cnk
;;
- -sim | -cisco | -oki | -wec | -winbond)
+ sim | cisco | oki | wec | winbond)
os=
basic_machine=$1
;;
- -scout)
+ scout)
;;
- -wrs)
- os=-vxworks
+ wrs)
+ os=vxworks
basic_machine=$1
;;
- -chorusos*)
- os=-chorusos
+ chorusos*)
+ os=chorusos
basic_machine=$1
;;
- -chorusrdb)
- os=-chorusrdb
+ chorusrdb)
+ os=chorusrdb
basic_machine=$1
;;
- -hiux*)
- os=-hiuxwe2
+ hiux*)
+ os=hiuxwe2
;;
- -sco6)
- os=-sco5v6
+ sco6)
+ os=sco5v6
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
- -sco5)
- os=-sco3.2v5
+ sco5)
+ os=sco3.2v5
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
- -sco4)
- os=-sco3.2v4
+ sco4)
+ os=sco3.2v4
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
- -sco3.2.[4-9]*)
+ sco3.2.[4-9]*)
os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
- -sco3.2v[4-9]*)
+ sco3.2v[4-9]*)
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
- -sco5v6*)
+ sco5v6*)
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
- -sco*)
- os=-sco3.2v2
+ sco*)
+ os=sco3.2v2
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
- -udk*)
+ udk*)
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
- -isc)
- os=-isc2.2
+ isc)
+ os=isc2.2
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
- -clix*)
+ clix*)
basic_machine=clipper-intergraph
;;
- -isc*)
+ isc*)
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
- -lynx*178)
- os=-lynxos178
+ lynx*178)
+ os=lynxos178
;;
- -lynx*5)
- os=-lynxos5
+ lynx*5)
+ os=lynxos5
;;
- -lynx*)
- os=-lynxos
+ lynx*)
+ os=lynxos
;;
- -ptx*)
+ ptx*)
basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
;;
- -psos*)
- os=-psos
+ psos*)
+ os=psos
;;
- -mint | -mint[0-9]*)
+ mint | mint[0-9]*)
basic_machine=m68k-atari
- os=-mint
+ os=mint
;;
esac
@@ -249,12 +273,12 @@
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arceb \
- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv6m | armv[78][arm] \
| avr | avr32 \
| ba \
| be32 | be64 \
| bfin \
- | c4x | c8051 | clipper \
+ | c4x | c8051 | clipper | csky \
| d10v | d30v | dlx | dsp16xx \
| e2k | epiphany \
| fido | fr30 | frv | ft32 \
@@ -293,6 +317,7 @@
| mt \
| msp430 \
| nds32 | nds32le | nds32be \
+ | nfp \
| nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
| open8 | or1k | or1knd | or32 \
@@ -331,10 +356,14 @@
;;
m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
basic_machine=$basic_machine-unknown
- os=-none
+ os=none
;;
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
;;
+ m9s12z | m68hcs12z | hcs12z | s12z)
+ basic_machine=s12z-unknown
+ os=none
+ ;;
ms1)
basic_machine=mt-unknown
;;
@@ -344,7 +373,7 @@
;;
xgate)
basic_machine=$basic_machine-unknown
- os=-none
+ os=none
;;
xscaleeb)
basic_machine=armeb-unknown
@@ -360,11 +389,6 @@
i*86 | x86_64)
basic_machine=$basic_machine-pc
;;
- # Object if more than one company name word.
- *-*-*)
- echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
- exit 1
- ;;
# Recognize the basic CPU types with company name.
580-* \
| a29k-* \
@@ -378,7 +402,7 @@
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
- | c8051-* | clipper-* | craynv-* | cydra-* \
+ | c8051-* | clipper-* | craynv-* | csky-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| e2k-* | elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -419,6 +443,7 @@
| mt-* \
| msp430-* \
| nds32-* | nds32le-* | nds32be-* \
+ | nfp-* \
| nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
@@ -458,7 +483,7 @@
# for a CPU type and a company and sometimes even an OS.
386bsd)
basic_machine=i386-pc
- os=-bsd
+ os=bsd
;;
3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
basic_machine=m68000-att
@@ -468,7 +493,7 @@
;;
a29khif)
basic_machine=a29k-amd
- os=-udi
+ os=udi
;;
abacus)
basic_machine=abacus-unknown
@@ -475,7 +500,7 @@
;;
adobe68k)
basic_machine=m68010-adobe
- os=-scout
+ os=scout
;;
alliant | fx80)
basic_machine=fx80-alliant
@@ -485,7 +510,7 @@
;;
am29k)
basic_machine=a29k-none
- os=-bsd
+ os=bsd
;;
amd64)
basic_machine=x86_64-pc
@@ -495,7 +520,7 @@
;;
amdahl)
basic_machine=580-amdahl
- os=-sysv
+ os=sysv
;;
amiga | amiga-*)
basic_machine=m68k-unknown
@@ -502,23 +527,23 @@
;;
amigaos | amigados)
basic_machine=m68k-unknown
- os=-amigaos
+ os=amigaos
;;
amigaunix | amix)
basic_machine=m68k-unknown
- os=-sysv4
+ os=sysv4
;;
apollo68)
basic_machine=m68k-apollo
- os=-sysv
+ os=sysv
;;
apollo68bsd)
basic_machine=m68k-apollo
- os=-bsd
+ os=bsd
;;
aros)
basic_machine=i386-pc
- os=-aros
+ os=aros
;;
asmjs)
basic_machine=asmjs-unknown
@@ -525,23 +550,23 @@
;;
aux)
basic_machine=m68k-apple
- os=-aux
+ os=aux
;;
balance)
basic_machine=ns32k-sequent
- os=-dynix
+ os=dynix
;;
blackfin)
basic_machine=bfin-unknown
- os=-linux
+ os=linux
;;
blackfin-*)
basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- os=-linux
+ os=linux
;;
bluegene*)
basic_machine=powerpc-ibm
- os=-cnk
+ os=cnk
;;
c54x-*)
basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
@@ -554,43 +579,43 @@
;;
c90)
basic_machine=c90-cray
- os=-unicos
+ os=unicos
;;
cegcc)
basic_machine=arm-unknown
- os=-cegcc
+ os=cegcc
;;
convex-c1)
basic_machine=c1-convex
- os=-bsd
+ os=bsd
;;
convex-c2)
basic_machine=c2-convex
- os=-bsd
+ os=bsd
;;
convex-c32)
basic_machine=c32-convex
- os=-bsd
+ os=bsd
;;
convex-c34)
basic_machine=c34-convex
- os=-bsd
+ os=bsd
;;
convex-c38)
basic_machine=c38-convex
- os=-bsd
+ os=bsd
;;
cray | j90)
basic_machine=j90-cray
- os=-unicos
+ os=unicos
;;
craynv)
basic_machine=craynv-cray
- os=-unicosmp
+ os=unicosmp
;;
cr16 | cr16-*)
basic_machine=cr16-unknown
- os=-elf
+ os=elf
;;
crds | unos)
basic_machine=m68k-crds
@@ -603,7 +628,7 @@
;;
crx)
basic_machine=crx-unknown
- os=-elf
+ os=elf
;;
da30 | da30-*)
basic_machine=m68k-da30
@@ -613,11 +638,11 @@
;;
decsystem10* | dec10*)
basic_machine=pdp10-dec
- os=-tops10
+ os=tops10
;;
decsystem20* | dec20*)
basic_machine=pdp10-dec
- os=-tops20
+ os=tops20
;;
delta | 3300 | motorola-3300 | motorola-delta \
| 3300-motorola | delta-motorola)
@@ -625,23 +650,23 @@
;;
delta88)
basic_machine=m88k-motorola
- os=-sysv3
+ os=sysv3
;;
dicos)
basic_machine=i686-pc
- os=-dicos
+ os=dicos
;;
djgpp)
basic_machine=i586-pc
- os=-msdosdjgpp
+ os=msdosdjgpp
;;
dpx20 | dpx20-*)
basic_machine=rs6000-bull
- os=-bosx
+ os=bosx
;;
dpx2*)
basic_machine=m68k-bull
- os=-sysv3
+ os=sysv3
;;
e500v[12])
basic_machine=powerpc-unknown
@@ -653,11 +678,11 @@
;;
ebmon29k)
basic_machine=a29k-amd
- os=-ebmon
+ os=ebmon
;;
elxsi)
basic_machine=elxsi-elxsi
- os=-bsd
+ os=bsd
;;
encore | umax | mmax)
basic_machine=ns32k-encore
@@ -664,7 +689,7 @@
;;
es1800 | OSE68k | ose68k | ose | OSE)
basic_machine=m68k-ericsson
- os=-ose
+ os=ose
;;
fx2800)
basic_machine=i860-alliant
@@ -674,31 +699,31 @@
;;
gmicro)
basic_machine=tron-gmicro
- os=-sysv
+ os=sysv
;;
go32)
basic_machine=i386-pc
- os=-go32
+ os=go32
;;
h3050r* | hiux*)
basic_machine=hppa1.1-hitachi
- os=-hiuxwe2
+ os=hiuxwe2
;;
h8300hms)
basic_machine=h8300-hitachi
- os=-hms
+ os=hms
;;
h8300xray)
basic_machine=h8300-hitachi
- os=-xray
+ os=xray
;;
h8500hms)
basic_machine=h8500-hitachi
- os=-hms
+ os=hms
;;
harris)
basic_machine=m88k-harris
- os=-sysv3
+ os=sysv3
;;
hp300-*)
basic_machine=m68k-hp
@@ -705,11 +730,11 @@
;;
hp300bsd)
basic_machine=m68k-hp
- os=-bsd
+ os=bsd
;;
hp300hpux)
basic_machine=m68k-hp
- os=-hpux
+ os=hpux
;;
hp3k9[0-9][0-9] | hp9[0-9][0-9])
basic_machine=hppa1.0-hp
@@ -742,11 +767,11 @@
;;
hppaosf)
basic_machine=hppa1.1-hp
- os=-osf
+ os=osf
;;
hppro)
basic_machine=hppa1.1-hp
- os=-proelf
+ os=proelf
;;
i370-ibm* | ibm*)
basic_machine=i370-ibm
@@ -753,41 +778,41 @@
;;
i*86v32)
basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
- os=-sysv32
+ os=sysv32
;;
i*86v4*)
basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
- os=-sysv4
+ os=sysv4
;;
i*86v)
basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
- os=-sysv
+ os=sysv
;;
i*86sol2)
basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
- os=-solaris2
+ os=solaris2
;;
i386mach)
basic_machine=i386-mach
- os=-mach
+ os=mach
;;
vsta)
basic_machine=i386-unknown
- os=-vsta
+ os=vsta
;;
iris | iris4d)
basic_machine=mips-sgi
case $os in
- -irix*)
+ irix*)
;;
*)
- os=-irix4
+ os=irix4
;;
esac
;;
isi68 | isi)
basic_machine=m68k-isi
- os=-sysv
+ os=sysv
;;
leon-*|leon[3-9]-*)
basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
@@ -794,19 +819,19 @@
;;
m68knommu)
basic_machine=m68k-unknown
- os=-linux
+ os=linux
;;
m68knommu-*)
basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- os=-linux
+ os=linux
;;
magnum | m3230)
basic_machine=mips-mips
- os=-sysv
+ os=sysv
;;
merlin)
basic_machine=ns32k-utek
- os=-sysv
+ os=sysv
;;
microblaze*)
basic_machine=microblaze-xilinx
@@ -813,22 +838,22 @@
;;
mingw64)
basic_machine=x86_64-pc
- os=-mingw64
+ os=mingw64
;;
mingw32)
basic_machine=i686-pc
- os=-mingw32
+ os=mingw32
;;
mingw32ce)
basic_machine=arm-unknown
- os=-mingw32ce
+ os=mingw32ce
;;
miniframe)
basic_machine=m68000-convergent
;;
- *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+ *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
basic_machine=m68k-atari
- os=-mint
+ os=mint
;;
mips3*-*)
basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
@@ -838,19 +863,19 @@
;;
monitor)
basic_machine=m68k-rom68k
- os=-coff
+ os=coff
;;
morphos)
basic_machine=powerpc-unknown
- os=-morphos
+ os=morphos
;;
moxiebox)
basic_machine=moxie-unknown
- os=-moxiebox
+ os=moxiebox
;;
msdos)
basic_machine=i386-pc
- os=-msdos
+ os=msdos
;;
ms1-*)
basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
@@ -857,76 +882,76 @@
;;
msys)
basic_machine=i686-pc
- os=-msys
+ os=msys
;;
mvs)
basic_machine=i370-ibm
- os=-mvs
+ os=mvs
;;
nacl)
basic_machine=le32-unknown
- os=-nacl
+ os=nacl
;;
ncr3000)
basic_machine=i486-ncr
- os=-sysv4
+ os=sysv4
;;
netbsd386)
basic_machine=i386-unknown
- os=-netbsd
+ os=netbsd
;;
netwinder)
basic_machine=armv4l-rebel
- os=-linux
+ os=linux
;;
news | news700 | news800 | news900)
basic_machine=m68k-sony
- os=-newsos
+ os=newsos
;;
news1000)
basic_machine=m68030-sony
- os=-newsos
+ os=newsos
;;
news-3600 | risc-news)
basic_machine=mips-sony
- os=-newsos
+ os=newsos
;;
necv70)
basic_machine=v70-nec
- os=-sysv
+ os=sysv
;;
next | m*-next)
basic_machine=m68k-next
case $os in
- -nextstep* )
+ nextstep* )
;;
- -ns2*)
- os=-nextstep2
+ ns2*)
+ os=nextstep2
;;
*)
- os=-nextstep3
+ os=nextstep3
;;
esac
;;
nh3000)
basic_machine=m68k-harris
- os=-cxux
+ os=cxux
;;
nh[45]000)
basic_machine=m88k-harris
- os=-cxux
+ os=cxux
;;
nindy960)
basic_machine=i960-intel
- os=-nindy
+ os=nindy
;;
mon960)
basic_machine=i960-intel
- os=-mon960
+ os=mon960
;;
nonstopux)
basic_machine=mips-compaq
- os=-nonstopux
+ os=nonstopux
;;
np1)
basic_machine=np1-gould
@@ -948,7 +973,7 @@
;;
op50n-* | op60c-*)
basic_machine=hppa1.1-oki
- os=-proelf
+ os=proelf
;;
openrisc | openrisc-*)
basic_machine=or32-unknown
@@ -955,31 +980,31 @@
;;
os400)
basic_machine=powerpc-ibm
- os=-os400
+ os=os400
;;
OSE68000 | ose68000)
basic_machine=m68000-ericsson
- os=-ose
+ os=ose
;;
os68k)
basic_machine=m68k-none
- os=-os68k
+ os=os68k
;;
pa-hitachi)
basic_machine=hppa1.1-hitachi
- os=-hiuxwe2
+ os=hiuxwe2
;;
paragon)
basic_machine=i860-intel
- os=-osf
+ os=osf
;;
parisc)
basic_machine=hppa-unknown
- os=-linux
+ os=linux
;;
parisc-*)
basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- os=-linux
+ os=linux
;;
pbd)
basic_machine=sparc-tti
@@ -1051,19 +1076,19 @@
;;
pw32)
basic_machine=i586-unknown
- os=-pw32
+ os=pw32
;;
rdos | rdos64)
basic_machine=x86_64-pc
- os=-rdos
+ os=rdos
;;
rdos32)
basic_machine=i386-pc
- os=-rdos
+ os=rdos
;;
rom68k)
basic_machine=m68k-rom68k
- os=-coff
+ os=coff
;;
rm[46]00)
basic_machine=mips-siemens
@@ -1079,7 +1104,7 @@
;;
sa29200)
basic_machine=a29k-amd
- os=-udi
+ os=udi
;;
sb1)
basic_machine=mipsisa64sb1-unknown
@@ -1089,11 +1114,11 @@
;;
sde)
basic_machine=mipsisa32-sde
- os=-elf
+ os=elf
;;
sei)
basic_machine=mips-sei
- os=-seiux
+ os=seiux
;;
sequent)
basic_machine=i386-sequent
@@ -1103,11 +1128,11 @@
;;
simso-wrs)
basic_machine=sparclite-wrs
- os=-vxworks
+ os=vxworks
;;
sps7)
basic_machine=m68k-bull
- os=-sysv2
+ os=sysv2
;;
spur)
basic_machine=spur-unknown
@@ -1117,7 +1142,7 @@
;;
stratus)
basic_machine=i860-stratus
- os=-sysv4
+ os=sysv4
;;
strongarm-* | thumb-*)
basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
@@ -1127,31 +1152,31 @@
;;
sun2os3)
basic_machine=m68000-sun
- os=-sunos3
+ os=sunos3
;;
sun2os4)
basic_machine=m68000-sun
- os=-sunos4
+ os=sunos4
;;
sun3os3)
basic_machine=m68k-sun
- os=-sunos3
+ os=sunos3
;;
sun3os4)
basic_machine=m68k-sun
- os=-sunos4
+ os=sunos4
;;
sun4os3)
basic_machine=sparc-sun
- os=-sunos3
+ os=sunos3
;;
sun4os4)
basic_machine=sparc-sun
- os=-sunos4
+ os=sunos4
;;
sun4sol2)
basic_machine=sparc-sun
- os=-solaris2
+ os=solaris2
;;
sun3 | sun3-*)
basic_machine=m68k-sun
@@ -1164,23 +1189,23 @@
;;
sv1)
basic_machine=sv1-cray
- os=-unicos
+ os=unicos
;;
symmetry)
basic_machine=i386-sequent
- os=-dynix
+ os=dynix
;;
t3e)
basic_machine=alphaev5-cray
- os=-unicos
+ os=unicos
;;
t90)
basic_machine=t90-cray
- os=-unicos
+ os=unicos
;;
tile*)
basic_machine=$basic_machine-unknown
- os=-linux-gnu
+ os=linux-gnu
;;
tx39)
basic_machine=mipstx39-unknown
@@ -1190,7 +1215,7 @@
;;
toad1)
basic_machine=pdp10-xkl
- os=-tops20
+ os=tops20
;;
tower | tower-32)
basic_machine=m68k-ncr
@@ -1197,27 +1222,27 @@
;;
tpf)
basic_machine=s390x-ibm
- os=-tpf
+ os=tpf
;;
udi29k)
basic_machine=a29k-amd
- os=-udi
+ os=udi
;;
ultra3)
basic_machine=a29k-nyu
- os=-sym1
+ os=sym1
;;
v810 | necv810)
basic_machine=v810-nec
- os=-none
+ os=none
;;
vaxv)
basic_machine=vax-dec
- os=-sysv
+ os=sysv
;;
vms)
basic_machine=vax-dec
- os=-vms
+ os=vms
;;
vpp*|vx|vx-*)
basic_machine=f301-fujitsu
@@ -1224,23 +1249,23 @@
;;
vxworks960)
basic_machine=i960-wrs
- os=-vxworks
+ os=vxworks
;;
vxworks68)
basic_machine=m68k-wrs
- os=-vxworks
+ os=vxworks
;;
vxworks29k)
basic_machine=a29k-wrs
- os=-vxworks
+ os=vxworks
;;
w65*)
basic_machine=w65-wdc
- os=-none
+ os=none
;;
w89k-*)
basic_machine=hppa1.1-winbond
- os=-proelf
+ os=proelf
;;
x64)
basic_machine=x86_64-pc
@@ -1247,7 +1272,7 @@
;;
xbox)
basic_machine=i686-pc
- os=-mingw32
+ os=mingw32
;;
xps | xps100)
basic_machine=xps100-honeywell
@@ -1257,11 +1282,11 @@
;;
ymp)
basic_machine=ymp-cray
- os=-unicos
+ os=unicos
;;
none)
basic_machine=none-none
- os=-none
+ os=none
;;
# Here we handle the default manufacturer of certain CPU types. It is in
@@ -1334,199 +1359,199 @@
# Decode manufacturer-specific aliases for certain operating systems.
-if [ x"$os" != x"" ]
+if [ x$os != x ]
then
case $os in
# First match some system type aliases that might get confused
# with valid system types.
- # -solaris* is a basic system type, with this one exception.
- -auroraux)
- os=-auroraux
+ # solaris* is a basic system type, with this one exception.
+ auroraux)
+ os=auroraux
;;
- -solaris1 | -solaris1.*)
+ solaris1 | solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
;;
- -solaris)
- os=-solaris2
+ solaris)
+ os=solaris2
;;
- -unixware*)
- os=-sysv4.2uw
+ unixware*)
+ os=sysv4.2uw
;;
- -gnu/linux*)
+ gnu/linux*)
os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
;;
# es1800 is here to avoid being matched by es* (a different OS)
- -es1800*)
- os=-ose
+ es1800*)
+ os=ose
;;
# Now accept the basic system types.
# The portable systems comes first.
# Each alternative MUST end in a * to match a version number.
- # -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- | -sym* | -kopensolaris* | -plan9* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* | -cloudabi* | -sortix* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
- | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
- | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \
- | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
- | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
- | -linux-newlib* | -linux-musl* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
- | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
- | -midnightbsd*)
+ # sysv* is not here because it comes later, after sysvr4.
+ gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
+ | *vms* | sco* | esix* | isc* | aix* | cnk* | sunos | sunos[34]*\
+ | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+ | sym* | kopensolaris* | plan9* \
+ | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
+ | aos* | aros* | cloudabi* | sortix* \
+ | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
+ | clix* | riscos* | uniplus* | iris* | rtu* | xenix* \
+ | hiux* | knetbsd* | mirbsd* | netbsd* \
+ | bitrig* | openbsd* | solidbsd* | libertybsd* \
+ | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
+ | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
+ | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+ | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \
+ | chorusos* | chorusrdb* | cegcc* | glidix* \
+ | cygwin* | msys* | pe* | psos* | moss* | proelf* | rtems* \
+ | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \
+ | linux-newlib* | linux-musl* | linux-uclibc* \
+ | uxpv* | beos* | mpeix* | udk* | moxiebox* \
+ | interix* | uwin* | mks* | rhapsody* | darwin* \
+ | openstep* | oskit* | conix* | pw32* | nonstopux* \
+ | storm-chaos* | tops10* | tenex* | tops20* | its* \
+ | os2* | vos* | palmos* | uclinux* | nucleus* \
+ | morphos* | superux* | rtmk* | windiss* \
+ | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
+ | skyos* | haiku* | rdos* | toppers* | drops* | es* \
+ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
+ | midnightbsd*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
- -qnx*)
+ qnx*)
case $basic_machine in
x86-* | i*86-*)
;;
*)
- os=-nto$os
+ os=nto-$os
;;
esac
;;
- -nto-qnx*)
+ nto-qnx*)
;;
- -nto*)
+ nto*)
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
- -sim | -xray | -os68k* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* \
- | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+ sim | xray | os68k* | v88r* \
+ | windows* | osx | abug | netware* | os9* \
+ | macos* | mpw* | magic* | mmixware* | mon960* | lnews*)
;;
- -mac*)
+ mac*)
os=`echo "$os" | sed -e 's|mac|macos|'`
;;
- -linux-dietlibc)
- os=-linux-dietlibc
+ linux-dietlibc)
+ os=linux-dietlibc
;;
- -linux*)
+ linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
- -sunos5*)
+ sunos5*)
os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
;;
- -sunos6*)
+ sunos6*)
os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
;;
- -opened*)
- os=-openedition
+ opened*)
+ os=openedition
;;
- -os400*)
- os=-os400
+ os400*)
+ os=os400
;;
- -wince*)
- os=-wince
+ wince*)
+ os=wince
;;
- -utek*)
- os=-bsd
+ utek*)
+ os=bsd
;;
- -dynix*)
- os=-bsd
+ dynix*)
+ os=bsd
;;
- -acis*)
- os=-aos
+ acis*)
+ os=aos
;;
- -atheos*)
- os=-atheos
+ atheos*)
+ os=atheos
;;
- -syllable*)
- os=-syllable
+ syllable*)
+ os=syllable
;;
- -386bsd)
- os=-bsd
+ 386bsd)
+ os=bsd
;;
- -ctix* | -uts*)
- os=-sysv
+ ctix* | uts*)
+ os=sysv
;;
- -nova*)
- os=-rtmk-nova
+ nova*)
+ os=rtmk-nova
;;
- -ns2)
- os=-nextstep2
+ ns2)
+ os=nextstep2
;;
- -nsk*)
- os=-nsk
+ nsk*)
+ os=nsk
;;
# Preserve the version number of sinix5.
- -sinix5.*)
+ sinix5.*)
os=`echo $os | sed -e 's|sinix|sysv|'`
;;
- -sinix*)
- os=-sysv4
+ sinix*)
+ os=sysv4
;;
- -tpf*)
- os=-tpf
+ tpf*)
+ os=tpf
;;
- -triton*)
- os=-sysv3
+ triton*)
+ os=sysv3
;;
- -oss*)
- os=-sysv3
+ oss*)
+ os=sysv3
;;
- -svr4*)
- os=-sysv4
+ svr4*)
+ os=sysv4
;;
- -svr3)
- os=-sysv3
+ svr3)
+ os=sysv3
;;
- -sysvr4)
- os=-sysv4
+ sysvr4)
+ os=sysv4
;;
- # This must come after -sysvr4.
- -sysv*)
+ # This must come after sysvr4.
+ sysv*)
;;
- -ose*)
- os=-ose
+ ose*)
+ os=ose
;;
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- os=-mint
+ *mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
+ os=mint
;;
- -zvmoe)
- os=-zvmoe
+ zvmoe)
+ os=zvmoe
;;
- -dicos*)
- os=-dicos
+ dicos*)
+ os=dicos
;;
- -pikeos*)
+ pikeos*)
# Until real need of OS specific support for
# particular features comes up, bare metal
# configurations are quite functional.
case $basic_machine in
arm*)
- os=-eabi
+ os=eabi
;;
*)
- os=-elf
+ os=elf
;;
esac
;;
- -nacl*)
+ nacl*)
;;
- -ios)
+ ios)
;;
- -none)
+ none)
;;
+ *-eabi)
+ ;;
*)
- # Get rid of the `-' at the beginning of $os.
- os=`echo $os | sed 's/[^-]*-//'`
echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
exit 1
;;
@@ -1545,173 +1570,173 @@
case $basic_machine in
score-*)
- os=-elf
+ os=elf
;;
spu-*)
- os=-elf
+ os=elf
;;
*-acorn)
- os=-riscix1.2
+ os=riscix1.2
;;
arm*-rebel)
- os=-linux
+ os=linux
;;
arm*-semi)
- os=-aout
+ os=aout
;;
c4x-* | tic4x-*)
- os=-coff
+ os=coff
;;
c8051-*)
- os=-elf
+ os=elf
;;
hexagon-*)
- os=-elf
+ os=elf
;;
tic54x-*)
- os=-coff
+ os=coff
;;
tic55x-*)
- os=-coff
+ os=coff
;;
tic6x-*)
- os=-coff
+ os=coff
;;
# This must come before the *-dec entry.
pdp10-*)
- os=-tops20
+ os=tops20
;;
pdp11-*)
- os=-none
+ os=none
;;
*-dec | vax-*)
- os=-ultrix4.2
+ os=ultrix4.2
;;
m68*-apollo)
- os=-domain
+ os=domain
;;
i386-sun)
- os=-sunos4.0.2
+ os=sunos4.0.2
;;
m68000-sun)
- os=-sunos3
+ os=sunos3
;;
m68*-cisco)
- os=-aout
+ os=aout
;;
mep-*)
- os=-elf
+ os=elf
;;
mips*-cisco)
- os=-elf
+ os=elf
;;
mips*-*)
- os=-elf
+ os=elf
;;
or32-*)
- os=-coff
+ os=coff
;;
*-tti) # must be before sparc entry or we get the wrong os.
- os=-sysv3
+ os=sysv3
;;
sparc-* | *-sun)
- os=-sunos4.1.1
+ os=sunos4.1.1
;;
pru-*)
- os=-elf
+ os=elf
;;
*-be)
- os=-beos
+ os=beos
;;
*-ibm)
- os=-aix
+ os=aix
;;
*-knuth)
- os=-mmixware
+ os=mmixware
;;
*-wec)
- os=-proelf
+ os=proelf
;;
*-winbond)
- os=-proelf
+ os=proelf
;;
*-oki)
- os=-proelf
+ os=proelf
;;
*-hp)
- os=-hpux
+ os=hpux
;;
*-hitachi)
- os=-hiux
+ os=hiux
;;
i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
- os=-sysv
+ os=sysv
;;
*-cbm)
- os=-amigaos
+ os=amigaos
;;
*-dg)
- os=-dgux
+ os=dgux
;;
*-dolphin)
- os=-sysv3
+ os=sysv3
;;
m68k-ccur)
- os=-rtu
+ os=rtu
;;
m88k-omron*)
- os=-luna
+ os=luna
;;
*-next)
- os=-nextstep
+ os=nextstep
;;
*-sequent)
- os=-ptx
+ os=ptx
;;
*-crds)
- os=-unos
+ os=unos
;;
*-ns)
- os=-genix
+ os=genix
;;
i370-*)
- os=-mvs
+ os=mvs
;;
*-gould)
- os=-sysv
+ os=sysv
;;
*-highlevel)
- os=-bsd
+ os=bsd
;;
*-encore)
- os=-bsd
+ os=bsd
;;
*-sgi)
- os=-irix
+ os=irix
;;
*-siemens)
- os=-sysv4
+ os=sysv4
;;
*-masscomp)
- os=-rtu
+ os=rtu
;;
f30[01]-fujitsu | f700-fujitsu)
- os=-uxpv
+ os=uxpv
;;
*-rom68k)
- os=-coff
+ os=coff
;;
*-*bug)
- os=-coff
+ os=coff
;;
*-apple)
- os=-macos
+ os=macos
;;
*-atari*)
- os=-mint
+ os=mint
;;
*)
- os=-none
+ os=none
;;
esac
fi
@@ -1722,67 +1747,67 @@
case $basic_machine in
*-unknown)
case $os in
- -riscix*)
+ riscix*)
vendor=acorn
;;
- -sunos*)
+ sunos*)
vendor=sun
;;
- -cnk*|-aix*)
+ cnk*|-aix*)
vendor=ibm
;;
- -beos*)
+ beos*)
vendor=be
;;
- -hpux*)
+ hpux*)
vendor=hp
;;
- -mpeix*)
+ mpeix*)
vendor=hp
;;
- -hiux*)
+ hiux*)
vendor=hitachi
;;
- -unos*)
+ unos*)
vendor=crds
;;
- -dgux*)
+ dgux*)
vendor=dg
;;
- -luna*)
+ luna*)
vendor=omron
;;
- -genix*)
+ genix*)
vendor=ns
;;
- -mvs* | -opened*)
+ mvs* | opened*)
vendor=ibm
;;
- -os400*)
+ os400*)
vendor=ibm
;;
- -ptx*)
+ ptx*)
vendor=sequent
;;
- -tpf*)
+ tpf*)
vendor=ibm
;;
- -vxsim* | -vxworks* | -windiss*)
+ vxsim* | vxworks* | windiss*)
vendor=wrs
;;
- -aux*)
+ aux*)
vendor=apple
;;
- -hms*)
+ hms*)
vendor=hitachi
;;
- -mpw* | -macos*)
+ mpw* | macos*)
vendor=apple
;;
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ *mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
vendor=atari
;;
- -vos*)
+ vos*)
vendor=stratus
;;
esac
@@ -1790,7 +1815,7 @@
;;
esac
-echo "$basic_machine$os"
+echo "$basic_machine-$os"
exit
# Local variables:
Modified: branches/stable/source/src/configure
===================================================================
--- branches/stable/source/src/configure 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/configure 2018-05-17 17:02:02 UTC (rev 797)
@@ -697,7 +697,6 @@
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
-am__quote
am__include
DEPDIR
am__untar
@@ -775,7 +774,8 @@
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL'
+SHELL
+am__quote'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -6554,7 +6554,7 @@
-am__api_version='1.15'
+am__api_version='1.16'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -6980,46 +6980,46 @@
ac_config_commands="$ac_config_commands depfiles"
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+ (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ case $?:`cat confinc.out 2>/dev/null` in #(
+ '0:this is the am__doit target') :
+ case $s in #(
+ BSD) :
+ am__include='.include' am__quote='"' ;; #(
+ *) :
+ am__include='include' am__quote='' ;;
+esac ;; #(
+ *) :
+ ;;
esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+$as_echo "${_am_result}" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
# Check whether --enable-dependency-tracking was given.
if test "${enable_dependency_tracking+set}" = set; then :
enableval=$enable_dependency_tracking;
@@ -10837,8 +10837,8 @@
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
# We need awk for the "check" target (and possibly the TAP driver). The
@@ -11102,7 +11102,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -23035,7 +23035,7 @@
#
# INIT-COMMANDS
#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
# The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -23866,29 +23866,35 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ case $CONFIG_FILES in #(
+ *\'*) :
+ eval set x "$CONFIG_FILES" ;; #(
+ *) :
+ set x $CONFIG_FILES ;; #(
+ *) :
+ ;;
+esac
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$am_mf" : 'X\(//\)[^/]' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$am_mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -23906,53 +23912,48 @@
q
}
s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$am_mf" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
}
- /^X\(\/\/\)[^/].*/{
+ /^X\/\(\/\/\)$/{
s//\1/
q
}
- /^X\(\/\/\)$/{
+ /^X\/\(\/\).*/{
s//\1/
q
}
- /^X\(\/\).*/{
- s//\1/
- q
- }
s/.*/./; q'`
- as_dir=$dirpart/$fdir; as_fn_mkdir_p
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ { echo "$as_me:$LINENO: cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles" >&5
+ (cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ { am_dirpart=; unset am_dirpart;}
+ { am_filepart=; unset am_filepart;}
+ { am_mf=; unset am_mf;}
+ { am_rc=; unset am_rc;}
+ rm -f conftest-deps.mk
}
;;
"libtool":C)
@@ -24883,11 +24884,11 @@
test "x$srcdir" = x. || msg_compiling="$msg_compiling
from sources in $kpse_src"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
-** Configuration summary for $PACKAGE_STRING (2018$with_banner_add):
+** Configuration summary for $PACKAGE_STRING (2019/dev$with_banner_add):
$msg_compiling" >&5
$as_echo "
-** Configuration summary for $PACKAGE_STRING (2018$with_banner_add):
+** Configuration summary for $PACKAGE_STRING (2019/dev$with_banner_add):
$msg_compiling" >&6; }
case $kpse_src$kpse_bld in
Modified: branches/stable/source/src/doc/Makefile.in
===================================================================
--- branches/stable/source/src/doc/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/doc/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -517,8 +517,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -683,7 +683,10 @@
cscope cscopelist:
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
Modified: branches/stable/source/src/doc/build-tools.txt
===================================================================
--- branches/stable/source/src/doc/build-tools.txt 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/doc/build-tools.txt 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,5 +1,5 @@
autoconf (GNU Autoconf) 2.69
-automake (GNU automake) 1.15.1
+automake (GNU automake) 1.16.1
bison (GNU Bison) 3.0.4
flex 2.6.0
ltmain.sh (GNU libtool) 2.4.6
Modified: branches/stable/source/src/doc/tlbuild.info
===================================================================
--- branches/stable/source/src/doc/tlbuild.info 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/doc/tlbuild.info 2018-05-17 17:02:02 UTC (rev 797)
@@ -710,7 +710,7 @@
Currently the versions we use are:
autoconf (GNU Autoconf) 2.69
- automake (GNU automake) 1.15.1
+ automake (GNU automake) 1.16.1
bison (GNU Bison) 3.0.4
flex 2.6.0
ltmain.sh (GNU libtool) 2.4.6
Modified: branches/stable/source/src/libs/Makefile.in
===================================================================
--- branches/stable/source/src/libs/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -238,7 +238,7 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- cscope distdir dist dist-all distcheck
+ cscope distdir distdir-am dist dist-all distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
@@ -461,8 +461,8 @@
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(srcdir)/../am/dist_hook.am $(srcdir)/../am/recurse.am $(am__empty):
@@ -581,7 +581,10 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
Modified: branches/stable/source/src/libs/README
===================================================================
--- branches/stable/source/src/libs/README 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/README 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,4 +1,4 @@
-$Id: README 47326 2018-04-06 15:25:15Z karl $
+$Id: README 47607 2018-05-04 03:48:43Z kakuto $
Public domain. Originally created by Karl Berry, 2005.
Libraries we compile for TeX Live.
@@ -12,7 +12,7 @@
cairo 1.14.12 - checked 07dec17
http://cairographics.org/releases/
-freetype2 2.9.0 - checked 09jan18
+freetype2 2.9.1 - checked 04may18
http://savannah.nongnu.org/download/freetype/
gd 2.2.5 - checked 30aug17
@@ -49,7 +49,7 @@
pixman 0.34.0 - checked 04feb16
http://cairographics.org/releases/
-poppler 0.63.0 - checked 18mar18
+poppler 0.64.0 - checked 29apr18
http://poppler.freedesktop.org/ - used by luatex and xetex
(requires C++11)
Modified: branches/stable/source/src/libs/aclocal.m4
===================================================================
--- branches/stable/source/src/libs/aclocal.m4 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/aclocal.m4 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
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.15.1], [],
+m4_if([$1], [1.16.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@
# 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.15.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -58,7 +58,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -141,7 +141,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -332,13 +332,12 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -346,49 +345,41 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ AS_CASE([$CONFIG_FILES],
+ [*\'*], [eval set x "$CONFIG_FILES"],
+ [*], [set x $CONFIG_FILES])
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`AS_DIRNAME(["$am_mf"])`
+ am_filepart=`AS_BASENAME(["$am_mf"])`
+ AM_RUN_LOG([cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles]) || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).])
+ fi
+ AS_UNSET([am_dirpart])
+ AS_UNSET([am_filepart])
+ AS_UNSET([am_mf])
+ AS_UNSET([am_rc])
+ rm -f conftest-deps.mk
}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -397,18 +388,17 @@
# -----------------------------
# This macro should only be invoked once -- use via AC_REQUIRE.
#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
+ [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -495,8 +485,8 @@
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms.
@@ -563,7 +553,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -605,7 +595,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -626,7 +616,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -648,7 +638,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -683,7 +673,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -691,49 +681,42 @@
# AM_MAKE_INCLUDE()
# -----------------
-# Check to see how make treats includes.
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+ AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+ ['0:this is the am__doit target'],
+ [AS_CASE([$s],
+ [BSD], [am__include='.include' am__quote='"'],
+ [am__include='include' am__quote=''])])
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT([${_am_result}])
+AC_SUBST([am__include])])
+AC_SUBST([am__quote])])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -772,7 +755,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -801,7 +784,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -848,7 +831,7 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -867,7 +850,7 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -948,7 +931,7 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1008,7 +991,7 @@
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1036,7 +1019,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1055,7 +1038,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Modified: branches/stable/source/src/libs/configure
===================================================================
--- branches/stable/source/src/libs/configure 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/configure 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live libs 2018.
+# Generated by GNU Autoconf 2.69 for TeX Live libs 2019/dev.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='TeX Live libs'
PACKAGE_TARNAME='tex-live-libs'
-PACKAGE_VERSION='2018'
-PACKAGE_STRING='TeX Live libs 2018'
+PACKAGE_VERSION='2019/dev'
+PACKAGE_STRING='TeX Live libs 2019/dev'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -606,7 +606,6 @@
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
-am__quote
am__include
DEPDIR
am__untar
@@ -684,7 +683,8 @@
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL'
+SHELL
+am__quote'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -1396,7 +1396,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures TeX Live libs 2018 to adapt to many kinds of systems.
+\`configure' configures TeX Live libs 2019/dev to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1466,7 +1466,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of TeX Live libs 2018:";;
+ short | recursive ) echo "Configuration of TeX Live libs 2019/dev:";;
esac
cat <<\_ACEOF
@@ -1757,7 +1757,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-TeX Live libs configure 2018
+TeX Live libs configure 2019/dev
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1858,7 +1858,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by TeX Live libs $as_me 2018, which was
+It was created by TeX Live libs $as_me 2019/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -5544,7 +5544,7 @@
-am__api_version='1.15'
+am__api_version='1.16'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -5970,46 +5970,46 @@
ac_config_commands="$ac_config_commands depfiles"
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+ (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ case $?:`cat confinc.out 2>/dev/null` in #(
+ '0:this is the am__doit target') :
+ case $s in #(
+ BSD) :
+ am__include='.include' am__quote='"' ;; #(
+ *) :
+ am__include='include' am__quote='' ;;
+esac ;; #(
+ *) :
+ ;;
esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+$as_echo "${_am_result}" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
# Check whether --enable-dependency-tracking was given.
if test "${enable_dependency_tracking+set}" = set; then :
enableval=$enable_dependency_tracking;
@@ -6106,7 +6106,7 @@
# Define the identity of the package.
PACKAGE='tex-live-libs'
- VERSION='2018'
+ VERSION='2019/dev'
cat >>confdefs.h <<_ACEOF
@@ -6136,8 +6136,8 @@
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
# We need awk for the "check" target (and possibly the TAP driver). The
@@ -6316,7 +6316,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -7099,7 +7099,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by TeX Live libs $as_me 2018, which was
+This file was extended by TeX Live libs $as_me 2019/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7156,7 +7156,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-TeX Live libs config.status 2018
+TeX Live libs config.status 2019/dev
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -7264,7 +7264,7 @@
#
# INIT-COMMANDS
#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
_ACEOF
@@ -7709,29 +7709,35 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ case $CONFIG_FILES in #(
+ *\'*) :
+ eval set x "$CONFIG_FILES" ;; #(
+ *) :
+ set x $CONFIG_FILES ;; #(
+ *) :
+ ;;
+esac
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$am_mf" : 'X\(//\)[^/]' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$am_mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -7749,53 +7755,48 @@
q
}
s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$am_mf" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
}
- /^X\(\/\/\)[^/].*/{
+ /^X\/\(\/\/\)$/{
s//\1/
q
}
- /^X\(\/\/\)$/{
+ /^X\/\(\/\).*/{
s//\1/
q
}
- /^X\(\/\).*/{
- s//\1/
- q
- }
s/.*/./; q'`
- as_dir=$dirpart/$fdir; as_fn_mkdir_p
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ { echo "$as_me:$LINENO: cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles" >&5
+ (cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ { am_dirpart=; unset am_dirpart;}
+ { am_filepart=; unset am_filepart;}
+ { am_mf=; unset am_mf;}
+ { am_rc=; unset am_rc;}
+ rm -f conftest-deps.mk
}
;;
Modified: branches/stable/source/src/libs/libpng/Makefile.in
===================================================================
--- branches/stable/source/src/libs/libpng/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/libpng/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -155,7 +155,26 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = @LIBPNG_TREE@/$(DEPDIR)/png.Po \
+ @LIBPNG_TREE@/$(DEPDIR)/pngerror.Po \
+ @LIBPNG_TREE@/$(DEPDIR)/pngget.Po \
+ @LIBPNG_TREE@/$(DEPDIR)/pngmem.Po \
+ @LIBPNG_TREE@/$(DEPDIR)/pngpread.Po \
+ @LIBPNG_TREE@/$(DEPDIR)/pngread.Po \
+ @LIBPNG_TREE@/$(DEPDIR)/pngrio.Po \
+ @LIBPNG_TREE@/$(DEPDIR)/pngrtran.Po \
+ @LIBPNG_TREE@/$(DEPDIR)/pngrutil.Po \
+ @LIBPNG_TREE@/$(DEPDIR)/pngset.Po \
+ @LIBPNG_TREE@/$(DEPDIR)/pngtest.Po \
+ @LIBPNG_TREE@/$(DEPDIR)/pngtrans.Po \
+ @LIBPNG_TREE@/$(DEPDIR)/pngwio.Po \
+ @LIBPNG_TREE@/$(DEPDIR)/pngwrite.Po \
+ @LIBPNG_TREE@/$(DEPDIR)/pngwtran.Po \
+ @LIBPNG_TREE@/$(DEPDIR)/pngwutil.Po \
+ @LIBPNG_TREE@/arm/$(DEPDIR)/arm_init.Po \
+ @LIBPNG_TREE@/arm/$(DEPDIR)/filter_neon.Po \
+ @LIBPNG_TREE@/arm/$(DEPDIR)/filter_neon_intrinsics.Po
am__mv = mv -f
CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS)
@@ -197,7 +216,8 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- cscope check recheck distdir dist dist-all distcheck
+ cscope check recheck distdir distdir-am dist dist-all \
+ distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
$(LISP)config.h.in
# Read a list of newline-separated strings from the standard input,
@@ -639,8 +659,8 @@
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
@@ -668,6 +688,9 @@
distclean-hdr:
-rm -f config.h stamp-h1
+clean-checkPROGRAMS:
+ -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
+
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@LIBPNG_TREE@/$(am__dirstamp):
@@ -726,9 +749,6 @@
$(AM_V_at)-rm -f libpng.a
$(AM_V_AR)$(libpng_a_AR) libpng.a $(libpng_a_OBJECTS) $(libpng_a_LIBADD)
$(AM_V_at)$(RANLIB) libpng.a
-
-clean-checkPROGRAMS:
- -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
@LIBPNG_TREE@/pngtest.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
@@ -744,26 +764,32 @@
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/png.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngerror.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngget.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngmem.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngpread.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngread.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngrio.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngrtran.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngrutil.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngset.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngtest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngtrans.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngwio.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngwrite.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngwtran.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngwutil.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/arm/$(DEPDIR)/arm_init.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/arm/$(DEPDIR)/filter_neon.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/arm/$(DEPDIR)/filter_neon_intrinsics.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/png.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngerror.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngget.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngmem.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngpread.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngread.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngrio.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngrtran.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngrutil.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngset.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngtest.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngtrans.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngwio.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngwrite.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngwtran.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/$(DEPDIR)/pngwutil.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/arm/$(DEPDIR)/arm_init.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/arm/$(DEPDIR)/filter_neon.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@LIBPNG_TREE@/arm/$(DEPDIR)/filter_neon_intrinsics.Po at am__quote@ # am--include-marker
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
.S.o:
@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCCAS_TRUE@ $(CPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -1022,7 +1048,7 @@
fi; \
$$success || exit 1
-check-TESTS:
+check-TESTS: $(check_PROGRAMS) $(dist_check_SCRIPTS)
@list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -1058,7 +1084,10 @@
@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -1303,7 +1332,25 @@
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf @LIBPNG_TREE@/$(DEPDIR) @LIBPNG_TREE@/arm/$(DEPDIR)
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/png.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngerror.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngget.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngmem.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngpread.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngread.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngrio.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngrtran.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngrutil.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngset.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngtest.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngtrans.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngwio.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngwrite.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngwtran.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngwutil.Po
+ -rm -f @LIBPNG_TREE@/arm/$(DEPDIR)/arm_init.Po
+ -rm -f @LIBPNG_TREE@/arm/$(DEPDIR)/filter_neon.Po
+ -rm -f @LIBPNG_TREE@/arm/$(DEPDIR)/filter_neon_intrinsics.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-tags
@@ -1351,7 +1398,25 @@
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -rf @LIBPNG_TREE@/$(DEPDIR) @LIBPNG_TREE@/arm/$(DEPDIR)
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/png.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngerror.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngget.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngmem.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngpread.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngread.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngrio.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngrtran.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngrutil.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngset.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngtest.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngtrans.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngwio.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngwrite.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngwtran.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/pngwutil.Po
+ -rm -f @LIBPNG_TREE@/arm/$(DEPDIR)/arm_init.Po
+ -rm -f @LIBPNG_TREE@/arm/$(DEPDIR)/filter_neon.Po
+ -rm -f @LIBPNG_TREE@/arm/$(DEPDIR)/filter_neon_intrinsics.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -1372,7 +1437,7 @@
.MAKE: $(am__recursive_targets) all check-am install-am install-strip
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
- am--refresh check check-TESTS check-am clean \
+ am--depfiles am--refresh check check-TESTS check-am clean \
clean-checkPROGRAMS clean-cscope clean-generic \
clean-noinstLIBRARIES cscope cscopelist-am ctags ctags-am dist \
dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
Modified: branches/stable/source/src/libs/libpng/aclocal.m4
===================================================================
--- branches/stable/source/src/libs/libpng/aclocal.m4 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/libpng/aclocal.m4 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
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.15.1], [],
+m4_if([$1], [1.16.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@
# 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.15.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -58,7 +58,7 @@
# Figure out how to run the assembler. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -78,7 +78,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -130,7 +130,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -161,7 +161,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -352,13 +352,12 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -366,49 +365,41 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ AS_CASE([$CONFIG_FILES],
+ [*\'*], [eval set x "$CONFIG_FILES"],
+ [*], [set x $CONFIG_FILES])
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`AS_DIRNAME(["$am_mf"])`
+ am_filepart=`AS_BASENAME(["$am_mf"])`
+ AM_RUN_LOG([cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles]) || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).])
+ fi
+ AS_UNSET([am_dirpart])
+ AS_UNSET([am_filepart])
+ AS_UNSET([am_mf])
+ AS_UNSET([am_rc])
+ rm -f conftest-deps.mk
}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -417,18 +408,17 @@
# -----------------------------
# This macro should only be invoked once -- use via AC_REQUIRE.
#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
+ [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -515,8 +505,8 @@
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms.
@@ -583,7 +573,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -625,7 +615,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -646,7 +636,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -668,7 +658,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -703,7 +693,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -711,49 +701,42 @@
# AM_MAKE_INCLUDE()
# -----------------
-# Check to see how make treats includes.
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+ AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+ ['0:this is the am__doit target'],
+ [AS_CASE([$s],
+ [BSD], [am__include='.include' am__quote='"'],
+ [am__include='include' am__quote=''])])
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT([${_am_result}])
+AC_SUBST([am__include])])
+AC_SUBST([am__quote])])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -792,7 +775,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -821,7 +804,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -868,7 +851,7 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -887,7 +870,7 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -968,7 +951,7 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1028,7 +1011,7 @@
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1056,7 +1039,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1075,7 +1058,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Modified: branches/stable/source/src/libs/libpng/configure
===================================================================
--- branches/stable/source/src/libs/libpng/configure 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/libpng/configure 2018-05-17 17:02:02 UTC (rev 797)
@@ -656,7 +656,6 @@
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
-am__quote
am__include
DEPDIR
OBJEXT
@@ -733,7 +732,8 @@
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL'
+SHELL
+am__quote'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -2282,7 +2282,7 @@
-am__api_version='1.15'
+am__api_version='1.16'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2750,46 +2750,46 @@
ac_config_commands="$ac_config_commands depfiles"
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+ (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ case $?:`cat confinc.out 2>/dev/null` in #(
+ '0:this is the am__doit target') :
+ case $s in #(
+ BSD) :
+ am__include='.include' am__quote='"' ;; #(
+ *) :
+ am__include='include' am__quote='' ;;
+esac ;; #(
+ *) :
+ ;;
esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+$as_echo "${_am_result}" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
# Check whether --enable-dependency-tracking was given.
if test "${enable_dependency_tracking+set}" = set; then :
enableval=$enable_dependency_tracking;
@@ -3854,8 +3854,8 @@
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
# We need awk for the "check" target (and possibly the TAP driver). The
@@ -3906,7 +3906,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -6763,7 +6763,7 @@
#
# INIT-COMMANDS
#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
_ACEOF
@@ -7376,29 +7376,35 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ case $CONFIG_FILES in #(
+ *\'*) :
+ eval set x "$CONFIG_FILES" ;; #(
+ *) :
+ set x $CONFIG_FILES ;; #(
+ *) :
+ ;;
+esac
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$am_mf" : 'X\(//\)[^/]' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$am_mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -7416,53 +7422,48 @@
q
}
s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$am_mf" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
}
- /^X\(\/\/\)[^/].*/{
+ /^X\/\(\/\/\)$/{
s//\1/
q
}
- /^X\(\/\/\)$/{
+ /^X\/\(\/\).*/{
s//\1/
q
}
- /^X\(\/\).*/{
- s//\1/
- q
- }
s/.*/./; q'`
- as_dir=$dirpart/$fdir; as_fn_mkdir_p
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ { echo "$as_me:$LINENO: cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles" >&5
+ (cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ { am_dirpart=; unset am_dirpart;}
+ { am_filepart=; unset am_filepart;}
+ { am_mf=; unset am_mf;}
+ { am_rc=; unset am_rc;}
+ rm -f conftest-deps.mk
}
;;
Modified: branches/stable/source/src/libs/libpng/include/Makefile.in
===================================================================
--- branches/stable/source/src/libs/libpng/include/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/libpng/include/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -249,8 +249,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_srcdir)/../../am/hdr_links.am $(am__empty):
@@ -269,7 +269,10 @@
cscope cscopelist:
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
Modified: branches/stable/source/src/libs/poppler/ChangeLog
===================================================================
--- branches/stable/source/src/libs/poppler/ChangeLog 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/ChangeLog 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,3 +1,8 @@
+2018-04-29 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import poppler-0.64.0.
+ * version.ac: Adjust.
+
2018-03-18 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
Import poppler-0.63.0.
Modified: branches/stable/source/src/libs/poppler/Makefile.in
===================================================================
--- branches/stable/source/src/libs/poppler/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -212,7 +212,87 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = @POPPLER_TREE@/fofi/$(DEPDIR)/FoFiBase.Po \
+ @POPPLER_TREE@/fofi/$(DEPDIR)/FoFiEncodings.Po \
+ @POPPLER_TREE@/fofi/$(DEPDIR)/FoFiIdentifier.Po \
+ @POPPLER_TREE@/fofi/$(DEPDIR)/FoFiTrueType.Po \
+ @POPPLER_TREE@/fofi/$(DEPDIR)/FoFiType1.Po \
+ @POPPLER_TREE@/fofi/$(DEPDIR)/FoFiType1C.Po \
+ @POPPLER_TREE@/goo/$(DEPDIR)/FixedPoint.Po \
+ @POPPLER_TREE@/goo/$(DEPDIR)/GooHash.Po \
+ @POPPLER_TREE@/goo/$(DEPDIR)/GooList.Po \
+ @POPPLER_TREE@/goo/$(DEPDIR)/GooString.Po \
+ @POPPLER_TREE@/goo/$(DEPDIR)/GooTimer.Po \
+ @POPPLER_TREE@/goo/$(DEPDIR)/gfile.Po \
+ @POPPLER_TREE@/goo/$(DEPDIR)/glibc.Po \
+ @POPPLER_TREE@/goo/$(DEPDIR)/gmem.Po \
+ @POPPLER_TREE@/goo/$(DEPDIR)/gmempp.Po \
+ @POPPLER_TREE@/goo/$(DEPDIR)/grandom.Po \
+ @POPPLER_TREE@/goo/$(DEPDIR)/gstrtod.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/Annot.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/Array.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/BuiltinFont.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/BuiltinFontTables.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/CMap.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/CachedFile.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/Catalog.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/CharCodeToUnicode.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/DateInfo.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/Decrypt.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/Dict.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/Error.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/FileSpec.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/FlateStream.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/FontEncodingTables.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/FontInfo.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/Form.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/Function.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/Gfx.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/GfxFont.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/GfxState.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/GlobalParams.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/Hints.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/JArithmeticDecoder.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/JBIG2Stream.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/JPXStream.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/Lexer.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/Linearization.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/Link.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/MarkedContentOutputDev.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/Movie.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/NameToCharCode.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/Object.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/OptionalContent.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/Outline.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/OutputDev.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/PDFDoc.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/PDFDocEncoding.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/PDFDocFactory.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/PSTokenizer.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/Page.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/PageLabelInfo.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/PageTransition.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/Parser.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/PopplerCache.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/PreScanOutputDev.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/ProfileData.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/Rendition.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/SecurityHandler.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/SignatureInfo.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/Sound.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/StdinCachedFile.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/StdinPDFDocBuilder.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/Stream.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/StructElement.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/StructTreeRoot.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/UTF.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/UnicodeMap.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/UnicodeMapFuncs.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/UnicodeTypeTable.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/ViewerPreferences.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/XRef.Po \
+ @POPPLER_TREE@/poppler/$(DEPDIR)/XpdfPluginAPI.Po
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -249,7 +329,7 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- cscope distdir dist dist-all distcheck
+ cscope distdir distdir-am dist dist-all distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
$(LISP)config.h.in
# Read a list of newline-separated strings from the standard input,
@@ -573,8 +653,8 @@
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
@@ -884,87 +964,93 @@
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/fofi/$(DEPDIR)/FoFiBase.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/fofi/$(DEPDIR)/FoFiEncodings.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/fofi/$(DEPDIR)/FoFiIdentifier.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/fofi/$(DEPDIR)/FoFiTrueType.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/fofi/$(DEPDIR)/FoFiType1.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/fofi/$(DEPDIR)/FoFiType1C.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/FixedPoint.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/GooHash.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/GooList.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/GooString.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/GooTimer.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/gfile.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/glibc.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/gmem.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/gmempp.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/grandom.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/gstrtod.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Annot.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Array.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/BuiltinFont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/BuiltinFontTables.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/CMap.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/CachedFile.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Catalog.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/CharCodeToUnicode.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/DateInfo.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Decrypt.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Dict.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Error.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/FileSpec.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/FlateStream.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/FontEncodingTables.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/FontInfo.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Form.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Function.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Gfx.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/GfxFont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/GfxState.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/GlobalParams.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Hints.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/JArithmeticDecoder.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/JBIG2Stream.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/JPXStream.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Lexer.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Linearization.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Link.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/MarkedContentOutputDev.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Movie.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/NameToCharCode.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Object.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/OptionalContent.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Outline.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/OutputDev.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/PDFDoc.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/PDFDocEncoding.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/PDFDocFactory.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/PSTokenizer.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Page.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/PageLabelInfo.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/PageTransition.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Parser.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/PopplerCache.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/PreScanOutputDev.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/ProfileData.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Rendition.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/SecurityHandler.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/SignatureInfo.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Sound.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/StdinCachedFile.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/StdinPDFDocBuilder.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Stream.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/StructElement.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/StructTreeRoot.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/UTF.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/UnicodeMap.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/UnicodeMapFuncs.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/UnicodeTypeTable.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/ViewerPreferences.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/XRef.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/XpdfPluginAPI.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/fofi/$(DEPDIR)/FoFiBase.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/fofi/$(DEPDIR)/FoFiEncodings.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/fofi/$(DEPDIR)/FoFiIdentifier.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/fofi/$(DEPDIR)/FoFiTrueType.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/fofi/$(DEPDIR)/FoFiType1.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/fofi/$(DEPDIR)/FoFiType1C.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/FixedPoint.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/GooHash.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/GooList.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/GooString.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/GooTimer.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/gfile.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/glibc.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/gmem.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/gmempp.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/grandom.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/goo/$(DEPDIR)/gstrtod.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Annot.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Array.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/BuiltinFont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/BuiltinFontTables.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/CMap.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/CachedFile.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Catalog.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/CharCodeToUnicode.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/DateInfo.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Decrypt.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Dict.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Error.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/FileSpec.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/FlateStream.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/FontEncodingTables.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/FontInfo.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Form.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Function.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Gfx.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/GfxFont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/GfxState.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/GlobalParams.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Hints.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/JArithmeticDecoder.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/JBIG2Stream.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/JPXStream.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Lexer.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Linearization.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Link.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/MarkedContentOutputDev.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Movie.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/NameToCharCode.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Object.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/OptionalContent.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Outline.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/OutputDev.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/PDFDoc.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/PDFDocEncoding.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/PDFDocFactory.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/PSTokenizer.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Page.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/PageLabelInfo.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/PageTransition.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Parser.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/PopplerCache.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/PreScanOutputDev.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/ProfileData.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Rendition.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/SecurityHandler.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/SignatureInfo.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Sound.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/StdinCachedFile.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/StdinPDFDocBuilder.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/Stream.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/StructElement.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/StructTreeRoot.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/UTF.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/UnicodeMap.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/UnicodeMapFuncs.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/UnicodeTypeTable.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/ViewerPreferences.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/XRef.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@POPPLER_TREE@/poppler/$(DEPDIR)/XpdfPluginAPI.Po at am__quote@ # am--include-marker
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
.cc.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -1087,7 +1173,10 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -1327,7 +1416,86 @@
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf @POPPLER_TREE@/fofi/$(DEPDIR) @POPPLER_TREE@/goo/$(DEPDIR) @POPPLER_TREE@/poppler/$(DEPDIR)
+ -rm -f @POPPLER_TREE@/fofi/$(DEPDIR)/FoFiBase.Po
+ -rm -f @POPPLER_TREE@/fofi/$(DEPDIR)/FoFiEncodings.Po
+ -rm -f @POPPLER_TREE@/fofi/$(DEPDIR)/FoFiIdentifier.Po
+ -rm -f @POPPLER_TREE@/fofi/$(DEPDIR)/FoFiTrueType.Po
+ -rm -f @POPPLER_TREE@/fofi/$(DEPDIR)/FoFiType1.Po
+ -rm -f @POPPLER_TREE@/fofi/$(DEPDIR)/FoFiType1C.Po
+ -rm -f @POPPLER_TREE@/goo/$(DEPDIR)/FixedPoint.Po
+ -rm -f @POPPLER_TREE@/goo/$(DEPDIR)/GooHash.Po
+ -rm -f @POPPLER_TREE@/goo/$(DEPDIR)/GooList.Po
+ -rm -f @POPPLER_TREE@/goo/$(DEPDIR)/GooString.Po
+ -rm -f @POPPLER_TREE@/goo/$(DEPDIR)/GooTimer.Po
+ -rm -f @POPPLER_TREE@/goo/$(DEPDIR)/gfile.Po
+ -rm -f @POPPLER_TREE@/goo/$(DEPDIR)/glibc.Po
+ -rm -f @POPPLER_TREE@/goo/$(DEPDIR)/gmem.Po
+ -rm -f @POPPLER_TREE@/goo/$(DEPDIR)/gmempp.Po
+ -rm -f @POPPLER_TREE@/goo/$(DEPDIR)/grandom.Po
+ -rm -f @POPPLER_TREE@/goo/$(DEPDIR)/gstrtod.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Annot.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Array.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/BuiltinFont.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/BuiltinFontTables.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/CMap.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/CachedFile.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Catalog.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/CharCodeToUnicode.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/DateInfo.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Decrypt.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Dict.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Error.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/FileSpec.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/FlateStream.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/FontEncodingTables.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/FontInfo.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Form.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Function.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Gfx.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/GfxFont.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/GfxState.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/GlobalParams.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Hints.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/JArithmeticDecoder.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/JBIG2Stream.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/JPXStream.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Lexer.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Linearization.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Link.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/MarkedContentOutputDev.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Movie.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/NameToCharCode.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Object.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/OptionalContent.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Outline.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/OutputDev.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/PDFDoc.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/PDFDocEncoding.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/PDFDocFactory.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/PSTokenizer.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Page.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/PageLabelInfo.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/PageTransition.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Parser.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/PopplerCache.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/PreScanOutputDev.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/ProfileData.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Rendition.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/SecurityHandler.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/SignatureInfo.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Sound.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/StdinCachedFile.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/StdinPDFDocBuilder.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Stream.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/StructElement.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/StructTreeRoot.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/UTF.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/UnicodeMap.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/UnicodeMapFuncs.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/UnicodeTypeTable.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/ViewerPreferences.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/XRef.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/XpdfPluginAPI.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-tags
@@ -1375,7 +1543,86 @@
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -rf @POPPLER_TREE@/fofi/$(DEPDIR) @POPPLER_TREE@/goo/$(DEPDIR) @POPPLER_TREE@/poppler/$(DEPDIR)
+ -rm -f @POPPLER_TREE@/fofi/$(DEPDIR)/FoFiBase.Po
+ -rm -f @POPPLER_TREE@/fofi/$(DEPDIR)/FoFiEncodings.Po
+ -rm -f @POPPLER_TREE@/fofi/$(DEPDIR)/FoFiIdentifier.Po
+ -rm -f @POPPLER_TREE@/fofi/$(DEPDIR)/FoFiTrueType.Po
+ -rm -f @POPPLER_TREE@/fofi/$(DEPDIR)/FoFiType1.Po
+ -rm -f @POPPLER_TREE@/fofi/$(DEPDIR)/FoFiType1C.Po
+ -rm -f @POPPLER_TREE@/goo/$(DEPDIR)/FixedPoint.Po
+ -rm -f @POPPLER_TREE@/goo/$(DEPDIR)/GooHash.Po
+ -rm -f @POPPLER_TREE@/goo/$(DEPDIR)/GooList.Po
+ -rm -f @POPPLER_TREE@/goo/$(DEPDIR)/GooString.Po
+ -rm -f @POPPLER_TREE@/goo/$(DEPDIR)/GooTimer.Po
+ -rm -f @POPPLER_TREE@/goo/$(DEPDIR)/gfile.Po
+ -rm -f @POPPLER_TREE@/goo/$(DEPDIR)/glibc.Po
+ -rm -f @POPPLER_TREE@/goo/$(DEPDIR)/gmem.Po
+ -rm -f @POPPLER_TREE@/goo/$(DEPDIR)/gmempp.Po
+ -rm -f @POPPLER_TREE@/goo/$(DEPDIR)/grandom.Po
+ -rm -f @POPPLER_TREE@/goo/$(DEPDIR)/gstrtod.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Annot.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Array.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/BuiltinFont.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/BuiltinFontTables.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/CMap.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/CachedFile.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Catalog.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/CharCodeToUnicode.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/DateInfo.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Decrypt.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Dict.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Error.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/FileSpec.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/FlateStream.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/FontEncodingTables.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/FontInfo.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Form.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Function.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Gfx.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/GfxFont.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/GfxState.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/GlobalParams.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Hints.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/JArithmeticDecoder.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/JBIG2Stream.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/JPXStream.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Lexer.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Linearization.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Link.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/MarkedContentOutputDev.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Movie.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/NameToCharCode.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Object.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/OptionalContent.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Outline.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/OutputDev.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/PDFDoc.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/PDFDocEncoding.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/PDFDocFactory.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/PSTokenizer.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Page.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/PageLabelInfo.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/PageTransition.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Parser.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/PopplerCache.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/PreScanOutputDev.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/ProfileData.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Rendition.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/SecurityHandler.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/SignatureInfo.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Sound.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/StdinCachedFile.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/StdinPDFDocBuilder.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/Stream.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/StructElement.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/StructTreeRoot.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/UTF.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/UnicodeMap.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/UnicodeMapFuncs.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/UnicodeTypeTable.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/ViewerPreferences.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/XRef.Po
+ -rm -f @POPPLER_TREE@/poppler/$(DEPDIR)/XpdfPluginAPI.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -1396,11 +1643,11 @@
.MAKE: $(am__recursive_targets) all install-am install-strip
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
- am--refresh check check-am clean clean-cscope clean-generic \
- clean-noinstLIBRARIES cscope cscopelist-am ctags ctags-am dist \
- dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
- dist-tarZ dist-xz dist-zip distcheck distclean \
- distclean-compile distclean-generic distclean-hdr \
+ am--depfiles am--refresh check check-am clean clean-cscope \
+ clean-generic clean-noinstLIBRARIES cscope cscopelist-am ctags \
+ ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \
+ dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
+ distclean distclean-compile distclean-generic distclean-hdr \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
Modified: branches/stable/source/src/libs/poppler/TLpatches/ChangeLog
===================================================================
--- branches/stable/source/src/libs/poppler/TLpatches/ChangeLog 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/TLpatches/ChangeLog 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,3 +1,8 @@
+2018-04-29 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ * patch-03-time: Adapted.
+ * patch-05-w32: Removed.
+
2018-04-01 Mojca Miklavec <mojca.miklavec.lists at gmail.com>
* patch-03-time: Adapted.
Modified: branches/stable/source/src/libs/poppler/TLpatches/TL-Changes
===================================================================
--- branches/stable/source/src/libs/poppler/TLpatches/TL-Changes 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/TLpatches/TL-Changes 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.63.0 tree as obtained from:
+Changes applied to the poppler-0.64.0 tree as obtained from:
http://poppler.freedesktop.org/
Removed unused dirs:
@@ -11,7 +11,7 @@
update version.ac
mv poppler-src poppler-prev
tar xf poppler-*.tar.gz
-mv poppler-0.62.0 poppler-src
+mv poppler-0.64.0 poppler-src
cd poppler-src
svn status >/tmp/s
svn add # the ? lines
Modified: branches/stable/source/src/libs/poppler/TLpatches/patch-03-time
===================================================================
--- branches/stable/source/src/libs/poppler/TLpatches/patch-03-time 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/TLpatches/patch-03-time 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,39 +1,7 @@
-https://bugs.freedesktop.org/show_bug.cgi?id=105766
-
-diff -ur poppler-0.63.0/goo/gfile.cc poppler-src/goo/gfile.cc
---- poppler-0.63.0/goo/gfile.cc
-+++ poppler-src/goo/gfile.cc
-@@ -34,9 +34,7 @@
-
- #include <config.h>
-
--#ifdef _WIN32
--# include <time.h>
--#else
-+#ifndef _WIN32
- # if defined(MACOS)
- # include <sys/stat.h>
- # elif !defined(ACORN)
-@@ -44,7 +42,6 @@
- # include <sys/stat.h>
- # include <fcntl.h>
- # endif
--# include <time.h>
- # include <limits.h>
- # include <string.h>
- # if !defined(VMS) && !defined(ACORN) && !defined(MACOS)
-diff -ur poppler-0.63.0/goo/gfile.h poppler-src/goo/gfile.h
---- poppler-0.63.0/goo/gfile.h
-+++ poppler-src/goo/gfile.h
-@@ -37,6 +37,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <stddef.h>
-+#include <time.h>
- extern "C" {
- #if defined(_WIN32)
- # include <sys/stat.h>
-@@ -49,8 +50,6 @@
+diff -ur poppler-0.64.0/goo/gfile.h poppler-src/goo/gfile.h
+--- poppler-0.64.0/goo/gfile.h Wed Apr 18 03:04:26 2018
++++ poppler-src/goo/gfile.h Thu Apr 26 11:27:12 2018
+@@ -51,8 +51,6 @@
# include <windows.h>
# endif
#elif defined(ACORN)
@@ -42,10 +10,10 @@
#else
# include <unistd.h>
# include <sys/types.h>
-diff -ur poppler-0.63.0/poppler/Form.h poppler-src/poppler/Form.h
---- poppler-0.63.0/poppler/Form.h
-+++ poppler-src/poppler/Form.h
-@@ -33,6 +33,7 @@
+diff -ur poppler-0.64.0/poppler/Form.h poppler-src/poppler/Form.h
+--- poppler-0.64.0/poppler/Form.h Wed Apr 18 03:04:26 2018
++++ poppler-src/poppler/Form.h Wed Apr 25 18:40:18 2018
+@@ -36,6 +36,7 @@
#include <set>
#include <vector>
Deleted: branches/stable/source/src/libs/poppler/TLpatches/patch-05-w32
===================================================================
--- branches/stable/source/src/libs/poppler/TLpatches/patch-05-w32 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/TLpatches/patch-05-w32 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,22 +0,0 @@
-$ diff -u gfile.cc.orig gfile.cc
---- gfile.cc.orig 2018-03-21 13:21:12.635648536 +0100
-+++ gfile.cc 2018-03-21 12:16:05.000000000 +0100
-@@ -65,6 +65,8 @@
- #define PATH_MAX 1024
- #endif
-
-+#ifndef _WIN32
-+
- namespace {
-
- template< typename... >
-@@ -99,6 +101,8 @@
-
- }
-
-+#endif
-+
- //------------------------------------------------------------------------
-
- GooString *getCurrentDir() {
-
Modified: branches/stable/source/src/libs/poppler/aclocal.m4
===================================================================
--- branches/stable/source/src/libs/poppler/aclocal.m4 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/aclocal.m4 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
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.15.1], [],
+m4_if([$1], [1.16.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@
# 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.15.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -58,7 +58,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -141,7 +141,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -332,13 +332,12 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -346,49 +345,41 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ AS_CASE([$CONFIG_FILES],
+ [*\'*], [eval set x "$CONFIG_FILES"],
+ [*], [set x $CONFIG_FILES])
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`AS_DIRNAME(["$am_mf"])`
+ am_filepart=`AS_BASENAME(["$am_mf"])`
+ AM_RUN_LOG([cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles]) || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).])
+ fi
+ AS_UNSET([am_dirpart])
+ AS_UNSET([am_filepart])
+ AS_UNSET([am_mf])
+ AS_UNSET([am_rc])
+ rm -f conftest-deps.mk
}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -397,18 +388,17 @@
# -----------------------------
# This macro should only be invoked once -- use via AC_REQUIRE.
#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
+ [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -495,8 +485,8 @@
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms.
@@ -563,7 +553,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -605,7 +595,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -626,7 +616,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -648,7 +638,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -683,7 +673,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -691,49 +681,42 @@
# AM_MAKE_INCLUDE()
# -----------------
-# Check to see how make treats includes.
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+ AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+ ['0:this is the am__doit target'],
+ [AS_CASE([$s],
+ [BSD], [am__include='.include' am__quote='"'],
+ [am__include='include' am__quote=''])])
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT([${_am_result}])
+AC_SUBST([am__include])])
+AC_SUBST([am__quote])])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -772,7 +755,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -801,7 +784,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -848,7 +831,7 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -867,7 +850,7 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -948,7 +931,7 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1008,7 +991,7 @@
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1036,7 +1019,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1055,7 +1038,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Modified: branches/stable/source/src/libs/poppler/configure
===================================================================
--- branches/stable/source/src/libs/poppler/configure 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/configure 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.63.0.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.64.0.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='poppler (TeX Live)'
PACKAGE_TARNAME='poppler--tex-live-'
-PACKAGE_VERSION='0.63.0'
-PACKAGE_STRING='poppler (TeX Live) 0.63.0'
+PACKAGE_VERSION='0.64.0'
+PACKAGE_STRING='poppler (TeX Live) 0.64.0'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -661,7 +661,6 @@
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
-am__quote
am__include
DEPDIR
OBJEXT
@@ -738,7 +737,8 @@
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL'
+SHELL
+am__quote'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -1307,7 +1307,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures poppler (TeX Live) 0.63.0 to adapt to many kinds of systems.
+\`configure' configures poppler (TeX Live) 0.64.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1374,7 +1374,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of poppler (TeX Live) 0.63.0:";;
+ short | recursive ) echo "Configuration of poppler (TeX Live) 0.64.0:";;
esac
cat <<\_ACEOF
@@ -1487,7 +1487,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-poppler (TeX Live) configure 0.63.0
+poppler (TeX Live) configure 0.64.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2134,7 +2134,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by poppler (TeX Live) $as_me 0.63.0, which was
+It was created by poppler (TeX Live) $as_me 0.64.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2515,7 +2515,7 @@
-am__api_version='1.15'
+am__api_version='1.16'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2983,46 +2983,46 @@
ac_config_commands="$ac_config_commands depfiles"
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+ (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ case $?:`cat confinc.out 2>/dev/null` in #(
+ '0:this is the am__doit target') :
+ case $s in #(
+ BSD) :
+ am__include='.include' am__quote='"' ;; #(
+ *) :
+ am__include='include' am__quote='' ;;
+esac ;; #(
+ *) :
+ ;;
esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+$as_echo "${_am_result}" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
# Check whether --enable-dependency-tracking was given.
if test "${enable_dependency_tracking+set}" = set; then :
enableval=$enable_dependency_tracking;
@@ -4057,7 +4057,7 @@
# Define the identity of the package.
PACKAGE='poppler--tex-live-'
- VERSION='0.63.0'
+ VERSION='0.64.0'
# Some tools Automake needs.
@@ -4078,8 +4078,8 @@
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
# We need awk for the "check" target (and possibly the TAP driver). The
@@ -4130,7 +4130,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -7647,7 +7647,7 @@
cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.63.0"
+#define POPPLER_VERSION "0.64.0"
_ACEOF
@@ -8341,7 +8341,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by poppler (TeX Live) $as_me 0.63.0, which was
+This file was extended by poppler (TeX Live) $as_me 0.64.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8407,7 +8407,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-poppler (TeX Live) config.status 0.63.0
+poppler (TeX Live) config.status 0.64.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -8526,7 +8526,7 @@
#
# INIT-COMMANDS
#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
_ACEOF
@@ -9142,29 +9142,35 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ case $CONFIG_FILES in #(
+ *\'*) :
+ eval set x "$CONFIG_FILES" ;; #(
+ *) :
+ set x $CONFIG_FILES ;; #(
+ *) :
+ ;;
+esac
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$am_mf" : 'X\(//\)[^/]' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$am_mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -9182,53 +9188,48 @@
q
}
s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$am_mf" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
}
- /^X\(\/\/\)[^/].*/{
+ /^X\/\(\/\/\)$/{
s//\1/
q
}
- /^X\(\/\/\)$/{
+ /^X\/\(\/\).*/{
s//\1/
q
}
- /^X\(\/\).*/{
- s//\1/
- q
- }
s/.*/./; q'`
- as_dir=$dirpart/$fdir; as_fn_mkdir_p
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ { echo "$as_me:$LINENO: cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles" >&5
+ (cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ { am_dirpart=; unset am_dirpart;}
+ { am_filepart=; unset am_filepart;}
+ { am_mf=; unset am_mf;}
+ { am_rc=; unset am_rc;}
+ rm -f conftest-deps.mk
}
;;
Modified: branches/stable/source/src/libs/poppler/include/Makefile.in
===================================================================
--- branches/stable/source/src/libs/poppler/include/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/include/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -136,7 +136,7 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- distdir
+ distdir distdir-am
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
@@ -311,8 +311,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_srcdir)/../../am/hdr_links.am $(am__empty):
@@ -424,7 +424,10 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
Modified: branches/stable/source/src/libs/poppler/include/fofi/Makefile.in
===================================================================
--- branches/stable/source/src/libs/poppler/include/fofi/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/include/fofi/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -250,8 +250,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_srcdir)/../../am/hdr_links.am $(am__empty):
@@ -270,7 +270,10 @@
cscope cscopelist:
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
Modified: branches/stable/source/src/libs/poppler/include/goo/Makefile.in
===================================================================
--- branches/stable/source/src/libs/poppler/include/goo/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/include/goo/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -250,8 +250,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_srcdir)/../../am/hdr_links.am $(am__empty):
@@ -270,7 +270,10 @@
cscope cscopelist:
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
Modified: branches/stable/source/src/libs/poppler/poppler-src/CMakeLists.txt
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/CMakeLists.txt 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/CMakeLists.txt 2018-05-17 17:02:02 UTC (rev 797)
@@ -30,7 +30,7 @@
endif()
set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "63")
+set(POPPLER_MINOR_VERSION "64")
set(POPPLER_MICRO_VERSION "0")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
@@ -46,6 +46,7 @@
option(ENABLE_UTILS "Compile poppler command line utils." ON)
option(ENABLE_CPP "Compile poppler cpp wrapper." ON)
option(ENABLE_GLIB "Compile poppler glib wrapper." ON)
+option(ENABLE_GOBJECT_INTROSPECTION "Whether to generate GObject introspection." ON)
option(ENABLE_GTK_DOC "Whether to generate glib API documentation." OFF)
option(ENABLE_QT5 "Compile poppler qt5 wrapper." ON)
set(ENABLE_LIBOPENJPEG "openjpeg2" CACHE STRING "Use libopenjpeg for JPX streams. Possible values: openjpeg2, unmaintained, none. 'unmaintained' gives you the internal unmaintained decoder. Use at your own risk. 'none' compiles no JPX decoder at all. Default: openjpeg2")
@@ -88,10 +89,13 @@
if(WIN32)
set(_default_fontconfiguration "win32")
+elseif(ANDROID)
+ # on android we don't have fontconfig and we don't want window-specific code
+ set(_default_fontconfiguration "generic")
else()
set(_default_fontconfiguration "fontconfig")
endif()
-set(FONT_CONFIGURATION "${_default_fontconfiguration}" CACHE STRING "The font configuration backend (win32|fontconfig).")
+set(FONT_CONFIGURATION "${_default_fontconfiguration}" CACHE STRING "The font configuration backend (win32|generic|fontconfig).")
string(TOLOWER "${FONT_CONFIGURATION}" font_configuration)
set(WITH_FONTCONFIGURATION_WIN32 OFF)
set(WITH_FONTCONFIGURATION_FONTCONFIG OFF)
@@ -99,6 +103,8 @@
set(WITH_FONTCONFIGURATION_WIN32 ON)
elseif(font_configuration STREQUAL "fontconfig")
set(WITH_FONTCONFIGURATION_FONTCONFIG ON)
+elseif(font_configuration STREQUAL "generic")
+ message(STATUS "no fontconfig or win32 specific code")
else()
message(FATAL_ERROR "Invalid font configuration setting: ${FONT_CONFIGURATION}")
endif()
@@ -167,9 +173,11 @@
endif()
endif()
if(ENABLE_GLIB)
- # Check for introspection
- macro_optional_find_package(GObjectIntrospection 0.9.12)
- set(HAVE_INTROSPECTION ${INTROSPECTION_FOUND})
+ if(ENABLE_GOBJECT_INTROSPECTION)
+ # Check for introspection
+ macro_optional_find_package(GObjectIntrospection 0.9.12)
+ set(HAVE_INTROSPECTION ${INTROSPECTION_FOUND})
+ endif()
set(POPPLER_GLIB_DISABLE_DEPRECATED "${POPPLER_GLIB_DISABLE_DEPRECATED} -DG_DISABLE_DEPRECATED")
set(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES "${POPPLER_GLIB_DISABLE_SINGLE_INCLUDES} -DG_DISABLE_SINGLE_INCLUDES")
macro_optional_find_package(GTK)
@@ -483,7 +491,7 @@
else()
add_library(poppler ${poppler_SRCS})
endif()
-set_target_properties(poppler PROPERTIES VERSION 74.0.0 SOVERSION 74)
+set_target_properties(poppler PROPERTIES VERSION 75.0.0 SOVERSION 75)
if(MINGW)
get_target_property(POPPLER_SOVERSION poppler SOVERSION)
set_target_properties(poppler PROPERTIES SUFFIX "-${POPPLER_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
Modified: branches/stable/source/src/libs/poppler/poppler-src/ChangeLog
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/ChangeLog 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/ChangeLog 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,3 +1,930 @@
+commit 4d851d16aa6a2a9f00b60091a2ef810be1a571ea
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Tue Apr 17 20:04:26 2018 +0200
+
+ poppler 0.64.0
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 33 +++++++++++++++++++++++++++++++++
+ cpp/Doxyfile | 2 +-
+ qt5/src/CMakeLists.txt | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ 5 files changed, 38 insertions(+), 5 deletions(-)
+
+commit 1dcf335a8e212fdfd18bad1f56a743504f653cf5
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Tue Apr 17 16:21:33 2018 +0200
+
+ qt5: Don't need this friend declaration
+
+ qt5/src/poppler-link.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit 281d5cbd33521c823f1602f3d0c1e2ad9a4ab1d2
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Apr 6 15:34:57 2018 +0200
+
+ Object::getName return const char instead of char
+
+ poppler/Form.cc | 2 +-
+ poppler/Form.h | 2 +-
+ poppler/Gfx.cc | 20 ++++++++++----------
+ poppler/Gfx.h | 14 +++++++-------
+ poppler/GfxFont.cc | 4 ++--
+ poppler/Link.cc | 6 +++---
+ poppler/Link.h | 2 +-
+ poppler/MarkedContentOutputDev.cc | 2 +-
+ poppler/MarkedContentOutputDev.h | 2 +-
+ poppler/Movie.cc | 2 +-
+ poppler/Object.h | 2 +-
+ poppler/OutputDev.cc | 6 +++---
+ poppler/OutputDev.h | 6 +++---
+ poppler/Rendition.cc | 2 +-
+ poppler/Stream.cc | 2 +-
+ poppler/Stream.h | 2 +-
+ 16 files changed, 38 insertions(+), 38 deletions(-)
+
+commit 8fe1a5b96e5ad7dac60dd0f198b3c8b18fb3c5bb
+Author: Andre Heinecke <aheinecke at intevation.de>
+Date: Tue Apr 17 10:02:40 2018 +0200
+
+ Fix parsing of focus out actions
+
+ The key is uppercase B with lowercase L. Not I.
+
+ poppler/Annot.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 3636ccbaece6706ef86dfab9303c3f164e68ffe2
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Tue Apr 17 10:57:06 2018 +0200
+
+ pdfsig: Don't use fixed buffer size for path
+
+ utils/pdfsig.cc | 19 +++++++++++++------
+ 1 file changed, 13 insertions(+), 6 deletions(-)
+
+commit 17c7e3b0e1801a8643712013eb3b106c802e0faa
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Tue Apr 17 11:02:29 2018 +0200
+
+ utils: Move numberOfCharacters to shared file
+
+ utils/numberofcharacters.h | 26 ++++++++++++++++++++++++++
+ utils/pdftocairo.cc | 13 +------------
+ utils/pdftoppm.cc | 13 +------------
+ 3 files changed, 28 insertions(+), 24 deletions(-)
+
+commit 73ab9930810ae83998467ec859f3ee3984548cbd
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Tue Apr 17 10:46:46 2018 +0200
+
+ pdfsig: Add -dump to manpage
+
+ utils/pdfsig.1 | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit bdece3bb0c115576d23e76dc29ee43f04aafdee0
+Author: Chinmoy Ranjan Pradhan <chinmoyrp65 at protonmail.com>
+Date: Tue Apr 17 10:45:15 2018 +0200
+
+ pdfsig: Add -dump which writes signatures to disk
+
+ Bug #104881
+
+ poppler/Form.cc | 8 +++++++-
+ poppler/Form.h | 7 +++++--
+ utils/pdfsig.cc | 33 +++++++++++++++++++++++++++++++--
+ 3 files changed, 43 insertions(+), 5 deletions(-)
+
+commit 97aa11bf135421c1f87f2a46e2f597626f503f10
+Author: Oliver Sander <oliver.sander at tu-dresden.de>
+Date: Fri Mar 23 22:04:11 2018 +0100
+
+ Document method drawImageMask
+
+ poppler/OutputDev.h | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+commit ae4349620863a42ae569f1ce05461bb27340c4ea
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Mon Apr 16 22:49:54 2018 +0200
+
+ Make the second parseAction variant private
+
+ poppler/Link.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 444d9d8de5d4f8d627084405e1583b6d6d3900c7
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Mon Apr 16 22:28:18 2018 +0200
+
+ Simplify LinkAction::parseAction a bit
+
+ After the discussion on the mailing list, also using unique_ptr was
+ wrong
+
+ poppler/Link.cc | 22 +++++++++++-----------
+ poppler/Link.h | 5 +++--
+ 2 files changed, 14 insertions(+), 13 deletions(-)
+
+commit 88c99f1f6f4faf31faabccd35d9d094958020ebc
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Mon Apr 16 17:59:35 2018 +0200
+
+ Fix crash on malformed documents
+
+ In GfxGouraudTriangleShading::parse
+
+ Bug #106061
+
+ poppler/GfxState.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit df8a4ee51e18a39f85568c4122e5edd8c03d61df
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Mon Apr 16 17:46:10 2018 +0200
+
+ Make it so we copy seenNextActions a bit less
+
+ poppler/Link.cc | 20 +++++++++++---------
+ poppler/Link.h | 3 ++-
+ 2 files changed, 13 insertions(+), 10 deletions(-)
+
+commit bd9fb431941916174e1c3b2201bf5f422bcf61bd
+Author: Aleix Pol <aleixpol at kde.org>
+Date: Mon Apr 16 16:38:09 2018 +0200
+
+ Make it possible to build poppler on Android without fontconfig
+
+ Didn't manage to make fontconfig build, still nice to have poppler
+ available.
+
+ CMakeLists.txt | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+commit 34a44e5b95230b1ed03bb030e9963d0187b01951
+Author: Aleix Pol <aleixpol at kde.org>
+Date: Mon Apr 16 16:35:47 2018 +0200
+
+ Do not assume that iconv is in /usr/include
+
+ We find it explicitly because it may be elsewhere.
+
+ cpp/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit bdd8db389c7b09cd9042267f36214f809e4c5f60
+Author: Andre Heinecke <aheinecke at intevation.de>
+Date: Mon Apr 16 17:13:05 2018 +0200
+
+ Add support for Next actions following an action
+
+ Next actions are action dictionaries or an array
+ of action dictonaries. "Next" is an entry in the
+ general action dictionary.
+
+ These actions are supposed to be performed after each other.
+ So that a single button press can for example
+ both trigger a Hide action and a JavaScript action.
+
+ poppler/Link.cc | 72
+ +++++++++++++++++++++++++++++++++++++++++-
+ poppler/Link.h | 18 +++++++++--
+ qt5/src/poppler-link-private.h | 9 ++++++
+ qt5/src/poppler-link.cc | 7 +++-
+ qt5/src/poppler-link.h | 11 ++++++-
+ qt5/src/poppler-page.cc | 14 ++++++++
+ 6 files changed, 125 insertions(+), 6 deletions(-)
+
+commit ab72205dd14efe9c5c8d12e6b1ae538208bce168
+Author: Andre Heinecke <aheinecke at intevation.de>
+Date: Mon Apr 16 16:31:38 2018 +0200
+
+ Add support for hide action
+
+ The hide action can be used to show / hide fields.
+
+ poppler/Link.cc | 29 +++++++++++++++++++++++++++++
+ poppler/Link.h | 35 +++++++++++++++++++++++++++++++++++
+ qt5/src/poppler-annotation.cc | 6 ++++++
+ qt5/src/poppler-link-private.h | 17 +++++++++++++++++
+ qt5/src/poppler-link.cc | 28 ++++++++++++++++++++++++++++
+ qt5/src/poppler-link.h | 39
+ ++++++++++++++++++++++++++++++++++++++-
+ qt5/src/poppler-page.cc | 11 +++++++++++
+ 7 files changed, 164 insertions(+), 1 deletion(-)
+
+commit 022ccd4e1c61f4e89c7ffad83d9a5a896f65dc40
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Mon Apr 16 16:22:55 2018 +0200
+
+ GfxGouraudTriangleShading::parse: Fix memory leak on malformed files
+
+ Bug #106059
+
+ poppler/GfxState.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit 776257d0c20d4e3ae8d66683ab0f087bf6fc7b0f
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Wed Apr 11 00:44:41 2018 +0200
+
+ Fix leaks in GfxPatchMeshShading::parse with malformed documents
+
+ Bug #105969
+
+ poppler/GfxState.cc | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+commit d80e7aac3366f93865581a783751abb528c120b3
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Wed Apr 11 00:32:35 2018 +0200
+
+ Make GfxGouraudTriangleShading::parse more accepting of malformed
+ documents
+
+ Bug #105972
+
+ poppler/GfxState.cc | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+commit fee13e935e4c9eaadff434436eaceeb13afcfc13
+Author: Oliver Sander <oliver.sander at tu-dresden.de>
+Date: Fri Mar 23 22:24:42 2018 +0100
+
+ Implement Type3 font support for ArthurOutputDev
+
+ qt5/src/ArthurOutputDev.cc | 177
+ ++++++++++++++++++++++++++++++++++++++++-----
+ qt5/src/ArthurOutputDev.h | 16 ++--
+ qt5/src/poppler-page.cc | 4 +-
+ 3 files changed, 170 insertions(+), 27 deletions(-)
+
+commit 79c588912f41aa6ee81ea058e7e649199a252f90
+Author: Oliver Sander <oliver.sander at tu-dresden.de>
+Date: Sun Mar 25 21:38:27 2018 +0200
+
+ Do not make ArthurOutputDev::startPage fill the page with white
+
+ qt5/src/ArthurOutputDev.cc | 13 +------------
+ 1 file changed, 1 insertion(+), 12 deletions(-)
+
+commit 8c8c0034ae88c06616ace5e5ead71318f04311cf
+Author: Oliver Sander <oliver.sander at tu-dresden.de>
+Date: Sat Apr 7 23:45:50 2018 +0200
+
+ Implement ArthurOutputDev::drawImageMask
+
+ Bug #105531
+
+ Also temporarily disable type3 fonts since it seems they're not
+ properly
+ supported
+
+ qt5/src/ArthurOutputDev.cc | 91
+ +++++++++++++++-------------------------------
+ qt5/src/ArthurOutputDev.h | 2 +-
+ 2 files changed, 30 insertions(+), 63 deletions(-)
+
+commit 3e0408966ccdd713de7795ce7992888b3896b49c
+Author: Andre Heinecke <aheinecke at intevation.de>
+Date: Thu Mar 22 14:53:19 2018 +0100
+
+ Qt5: Allow setting of visibility
+
+ Extends Qt5 API to allow setting visibility flags
+
+ qt5/src/poppler-form.cc | 11 +++++++++++
+ qt5/src/poppler-form.h | 6 ++++++
+ 2 files changed, 17 insertions(+)
+
+commit b4127fb1c45fe5dcabe3751f0b40029405224f49
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Apr 6 23:08:15 2018 +0200
+
+ Add some more const
+
+ const is always good :)
+
+ cpp/poppler-embedded-file.cpp | 13 ++--
+ cpp/poppler-private.cpp | 4 +-
+ cpp/poppler-private.h | 3 +-
+ cpp/poppler-toc-private.h | 4 +-
+ cpp/poppler-toc.cpp | 9 +--
+ glib/poppler-action.cc | 50 +++++++--------
+ glib/poppler-document.cc | 8 +--
+ glib/poppler-layer.cc | 2 +-
+ glib/poppler-media.cc | 4 +-
+ glib/poppler-movie.cc | 2 +-
+ glib/poppler-private.h | 6 +-
+ goo/GooList.cc | 16 ++++-
+ goo/GooList.h | 8 +--
+ poppler/FileSpec.cc | 10 +--
+ poppler/FileSpec.h | 26 ++++----
+ poppler/Function.h | 2 +-
+ poppler/Link.cc | 26 ++++----
+ poppler/Link.h | 138
+ ++++++++++++++++++++--------------------
+ poppler/Movie.cc | 12 ++--
+ poppler/Movie.h | 26 ++++----
+ poppler/OptionalContent.cc | 8 +--
+ poppler/OptionalContent.h | 14 ++--
+ poppler/Outline.cc | 10 +--
+ poppler/Outline.h | 20 +++---
+ poppler/Rendition.cc | 4 +-
+ poppler/Rendition.h | 18 +++---
+ poppler/Sound.cc | 6 +-
+ poppler/Sound.h | 18 +++---
+ qt5/src/poppler-document.cc | 4 +-
+ qt5/src/poppler-embeddedfile.cc | 10 +--
+ qt5/src/poppler-link.cc | 4 +-
+ qt5/src/poppler-media.cc | 2 +-
+ qt5/src/poppler-movie.cc | 4 +-
+ qt5/src/poppler-optcontent.cc | 4 +-
+ qt5/src/poppler-private.cc | 24 +++----
+ qt5/src/poppler-private.h | 8 +--
+ qt5/src/poppler-sound.cc | 2 +-
+ utils/HtmlFonts.cc | 4 +-
+ utils/HtmlFonts.h | 2 +-
+ utils/HtmlOutputDev.cc | 12 ++--
+ utils/HtmlOutputDev.h | 4 +-
+ utils/pdfdetach.cc | 2 +-
+ 42 files changed, 285 insertions(+), 268 deletions(-)
+
+commit a8e93f46df9feb7f7241826307af51befdb25d9e
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Fri Apr 6 09:02:28 2018 +0200
+
+ Make Object return const GooString pointer
+
+ This helps making sure noone is changing strings that belong to
+ objects without us realizing.
+
+ In fact noone was doing except an ifdef for windows, fixed it to
+ not modify the dict contents anymore
+
+ glib/poppler-action.cc | 2 +-
+ poppler/Annot.cc | 6 +++---
+ poppler/FileSpec.cc | 4 +++-
+ poppler/Form.cc | 6 +++---
+ poppler/GfxFont.cc | 4 ++--
+ poppler/GfxState.cc | 3 ++-
+ poppler/Link.cc | 3 ++-
+ poppler/Object.h | 3 ++-
+ poppler/Outline.cc | 3 ++-
+ poppler/PDFDoc.cc | 3 ++-
+ poppler/Parser.cc | 4 +++-
+ poppler/Stream.cc | 2 +-
+ poppler/StructElement.cc | 3 ++-
+ qt5/src/poppler-document.cc | 6 +++---
+ qt5/src/poppler-embeddedfile.cc | 5 +++--
+ qt5/src/poppler-optcontent.cc | 3 ++-
+ qt5/src/poppler-qt5.h | 2 +-
+ qt5/tests/check_dateConversion.cpp | 4 ++--
+ test/pdf-fullrewrite.cc | 4 ++--
+ utils/pdfinfo.cc | 7 ++++---
+ utils/pdftohtml.cc | 5 +++--
+ utils/pdftotext.cc | 5 +++--
+ utils/pdfunite.cc | 5 +++--
+ 23 files changed, 54 insertions(+), 38 deletions(-)
+
+commit 07180b86786cce95df4e2433a7cf3e006749a0f5
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Fri Apr 6 13:03:16 2018 +0200
+
+ Gfx: Make two functions take const GooString *
+
+ poppler/Gfx.cc | 8 ++++----
+ poppler/Gfx.h | 4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+commit c4af5981ab2a5f42a9a1194bb5929c2151fc2674
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Fri Apr 6 13:00:12 2018 +0200
+
+ OutputDev: change functions taking GooString * to make it const
+
+ People that use poppler core, beware of the signature change!
+
+ poppler/CairoOutputDev.cc | 5 +++--
+ poppler/CairoOutputDev.h | 5 +++--
+ poppler/OutputDev.h | 7 ++++---
+ poppler/PSOutputDev.cc | 4 ++--
+ poppler/PSOutputDev.h | 2 +-
+ poppler/TextOutputDev.cc | 7 ++++---
+ poppler/TextOutputDev.h | 7 ++++---
+ utils/HtmlOutputDev.cc | 5 +++--
+ utils/HtmlOutputDev.h | 5 +++--
+ 9 files changed, 27 insertions(+), 20 deletions(-)
+
+commit 5fc6d9fcb41966b85dc67117531c81ec89f42f20
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Apr 6 12:50:18 2018 +0200
+
+ PageAttrs and Page getLastModified return const GooString *
+
+ poppler/Page.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit a801b46e1e792b5d0a34f97de870c485e0ef312a
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Fri Apr 6 12:48:18 2018 +0200
+
+ PSOuputDev writePSString and writePSTextLine take const
+
+ poppler/PSOutputDev.cc | 4 ++--
+ poppler/PSOutputDev.h | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+commit eb6de58de5ef8c2ddeeed386e0b8b498b945797f
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Apr 6 12:47:12 2018 +0200
+
+ PDFDoc::writeString take const GooString pointer
+
+ poppler/PDFDoc.cc | 2 +-
+ poppler/PDFDoc.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 853b2251d4e11f14cd891bf1b6095ee36683d161
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Apr 6 12:46:06 2018 +0200
+
+ OCDisplayNode take const GooString pointer
+
+ poppler/OptionalContent.cc | 4 ++--
+ poppler/OptionalContent.h | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 0a8311929ba599d7b0a35e83b1f5dec4a3c9da06
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Fri Apr 6 12:44:43 2018 +0200
+
+ GfxFont::getNextChar take const char pointer
+
+ poppler/GfxFont.cc | 4 ++--
+ poppler/GfxFont.h | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 0e35441513bdce2471113b937bccb8928c7c9d9f
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Fri Apr 6 12:42:29 2018 +0200
+
+ FormFieldText::tokenizeDA take const GooString
+
+ poppler/Form.cc | 2 +-
+ poppler/Form.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit ba91b95f6e504cce08825e83a567a554ac846e39
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Apr 6 12:41:44 2018 +0200
+
+ dateStringToTime take const GooString
+
+ poppler/DateInfo.cc | 4 ++--
+ poppler/DateInfo.h | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 9bfe4b43216bce4e702d7d8f61fc7cb9acdbb8f6
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Apr 6 12:40:53 2018 +0200
+
+ CMap::getCID take const char
+
+ poppler/CMap.cc | 4 ++--
+ poppler/CMap.h | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 690ea9e5c900268556431df71bdac38f5e74dc36
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Fri Apr 6 12:39:35 2018 +0200
+
+ GooString::insert make pointer const
+
+ goo/GooString.cc | 2 +-
+ goo/GooString.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit f3551055dab57eb0bc544070b15c6a7435585003
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Apr 6 12:19:54 2018 +0200
+
+ Introduce AutoFreeMemStream
+
+ This is done by turning the old MemStream implementation to a new
+ template implementation in BaseMemStream
+ and inheriting from it MemStream for const char * and
+ AutoFreeMemStream for char *.
+
+ This way we make clear one frees the data and the other does not,
+ while also removing the ugly setNeedsFree in MemStream
+
+ poppler/Annot.cc | 16 ++++++---------
+ poppler/SplashOutputDev.cc | 3 +--
+ poppler/Stream.h | 51
+ +++++++++++++++++++++++++++-------------------
+ 3 files changed, 37 insertions(+), 33 deletions(-)
+
+commit 4cc89c79f58cb416aae8396190a788e1398113ff
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Apr 6 12:11:55 2018 +0200
+
+ Move MemStream implementation to header
+
+ Will be useful in next step where we turn it into a template
+
+ poppler/Stream.cc | 83 --------------------------------------------------
+ poppler/Stream.h | 91
+ +++++++++++++++++++++++++++++++++++++++++++++++++------
+ 2 files changed, 81 insertions(+), 93 deletions(-)
+
+commit 8821c04f36cb737776cd9077a46f1a9f86ca54e7
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Wed Apr 4 10:20:52 2018 +0200
+
+ Workaround form field text not being drawn on broken files
+
+ Try drawing with the form appearance instead of the field apparance
+ if drawing with the field appearance fails
+
+ Bug #103245
+
+ poppler/Annot.cc | 88
+ +++++++++++++++++++++++++++++++++++---------------------
+ poppler/Annot.h | 24 +++++++++-------
+ 2 files changed, 68 insertions(+), 44 deletions(-)
+
+commit afb053d652cc1f670465d471f671652b112dbf51
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Thu Apr 5 11:48:11 2018 +0200
+
+ Annot: Move appearBuf construction to a new class
+
+ Previously we had appearBuf construction functions in Annot itself
+ which was a bit
+ confusing. Some functions like writeString took appearBuf as
+ parameter, some
+ other did not. By moving it out to a new class and making all the
+ input parameters const
+ pointers we make it clear the construction of appearBuf doesn't have
+ any other side
+ effect on Annot itself or any other class
+
+ I'm leaving the functions in their old place to minimize the diff
+ so it's easier to read.
+ I'll move them in a follow up commit
+
+ poppler/Annot.cc | 528
+ ++++++++++++++++++++++++++++---------------------------
+ poppler/Annot.h | 73 +++++---
+ 2 files changed, 321 insertions(+), 280 deletions(-)
+
+commit 0a79dc3036111e86a11bd290057da6674da3b311
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Thu Apr 5 18:15:33 2018 +0200
+
+ Add some more const
+
+ glib/poppler-action.cc | 14 +++++------
+ glib/poppler-annot.cc | 18 +++++++--------
+ glib/poppler-document.cc | 2 +-
+ glib/poppler-form-field.cc | 4 ++--
+ glib/poppler-private.h | 2 +-
+ poppler/Annot.cc | 16 ++++++-------
+ poppler/Annot.h | 54
+ +++++++++++++++++++++----------------------
+ poppler/Catalog.cc | 5 ++--
+ poppler/Catalog.h | 5 ++--
+ poppler/Form.cc | 6 ++---
+ poppler/Form.h | 6 ++---
+ poppler/Link.h | 23 +++++++++---------
+ poppler/PDFDoc.h | 3 ++-
+ poppler/UTF.cc | 3 ++-
+ poppler/UTF.h | 3 ++-
+ qt5/src/poppler-annotation.cc | 5 ++--
+ qt5/src/poppler-document.cc | 9 +++++++-
+ qt5/src/poppler-form.cc | 4 ++--
+ qt5/src/poppler-page.cc | 2 +-
+ qt5/src/poppler-private.cc | 4 ++--
+ qt5/src/poppler-private.h | 4 ++--
+ qt5/src/poppler-qt5.h | 7 ++++++
+ utils/JSInfo.cc | 7 +++---
+ utils/JSInfo.h | 3 ++-
+ 24 files changed, 116 insertions(+), 93 deletions(-)
+
+commit b60de1700d95d022ec0d1676886b0442cb763473
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Thu Apr 5 16:03:54 2018 +0200
+
+ Introduce a const version of GfxResources::lookupFont
+
+ poppler/Gfx.cc | 13 +++++++++++--
+ poppler/Gfx.h | 5 ++++-
+ poppler/GfxFont.cc | 2 +-
+ poppler/GfxFont.h | 2 +-
+ 4 files changed, 17 insertions(+), 5 deletions(-)
+
+commit 6bb508acd9a79671e5e9defc7b92a943fb880cda
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Thu Apr 5 14:19:51 2018 +0200
+
+ More const in GfxFont methods
+
+ poppler/GfxFont.h | 10 +++++-----
+ poppler/PSOutputDev.cc | 2 +-
+ poppler/PSOutputDev.h | 2 +-
+ poppler/SplashOutputDev.cc | 11 ++++++-----
+ qt5/src/ArthurOutputDev.cc | 3 ++-
+ 5 files changed, 15 insertions(+), 13 deletions(-)
+
+commit 390109044bdef1ba67c2339bffaf11b38261854d
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Thu Apr 5 13:00:59 2018 +0200
+
+ Fix windows build
+
+ poppler/GlobalParamsWin.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit f75c0f5c3f9d63334cc21e0ab68f1af45d0037cc
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Thu Apr 5 12:58:34 2018 +0200
+
+ Make GfxFont::getName const
+
+ glib/poppler-structure-element.cc | 2 +-
+ poppler/FontInfo.cc | 3 ++-
+ poppler/GfxFont.h | 2 +-
+ poppler/GlobalParams.cc | 6 +++---
+ poppler/PSOutputDev.cc | 6 ++++--
+ poppler/PSOutputDev.h | 3 ++-
+ utils/HtmlFonts.cc | 3 ++-
+ 7 files changed, 15 insertions(+), 10 deletions(-)
+
+commit a669ad5cfb28cdfcfe38bbce39fbf8c6fc3102d9
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Thu Apr 5 12:55:39 2018 +0200
+
+ buildFcPattern: Don't modify the actual name of the font
+
+ When doing the '-' to ' ' replacement to build the fc pattern
+
+ poppler/GlobalParams.cc | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+commit 4f9b3d8d8d17863873a8a399ff3fe212d247b236
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Thu Apr 5 12:37:40 2018 +0200
+
+ Make some GfxFont methods const
+
+ poppler/GfxFont.cc | 8 ++++----
+ poppler/GfxFont.h | 16 ++++++++--------
+ 2 files changed, 12 insertions(+), 12 deletions(-)
+
+commit 2bf6f2275c49f94e84f935653d6c42f6b5f9b364
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Thu Apr 5 12:21:38 2018 +0200
+
+ Make some Form methods const
+
+ glib/poppler-form-field.cc | 6 +++---
+ poppler/Annot.cc | 4 ++--
+ poppler/Form.cc | 18 +++++++++---------
+ poppler/Form.h | 32 ++++++++++++++++----------------
+ qt5/src/poppler-form.cc | 3 ++-
+ 5 files changed, 32 insertions(+), 31 deletions(-)
+
+commit 6f2bc64e09b7f5e5be6962840ede40369b78fd5e
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Thu Apr 5 12:25:17 2018 +0200
+
+ Make AnnotWidget::drawText and Annot::layoutText input GooString const
+
+ poppler/Annot.cc | 9 +++++----
+ poppler/Annot.h | 5 +++--
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+commit 5e7931c4c9fdaba8b3343d04eda6e9eb2a2e3dcd
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Thu Apr 5 12:23:21 2018 +0200
+
+ Make _poppler_goo_string_to_utf8 input param const
+
+ glib/poppler-document.cc | 2 +-
+ glib/poppler-private.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 3fdb7ea7b6a1ed4add2fbc6dca7a38b27fc79f45
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Thu Apr 5 12:21:11 2018 +0200
+
+ Make UnicodeParsedString input const
+
+ qt5/src/poppler-private.cc | 5 +++--
+ qt5/src/poppler-private.h | 3 ++-
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+commit 4b96c8399102a36e542c9da3b34650c26ccdda3c
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Thu Apr 5 12:19:07 2018 +0200
+
+ Make pdfDocEncodingToUTF16 input param const
+
+ poppler/Form.cc | 5 +++--
+ poppler/Form.h | 1 +
+ poppler/PDFDocEncoding.h | 2 +-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+commit 5804259f22d4d42ed7c37c9efb613910248cd1d4
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Thu Apr 5 11:58:50 2018 +0200
+
+ GfxFont::getToUnicode -> const
+
+ And we don't need to do the inc/dec ref dance in Annot
+ since the GfxFont is still alive while we use it and there's
+ no other users to getToUnicode that may keep the CharCodeToUnicode
+ for longer time than the GfxFont live
+
+ poppler/Annot.cc | 5 ++---
+ poppler/GfxFont.cc | 12 ++++--------
+ poppler/GfxFont.h | 7 ++++---
+ 3 files changed, 10 insertions(+), 14 deletions(-)
+
+commit 1eb06156855758e4b1da2adc0334d84d3f857fb1
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Thu Apr 5 11:56:57 2018 +0200
+
+ CharCodeToUnicode::mapToCharCode -> const
+
+ poppler/CharCodeToUnicode.cc | 3 ++-
+ poppler/CharCodeToUnicode.h | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 2a49511517678b7e05660bb9a35a614c83229b66
+Author: Albert Astals Cid <albert.astals.cid at kdab.com>
+Date: Thu Apr 5 11:50:23 2018 +0200
+
+ Add some const to GooHash and GooString
+
+ goo/GooHash.cc | 7 ++++---
+ goo/GooHash.h | 7 ++++---
+ goo/GooString.cc | 7 ++++---
+ goo/GooString.h | 7 ++++---
+ 4 files changed, 16 insertions(+), 12 deletions(-)
+
+commit e491e935ea355d48519cf0a14e4b060655850675
+Author: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Mon Apr 2 16:09:34 2018 +0300
+
+ Fix PDFDoc::checkHeader() for PDFs smaller than 1 KiB
+
+ The fix for bug 104502 made it so PDFDoc::checkHeader() would print a
+ warning and return immediatelly if it encounters an EOF while reading
+ the first 1024 bytes.
+
+ Some PDF files can be smaller than 1024 bytes, for example those used
+ by pdf2djvu's test suite. The latter would fail due to the unexpected
+ warnings.
+
+ Change the behavior of PDFDoc::checkHeader() when encountering an EOF
+ so it processes the data it has read so far instead of aborting early.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=105674
+
+ poppler/PDFDoc.cc | 23 +++++++++++++++--------
+ 1 file changed, 15 insertions(+), 8 deletions(-)
+
+commit c19469f2a80ebc09bef3fbd603034e43c4a707cd
+Author: Mojca Miklavec <mojca at macports.org>
+Date: Mon Apr 2 12:52:35 2018 +0200
+
+ Fix build on some platforms
+
+ We need to include time.h in gfile.h
+
+ Bug #105766
+
+ goo/gfile.cc | 6 ++----
+ goo/gfile.h | 2 ++
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+commit c7a317635cfc6934e975e846335e37a68d6b3876
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Mon Mar 26 16:10:05 2018 +0200
+
+ glib: less deprecated calls
+
+ And increate gdk pixbuf requirement to the version i think we
+ actually require
+
+ cmake/modules/FindGTK.cmake | 2 +-
+ glib/demo/annots.c | 2 +-
+ glib/demo/selections.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 7a708ffd374cd18e9e4bfe8a8e95c02184a074ba
+Author: Oliver Sander <oliver.sander at tu-dresden.de>
+Date: Wed Mar 28 00:00:35 2018 +0200
+
+ Implement ArthurOutputDev::axialShadedFill
+
+ qt5/src/ArthurOutputDev.cc | 128
+ ++++++++++++++++++++++++++++++++++++++++++++-
+ qt5/src/ArthurOutputDev.h | 9 +++-
+ 2 files changed, 135 insertions(+), 2 deletions(-)
+
+commit 5e7aef9df36a07c82b0ab40f80fd8464840f6424
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Mar 23 15:34:56 2018 +0100
+
+ PSOutputDev: move i declaration to the for
+
+ poppler/PSOutputDev.cc | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+commit 79789ed3d2798fb34f1c82d950e03a4d41e197de
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Mar 23 19:58:16 2018 +0100
+
+ Annot: setColor -> setDrawColor
+
+ to differentiate from the setColor that actually changes the annot
+ color
+
+ poppler/Annot.cc | 60
+ ++++++++++++++++++++++++++++----------------------------
+ poppler/Annot.h | 2 +-
+ 2 files changed, 31 insertions(+), 31 deletions(-)
+
+commit e34e187934e3654989b6af5177f345032623dd9b
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Mar 23 19:57:39 2018 +0100
+
+ SplashOutputDev: make getMatteColor static
+
+ poppler/SplashOutputDev.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit c14dfa44a70ce32bbe1268ddff6106cab3f33bc2
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Mar 23 19:56:12 2018 +0100
+
+ HtmlOutputDev: don't pass catalog around to not use it
+
+ utils/HtmlOutputDev.cc | 13 ++++++-------
+ utils/HtmlOutputDev.h | 4 ++--
+ 2 files changed, 8 insertions(+), 9 deletions(-)
+
+commit 92c51751a87b31c4bafa7b0146f745b3008ec9fc
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Fri Mar 23 19:55:42 2018 +0100
+
+ JPEG2000Stream.cc: no need to store indexed
+
+ we only use it in one function
+
+ poppler/JPEG2000Stream.cc | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+commit 46543272dbe7655821e1c794ca3cc22e8cb4cef9
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Tue Mar 20 23:44:23 2018 +0100
+
+ gfile: Fix windows build
+
+ goo/gfile.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 327c342a932d8df731ec02a6b22792004206c2db
+Author: Andre Heinecke <aheinecke at intevation.de>
+Date: Tue Mar 20 23:07:15 2018 +0100
+
+ Add read only setter for form fields
+
+ Read only is modifiable from AcroForm scripts.
+
+ poppler/Form.cc | 32 ++++++++++++++++++++++++++++++++
+ poppler/Form.h | 4 +++-
+ qt5/src/poppler-form.cc | 6 ++++++
+ qt5/src/poppler-form.h | 7 +++++++
+ 4 files changed, 48 insertions(+), 1 deletion(-)
+
+commit 4798ef5298bcfcfadf8e1d66f9200e3c9eee2248
+Author: Carlos Garcia Campos <cgarcia at igalia.com>
+Date: Mon Mar 19 11:16:03 2018 +0100
+
+ build: bring back the option to disable GObject introspection
+
+ It was available with autotools, but we lost it when switching
+ to cmake.
+
+ CMakeLists.txt | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
commit f26285f361478219ea9d3c6de1529ecd5ff96ac9
Author: Albert Astals Cid <aacid at kde.org>
Date: Sun Mar 18 19:23:49 2018 +0100
Modified: branches/stable/source/src/libs/poppler/poppler-src/NEWS
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/NEWS 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/NEWS 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,3 +1,36 @@
+Release 0.64.0
+ core:
+ * Workaround form field text not being drawn on broken files. Bug #103245
+ * Add read only setter for form fields
+ * Add support for Link Hide action
+ * Add support for Next actions in Links
+ * Fix parsing of Annot focus out actions
+ * Fix PDFDoc::checkHeader() for PDFs smaller than 1 KiB. Bug #105674
+ * Add const to several classes and members
+ * gfile: Fix build on some platforms
+ * Fix issues with on malformed documents. Bug #105972, #105969, #106059, #106061
+ * Several small code improvements
+
+ qt5:
+ * Allow setting of Form visibility status
+ * Allow setting of Form read only status
+ * Add support for Link Hide action
+ * Add support for Next actions in Links
+ * ArthurOutputDev: Implement axialShadedFill
+ * ArthurOutputDev: Implement drawImageMask. Bug #105531
+ * ArthurOutputDev: Implement Type3 font support
+
+ utils:
+ * pdfsig: Add -dump which writes signatures to disk. Bug #104881
+
+ glib:
+ * less deprecated calls
+
+ build system:
+ * bring back the option to disable GObject introspection
+ * Add iconv include dir when compiling
+ * Make it possible to build poppler without fontconfig. Default for Android
+
Release 0.63.0
core:
* CairoOutputDev: support embedding CCITT image data. Bug #103399
Modified: branches/stable/source/src/libs/poppler/poppler-src/goo/GooHash.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/goo/GooHash.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/goo/GooHash.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -14,6 +14,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2017 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -154,7 +155,7 @@
return p->val.p;
}
-int GooHash::lookupInt(GooString *key) {
+int GooHash::lookupInt(const GooString *key) {
GooHashBucket *p;
int h;
@@ -351,7 +352,7 @@
gfree(oldTab);
}
-GooHashBucket *GooHash::find(GooString *key, int *h) {
+GooHashBucket *GooHash::find(const GooString *key, int *h) {
GooHashBucket *p;
if (unlikely(!key))
@@ -378,7 +379,7 @@
return nullptr;
}
-int GooHash::hash(GooString *key) {
+int GooHash::hash(const GooString *key) {
const char *p;
unsigned int h;
int i;
Modified: branches/stable/source/src/libs/poppler/poppler-src/goo/GooHash.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/goo/GooHash.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/goo/GooHash.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -14,6 +14,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2012 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -45,7 +46,7 @@
void replace(GooString *key, void *val);
void replace(GooString *key, int val);
void *lookup(GooString *key);
- int lookupInt(GooString *key);
+ int lookupInt(const GooString *key);
void *lookup(const char *key);
int lookupInt(const char *key);
void *remove(GooString *key);
@@ -63,9 +64,9 @@
GooHash& operator=(const GooHash &other);
void expand();
- GooHashBucket *find(GooString *key, int *h);
+ GooHashBucket *find(const GooString *key, int *h);
GooHashBucket *find(const char *key, int *h);
- int hash(GooString *key);
+ int hash(const GooString *key);
int hash(const char *key);
GBool deleteKeys; // set if key strings should be deleted
Modified: branches/stable/source/src/libs/poppler/poppler-src/goo/GooList.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/goo/GooList.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/goo/GooList.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -6,6 +6,20 @@
//
//========================================================================
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
+// Copyright (C) 2018 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
#include <config.h>
#ifdef USE_GCC_PRAGMAS
@@ -39,7 +53,7 @@
gfree(data);
}
-GooList *GooList::copy() {
+GooList *GooList::copy() const {
GooList *ret;
ret = new GooList(length);
Modified: branches/stable/source/src/libs/poppler/poppler-src/goo/GooList.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/goo/GooList.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/goo/GooList.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -13,7 +13,7 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2012 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2012, 2018 Albert Astals Cid <aacid at kde.org>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -48,16 +48,16 @@
//----- general
// Get the number of elements.
- int getLength() { return length; }
+ int getLength() const { return length; }
// Returns a (shallow) copy of this list.
- GooList *copy();
+ GooList *copy() const;
//----- ordered list support
// Return the <i>th element.
// Assumes 0 <= i < length.
- void *get(int i) { return data[i]; }
+ void *get(int i) const { return data[i]; }
// Replace the <i>th element.
// Assumes 0 <= i < length.
Modified: branches/stable/source/src/libs/poppler/poppler-src/goo/GooString.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/goo/GooString.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/goo/GooString.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -26,6 +26,7 @@
// Copyright (C) 2013 Jason Crain <jason at aquaticape.us>
// Copyright (C) 2015 William Bader <williambader at hotmail.com>
// Copyright (C) 2016 Jakub Alba <jakubalba at gmail.com>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -206,7 +207,7 @@
Set(sA, lengthA);
}
-GooString::GooString(GooString *str, int idx, int lengthA) {
+GooString::GooString(const GooString *str, int idx, int lengthA) {
s = nullptr;
length = 0;
assert(idx + lengthA <= str->length);
@@ -268,7 +269,7 @@
return append((const char*)&c, 1);
}
-GooString *GooString::append(GooString *str) {
+GooString *GooString::append(const GooString *str) {
return append(str->getCString(), str->getLength());
}
@@ -739,7 +740,7 @@
return insert(i, (const char*)&c, 1);
}
-GooString *GooString::insert(int i, GooString *str) {
+GooString *GooString::insert(int i, const GooString *str) {
return insert(i, str->getCString(), str->getLength());
}
@@ -789,7 +790,7 @@
return this;
}
-int GooString::cmp(GooString *str) const {
+int GooString::cmp(const GooString *str) const {
int n1, n2, i, x;
char *p1, *p2;
Modified: branches/stable/source/src/libs/poppler/poppler-src/goo/GooString.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/goo/GooString.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/goo/GooString.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -23,6 +23,7 @@
// Copyright (C) 2015 Adam Reichold <adam.reichold at t-online.de>
// Copyright (C) 2016 Jakub Alba <jakubalba at gmail.com>
// Copyright (C) 2017 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -64,7 +65,7 @@
GooString(const char *sA, int lengthA);
// Create a string from <lengthA> chars at <idx> in <str>.
- GooString(GooString *str, int idx, int lengthA);
+ GooString(const GooString *str, int idx, int lengthA);
// Set content of a string to <newStr>. If <newLen> is CALC_STRING_LEN, then
// length of the string will be calculated with strlen(). Otherwise we assume
@@ -132,7 +133,7 @@
// Append a character or string.
GooString *append(char c);
- GooString *append(GooString *str);
+ GooString *append(const GooString *str);
GooString *append(const char *str, int lengthA=CALC_STRING_LEN);
// Append a formatted string.
@@ -141,7 +142,7 @@
// Insert a character or string.
GooString *insert(int i, char c);
- GooString *insert(int i, GooString *str);
+ GooString *insert(int i, const GooString *str);
GooString *insert(int i, const char *str, int lengthA=CALC_STRING_LEN);
// Delete a character or range of characters.
@@ -152,7 +153,7 @@
GooString *lowerCase();
// Compare two strings: -1:< 0:= +1:>
- int cmp(GooString *str) const;
+ int cmp(const GooString *str) const;
int cmpN(GooString *str, int n) const;
int cmp(const char *sA) const;
int cmpN(const char *sA, int n) const;
Modified: branches/stable/source/src/libs/poppler/poppler-src/goo/gfile.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/goo/gfile.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/goo/gfile.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -26,6 +26,7 @@
// Copyright (C) 2013 Peter Breitenlohner <peb at mppmu.mpg.de>
// Copyright (C) 2013, 2017 Thomas Freitag <Thomas.Freitag at alfa.de>
// Copyright (C) 2017 Christoph Cullmann <cullmann at kde.org>
+// Copyright (C) 2018 Mojca Miklavec <mojca at macports.org>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
Modified: branches/stable/source/src/libs/poppler/poppler-src/goo/gfile.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/goo/gfile.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/goo/gfile.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -24,6 +24,7 @@
// Copyright (C) 2014 Peter Breitenlohner <peb at mppmu.mpg.de>
// Copyright (C) 2017 Christoph Cullmann <cullmann at kde.org>
// Copyright (C) 2017 Thomas Freitag <Thomas.Freitag at alfa.de>
+// Copyright (C) 2018 Mojca Miklavec <mojca at macports.org>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -15,7 +15,7 @@
//
// Copyright (C) 2006 Scott Turner <scotty1024 at mac.com>
// Copyright (C) 2007, 2008 Julien Rebetez <julienr at svn.gnome.org>
-// Copyright (C) 2007-2013, 2015-2017 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2007-2013, 2015-2018 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2007-2013 Carlos Garcia Campos <carlosgc at gnome.org>
// Copyright (C) 2007, 2008 Iñigo Martínez <inigomartinez at gmail.com>
// Copyright (C) 2007 Jeff Muizelaar <jeff at infidigm.net>
@@ -36,6 +36,8 @@
// Copyright (C) 2015 Philipp Reinkemeier <philipp.reinkemeier at offis.de>
// Copyright (C) 2015 Tamas Szekeres <szekerest at gmail.com>
// Copyright (C) 2017 Hans-Ulrich Jüttner <huj at froreich-bioscientia.de>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
+// Copyright 2018 Andre Heinecke <aheinecke at intevation.de>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -113,7 +115,7 @@
// = (4 * (sqrt(2) - 1) / 3) * r
#define bezierCircle 0.55228475
-static AnnotLineEndingStyle parseAnnotLineEndingStyle(GooString *string) {
+static AnnotLineEndingStyle parseAnnotLineEndingStyle(const GooString *string) {
if (string != nullptr) {
if (!string->cmp("Square")) {
return annotLineEndingSquare;
@@ -220,7 +222,7 @@
type == Annot::actionMousePressed ? "D" :
type == Annot::actionMouseReleased ? "U" :
type == Annot::actionFocusIn ? "Fo" :
- type == Annot::actionFocusOut ? "BI" :
+ type == Annot::actionFocusOut ? "Bl" :
type == Annot::actionPageOpening ? "PO" :
type == Annot::actionPageClosing ? "PC" :
type == Annot::actionPageVisible ? "PV" :
@@ -1201,7 +1203,6 @@
appearStreams = nullptr;
appearBBox = nullptr;
appearState = nullptr;
- appearBuf = nullptr;
fontSize = 0;
appearance.setToNull();
@@ -1609,10 +1610,10 @@
#endif
}
-void Annot::setColor(AnnotColor *color, GBool fill) {
- const double *values = color->getValues();
+void AnnotAppearanceBuilder::setDrawColor(const AnnotColor *drawColor, GBool fill) {
+ const double *values = drawColor->getValues();
- switch (color->getSpace()) {
+ switch (drawColor->getSpace()) {
case AnnotColor::colorCMYK:
appearBuf->appendf("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:c}\n",
values[0], values[1], values[2], values[3],
@@ -1634,7 +1635,7 @@
}
}
-void Annot::setLineStyleForBorder(AnnotBorder *border) {
+void AnnotAppearanceBuilder::setLineStyleForBorder(const AnnotBorder *border) {
int i, dashLength;
double *dash;
@@ -1656,7 +1657,7 @@
// Draw an (approximate) circle of radius <r> centered at (<cx>, <cy>).
// If <fill> is true, the circle is filled; otherwise it is stroked.
-void Annot::drawCircle(double cx, double cy, double r, GBool fill) {
+void AnnotAppearanceBuilder::drawCircle(double cx, double cy, double r, GBool fill) {
appearBuf->appendf("{0:.2f} {1:.2f} m\n",
cx + r, cy);
appearBuf->appendf("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n",
@@ -1680,7 +1681,7 @@
// Draw the top-left half of an (approximate) circle of radius <r>
// centered at (<cx>, <cy>).
-void Annot::drawCircleTopLeft(double cx, double cy, double r) {
+void AnnotAppearanceBuilder::drawCircleTopLeft(double cx, double cy, double r) {
double r2;
r2 = r / sqrt(2.0);
@@ -1705,7 +1706,7 @@
// Draw the bottom-right half of an (approximate) circle of radius <r>
// centered at (<cx>, <cy>).
-void Annot::drawCircleBottomRight(double cx, double cy, double r) {
+void AnnotAppearanceBuilder::drawCircleBottomRight(double cx, double cy, double r) {
double r2;
r2 = r / sqrt(2.0);
@@ -1728,7 +1729,7 @@
appearBuf->append("S\n");
}
-Object Annot::createForm(double *bbox, GBool transparencyGroup, Dict *resDict) {
+Object Annot::createForm(const GooString *appearBuf, double *bbox, GBool transparencyGroup, Dict *resDict) {
Dict *appearDict = new Dict(xref);
appearDict->set("Length", Object(appearBuf->getLength()));
appearDict->set("Subtype", Object(objName, "Form"));
@@ -1747,10 +1748,9 @@
if (resDict)
appearDict->set("Resources", Object(resDict));
- MemStream *mStream = new MemStream(copyString(appearBuf->getCString()), 0,
+ Stream *mStream = new AutoFreeMemStream(copyString(appearBuf->getCString()), 0,
appearBuf->getLength(), Object(appearDict));
- mStream->setNeedFree(gTrue);
- return Object(static_cast<Stream*>(mStream));
+ return Object(mStream);
}
Dict *Annot::createResourcesDict(const char *formName, Object &&formStream,
@@ -2098,11 +2098,11 @@
obj1 = dict->lookup("StateModel");
if (obj1.isString()) {
- GooString *modelName = obj1.getString();
+ const GooString *modelName = obj1.getString();
Object obj2 = dict->lookup("State");
if (obj2.isString()) {
- GooString *stateName = obj2.getString();
+ const GooString *stateName = obj2.getString();
if (!stateName->cmp("Marked")) {
state = stateMarked;
@@ -2435,32 +2435,32 @@
if (appearance.isNull()) {
ca = opacity;
- appearBuf = new GooString ();
+ AnnotAppearanceBuilder appearBuilder;
- appearBuf->append ("q\n");
+ appearBuilder.append ("q\n");
if (color)
- setColor(color, gTrue);
+ appearBuilder.setDrawColor(color, gTrue);
else
- appearBuf->append ("1 1 1 rg\n");
+ appearBuilder.append ("1 1 1 rg\n");
if (!icon->cmp("Note"))
- appearBuf->append (ANNOT_TEXT_AP_NOTE);
+ appearBuilder.append (ANNOT_TEXT_AP_NOTE);
else if (!icon->cmp("Comment"))
- appearBuf->append (ANNOT_TEXT_AP_COMMENT);
+ appearBuilder.append (ANNOT_TEXT_AP_COMMENT);
else if (!icon->cmp("Key"))
- appearBuf->append (ANNOT_TEXT_AP_KEY);
+ appearBuilder.append (ANNOT_TEXT_AP_KEY);
else if (!icon->cmp("Help"))
- appearBuf->append (ANNOT_TEXT_AP_HELP);
+ appearBuilder.append (ANNOT_TEXT_AP_HELP);
else if (!icon->cmp("NewParagraph"))
- appearBuf->append (ANNOT_TEXT_AP_NEW_PARAGRAPH);
+ appearBuilder.append (ANNOT_TEXT_AP_NEW_PARAGRAPH);
else if (!icon->cmp("Paragraph"))
- appearBuf->append (ANNOT_TEXT_AP_PARAGRAPH);
+ appearBuilder.append (ANNOT_TEXT_AP_PARAGRAPH);
else if (!icon->cmp("Insert"))
- appearBuf->append (ANNOT_TEXT_AP_INSERT);
+ appearBuilder.append (ANNOT_TEXT_AP_INSERT);
else if (!icon->cmp("Cross"))
- appearBuf->append (ANNOT_TEXT_AP_CROSS);
+ appearBuilder.append (ANNOT_TEXT_AP_CROSS);
else if (!icon->cmp("Circle"))
- appearBuf->append (ANNOT_TEXT_AP_CIRCLE);
- appearBuf->append ("Q\n");
+ appearBuilder.append (ANNOT_TEXT_AP_CIRCLE);
+ appearBuilder.append ("Q\n");
// Force 24x24 rectangle
PDFRectangle fixedRect(rect->x1, rect->y2 - 24, rect->x1 + 24, rect->y2);
@@ -2468,16 +2468,14 @@
double bbox[4];
appearBBox->getBBoxRect(bbox);
if (ca == 1) {
- appearance = createForm(bbox, gFalse, nullptr);
+ appearance = createForm(appearBuilder.buffer(), bbox, gFalse, nullptr);
} else {
- Object aStream = createForm(bbox, gTrue, nullptr);
- delete appearBuf;
+ Object aStream = createForm(appearBuilder.buffer(), bbox, gTrue, nullptr);
- appearBuf = new GooString ("/GS0 gs\n/Fm0 Do");
+ GooString appearBuf("/GS0 gs\n/Fm0 Do");
Dict *resDict = createResourcesDict("Fm0", std::move(aStream), "GS0", ca, nullptr);
- appearance = createForm(bbox, gFalse, resDict);
+ appearance = createForm(&appearBuf, bbox, gFalse, resDict);
}
- delete appearBuf;
}
// draw the appearance stream
@@ -2859,12 +2857,12 @@
{
double borderWidth, ca = opacity;
- appearBuf = new GooString ();
- appearBuf->append ("q\n");
+ AnnotAppearanceBuilder appearBuilder;
+ appearBuilder.append ("q\n");
borderWidth = border->getWidth();
if (borderWidth > 0)
- setLineStyleForBorder(border);
+ appearBuilder.setLineStyleForBorder(border);
// Box size
const double width = rect->x2 - rect->x1;
@@ -2887,14 +2885,14 @@
GBool doStroke = (borderWidth != 0);
if (doFill || doStroke) {
if (doStroke) {
- setColor(fontcolor, gFalse); // Border color: same as font color
+ appearBuilder.setDrawColor(fontcolor, gFalse); // Border color: same as font color
}
- appearBuf->appendf ("{0:.2f} {0:.2f} {1:.2f} {2:.2f} re\n", borderWidth/2, width-borderWidth, height-borderWidth);
+ appearBuilder.appendf ("{0:.2f} {0:.2f} {1:.2f} {2:.2f} re\n", borderWidth/2, width-borderWidth, height-borderWidth);
if (doFill) {
- setColor(color, gTrue);
- appearBuf->append(doStroke ? "B\n" : "f\n");
+ appearBuilder.setDrawColor(color, gTrue);
+ appearBuilder.append(doStroke ? "B\n" : "f\n");
} else {
- appearBuf->append("S\n");
+ appearBuilder.append("S\n");
}
}
@@ -2901,15 +2899,15 @@
// Setup text clipping
const double textmargin = borderWidth * 2;
const double textwidth = width - 2*textmargin;
- appearBuf->appendf ("{0:.2f} {0:.2f} {1:.2f} {2:.2f} re W n\n", textmargin, textwidth, height - 2*textmargin);
+ appearBuilder.appendf ("{0:.2f} {0:.2f} {1:.2f} {2:.2f} re W n\n", textmargin, textwidth, height - 2*textmargin);
Dict *fontResDict = new Dict(xref);
GfxFont *font = createAnnotDrawFont(xref, fontResDict);
// Set font state
- setColor(fontcolor, gTrue);
- appearBuf->appendf ("BT 1 0 0 1 {0:.2f} {1:.2f} Tm\n", textmargin, height - textmargin - fontsize * font->getDescent());
- appearBuf->appendf ("/AnnotDrawFont {0:.2f} Tf\n", fontsize);
+ appearBuilder.setDrawColor(fontcolor, gTrue);
+ appearBuilder.appendf ("BT 1 0 0 1 {0:.2f} {1:.2f} Tm\n", textmargin, height - textmargin - fontsize * font->getDescent());
+ appearBuilder.appendf ("/AnnotDrawFont {0:.2f} Tf\n", fontsize);
int i = 0;
double xposPrev = 0;
@@ -2929,15 +2927,15 @@
xpos = 0;
break;
}
- appearBuf->appendf("{0:.2f} {1:.2f} Td\n", xpos - xposPrev, -fontsize);
- writeString(&out, appearBuf);
- appearBuf->append("Tj\n");
+ appearBuilder.appendf("{0:.2f} {1:.2f} Td\n", xpos - xposPrev, -fontsize);
+ appearBuilder.writeString(out);
+ appearBuilder.append("Tj\n");
xposPrev = xpos;
}
font->decRefCnt();
delete fontcolor;
- appearBuf->append ("ET Q\n");
+ appearBuilder.append ("ET Q\n");
double bbox[4];
bbox[0] = bbox[1] = 0;
@@ -2945,16 +2943,14 @@
bbox[3] = rect->y2 - rect->y1;
if (ca == 1) {
- appearance = createForm(bbox, gFalse, fontResDict);
+ appearance = createForm(appearBuilder.buffer(), bbox, gFalse, fontResDict);
} else {
- Object aStream = createForm(bbox, gTrue, fontResDict);
- delete appearBuf;
+ Object aStream = createForm(appearBuilder.buffer(), bbox, gTrue, fontResDict);
- appearBuf = new GooString ("/GS0 gs\n/Fm0 Do");
+ GooString appearBuf("/GS0 gs\n/Fm0 Do");
Dict *resDict = createResourcesDict("Fm0", std::move(aStream), "GS0", ca, nullptr);
- appearance = createForm(bbox, gFalse, resDict);
+ appearance = createForm(&appearBuf, bbox, gFalse, resDict);
}
- delete appearBuf;
}
void AnnotFreeText::draw(Gfx *gfx, GBool printing) {
@@ -3233,13 +3229,13 @@
double borderWidth, ca = opacity;
appearBBox = new AnnotAppearanceBBox(rect);
- appearBuf = new GooString ();
- appearBuf->append ("q\n");
+ AnnotAppearanceBuilder appearBuilder;
+ appearBuilder.append ("q\n");
if (color) {
- setColor(color, gFalse);
+ appearBuilder.setDrawColor(color, gFalse);
}
- setLineStyleForBorder(border);
+ appearBuilder.setLineStyleForBorder(border);
borderWidth = border->getWidth();
appearBBox->setBorderWidth(std::max(1., borderWidth));
@@ -3297,19 +3293,19 @@
// Draw main segment
matr.transform (0, leaderLineLength, &tx, &ty);
- appearBuf->appendf ("{0:.2f} {1:.2f} m\n", tx, ty);
+ appearBuilder.appendf ("{0:.2f} {1:.2f} m\n", tx, ty);
appearBBox->extendTo (tx, ty);
if (captionwidth != 0 && actualCaptionPos == captionPosInline) { // Break in the middle
matr.transform ((main_len-captionwidth)/2 - captionhmargin, leaderLineLength, &tx, &ty);
- appearBuf->appendf ("{0:.2f} {1:.2f} l S\n", tx, ty);
+ appearBuilder.appendf ("{0:.2f} {1:.2f} l S\n", tx, ty);
matr.transform ((main_len+captionwidth)/2 + captionhmargin, leaderLineLength, &tx, &ty);
- appearBuf->appendf ("{0:.2f} {1:.2f} m\n", tx, ty);
+ appearBuilder.appendf ("{0:.2f} {1:.2f} m\n", tx, ty);
}
matr.transform (main_len, leaderLineLength, &tx, &ty);
- appearBuf->appendf ("{0:.2f} {1:.2f} l S\n", tx, ty);
+ appearBuilder.appendf ("{0:.2f} {1:.2f} l S\n", tx, ty);
appearBBox->extendTo (tx, ty);
// TODO: Line endings
@@ -3337,10 +3333,10 @@
appearBBox->extendTo (tx, ty);
// Setup text state (reusing transformed top-left coord)
- appearBuf->appendf ("0 g BT /AnnotDrawFont {0:.2f} Tf\n", fontsize); // Font color: black
- appearBuf->appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} Tm\n",
+ appearBuilder.appendf ("0 g BT /AnnotDrawFont {0:.2f} Tf\n", fontsize); // Font color: black
+ appearBuilder.appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} Tm\n",
matr.m[0], matr.m[1], matr.m[2], matr.m[3], tx, ty);
- appearBuf->appendf ("0 {0:.2f} Td\n", -fontsize * font->getDescent());
+ appearBuilder.appendf ("0 {0:.2f} Td\n", -fontsize * font->getDescent());
// Draw text
int i = 0;
double xposPrev = 0;
@@ -3350,12 +3346,12 @@
layoutText(contents, &out, &i, font, &linewidth, 0, nullptr, gFalse);
linewidth *= fontsize;
xpos = (captionwidth - linewidth) / 2;
- appearBuf->appendf("{0:.2f} {1:.2f} Td\n", xpos - xposPrev, -fontsize);
- writeString(&out, appearBuf);
- appearBuf->append ("Tj\n");
+ appearBuilder.appendf("{0:.2f} {1:.2f} Td\n", xpos - xposPrev, -fontsize);
+ appearBuilder.writeString(out);
+ appearBuilder.append ("Tj\n");
xposPrev = xpos;
}
- appearBuf->append ("ET\n");
+ appearBuilder.append ("ET\n");
font->decRefCnt();
}
@@ -3364,35 +3360,33 @@
double sign = leaderLineLength >= 0 ? 1 : -1;
if (ll_len != 0) {
matr.transform (0, 0, &tx, &ty);
- appearBuf->appendf ("{0:.2f} {1:.2f} m\n", tx, ty);
+ appearBuilder.appendf ("{0:.2f} {1:.2f} m\n", tx, ty);
appearBBox->extendTo (tx, ty);
matr.transform (0, sign*ll_len, &tx, &ty);
- appearBuf->appendf ("{0:.2f} {1:.2f} l S\n", tx, ty);
+ appearBuilder.appendf ("{0:.2f} {1:.2f} l S\n", tx, ty);
appearBBox->extendTo (tx, ty);
matr.transform (main_len, 0, &tx, &ty);
- appearBuf->appendf ("{0:.2f} {1:.2f} m\n", tx, ty);
+ appearBuilder.appendf ("{0:.2f} {1:.2f} m\n", tx, ty);
appearBBox->extendTo (tx, ty);
matr.transform (main_len, sign*ll_len, &tx, &ty);
- appearBuf->appendf ("{0:.2f} {1:.2f} l S\n", tx, ty);
+ appearBuilder.appendf ("{0:.2f} {1:.2f} l S\n", tx, ty);
appearBBox->extendTo (tx, ty);
}
- appearBuf->append ("Q\n");
+ appearBuilder.append ("Q\n");
double bbox[4];
appearBBox->getBBoxRect(bbox);
if (ca == 1) {
- appearance = createForm(bbox, gFalse, fontResDict);
+ appearance = createForm(appearBuilder.buffer(), bbox, gFalse, fontResDict);
} else {
- Object aStream = createForm(bbox, gTrue, fontResDict);
- delete appearBuf;
+ Object aStream = createForm(appearBuilder.buffer(), bbox, gTrue, fontResDict);
- appearBuf = new GooString ("/GS0 gs\n/Fm0 Do");
+ GooString appearBuf("/GS0 gs\n/Fm0 Do");
Dict *resDict = createResourcesDict("Fm0", std::move(aStream), "GS0", ca, nullptr);
- appearance = createForm(bbox, gFalse, resDict);
+ appearance = createForm(&appearBuf, bbox, gFalse, resDict);
}
- delete appearBuf;
}
void AnnotLine::draw(Gfx *gfx, GBool printing) {
@@ -3554,8 +3548,8 @@
GBool blendMultiply = gTrue;
ca = opacity;
- appearBuf = new GooString ();
- appearBuf->append ("q\n");
+ AnnotAppearanceBuilder appearBuilder;
+ appearBuilder.append ("q\n");
/* Adjust BBox */
delete appearBBox;
@@ -3570,9 +3564,9 @@
switch (type) {
case typeUnderline:
if (color) {
- setColor(color, gFalse);
+ appearBuilder.setDrawColor(color, gFalse);
}
- appearBuf->append ("[] 0 d 1 w\n");
+ appearBuilder.append ("[] 0 d 1 w\n");
for (i = 0; i < quadrilaterals->getQuadrilateralsLength(); ++i) {
double x3, y3, x4, y4;
@@ -3582,17 +3576,17 @@
x4 = quadrilaterals->getX4(i);
y4 = quadrilaterals->getY4(i);
- appearBuf->appendf ("{0:.2f} {1:.2f} m\n", x3, y3);
- appearBuf->appendf ("{0:.2f} {1:.2f} l\n", x4, y4);
- appearBuf->append ("S\n");
+ appearBuilder.appendf ("{0:.2f} {1:.2f} m\n", x3, y3);
+ appearBuilder.appendf ("{0:.2f} {1:.2f} l\n", x4, y4);
+ appearBuilder.append ("S\n");
}
break;
case typeStrikeOut:
if (color) {
- setColor(color, gFalse);
+ appearBuilder.setDrawColor(color, gFalse);
}
blendMultiply = gFalse;
- appearBuf->append ("[] 0 d 1 w\n");
+ appearBuilder.append ("[] 0 d 1 w\n");
for (i = 0; i < quadrilaterals->getQuadrilateralsLength(); ++i) {
double x1, y1, x2, y2;
@@ -3608,16 +3602,16 @@
x4 = quadrilaterals->getX4(i);
y4 = quadrilaterals->getY4(i);
- appearBuf->appendf ("{0:.2f} {1:.2f} m\n", (x1+x3)/2., (y1+y3)/2.);
- appearBuf->appendf ("{0:.2f} {1:.2f} l\n", (x2+x4)/2., (y2+y4)/2.);
- appearBuf->append ("S\n");
+ appearBuilder.appendf ("{0:.2f} {1:.2f} m\n", (x1+x3)/2., (y1+y3)/2.);
+ appearBuilder.appendf ("{0:.2f} {1:.2f} l\n", (x2+x4)/2., (y2+y4)/2.);
+ appearBuilder.append ("S\n");
}
break;
case typeSquiggly:
if (color) {
- setColor(color, gFalse);
+ appearBuilder.setDrawColor(color, gFalse);
}
- appearBuf->append ("[] 0 d 1 w\n");
+ appearBuilder.append ("[] 0 d 1 w\n");
for (i = 0; i < quadrilaterals->getQuadrilateralsLength(); ++i) {
double x1, y1, x2, y3;
@@ -3629,20 +3623,20 @@
y3 = quadrilaterals->getY3(i);
h6 = (y1 - y3) / 6.0;
- appearBuf->appendf ("{0:.2f} {1:.2f} m\n", x1, y3+h6);
+ appearBuilder.appendf ("{0:.2f} {1:.2f} m\n", x1, y3+h6);
bool down = false;
do {
down = !down; // Zigzag line
x1 += 2;
- appearBuf->appendf ("{0:.2f} {1:.2f} l\n", x1, y3 + (down ? 0 : h6));
+ appearBuilder.appendf ("{0:.2f} {1:.2f} l\n", x1, y3 + (down ? 0 : h6));
} while (x1 < x2);
- appearBuf->append ("S\n");
+ appearBuilder.append ("S\n");
}
break;
default:
case typeHighlight:
if (color)
- setColor(color, gTrue);
+ appearBuilder.setDrawColor(color, gTrue);
double biggestBorder = 0;
for (i = 0; i < quadrilaterals->getQuadrilateralsLength(); ++i) {
@@ -3663,41 +3657,36 @@
biggestBorder = h4;
}
- appearBuf->appendf ("{0:.2f} {1:.2f} m\n", x3, y3);
- appearBuf->appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n",
+ appearBuilder.appendf ("{0:.2f} {1:.2f} m\n", x3, y3);
+ appearBuilder.appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n",
x3 - h4, y3 + h4, x1 - h4, y1 - h4, x1, y1);
- appearBuf->appendf ("{0:.2f} {1:.2f} l\n", x2, y2);
- appearBuf->appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n",
+ appearBuilder.appendf ("{0:.2f} {1:.2f} l\n", x2, y2);
+ appearBuilder.appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n",
x2 + h4, y2 - h4, x4 + h4, y4 + h4, x4, y4);
- appearBuf->append ("f\n");
+ appearBuilder.append ("f\n");
}
appearBBox->setBorderWidth(biggestBorder);
break;
}
- appearBuf->append ("Q\n");
+ appearBuilder.append ("Q\n");
- Object aStream;
double bbox[4];
bbox[0] = appearBBox->getPageXMin();
bbox[1] = appearBBox->getPageYMin();
bbox[2] = appearBBox->getPageXMax();
bbox[3] = appearBBox->getPageYMax();
- aStream = createForm(bbox, gTrue, nullptr);
- delete appearBuf;
+ Object aStream = createForm(appearBuilder.buffer(), bbox, gTrue, nullptr);
- appearBuf = new GooString ("/GS0 gs\n/Fm0 Do");
+ GooString appearBuf("/GS0 gs\n/Fm0 Do");
Dict *resDict = createResourcesDict("Fm0", std::move(aStream), "GS0", 1, blendMultiply ? "Multiply" : nullptr);
if (ca == 1) {
- appearance = createForm(bbox, gFalse, resDict);
+ appearance = createForm(&appearBuf, bbox, gFalse, resDict);
} else {
- aStream = createForm(bbox, gTrue, resDict);
- delete appearBuf;
+ aStream = createForm(&appearBuf, bbox, gTrue, resDict);
- appearBuf = new GooString ("/GS0 gs\n/Fm0 Do");
Dict *resDict2 = createResourcesDict("Fm0", std::move(aStream), "GS0", ca, nullptr);
- appearance = createForm(bbox, gFalse, resDict2);
+ appearance = createForm(&appearBuf, bbox, gFalse, resDict2);
}
- delete appearBuf;
}
// draw the appearance stream
@@ -3829,8 +3818,8 @@
// TODO: Handle surrogate pairs in UTF-16.
// Should be able to generate output for any CID-keyed font.
// Doesn't handle vertical fonts--should it?
-void Annot::layoutText(GooString *text, GooString *outBuf, int *i,
- GfxFont *font, double *width, double widthLimit,
+void Annot::layoutText(const GooString *text, GooString *outBuf, int *i,
+ const GfxFont *font, double *width, double widthLimit,
int *charCount, GBool noReencode)
{
CharCode c;
@@ -3906,13 +3895,12 @@
if (noReencode) {
outBuf->append(uChar);
} else {
- CharCodeToUnicode *ccToUnicode = font->getToUnicode();
+ const CharCodeToUnicode *ccToUnicode = font->getToUnicode();
if (!ccToUnicode) {
// This assumes an identity CMap.
outBuf->append((uChar >> 8) & 0xff);
outBuf->append(uChar & 0xff);
} else if (ccToUnicode->mapToCharCode(&uChar, &c, 1)) {
- ccToUnicode->decRefCnt();
if (font->isCIDFont()) {
// TODO: This assumes an identity CMap. It should be extended to
// handle the general case.
@@ -3923,7 +3911,6 @@
outBuf->append(c);
}
} else {
- ccToUnicode->decRefCnt();
error(errSyntaxError, -1, "AnnotWidget::layoutText, cannot convert U+{0:04uX}", uChar);
}
}
@@ -4025,7 +4012,7 @@
// Copy the given string to appearBuf, adding parentheses around it and
// escaping characters as appropriate.
-void Annot::writeString(GooString *str, GooString *appearBuf)
+void AnnotAppearanceBuilder::writeString(const GooString &str)
{
char c;
int i;
@@ -4032,8 +4019,8 @@
appearBuf->append('(');
- for (i = 0; i < str->getLength(); ++i) {
- c = str->getChar(i);
+ for (i = 0; i < str.getLength(); ++i) {
+ c = str.getChar(i);
if (c == '(' || c == ')' || c == '\\') {
appearBuf->append('\\');
appearBuf->append(c);
@@ -4048,24 +4035,26 @@
}
// Draw the variable text or caption for a field.
-void AnnotWidget::drawText(GooString *text, GooString *da, GfxResources *resources,
+bool AnnotAppearanceBuilder::drawText(const GooString *text, const GooString *da, const GfxResources *resources,
+ const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect,
GBool multiline, int comb, int quadding,
GBool txField, GBool forceZapfDingbats,
+ XRef *xref, bool *addedDingbatsResource,
GBool password) {
GooList *daToks;
GooString *tok, *convertedText;
- GfxFont *font;
+ const GfxFont *font;
double dx, dy;
double fontSize, fontSize2, borderWidth, x, xPrev, y, w, wMax;
int tfPos, tmPos, i, j;
int rot;
GBool freeText = gFalse; // true if text should be freed before return
- GBool freeFont = gFalse;
+ GfxFont *fontToFree = nullptr;
//~ if there is no MK entry, this should use the existing content stream,
//~ and only replace the marked content portion of it
//~ (this is only relevant for Tx fields)
-
+
// parse the default appearance string
tfPos = tmPos = -1;
if (da) {
@@ -4096,6 +4085,10 @@
// force ZapfDingbats
if (forceZapfDingbats) {
+ assert(xref != nullptr);
+ assert(addedDingbatsResource != nullptr);
+ *addedDingbatsResource = false;
+
if (tfPos >= 0) {
tok = (GooString *)daToks->get(tfPos);
if (tok->cmp("/ZaDb")) {
@@ -4118,10 +4111,10 @@
r.num = -1;
r.gen = -1;
Dict *d = new Dict(xref);
- font = new Gfx8BitFont(xref, "ZaDb", r, new GooString("ZapfDingbats"), fontType1, r, d);
+ fontToFree = new Gfx8BitFont(xref, "ZaDb", r, new GooString("ZapfDingbats"), fontType1, r, d);
delete d;
- freeFont = gTrue;
- addDingbatsResource = gTrue;
+ font = fontToFree;
+ *addedDingbatsResource = true;
} else {
error(errSyntaxError, -1, "Unknown font in field's DA string");
}
@@ -4138,7 +4131,7 @@
if (daToks) {
deleteGooList(daToks, GooString);
}
- return;
+ return false;
}
// get the border width
@@ -4152,9 +4145,10 @@
else
len = text->getLength();
- text = new GooString;
+ GooString *newText = new GooString;
for (i = 0; i < len; ++i)
- text->append('*');
+ newText->append('*');
+ text = newText;
freeText = gTrue;
}
@@ -4201,7 +4195,7 @@
y = dy - 3;
i = 0;
while (i < text->getLength()) {
- layoutText(text, convertedText, &i, font, &w, wMax / fontSize, nullptr,
+ Annot::layoutText(text, convertedText, &i, font, &w, wMax / fontSize, nullptr,
forceZapfDingbats);
y -= fontSize;
}
@@ -4248,7 +4242,7 @@
i = 0;
xPrev = 0;
while (i < text->getLength()) {
- layoutText(text, convertedText, &i, font, &w, wMax / fontSize, nullptr,
+ Annot::layoutText(text, convertedText, &i, font, &w, wMax / fontSize, nullptr,
forceZapfDingbats);
w *= fontSize;
@@ -4268,7 +4262,7 @@
// draw the line
appearBuf->appendf("{0:.2f} {1:.2f} Td\n", x - xPrev, -fontSize);
- writeString(convertedText, appearBuf);
+ writeString(*convertedText);
appearBuf->append(" Tj\n");
// next line
@@ -4301,7 +4295,7 @@
}
i = 0;
- layoutText(text, convertedText, &i, font, nullptr, 0.0, &charCount,
+ Annot::layoutText(text, convertedText, &i, font, nullptr, 0.0, &charCount,
forceZapfDingbats);
if (charCount > comb)
charCount = comb;
@@ -4364,10 +4358,9 @@
x = 0.5 * (w - dx);
appearBuf->appendf("{0:.2f} 0 Td\n", x - xPrev + w);
- GooString *charBuf = new GooString(s, n);
- writeString(charBuf, appearBuf);
+ GooString charBuf(s, n);
+ writeString(charBuf);
appearBuf->append(" Tj\n");
- delete charBuf;
i++;
s += n;
@@ -4378,7 +4371,7 @@
// regular (non-comb) formatting
} else {
i = 0;
- layoutText(text, convertedText, &i, font, &w, 0.0, nullptr,
+ Annot::layoutText(text, convertedText, &i, font, &w, 0.0, nullptr,
forceZapfDingbats);
// compute font autosize
@@ -4435,7 +4428,7 @@
}
// write the text string
- writeString(convertedText, appearBuf);
+ writeString(*convertedText);
appearBuf->append(" Tj\n");
}
}
@@ -4452,17 +4445,19 @@
delete text;
}
delete convertedText;
- if (freeFont) {
- font->decRefCnt();
+ if (fontToFree) {
+ fontToFree->decRefCnt();
}
+
+ return true;
}
// Draw the variable text or caption for a field.
-void AnnotWidget::drawListBox(FormFieldChoice *fieldChoice,
- GooString *da, GfxResources *resources, int quadding) {
+bool AnnotAppearanceBuilder::drawListBox(const FormFieldChoice *fieldChoice, const AnnotBorder *border, const PDFRectangle *rect,
+ const GooString *da, const GfxResources *resources, int quadding) {
GooList *daToks;
GooString *tok, *convertedText;
- GfxFont *font;
+ const GfxFont *font;
double fontSize, fontSize2, borderWidth, x, y, w, wMax;
int tfPos, tmPos, i, j;
@@ -4519,7 +4514,7 @@
if (daToks) {
deleteGooList(daToks, GooString);
}
- return;
+ return false;
}
convertedText = new GooString;
@@ -4538,9 +4533,9 @@
deleteGooList(daToks, GooString);
}
delete convertedText;
- return;
+ return false;
}
- layoutText(fieldChoice->getChoice(i), convertedText, &j, font, &w, 0.0, nullptr, gFalse);
+ Annot::layoutText(fieldChoice->getChoice(i), convertedText, &j, font, &w, 0.0, nullptr, gFalse);
if (w > wMax) {
wMax = w;
}
@@ -4578,7 +4573,7 @@
// compute text width and start position
j = 0;
- layoutText(fieldChoice->getChoice(i), convertedText, &j, font, &w, 0.0, nullptr, gFalse);
+ Annot::layoutText(fieldChoice->getChoice(i), convertedText, &j, font, &w, 0.0, nullptr, gFalse);
w *= fontSize;
switch (quadding) {
case quaddingLeftJustified:
@@ -4621,7 +4616,7 @@
}
// write the text string
- writeString(convertedText, appearBuf);
+ writeString(*convertedText);
appearBuf->append(" Tj\n");
// cleanup
@@ -4637,27 +4632,29 @@
}
delete convertedText;
+
+ return true;
}
-void AnnotWidget::drawBorder() {
+void AnnotAppearanceBuilder::drawFieldBorder(const FormField *field, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect) {
int dashLength;
double *dash;
AnnotColor adjustedColor;
- double w = border->getWidth();
+ const double w = border->getWidth();
- AnnotColor *aColor = appearCharacs->getBorderColor();
+ const AnnotColor *aColor = appearCharacs->getBorderColor();
if (!aColor)
aColor = appearCharacs->getBackColor();
if (!aColor)
return;
- double dx = rect->x2 - rect->x1;
- double dy = rect->y2 - rect->y1;
+ const double dx = rect->x2 - rect->x1;
+ const double dy = rect->y2 - rect->y1;
// radio buttons with no caption have a round border
- GBool hasCaption = appearCharacs->getNormalCaption() != nullptr;
+ const GBool hasCaption = appearCharacs->getNormalCaption() != nullptr;
if (field->getType() == formButton &&
- static_cast<FormFieldButton*>(field)->getButtonType() == formButtonRadio && !hasCaption) {
+ static_cast<const FormFieldButton*>(field)->getButtonType() == formButtonRadio && !hasCaption) {
double r = 0.5 * (dx < dy ? dx : dy);
switch (border->getStyle()) {
case AnnotBorder::borderDashed:
@@ -4672,21 +4669,21 @@
case AnnotBorder::borderSolid:
case AnnotBorder::borderUnderlined:
appearBuf->appendf("{0:.2f} w\n", w);
- setColor(aColor, gFalse);
+ setDrawColor(aColor, gFalse);
drawCircle(0.5 * dx, 0.5 * dy, r - 0.5 * w, gFalse);
break;
case AnnotBorder::borderBeveled:
case AnnotBorder::borderInset:
appearBuf->appendf("{0:.2f} w\n", 0.5 * w);
- setColor(aColor, gFalse);
+ setDrawColor(aColor, gFalse);
drawCircle(0.5 * dx, 0.5 * dy, r - 0.25 * w, gFalse);
adjustedColor = AnnotColor(*aColor);
adjustedColor.adjustColor(border->getStyle() == AnnotBorder::borderBeveled ? 1 : -1);
- setColor(&adjustedColor, gFalse);
+ setDrawColor(&adjustedColor, gFalse);
drawCircleTopLeft(0.5 * dx, 0.5 * dy, r - 0.75 * w);
adjustedColor = AnnotColor(*aColor);
adjustedColor.adjustColor(border->getStyle() == AnnotBorder::borderBeveled ? -1 : 1);
- setColor(&adjustedColor, gFalse);
+ setDrawColor(&adjustedColor, gFalse);
drawCircleBottomRight(0.5 * dx, 0.5 * dy, r - 0.75 * w);
break;
}
@@ -4703,7 +4700,7 @@
// fallthrough
case AnnotBorder::borderSolid:
appearBuf->appendf("{0:.2f} w\n", w);
- setColor(aColor, gFalse);
+ setDrawColor(aColor, gFalse);
appearBuf->appendf("{0:.2f} {0:.2f} {1:.2f} {2:.2f} re s\n",
0.5 * w, dx - w, dy - w);
break;
@@ -4711,7 +4708,7 @@
case AnnotBorder::borderInset:
adjustedColor = AnnotColor(*aColor);
adjustedColor.adjustColor(border->getStyle() == AnnotBorder::borderBeveled ? 1 : -1);
- setColor(&adjustedColor, gTrue);
+ setDrawColor(&adjustedColor, gTrue);
appearBuf->append("0 0 m\n");
appearBuf->appendf("0 {0:.2f} l\n", dy);
appearBuf->appendf("{0:.2f} {1:.2f} l\n", dx, dy);
@@ -4721,7 +4718,7 @@
appearBuf->append("f\n");
adjustedColor = AnnotColor(*aColor);
adjustedColor.adjustColor(border->getStyle() == AnnotBorder::borderBeveled ? -1 : 1);
- setColor(&adjustedColor, gTrue);
+ setDrawColor(&adjustedColor, gTrue);
appearBuf->append("0 0 m\n");
appearBuf->appendf("{0:.2f} 0 l\n", dx);
appearBuf->appendf("{0:.2f} {1:.2f} l\n", dx, dy);
@@ -4732,7 +4729,7 @@
break;
case AnnotBorder::borderUnderlined:
appearBuf->appendf("{0:.2f} w\n", w);
- setColor(aColor, gFalse);
+ setDrawColor(aColor, gFalse);
appearBuf->appendf("0 0 m {0:.2f} 0 l s\n", dx);
break;
}
@@ -4743,27 +4740,51 @@
}
}
-void AnnotWidget::drawFormFieldButton(GfxResources *resources, GooString *da) {
- GooString *caption = nullptr;
+bool AnnotAppearanceBuilder::drawFormField(const FormField *field, const Form *form, const GfxResources *resources, const GooString *da, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect, const GooString *appearState, XRef *xref, bool *addedDingbatsResource)
+{
+ // draw the field contents
+ switch (field->getType()) {
+ case formButton:
+ return drawFormFieldButton(static_cast<const FormFieldButton *>(field), resources, da, border, appearCharacs, rect, appearState, xref, addedDingbatsResource);
+ break;
+ case formText:
+ return drawFormFieldText(static_cast<const FormFieldText *>(field), form, resources, da, border, appearCharacs, rect);
+ case formChoice:
+ return drawFormFieldChoice(static_cast<const FormFieldChoice *>(field), form, resources, da, border, appearCharacs, rect);
+ break;
+ case formSignature:
+ //~unimp
+ break;
+ case formUndef:
+ default:
+ error(errSyntaxError, -1, "Unknown field type");
+ }
+
+ return false;
+}
+
+
+bool AnnotAppearanceBuilder::drawFormFieldButton(const FormFieldButton *field, const GfxResources *resources, const GooString *da, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect, const GooString *appearState, XRef *xref, bool *addedDingbatsResource) {
+ const GooString *caption = nullptr;
if (appearCharacs)
caption = appearCharacs->getNormalCaption();
- switch (static_cast<FormFieldButton *>(field)->getButtonType()) {
+ switch (field->getButtonType()) {
case formButtonRadio: {
//~ Acrobat doesn't draw a caption if there is no AP dict (?)
if (appearState && appearState->cmp("Off") != 0 &&
- static_cast<FormFieldButton *>(field)->getState(appearState->getCString())) {
+ field->getState(appearState->getCString())) {
if (caption) {
- drawText(caption, da, resources, gFalse, 0, fieldQuadCenter,
- gFalse, gTrue);
+ return drawText(caption, da, resources, border, appearCharacs, rect, gFalse, 0, fieldQuadCenter, gFalse, gTrue, xref, addedDingbatsResource, gFalse);
} else if (appearCharacs) {
- AnnotColor *aColor = appearCharacs->getBorderColor();
+ const AnnotColor *aColor = appearCharacs->getBorderColor();
if (aColor) {
- double dx = rect->x2 - rect->x1;
- double dy = rect->y2 - rect->y1;
- setColor(aColor, gTrue);
+ const double dx = rect->x2 - rect->x1;
+ const double dy = rect->y2 - rect->y1;
+ setDrawColor(aColor, gTrue);
drawCircle(0.5 * dx, 0.5 * dy, 0.2 * (dx < dy ? dx : dy), gTrue);
}
+ return true;
}
}
}
@@ -4770,70 +4791,74 @@
break;
case formButtonPush:
if (caption)
- drawText(caption, da, resources, gFalse, 0, fieldQuadCenter, gFalse, gFalse);
+ return drawText(caption, da, resources, border, appearCharacs, rect, gFalse, 0, fieldQuadCenter, gFalse, gFalse, xref, addedDingbatsResource, gFalse);
break;
case formButtonCheck:
if (appearState && appearState->cmp("Off") != 0) {
if (!caption) {
GooString checkMark("3");
- drawText(&checkMark, da, resources, gFalse, 0, fieldQuadCenter, gFalse, gTrue);
+ return drawText(&checkMark, da, resources, border, appearCharacs, rect, gFalse, 0, fieldQuadCenter, gFalse, gTrue, xref, addedDingbatsResource, gFalse);
} else {
- drawText(caption, da, resources, gFalse, 0, fieldQuadCenter, gFalse, gTrue);
+ return drawText(caption, da, resources, border, appearCharacs, rect, gFalse, 0, fieldQuadCenter, gFalse, gTrue, xref, addedDingbatsResource, gFalse);
}
}
break;
}
+
+ return true;
}
-void AnnotWidget::drawFormFieldText(GfxResources *resources, GooString *da) {
+bool AnnotAppearanceBuilder::drawFormFieldText(const FormFieldText *fieldText, const Form *form, const GfxResources *resources, const GooString *da, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect) {
VariableTextQuadding quadding;
- GooString *contents;
- FormFieldText *fieldText = static_cast<FormFieldText *>(field);
+ const GooString *contents;
contents = fieldText->getContent();
if (contents) {
- quadding = field->hasTextQuadding() ? field->getTextQuadding() : form->getTextQuadding();
+ quadding = fieldText->hasTextQuadding() ? fieldText->getTextQuadding() : form->getTextQuadding();
int comb = 0;
if (fieldText->isComb())
comb = fieldText->getMaxLen();
- drawText(contents, da, resources,
- fieldText->isMultiline(), comb, quadding, gTrue, gFalse, fieldText->isPassword());
+ return drawText(contents, da, resources, border, appearCharacs, rect,
+ fieldText->isMultiline(), comb, quadding, gTrue, gFalse, nullptr, nullptr, fieldText->isPassword());
}
+
+ return true;
}
-void AnnotWidget::drawFormFieldChoice(GfxResources *resources, GooString *da) {
- GooString *selected;
+bool AnnotAppearanceBuilder::drawFormFieldChoice(const FormFieldChoice *fieldChoice, const Form *form, const GfxResources *resources, const GooString *da, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect) {
+ const GooString *selected;
VariableTextQuadding quadding;
- FormFieldChoice *fieldChoice = static_cast<FormFieldChoice *>(field);
- quadding = field->hasTextQuadding() ? field->getTextQuadding() : form->getTextQuadding();
+ quadding = fieldChoice->hasTextQuadding() ? fieldChoice->getTextQuadding() : form->getTextQuadding();
if (fieldChoice->isCombo()) {
selected = fieldChoice->getSelectedChoice();
if (selected) {
- drawText(selected, da, resources, gFalse, 0, quadding, gTrue, gFalse);
+ return drawText(selected, da, resources, border, appearCharacs, rect, gFalse, 0, quadding, gTrue, gFalse, nullptr, nullptr, gFalse);
//~ Acrobat draws a popup icon on the right side
}
// list box
} else {
- drawListBox(fieldChoice, da, resources, quadding);
+ return drawListBox(fieldChoice, border, rect, da, resources, quadding);
}
+
+ return true;
}
-void AnnotWidget::generateFieldAppearance() {
+void AnnotWidget::generateFieldAppearance(bool *addedDingbatsResource) {
GfxResources *resources;
- GooString *da;
+ const GooString *da;
- appearBuf = new GooString ();
+ AnnotAppearanceBuilder appearBuilder;
// draw the background
if (appearCharacs) {
- AnnotColor *aColor = appearCharacs->getBackColor();
+ const AnnotColor *aColor = appearCharacs->getBackColor();
if (aColor) {
- setColor(aColor, gTrue);
- appearBuf->appendf("0 0 {0:.2f} {1:.2f} re f\n",
+ appearBuilder.setDrawColor(aColor, gTrue);
+ appearBuilder.appendf("0 0 {0:.2f} {1:.2f} re f\n",
rect->x2 - rect->x1, rect->y2 - rect->y1);
}
}
@@ -4840,7 +4865,7 @@
// draw the border
if (appearCharacs && border && border->getWidth() > 0)
- drawBorder();
+ appearBuilder.drawFieldBorder(field, border, appearCharacs, rect);
da = field->getDefaultAppearance();
if (!da)
@@ -4848,25 +4873,13 @@
resources = form->getDefaultResources();
- // draw the field contents
- switch (field->getType()) {
- case formButton:
- drawFormFieldButton(resources, da);
- break;
- case formText:
- drawFormFieldText(resources, da);
- break;
- case formChoice:
- drawFormFieldChoice(resources, da);
- break;
- case formSignature:
- //~unimp
- break;
- case formUndef:
- default:
- error(errSyntaxError, -1, "Unknown field type");
+ const bool success = appearBuilder.drawFormField(field, form, resources, da, border, appearCharacs, rect, appearState, xref, addedDingbatsResource);
+ if (!success && da != form->getDefaultAppearance()) {
+ da = form->getDefaultAppearance();
+ appearBuilder.drawFormField(field, form, resources, da, border, appearCharacs, rect, appearState, xref, addedDingbatsResource);
}
+ const GooString *appearBuf = appearBuilder.buffer();
// build the appearance stream dictionary
Dict *appearDict = new Dict(xref);
appearDict->add(copyString("Length"), Object(appearBuf->getLength()));
@@ -4885,12 +4898,9 @@
}
// build the appearance stream
- MemStream *appearStream = new MemStream(copyString(appearBuf->getCString()), 0,
+ Stream *appearStream = new AutoFreeMemStream(copyString(appearBuf->getCString()), 0,
appearBuf->getLength(), Object(appearDict));
- appearance = Object(static_cast<Stream*>(appearStream));
- delete appearBuf;
-
- appearStream->setNeedFree(gTrue);
+ appearance = Object(appearStream);
}
void AnnotWidget::updateAppearanceStream()
@@ -4907,7 +4917,9 @@
return;
// Create the new appearance
- generateFieldAppearance();
+ bool dummyAddDingbatsResource = false; // This is only update so if we didn't need to add
+ // the dingbats resource we should not need it now
+ generateFieldAppearance(&dummyAddDingbatsResource);
// Fetch the appearance stream we've just created
Object obj1 = appearance.fetch(xref);
@@ -4938,7 +4950,7 @@
return;
annotLocker();
- addDingbatsResource = gFalse;
+ bool addDingbatsResource = false;
// Only construct the appearance stream when
// - annot doesn't have an AP or
@@ -4945,7 +4957,7 @@
// - NeedAppearances is true
if (field) {
if (appearance.isNull() || (form && form->getNeedAppearances()))
- generateFieldAppearance();
+ generateFieldAppearance(&addDingbatsResource);
}
// draw the appearance stream
@@ -5039,7 +5051,7 @@
movie->getAspect(&width, &height);
if (width != -1 && height != -1 && !poster.isNone()) {
- appearBuf = new GooString ();
+ GooString *appearBuf = new GooString ();
appearBuf->append ("q\n");
appearBuf->appendf ("{0:d} 0 0 {1:d} 0 0 cm\n", width, height);
appearBuf->append ("/MImg Do\n");
@@ -5071,13 +5083,12 @@
formDict->set("Matrix", Object(matrix));
formDict->set("Resources", Object(resDict));
- MemStream *mStream = new MemStream(copyString(appearBuf->getCString()), 0,
+ Stream *mStream = new AutoFreeMemStream(copyString(appearBuf->getCString()), 0,
appearBuf->getLength(), Object(formDict));
- mStream->setNeedFree(gTrue);
delete appearBuf;
Dict *dict = new Dict(gfx->getXRef());
- dict->set("FRM", Object(static_cast<Stream*>(mStream)));
+ dict->set("FRM", Object(mStream));
Dict *resDict2 = new Dict(gfx->getXRef());
resDict2->set("XObject", Object(dict));
@@ -5096,7 +5107,7 @@
bbox[0] = bbox[1] = 0;
bbox[2] = width;
bbox[3] = height;
- appearance = createForm(bbox, gFalse, resDict2);
+ appearance = createForm(appearBuf, bbox, gFalse, resDict2);
delete appearBuf;
}
}
@@ -5327,19 +5338,19 @@
if (appearance.isNull()) {
ca = opacity;
- appearBuf = new GooString ();
- appearBuf->append ("q\n");
+ AnnotAppearanceBuilder appearBuilder;
+ appearBuilder.append ("q\n");
if (color)
- setColor(color, gFalse);
+ appearBuilder.setDrawColor(color, gFalse);
double borderWidth = border->getWidth();
- setLineStyleForBorder(border);
+ appearBuilder.setLineStyleForBorder(border);
if (interiorColor)
- setColor(interiorColor, gTrue);
+ appearBuilder.setDrawColor(interiorColor, gTrue);
if (type == typeSquare) {
- appearBuf->appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} re\n",
+ appearBuilder.appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} re\n",
borderWidth / 2.0, borderWidth / 2.0,
(rect->x2 - rect->x1) - borderWidth,
(rect->y2 - rect->y1) - borderWidth);
@@ -5354,7 +5365,7 @@
x1 = b;
y1 = height / 2.0;
- appearBuf->appendf ("{0:.2f} {1:.2f} m\n", x1, y1);
+ appearBuilder.appendf ("{0:.2f} {1:.2f} m\n", x1, y1);
y1 += height / 4.0;
x2 = width / 4.0;
@@ -5361,7 +5372,7 @@
y2 = height - b;
x3 = width / 2.0;
y3 = y2;
- appearBuf->appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n",
+ appearBuilder.appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n",
x1, y1, x2, y2, x3, y3);
x2 = width - b;
y2 = y1;
@@ -5369,7 +5380,7 @@
y1 = y3;
x3 = x2;
y3 = height / 2.0;
- appearBuf->appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n",
+ appearBuilder.appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n",
x1, y1, x2, y2, x3, y3);
x2 = x1;
@@ -5378,7 +5389,7 @@
y1 = height / 4.0;
x3 = width / 2.0;
y3 = b;
- appearBuf->appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n",
+ appearBuilder.appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n",
x1, y1, x2, y2, x3, y3);
x2 = b;
@@ -5387,16 +5398,16 @@
y1 = b;
x3 = b;
y3 = height / 2.0;
- appearBuf->appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n",
+ appearBuilder.appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n",
x1, y1, x2, y2, x3, y3);
}
if (interiorColor && interiorColor->getSpace() != AnnotColor::colorTransparent)
- appearBuf->append ("b\n");
+ appearBuilder.append ("b\n");
else
- appearBuf->append ("S\n");
+ appearBuilder.append ("S\n");
- appearBuf->append ("Q\n");
+ appearBuilder.append ("Q\n");
double bbox[4];
bbox[0] = bbox[1] = 0;
@@ -5403,16 +5414,14 @@
bbox[2] = rect->x2 - rect->x1;
bbox[3] = rect->y2 - rect->y1;
if (ca == 1) {
- appearance = createForm(bbox, gFalse, nullptr);
+ appearance = createForm(appearBuilder.buffer(), bbox, gFalse, nullptr);
} else {
- Object aStream = createForm(bbox, gTrue, nullptr);
- delete appearBuf;
+ Object aStream = createForm(appearBuilder.buffer(), bbox, gTrue, nullptr);
- appearBuf = new GooString ("/GS0 gs\n/Fm0 Do");
+ GooString appearBuf("/GS0 gs\n/Fm0 Do");
Dict *resDict = createResourcesDict("Fm0", std::move(aStream), "GS0", ca, nullptr);
- appearance = createForm(bbox, gFalse, resDict);
+ appearance = createForm(&appearBuf, bbox, gFalse, resDict);
}
- delete appearBuf;
}
// draw the appearance stream
@@ -5624,55 +5633,53 @@
appearBBox = new AnnotAppearanceBBox(rect);
ca = opacity;
- appearBuf = new GooString ();
- appearBuf->append ("q\n");
+ AnnotAppearanceBuilder appearBuilder;
+ appearBuilder.append ("q\n");
if (color) {
- setColor(color, gFalse);
+ appearBuilder.setDrawColor(color, gFalse);
}
- setLineStyleForBorder(border);
+ appearBuilder.setLineStyleForBorder(border);
appearBBox->setBorderWidth(std::max(1., border->getWidth()));
if (interiorColor) {
- setColor(interiorColor, gTrue);
+ appearBuilder.setDrawColor(interiorColor, gTrue);
}
if (vertices->getCoordsLength() != 0) {
- appearBuf->appendf ("{0:.2f} {1:.2f} m\n", vertices->getX(0) - rect->x1, vertices->getY(0) - rect->y1);
+ appearBuilder.appendf ("{0:.2f} {1:.2f} m\n", vertices->getX(0) - rect->x1, vertices->getY(0) - rect->y1);
appearBBox->extendTo (vertices->getX(0) - rect->x1, vertices->getY(0) - rect->y1);
for (int i = 1; i < vertices->getCoordsLength(); ++i) {
- appearBuf->appendf ("{0:.2f} {1:.2f} l\n", vertices->getX(i) - rect->x1, vertices->getY(i) - rect->y1);
+ appearBuilder.appendf ("{0:.2f} {1:.2f} l\n", vertices->getX(i) - rect->x1, vertices->getY(i) - rect->y1);
appearBBox->extendTo (vertices->getX(i) - rect->x1, vertices->getY(i) - rect->y1);
}
if (type == typePolygon) {
if (interiorColor && interiorColor->getSpace() != AnnotColor::colorTransparent) {
- appearBuf->append ("b\n");
+ appearBuilder.append ("b\n");
} else {
- appearBuf->append ("s\n");
+ appearBuilder.append ("s\n");
}
} else {
- appearBuf->append ("S\n");
+ appearBuilder.append ("S\n");
}
}
- appearBuf->append ("Q\n");
+ appearBuilder.append ("Q\n");
double bbox[4];
appearBBox->getBBoxRect(bbox);
if (ca == 1) {
- appearance = createForm(bbox, gFalse, nullptr);
+ appearance = createForm(appearBuilder.buffer(), bbox, gFalse, nullptr);
} else {
- Object aStream = createForm(bbox, gTrue, nullptr);
- delete appearBuf;
+ Object aStream = createForm(appearBuilder.buffer(), bbox, gTrue, nullptr);
- appearBuf = new GooString ("/GS0 gs\n/Fm0 Do");
+ GooString appearBuf("/GS0 gs\n/Fm0 Do");
Dict *resDict = createResourcesDict("Fm0", std::move(aStream), "GS0", ca, nullptr);
- appearance = createForm(bbox, gFalse, resDict);
+ appearance = createForm(&appearBuf, bbox, gFalse, resDict);
}
- delete appearBuf;
}
// draw the appearance stream
@@ -5842,46 +5849,44 @@
appearBBox = new AnnotAppearanceBBox(rect);
ca = opacity;
- appearBuf = new GooString ();
- appearBuf->append ("q\n");
+ AnnotAppearanceBuilder appearBuilder;
+ appearBuilder.append ("q\n");
if (color) {
- setColor(color, gFalse);
+ appearBuilder.setDrawColor(color, gFalse);
}
- setLineStyleForBorder(border);
+ appearBuilder.setLineStyleForBorder(border);
appearBBox->setBorderWidth(std::max(1., border->getWidth()));
for (int i = 0; i < inkListLength; ++i) {
const AnnotPath * path = inkList[i];
if (path && path->getCoordsLength() != 0) {
- appearBuf->appendf ("{0:.2f} {1:.2f} m\n", path->getX(0) - rect->x1, path->getY(0) - rect->y1);
+ appearBuilder.appendf ("{0:.2f} {1:.2f} m\n", path->getX(0) - rect->x1, path->getY(0) - rect->y1);
appearBBox->extendTo (path->getX(0) - rect->x1, path->getY(0) - rect->y1);
for (int j = 1; j < path->getCoordsLength(); ++j) {
- appearBuf->appendf ("{0:.2f} {1:.2f} l\n", path->getX(j) - rect->x1, path->getY(j) - rect->y1);
+ appearBuilder.appendf ("{0:.2f} {1:.2f} l\n", path->getX(j) - rect->x1, path->getY(j) - rect->y1);
appearBBox->extendTo (path->getX(j) - rect->x1, path->getY(j) - rect->y1);
}
- appearBuf->append ("S\n");
+ appearBuilder.append ("S\n");
}
}
- appearBuf->append ("Q\n");
+ appearBuilder.append ("Q\n");
double bbox[4];
appearBBox->getBBoxRect(bbox);
if (ca == 1) {
- appearance = createForm(bbox, gFalse, nullptr);
+ appearance = createForm(appearBuilder.buffer(), bbox, gFalse, nullptr);
} else {
- Object aStream = createForm(bbox, gTrue, nullptr);
- delete appearBuf;
+ Object aStream = createForm(appearBuilder.buffer(), bbox, gTrue, nullptr);
- appearBuf = new GooString ("/GS0 gs\n/Fm0 Do");
+ GooString appearBuf("/GS0 gs\n/Fm0 Do");
Dict *resDict = createResourcesDict("Fm0", std::move(aStream), "GS0", ca, nullptr);
- appearance = createForm(bbox, gFalse, resDict);
+ appearance = createForm(&appearBuf, bbox, gFalse, resDict);
}
- delete appearBuf;
}
// draw the appearance stream
@@ -6061,37 +6066,35 @@
if (appearance.isNull()) {
ca = opacity;
- appearBuf = new GooString ();
+ AnnotAppearanceBuilder appearBuilder;
- appearBuf->append ("q\n");
+ appearBuilder.append ("q\n");
if (color)
- setColor(color, gTrue);
+ appearBuilder.setDrawColor(color, gTrue);
else
- appearBuf->append ("1 1 1 rg\n");
+ appearBuilder.append ("1 1 1 rg\n");
if (!name->cmp("PushPin"))
- appearBuf->append (ANNOT_FILE_ATTACHMENT_AP_PUSHPIN);
+ appearBuilder.append (ANNOT_FILE_ATTACHMENT_AP_PUSHPIN);
else if (!name->cmp("Paperclip"))
- appearBuf->append (ANNOT_FILE_ATTACHMENT_AP_PAPERCLIP);
+ appearBuilder.append (ANNOT_FILE_ATTACHMENT_AP_PAPERCLIP);
else if (!name->cmp("Graph"))
- appearBuf->append (ANNOT_FILE_ATTACHMENT_AP_GRAPH);
+ appearBuilder.append (ANNOT_FILE_ATTACHMENT_AP_GRAPH);
else if (!name->cmp("Tag"))
- appearBuf->append (ANNOT_FILE_ATTACHMENT_AP_TAG);
- appearBuf->append ("Q\n");
+ appearBuilder.append (ANNOT_FILE_ATTACHMENT_AP_TAG);
+ appearBuilder.append ("Q\n");
double bbox[4];
bbox[0] = bbox[1] = 0;
bbox[2] = bbox[3] = 24;
if (ca == 1) {
- appearance = createForm (bbox, gFalse, nullptr);
+ appearance = createForm (appearBuilder.buffer(), bbox, gFalse, nullptr);
} else {
- Object aStream = createForm (bbox, gTrue, nullptr);
- delete appearBuf;
+ Object aStream = createForm (appearBuilder.buffer(), bbox, gTrue, nullptr);
- appearBuf = new GooString ("/GS0 gs\n/Fm0 Do");
+ GooString appearBuf("/GS0 gs\n/Fm0 Do");
Dict *resDict = createResourcesDict("Fm0", std::move(aStream), "GS0", ca, nullptr);
- appearance = createForm(bbox, gFalse, resDict);
+ appearance = createForm(&appearBuf, bbox, gFalse, resDict);
}
- delete appearBuf;
}
// draw the appearance stream
@@ -6216,33 +6219,31 @@
if (appearance.isNull()) {
ca = opacity;
- appearBuf = new GooString ();
+ AnnotAppearanceBuilder appearBuilder;
- appearBuf->append ("q\n");
+ appearBuilder.append ("q\n");
if (color)
- setColor(color, gTrue);
+ appearBuilder.setDrawColor(color, gTrue);
else
- appearBuf->append ("1 1 1 rg\n");
+ appearBuilder.append ("1 1 1 rg\n");
if (!name->cmp("Speaker"))
- appearBuf->append (ANNOT_SOUND_AP_SPEAKER);
+ appearBuilder.append (ANNOT_SOUND_AP_SPEAKER);
else if (!name->cmp("Mic"))
- appearBuf->append (ANNOT_SOUND_AP_MIC);
- appearBuf->append ("Q\n");
+ appearBuilder.append (ANNOT_SOUND_AP_MIC);
+ appearBuilder.append ("Q\n");
double bbox[4];
bbox[0] = bbox[1] = 0;
bbox[2] = bbox[3] = 24;
if (ca == 1) {
- appearance = createForm(bbox, gFalse, nullptr);
+ appearance = createForm(appearBuilder.buffer(), bbox, gFalse, nullptr);
} else {
- Object aStream = createForm(bbox, gTrue, nullptr);
- delete appearBuf;
+ Object aStream = createForm(appearBuilder.buffer(), bbox, gTrue, nullptr);
- appearBuf = new GooString ("/GS0 gs\n/Fm0 Do");
+ GooString appearBuf("/GS0 gs\n/Fm0 Do");
Dict *resDict = createResourcesDict("Fm0", std::move(aStream), "GS0", ca, nullptr);
- appearance = createForm(bbox, gFalse, resDict);
+ appearance = createForm(&appearBuf, bbox, gFalse, resDict);
}
- delete appearBuf;
}
// draw the appearance stream
@@ -6580,7 +6581,7 @@
delete name;
}
-GooString* AnnotRichMedia::Asset::getName() const {
+const GooString* AnnotRichMedia::Asset::getName() const {
return name;
}
@@ -6679,7 +6680,7 @@
return instances[index];
}
-GooString* AnnotRichMedia::Configuration::getName() const {
+const GooString* AnnotRichMedia::Configuration::getName() const {
return name;
}
@@ -6740,7 +6741,7 @@
delete flashVars;
}
-GooString* AnnotRichMedia::Params::getFlashVars() const {
+const GooString* AnnotRichMedia::Params::getFlashVars() const {
return flashVars;
}
@@ -6913,3 +6914,37 @@
}
gfree(annots);
}
+
+
+//------------------------------------------------------------------------
+// AnnotAppearanceBuilder
+//------------------------------------------------------------------------
+
+AnnotAppearanceBuilder::AnnotAppearanceBuilder()
+ : appearBuf(new GooString())
+{
+}
+
+AnnotAppearanceBuilder::~AnnotAppearanceBuilder()
+{
+ delete appearBuf;
+}
+
+void AnnotAppearanceBuilder::append(const char *text)
+{
+ appearBuf->append(text);
+}
+
+void AnnotAppearanceBuilder::appendf(const char *fmt, ...) GOOSTRING_FORMAT
+{
+ va_list argList;
+
+ va_start(argList, fmt);
+ appearBuf->appendfv(fmt, argList);
+ va_end(argList);
+}
+
+const GooString *AnnotAppearanceBuilder::buffer() const
+{
+ return appearBuf;
+}
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -26,6 +26,7 @@
// Copyright (C) 2012, 2015 Tobias Koenig <tokoe at kdab.com>
// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
// Copyright (C) 2013, 2017 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -51,6 +52,8 @@
class Form;
class FormWidget;
class FormField;
+class FormFieldButton;
+class FormFieldText;
class FormFieldChoice;
class PDFRectangle;
class Movie;
@@ -444,14 +447,14 @@
AnnotAppearanceCharacs(const AnnotAppearanceCharacs &) = delete;
AnnotAppearanceCharacs& operator=(const AnnotAppearanceCharacs &) = delete;
- int getRotation() { return rotation; }
- AnnotColor *getBorderColor() { return borderColor; }
- AnnotColor *getBackColor() { return backColor; }
- GooString *getNormalCaption() { return normalCaption; }
- GooString *getRolloverCaption() { return rolloverCaption; }
- GooString *getAlternateCaption() { return alternateCaption; }
- AnnotIconFit *getIconFit() { return iconFit; }
- AnnotAppearanceCharacsTextPos getPosition() { return position; }
+ int getRotation() const { return rotation; }
+ const AnnotColor *getBorderColor() const { return borderColor; }
+ const AnnotColor *getBackColor() const { return backColor; }
+ const GooString *getNormalCaption() const { return normalCaption; }
+ const GooString *getRolloverCaption() const { return rolloverCaption; }
+ const GooString *getAlternateCaption() const { return alternateCaption; }
+ const AnnotIconFit *getIconFit() const { return iconFit; }
+ AnnotAppearanceCharacsTextPos getPosition() const { return position; }
protected:
@@ -495,6 +498,49 @@
};
//------------------------------------------------------------------------
+// AnnotAppearanceBuilder
+//------------------------------------------------------------------------
+
+class AnnotAppearanceBuilder {
+public:
+ AnnotAppearanceBuilder();
+ ~AnnotAppearanceBuilder();
+
+ AnnotAppearanceBuilder(const AnnotAppearanceBuilder &) = delete;
+ AnnotAppearanceBuilder& operator=(const AnnotAppearanceBuilder &) = delete;
+
+ void setDrawColor(const AnnotColor *color, GBool fill);
+ void setLineStyleForBorder(const AnnotBorder *border);
+ void drawCircle(double cx, double cy, double r, GBool fill);
+ void drawCircleTopLeft(double cx, double cy, double r);
+ void drawCircleBottomRight(double cx, double cy, double r);
+ void drawFieldBorder(const FormField *field, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect);
+ bool drawFormField(const FormField *field, const Form *form, const GfxResources *resources, const GooString *da, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect, const GooString *appearState, XRef *xref, bool *addedDingbatsResource);
+
+ void writeString(const GooString &str);
+
+ void append(const char *text);
+ void appendf(const char *fmt, ...) GOOSTRING_FORMAT;
+
+ const GooString *buffer() const;
+
+private:
+ bool drawListBox(const FormFieldChoice *fieldChoice, const AnnotBorder *border, const PDFRectangle *rect,
+ const GooString *da, const GfxResources *resources, int quadding);
+ bool drawFormFieldButton(const FormFieldButton *field, const GfxResources *resources, const GooString *da, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect, const GooString *appearState, XRef *xref, bool *addedDingbatsResource);
+ bool drawFormFieldText(const FormFieldText *fieldText, const Form *form, const GfxResources *resources, const GooString *da, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect);
+ bool drawFormFieldChoice(const FormFieldChoice *fieldChoice, const Form *form, const GfxResources *resources, const GooString *da, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect);
+ bool drawText(const GooString *text, const GooString *da, const GfxResources *resources,
+ const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect,
+ GBool multiline, int comb, int quadding,
+ GBool txField, GBool forceZapfDingbats,
+ XRef *xref, bool *addedDingbatsResource, // xref and addedDingbatsResource both must not be null if forceZapfDingbats is passed
+ GBool password);
+
+ GooString *appearBuf;
+};
+
+//------------------------------------------------------------------------
// Annot
//------------------------------------------------------------------------
@@ -617,13 +663,13 @@
AnnotSubtype getType() const { return type; }
PDFRectangle *getRect() const { return rect; }
void getRect(double *x1, double *y1, double *x2, double *y2) const;
- GooString *getContents() const { return contents; }
+ const GooString *getContents() const { return contents; }
int getPageNum() const { return page; }
- GooString *getName() const { return name; }
- GooString *getModified() const { return modified; }
+ const GooString *getName() const { return name; }
+ const GooString *getModified() const { return modified; }
Guint getFlags() const { return flags; }
AnnotAppearance *getAppearStreams() const { return appearStreams; }
- GooString *getAppearState() const { return appearState; }
+ const GooString *getAppearState() const { return appearState; }
AnnotBorder *getBorder() const { return border; }
AnnotColor *getColor() const { return color; }
int getTreeKey() const { return treeKey; }
@@ -633,6 +679,10 @@
// Check if point is inside the annot rectangle.
GBool inRect(double x, double y) const;
+ static void layoutText(const GooString *text, GooString *outBuf, int *i, const GfxFont *font,
+ double *width, double widthLimit, int *charCount,
+ GBool noReencode);
+
private:
void readArrayNum(Object *pdfArray, int key, double *value);
// write vStr[i:j[ in appearBuf
@@ -644,16 +694,7 @@
protected:
virtual ~Annot();
virtual void removeReferencedObjects(); // Called by Page::removeAnnot
- void setColor(AnnotColor *color, GBool fill);
- void setLineStyleForBorder(AnnotBorder *border);
- void drawCircle(double cx, double cy, double r, GBool fill);
- void drawCircleTopLeft(double cx, double cy, double r);
- void drawCircleBottomRight(double cx, double cy, double r);
- void layoutText(GooString *text, GooString *outBuf, int *i, GfxFont *font,
- double *width, double widthLimit, int *charCount,
- GBool noReencode);
- void writeString(GooString *str, GooString *appearBuf);
- Object createForm(double *bbox, GBool transparencyGroup, Dict *resDict);
+ Object createForm(const GooString *appearBuf, double *bbox, GBool transparencyGroup, Dict *resDict);
Dict *createResourcesDict(const char *formName, Object &&formStream, const char *stateName,
double opacity, const char *blendMode);
GBool isVisible(GBool printing);
@@ -691,7 +732,6 @@
PDFDoc *doc;
XRef *xref; // the xref table for this PDF file
Ref ref; // object ref identifying this annotation
- GooString *appearBuf;
AnnotBorder *border; // Border, BS
AnnotColor *color; // C
double fontSize;
@@ -742,13 +782,13 @@
~AnnotMarkup();
// getters
- GooString *getLabel() const { return label; }
+ const GooString *getLabel() const { return label; }
AnnotPopup *getPopup() const { return popup; }
double getOpacity() const { return opacity; }
// getRC
- GooString *getDate() const { return date; }
+ const GooString *getDate() const { return date; }
int getInReplyToID() const { return inReplyTo.num; }
- GooString *getSubject() const { return subject; }
+ const GooString *getSubject() const { return subject; }
AnnotMarkupReplyType getReplyTo() const { return replyTo; }
AnnotExternalDataType getExData() const { return exData; }
@@ -805,7 +845,7 @@
// getters
GBool getOpen() const { return open; }
- GooString *getIcon() const { return icon; }
+ const GooString *getIcon() const { return icon; }
AnnotTextState getState() const { return state; }
void setOpen(GBool openA);
@@ -836,7 +876,7 @@
void draw(Gfx *gfx, GBool printing) override;
- GooString* getTitle() { return title; }
+ const GooString* getTitle() const { return title; }
Movie* getMovie() { return movie; }
private:
@@ -858,7 +898,7 @@
AnnotScreen(PDFDoc *docA, Object *dictObject, Object *obj);
~AnnotScreen();
- GooString* getTitle() { return title; }
+ const GooString* getTitle() const { return title; }
AnnotAppearanceCharacs *getAppearCharacs() { return appearCharacs; }
LinkAction* getAction() { return action; } // The caller should now delete the result
@@ -947,10 +987,10 @@
void setIntent(AnnotFreeTextIntent new_intent);
// getters
- GooString *getAppearanceString() const { return appearanceString; }
+ const GooString *getAppearanceString() const { return appearanceString; }
AnnotFreeTextQuadding getQuadding() const { return quadding; }
// return rc
- GooString *getStyleString() const { return styleString; }
+ const GooString *getStyleString() const { return styleString; }
AnnotCalloutLine *getCalloutLine() const { return calloutLine; }
AnnotFreeTextIntent getIntent() const { return intent; }
AnnotBorderEffect *getBorderEffect() const { return borderEffect; }
@@ -1096,7 +1136,7 @@
void setIcon(GooString *new_icon);
// getters
- GooString *getIcon() const { return icon; }
+ const GooString *getIcon() const { return icon; }
private:
@@ -1266,7 +1306,7 @@
// getters
Object *getFile() { return &file; }
- GooString *getName() const { return name; }
+ const GooString *getName() const { return name; }
private:
@@ -1294,7 +1334,7 @@
// getters
Sound *getSound() { return sound; }
- GooString *getName() const { return name; }
+ const GooString *getName() const { return name; }
private:
@@ -1327,11 +1367,7 @@
void draw(Gfx *gfx, GBool printing) override;
- void drawBorder();
- void drawFormFieldButton(GfxResources *resources, GooString *da);
- void drawFormFieldText(GfxResources *resources, GooString *da);
- void drawFormFieldChoice(GfxResources *resources, GooString *da);
- void generateFieldAppearance ();
+ void generateFieldAppearance (bool *addDingbatsResource);
void updateAppearanceStream ();
AnnotWidgetHighlightMode getMode() { return mode; }
@@ -1345,13 +1381,6 @@
void initialize(PDFDoc *docA, Dict *dict);
- void drawText(GooString *text, GooString *da, GfxResources *resources,
- GBool multiline, int comb, int quadding,
- GBool txField, GBool forceZapfDingbats,
- GBool password=false);
- void drawListBox(FormFieldChoice *fieldChoice,
- GooString *da, GfxResources *resources, int quadding);
-
Form *form;
FormField *field; // FormField object for this annotation
AnnotWidgetHighlightMode mode; // H (Default I)
@@ -1361,7 +1390,6 @@
// inherited from Annot
// AnnotBorderBS border; // BS
Dict *parent; // Parent
- GBool addDingbatsResource;
Ref updatedAppearanceStream; // {-1,-1} if updateAppearanceStream has never been called
};
@@ -1438,7 +1466,7 @@
Params(const Params &) = delete;
Params& operator=(const Params &) = delete;
- GooString* getFlashVars() const;
+ const GooString* getFlashVars() const;
private:
// optional
@@ -1485,7 +1513,7 @@
Configuration& operator=(const Configuration &) = delete;
Type getType() const;
- GooString* getName() const;
+ const GooString* getName() const;
int getInstancesCount() const;
Instance* getInstance(int index) const;
@@ -1507,7 +1535,7 @@
Asset(const Asset &) = delete;
Asset& operator=(const Asset &) = delete;
- GooString* getName() const;
+ const GooString* getName() const;
Object* getFileSpec() const;
private:
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/CMap.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/CMap.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/CMap.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -14,7 +14,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2008 Koji Otani <sho at bbr.jp>
-// Copyright (C) 2008, 2009, 2017 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008, 2009, 2017, 2018 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2013 Fabio D'Urso <fabiodurso at hotmail.it>
// Copyright (C) 2017 Adrian Johnson <ajohnson at redneon.com>
//
@@ -478,7 +478,7 @@
return !collection->cmp(collectionA) && !cMapName->cmp(cMapNameA);
}
-CID CMap::getCID(char *s, int len, CharCode *c, int *nUsed) {
+CID CMap::getCID(const char *s, int len, CharCode *c, int *nUsed) {
CMapVectorEntry *vec;
CharCode cc;
int n, i;
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/CMap.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/CMap.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/CMap.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -89,7 +89,7 @@
// Return the CID corresponding to the character code starting at
// <s>, which contains <len> bytes. Sets *<c> to the char code, and
// *<nUsed> to the number of bytes used by the char code.
- CID getCID(char *s, int len, CharCode *c, int *nUsed);
+ CID getCID(const char *s, int len, CharCode *c, int *nUsed);
// Return the writing mode (0=horizontal, 1=vertical).
int getWMode() { return wMode; }
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoOutputDev.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoOutputDev.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoOutputDev.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -29,6 +29,7 @@
// Copyright (C) 2012 Patrick Pfeifer <p2000 at mailinator.com>
// Copyright (C) 2012, 2015, 2016 Jason Crain <jason at aquaticape.us>
// Copyright (C) 2015 Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -1379,7 +1380,7 @@
cairo_restore (cairo);
}
-void CairoOutputDev::beginString(GfxState *state, GooString *s)
+void CairoOutputDev::beginString(GfxState *state, const GooString *s)
{
int len = s->getLength();
@@ -1588,7 +1589,7 @@
}
}
-void CairoOutputDev::beginActualText(GfxState *state, GooString *text)
+void CairoOutputDev::beginActualText(GfxState *state, const GooString *text)
{
if (this->text)
actualText->begin(state, text);
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoOutputDev.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoOutputDev.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/CairoOutputDev.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -24,6 +24,7 @@
// Copyright (C) 2015 Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
// Copyright (C) 2016 Jason Crain <jason at aquaticape.us>
// Copyright (C) 2018 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -191,13 +192,13 @@
void eoClip(GfxState *state) override;
//----- text drawing
- void beginString(GfxState *state, GooString *s) override;
+ void beginString(GfxState *state, const GooString *s) override;
void endString(GfxState *state) override;
void drawChar(GfxState *state, double x, double y,
double dx, double dy,
double originX, double originY,
CharCode code, int nBytes, Unicode *u, int uLen) override;
- void beginActualText(GfxState *state, GooString *text) override;
+ void beginActualText(GfxState *state, const GooString *text) override;
void endActualText(GfxState *state) override;
GBool beginType3Char(GfxState *state, double x, double y,
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Catalog.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Catalog.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Catalog.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -33,6 +33,7 @@
// Copyright (C) 2014 Ed Porras <ed at moto-research.com>
// Copyright (C) 2015 Even Rouault <even.rouault at spatialys.com>
// Copyright (C) 2016 Masamichi Hosoda <trueroad at trueroad.jp>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -382,7 +383,7 @@
return 0;
}
-LinkDest *Catalog::findDest(GooString *name) {
+LinkDest *Catalog::findDest(const GooString *name) {
// try named destination dictionary then name tree
if (getDests()->isDict()) {
Object obj1 = getDests()->dictLookup(name->getCString());
@@ -684,7 +685,7 @@
return key->cmp(&entry->name);
}
-Object NameTree::lookup(GooString *name)
+Object NameTree::lookup(const GooString *name)
{
Entry **entry;
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Catalog.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Catalog.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Catalog.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -26,6 +26,7 @@
// Copyright (C) 2013, 2017 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2013 José Aliste <jaliste at src.gnome.org>
// Copyright (C) 2016 Masamichi Hosoda <trueroad at trueroad.jp>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -73,7 +74,7 @@
NameTree& operator=(const NameTree &) = delete;
void init(XRef *xref, Object *tree);
- Object lookup(GooString *name);
+ Object lookup(const GooString *name);
int numEntries() { return length; };
// iterator accessor, note it returns a pointer to the internal object, do not free nor delete it
Object *getValue(int i);
@@ -154,7 +155,7 @@
// Find a named destination. Returns the link destination, or
// NULL if <name> is not a destination.
- LinkDest *findDest(GooString *name);
+ LinkDest *findDest(const GooString *name);
Object *getDests();
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/CharCodeToUnicode.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/CharCodeToUnicode.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/CharCodeToUnicode.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -25,6 +25,7 @@
// Copyright (C) 2014 Jiri Slaby <jirislaby at gmail.com>
// Copyright (C) 2015 Marek Kasik <mkasik at redhat.com>
// Copyright (C) 2017 Jean Ghali <jghali at libertysurf.fr>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -635,7 +636,7 @@
return 0;
}
-int CharCodeToUnicode::mapToCharCode(Unicode* u, CharCode *c, int usize) {
+int CharCodeToUnicode::mapToCharCode(Unicode* u, CharCode *c, int usize) const {
//look for charcode in map
if (usize == 1 || (usize > 1 && !(*u & ~0xff))) {
if (isIdentity) {
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/CharCodeToUnicode.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/CharCodeToUnicode.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/CharCodeToUnicode.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -19,6 +19,7 @@
// Copyright (C) 2007 Koji Otani <sho at bbr.jp>
// Copyright (C) 2008, 2011, 2012, 2018 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2017 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -96,7 +97,7 @@
int mapToUnicode(CharCode c, Unicode **u);
// Map a Unicode to CharCode.
- int mapToCharCode(Unicode* u, CharCode *c, int usize);
+ int mapToCharCode(Unicode* u, CharCode *c, int usize) const;
// Return the mapping's length, i.e., one more than the max char
// code supported by the mapping.
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/DateInfo.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/DateInfo.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/DateInfo.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -2,7 +2,7 @@
//
// DateInfo.cc
//
-// Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008, 2018 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc at gnome.org>
// Copyright (C) 2015 André Guerreiro <aguerreiro1985 at gmail.com>
// Copyright (C) 2015 André Esser <bepandre at hotmail.com>
@@ -117,7 +117,7 @@
}
// Convert PDF date string to time. Returns -1 if conversion fails.
-time_t dateStringToTime(GooString *dateString) {
+time_t dateStringToTime(const GooString *dateString) {
int year, mon, day, hour, min, sec, tz_hour, tz_minute;
char tz;
struct tm tm;
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/DateInfo.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/DateInfo.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/DateInfo.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -2,7 +2,7 @@
//
// DateInfo.h
//
-// Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008, 2018 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc at gnome.org>
// Copyright (C) 2015 André Guerreiro <aguerreiro1985 at gmail.com>
// Copyright (C) 2015 André Esser <bepandre at hotmail.com>
@@ -38,6 +38,6 @@
/* Convert PDF date string to time.
* Returns -1 if conversion fails.
*/
-time_t dateStringToTime(GooString *dateString);
+time_t dateStringToTime(const GooString *dateString);
#endif
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/FileSpec.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/FileSpec.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/FileSpec.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -7,8 +7,9 @@
//
// Copyright (C) 2008-2009 Carlos Garcia Campos <carlosgc at gnome.org>
// Copyright (C) 2009 Kovid Goyal <kovid at kovidgoyal.net>
-// Copyright (C) 2012, 2017 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2012, 2017, 2018 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2012 Hib Eris <hib at hiberis.nl>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -27,7 +28,7 @@
#include "FileSpec.h"
-EmbFile::EmbFile(Object *efStream)
+EmbFile::EmbFile(const Object *efStream)
{
m_size = -1;
m_createDate = nullptr;
@@ -99,7 +100,7 @@
return gTrue;
}
-FileSpec::FileSpec(Object *fileSpecA)
+FileSpec::FileSpec(const Object *fileSpecA)
{
ok = gTrue;
fileName = nullptr;
@@ -171,7 +172,7 @@
return platformFileName;
}
-Object getFileSpecName (Object *fileSpec)
+Object getFileSpecName (const Object *fileSpec)
{
if (fileSpec->isString()) {
return fileSpec->copy();
@@ -202,7 +203,7 @@
return Object();
}
-Object getFileSpecNameForPlatform (Object *fileSpec)
+Object getFileSpecNameForPlatform (const Object *fileSpec)
{
if (fileSpec->isString()) {
return fileSpec->copy();
@@ -234,7 +235,7 @@
// system-dependent path manipulation
#ifdef _WIN32
int i, j;
- GooString *name = fileName.getString();
+ GooString *name = fileName.getString()->copy();
// "//...." --> "\...."
// "/x/...." --> "x:\...."
// "/server/share/...." --> "\\server\share\...."
@@ -274,6 +275,7 @@
name->del(i);
}
}
+ fileName = Object(name);
#endif /* _WIN32 */
return fileName;
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/FileSpec.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/FileSpec.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/FileSpec.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -24,20 +24,20 @@
class EmbFile {
public:
- EmbFile(Object *efStream);
+ EmbFile(const Object *efStream);
~EmbFile();
EmbFile(const EmbFile &) = delete;
EmbFile& operator=(const EmbFile &) = delete;
- int size() { return m_size; }
- GooString *modDate() { return m_modDate; }
- GooString *createDate() { return m_createDate; }
- GooString *checksum() { return m_checksum; }
- GooString *mimeType() { return m_mimetype; }
+ int size() const { return m_size; }
+ const GooString *modDate() const { return m_modDate; }
+ const GooString *createDate() const { return m_createDate; }
+ const GooString *checksum() const { return m_checksum; }
+ const GooString *mimeType() const { return m_mimetype; }
Object *streamObject() { return &m_objStr; }
Stream *stream() { return isOk() ? m_objStr.getStream() : NULL; }
- GBool isOk() { return m_objStr.isStream(); }
+ GBool isOk() const { return m_objStr.isStream(); }
GBool save(const char *path);
private:
@@ -53,17 +53,17 @@
class FileSpec {
public:
- FileSpec(Object *fileSpec);
+ FileSpec(const Object *fileSpec);
~FileSpec();
FileSpec(const FileSpec &) = delete;
FileSpec& operator=(const FileSpec &) = delete;
- GBool isOk() { return ok; }
+ GBool isOk() const { return ok; }
- GooString *getFileName() const { return fileName; }
+ const GooString *getFileName() const { return fileName; }
GooString *getFileNameForPlatform();
- GooString *getDescription() const { return desc; }
+ const GooString *getDescription() const { return desc; }
EmbFile *getEmbeddedFile();
private:
@@ -78,7 +78,7 @@
GooString *desc; // Desc
};
-Object getFileSpecName (Object *fileSpec);
-Object getFileSpecNameForPlatform (Object *fileSpec);
+Object getFileSpecName (const Object *fileSpec);
+Object getFileSpecNameForPlatform (const Object *fileSpec);
#endif /* FILE_SPEC_H */
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/FontInfo.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/FontInfo.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/FontInfo.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -12,6 +12,7 @@
// Copyright (C) 2010, 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
// Copyright (C) 2011 Carlos Garcia Campos <carlosgc at gnome.org>
// Copyright (C) 2012 Fabio D'Urso <fabiodurso at hotmail.it>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -153,7 +154,7 @@
}
FontInfo::FontInfo(GfxFont *font, XRef *xref) {
- GooString *origName;
+ const GooString *origName;
fontRef = *font->getID();
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -19,6 +19,9 @@
// Copyright 2015 André Esser <bepandre at hotmail.com>
// Copyright 2017 Hans-Ulrich Jüttner <huj at froreich-bioscientia.de>
// Copyright 2017 Bernd Kuhls <berndkuhls at hotmail.com>
+// Copyright 2018 Andre Heinecke <aheinecke at intevation.de>
+// Copyright 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
+// Copyright 2018 Chinmoy Ranjan Pradhan <chinmoyrp65 at protonmail.com>
//
//========================================================================
@@ -55,12 +58,12 @@
#include "Lexer.h"
//return a newly allocated char* containing an UTF16BE string of size length
-char* pdfDocEncodingToUTF16 (GooString* orig, int* length)
+char* pdfDocEncodingToUTF16 (const GooString* orig, int* length)
{
//double size, a unicode char takes 2 char, add 2 for the unicode marker
*length = 2+2*orig->getLength();
char *result = new char[(*length)];
- char *cstring = orig->getCString();
+ const char *cstring = orig->getCString();
//unicode marker
result[0] = (char)0xfe;
result[1] = (char)0xff;
@@ -135,6 +138,11 @@
return field->isReadOnly();
}
+void FormWidget::setReadOnly(bool value)
+{
+ return field->setReadOnly(value);
+}
+
int FormWidget::encodeID (unsigned pageNum, unsigned fieldNum)
{
return (pageNum << 4*sizeof(unsigned)) + fieldNum;
@@ -146,7 +154,7 @@
*fieldNum = (id << 4*sizeof(unsigned)) >> 4*sizeof(unsigned);
}
-GooString *FormWidget::getPartialName() const {
+const GooString *FormWidget::getPartialName() const {
return field->getPartialName();
}
@@ -155,11 +163,11 @@
field->setPartialName(name);
}
-GooString *FormWidget::getAlternateUiName() const {
+const GooString *FormWidget::getAlternateUiName() const {
return field->getAlternateUiName();
}
-GooString *FormWidget::getMappingName() const {
+const GooString *FormWidget::getMappingName() const {
return field->getMappingName();
}
@@ -260,7 +268,7 @@
type = formText;
}
-GooString* FormWidgetText::getContent ()
+const GooString* FormWidgetText::getContent () const
{
return parent()->getContent();
}
@@ -346,7 +354,7 @@
{
}
-bool FormWidgetChoice::_checkRange (int i)
+bool FormWidgetChoice::_checkRange (int i) const
{
if (i < 0 || i >= parent()->getNumChoices()) {
error(errInternal, -1, "FormWidgetChoice::_checkRange i out of range : {0:d}", i);
@@ -372,7 +380,7 @@
parent()->deselectAll();
}
-GooString* FormWidgetChoice::getEditChoice ()
+const GooString* FormWidgetChoice::getEditChoice () const
{
if (!hasEdit()) {
error(errInternal, -1, "FormFieldChoice::getEditChoice called on a non-editable choice\n");
@@ -387,7 +395,7 @@
widget->updateAppearanceStream();
}
-bool FormWidgetChoice::isSelected (int i)
+bool FormWidgetChoice::isSelected (int i) const
{
if (!_checkRange(i)) return false;
return parent()->isSelected(i);
@@ -403,12 +411,12 @@
parent()->setEditChoice(new_content);
}
-int FormWidgetChoice::getNumChoices()
+int FormWidgetChoice::getNumChoices() const
{
return parent()->getNumChoices();
}
-GooString* FormWidgetChoice::getChoice(int i)
+const GooString* FormWidgetChoice::getChoice(int i) const
{
return parent()->getChoice(i);
}
@@ -454,6 +462,11 @@
type = formSignature;
}
+const GooString *FormWidgetSignature::getSignature() const
+{
+ return static_cast<FormFieldSignature*>(field)->getSignature();
+}
+
SignatureInfo *FormWidgetSignature::validateSignature(bool doVerifyCert, bool forceRevalidation, time_t validationTime)
{
return static_cast<FormFieldSignature*>(field)->validateSignature(doVerifyCert, forceRevalidation, validationTime);
@@ -847,7 +860,7 @@
GooString* FormField::getFullyQualifiedName() {
Object obj1;
Object parent;
- GooString *parent_name;
+ const GooString *parent_name;
GooString *full_name;
GBool unicode_encoded = gFalse;
@@ -939,6 +952,32 @@
}
}
+void FormField::setReadOnly (bool value)
+{
+ if (value == readOnly) {
+ return;
+ }
+
+ readOnly = value;
+
+ Dict* dict = obj.getDict();
+
+ const Object obj1 = Form::fieldLookup(dict, "Ff");
+ int flags = 0;
+ if (obj1.isInt()) {
+ flags = obj1.getInt();
+ }
+ if (value) {
+ flags |= 1;
+ } else {
+ flags &= ~1;
+ }
+
+ dict->set("Ff", Object(flags));
+ xref->setModifiedObject(&obj, ref);
+ updateChildrenAppearance();
+}
+
//------------------------------------------------------------------------
// FormFieldButton
//------------------------------------------------------------------------
@@ -1050,7 +1089,7 @@
if (!isOn && noAllOff)
return gFalse; // Don't allow to set all radio to off
- char *current = getAppearanceState();
+ const char *current = getAppearanceState();
GBool currentFound = gFalse, newFound = gFalse;
for (int i = 0; i < numChildren; i++) {
@@ -1089,7 +1128,7 @@
return gTrue;
}
-GBool FormFieldButton::getState(char *state) {
+GBool FormFieldButton::getState(const char *state) const {
if (appearanceState.isName(state))
return gTrue;
@@ -1241,7 +1280,7 @@
}
}
-int FormFieldText::tokenizeDA(GooString* da, GooList* daToks, const char* searchTok)
+int FormFieldText::tokenizeDA(const GooString* da, GooList* daToks, const char* searchTok)
{
int idx = -1;
if(da && daToks) {
@@ -1271,7 +1310,7 @@
if (obj.isDict()) {
Object objDA(obj.dictLookup("DA"));
if (objDA.isString()) {
- GooString* da = objDA.getString();
+ const GooString* da = objDA.getString();
idx = tokenizeDA(da, daToks, "Tf") - 1;
}
}
@@ -1546,7 +1585,7 @@
updateSelection();
}
-GooString* FormFieldChoice::getEditChoice ()
+const GooString* FormFieldChoice::getEditChoice () const
{
return editedChoice;
}
@@ -1561,7 +1600,7 @@
return cnt;
}
-GooString *FormFieldChoice::getSelectedChoice() {
+const GooString *FormFieldChoice::getSelectedChoice() const {
if (edit && editedChoice)
return editedChoice;
@@ -1614,7 +1653,7 @@
// retrieve SigningTime
Object time_of_signing = sig_dict.dictLookup("M");
if (time_of_signing.isString()) {
- GooString *time_str = time_of_signing.getString();
+ const GooString *time_str = time_of_signing.getString();
signature_info->setSigningTime(dateStringToTime(time_str)); // Put this information directly in SignatureInfo object
}
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Form.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -15,6 +15,9 @@
// Copyright 2015 André Esser <bepandre at hotmail.com>
// Copyright 2017 Roland Hieber <r.hieber at pengutronix.de>
// Copyright 2017 Hans-Ulrich Jüttner <huj at froreich-bioscientia.de>
+// Copyright 2018 Andre Heinecke <aheinecke at intevation.de>
+// Copyright 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
+// Copyright 2018 Chinmoy Ranjan Pradhan <chinmoyrp65 at protonmail.com>
//
//========================================================================
@@ -110,15 +113,16 @@
double getFontSize() const;
- GooString *getPartialName() const;
+ const GooString *getPartialName() const;
void setPartialName(const GooString &name);
- GooString *getAlternateUiName() const;
- GooString *getMappingName() const;
+ const GooString *getAlternateUiName() const;
+ const GooString *getMappingName() const;
GooString *getFullyQualifiedName();
GBool isModified () const;
bool isReadOnly() const;
+ void setReadOnly(bool value);
LinkAction *getActivationAction(); // The caller should not delete the result
LinkAction *getAdditionalAction(Annot::FormAdditionalActionsType type); // The caller should delete the result
@@ -193,7 +197,7 @@
public:
FormWidgetText(PDFDoc *docA, Object *dict, unsigned num, Ref ref, FormField *p);
//return the field's content (UTF16BE)
- GooString* getContent() ;
+ const GooString* getContent() const;
//return a copy of the field's content (UTF16BE)
GooString* getContentCopy();
@@ -228,9 +232,9 @@
FormWidgetChoice(PDFDoc *docA, Object *dict, unsigned num, Ref ref, FormField *p);
~FormWidgetChoice();
- int getNumChoices();
+ int getNumChoices() const;
//return the display name of the i-th choice (UTF16BE)
- GooString* getChoice(int i);
+ const GooString* getChoice(int i) const;
//select the i-th choice
void select (int i);
@@ -244,10 +248,10 @@
//only work for editable combo box, set the user-entered text as the current choice
void setEditChoice(GooString* new_content);
- GooString* getEditChoice ();
+ const GooString* getEditChoice () const;
void updateWidgetAppearance() override;
- bool isSelected (int i);
+ bool isSelected (int i) const;
bool isCombo () const;
bool hasEdit () const;
@@ -256,7 +260,7 @@
bool commitOnSelChange () const;
bool isListBox () const;
protected:
- bool _checkRange (int i);
+ bool _checkRange (int i) const;
FormFieldChoice *parent() const;
};
@@ -281,6 +285,8 @@
// if the check passed (and the checked file size as output parameter in checkedFileSize)
// otherwise a nullptr is returned
GooString* getCheckedSignature(Goffset *checkedFileSize);
+
+ const GooString *getSignature() const;
};
//------------------------------------------------------------------------
@@ -297,11 +303,11 @@
virtual ~FormField();
// Accessors.
- FormFieldType getType() { return type; }
+ FormFieldType getType() const { return type; }
Object* getObj() { return &obj; }
Ref getRef() { return ref; }
- void setReadOnly (bool b) { readOnly = b; }
+ void setReadOnly (bool b);
bool isReadOnly () const { return readOnly; }
GooString* getDefaultAppearance() const { return defaultAppearance; }
@@ -369,15 +375,15 @@
public:
FormFieldButton(PDFDoc *docA, Object *dict, const Ref& ref, FormField *parent, std::set<int> *usedParents);
- FormButtonType getButtonType () { return btype; }
+ FormButtonType getButtonType () const { return btype; }
bool noToggleToOff () const { return noAllOff; }
// returns gTrue if the state modification is accepted
GBool setState (char *state);
- GBool getState(char *state);
+ GBool getState(const char *state) const;
- char *getAppearanceState() { return appearanceState.isName() ? appearanceState.getName() : NULL; }
+ const char *getAppearanceState() const { return appearanceState.isName() ? appearanceState.getName() : nullptr; }
void fillChildrenSiblingsID () override;
@@ -415,7 +421,7 @@
public:
FormFieldText(PDFDoc *docA, Object *dict, const Ref& ref, FormField *parent, std::set<int> *usedParents);
- GooString* getContent () { return content; }
+ const GooString* getContent () const { return content; }
GooString* getContentCopy ();
void setContentCopy (GooString* new_content);
~FormFieldText();
@@ -439,7 +445,7 @@
void print(int indent = 0);
#endif
- static int tokenizeDA(GooString* daString, GooList* daToks, const char* searchTok);
+ static int tokenizeDA(const GooString* daString, GooList* daToks, const char* searchTok);
protected:
int parseDA(GooList* daToks);
@@ -465,11 +471,11 @@
~FormFieldChoice();
- int getNumChoices() { return numChoices; }
- GooString* getChoice(int i) { return choices ? choices[i].optionName : NULL; }
- GooString* getExportVal (int i) { return choices ? choices[i].exportVal : NULL; }
+ int getNumChoices() const { return numChoices; }
+ const GooString* getChoice(int i) const { return choices ? choices[i].optionName : NULL; }
+ const GooString* getExportVal (int i) const { return choices ? choices[i].exportVal : NULL; }
// For multi-select choices it returns the first one
- GooString* getSelectedChoice();
+ const GooString* getSelectedChoice() const;
//select the i-th choice
void select (int i);
@@ -483,9 +489,9 @@
//only work for editable combo box, set the user-entered text as the current choice
void setEditChoice(GooString* new_content);
- GooString* getEditChoice ();
+ const GooString* getEditChoice () const;
- bool isSelected (int i) { return choices[i].selected; }
+ bool isSelected (int i) const { return choices[i].selected; }
int getNumSelected ();
@@ -538,7 +544,7 @@
~FormFieldSignature();
Object* getByteRange() { return &byte_range; }
- GooString* getSignature() { return signature; }
+ const GooString* getSignature() const { return signature; }
private:
void parseInfo();
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Function.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Function.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Function.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -240,7 +240,7 @@
void transform(double *in, double *out) override;
GBool isOk() override { return ok; }
- GooString *getCodeString() { return codeString; }
+ const GooString *getCodeString() const { return codeString; }
private:
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Gfx.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Gfx.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Gfx.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -38,7 +38,7 @@
// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso at hotmail.it>
// Copyright (C) 2012 Lu Wang <coolwanglu at gmail.com>
// Copyright (C) 2014 Jason Crain <jason at aquaticape.us>
-// Copyright (C) 2017 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
+// Copyright (C) 2017, 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -375,9 +375,10 @@
delete fonts;
}
-GfxFont *GfxResources::lookupFont(char *name) {
+GfxFont *GfxResources::doLookupFont(const char *name) const
+{
GfxFont *font;
- GfxResources *resPtr;
+ const GfxResources *resPtr;
for (resPtr = this; resPtr; resPtr = resPtr->next) {
if (resPtr->fonts) {
@@ -389,7 +390,15 @@
return nullptr;
}
-Object GfxResources::lookupXObject(char *name) {
+GfxFont *GfxResources::lookupFont(const char *name) {
+ return doLookupFont(name);
+}
+
+const GfxFont *GfxResources::lookupFont(const char *name) const {
+ return doLookupFont(name);
+}
+
+Object GfxResources::lookupXObject(const char *name) {
GfxResources *resPtr;
for (resPtr = this; resPtr; resPtr = resPtr->next) {
@@ -403,7 +412,7 @@
return Object(objNull);
}
-Object GfxResources::lookupXObjectNF(char *name) {
+Object GfxResources::lookupXObjectNF(const char *name) {
GfxResources *resPtr;
for (resPtr = this; resPtr; resPtr = resPtr->next) {
@@ -417,7 +426,7 @@
return Object(objNull);
}
-Object GfxResources::lookupMarkedContentNF(char *name) {
+Object GfxResources::lookupMarkedContentNF(const char *name) {
GfxResources *resPtr;
for (resPtr = this; resPtr; resPtr = resPtr->next) {
@@ -445,7 +454,7 @@
return Object(objNull);
}
-GfxPattern *GfxResources::lookupPattern(char *name, OutputDev *out, GfxState *state) {
+GfxPattern *GfxResources::lookupPattern(const char *name, OutputDev *out, GfxState *state) {
GfxResources *resPtr;
GfxPattern *pattern;
@@ -468,7 +477,7 @@
return nullptr;
}
-GfxShading *GfxResources::lookupShading(char *name, OutputDev *out, GfxState *state) {
+GfxShading *GfxResources::lookupShading(const char *name, OutputDev *out, GfxState *state) {
GfxResources *resPtr;
GfxShading *shading;
@@ -485,7 +494,7 @@
return nullptr;
}
-Object GfxResources::lookupGState(char *name) {
+Object GfxResources::lookupGState(const char *name) {
Object obj = lookupGStateNF(name);
if (obj.isNull())
return Object(objNull);
@@ -502,7 +511,7 @@
return obj;
}
-Object GfxResources::lookupGStateNF(char *name) {
+Object GfxResources::lookupGStateNF(const char *name) {
GfxResources *resPtr;
for (resPtr = this; resPtr; resPtr = resPtr->next) {
@@ -3870,7 +3879,7 @@
}
}
-void Gfx::doShowText(GooString *s) {
+void Gfx::doShowText(const GooString *s) {
GfxFont *font;
int wMode;
double riseX, riseY;
@@ -3884,7 +3893,7 @@
Dict *resDict;
Parser *oldParser;
GfxState *savedState;
- char *p;
+ const char *p;
int render;
GBool patternFill;
int len, n, uLen, nChars, nSpaces, i;
@@ -4123,7 +4132,7 @@
}
// NB: this is only called when ocState is false.
-void Gfx::doIncCharCount(GooString *s) {
+void Gfx::doIncCharCount(const GooString *s) {
if (out->needCharCount()) {
out->incCharCount(s->getLength());
}
@@ -4134,7 +4143,7 @@
//------------------------------------------------------------------------
void Gfx::opXObject(Object args[], int numArgs) {
- char *name;
+ const char *name;
if (!ocState && !out->needCharCount()) {
return;
@@ -5022,11 +5031,11 @@
pushMarkedContent();
OCGs *contentConfig = catalog->getOptContentConfig();
- char* name0 = args[0].getName();
+ const char* name0 = args[0].getName();
if ( strncmp( name0, "OC", 2) == 0 && contentConfig) {
if ( numArgs >= 2 ) {
if (args[1].isName()) {
- char* name1 = args[1].getName();
+ const char* name1 = args[1].getName();
MarkedContentStack *mc = mcStack;
mc->kind = gfxMCOptionalContent;
Object markedContent = res->lookupMarkedContentNF( name1 );
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Gfx.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Gfx.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Gfx.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -22,6 +22,7 @@
// Copyright (C) 2010 David Benjamin <davidben at mit.edu>
// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger at googlemail.com>
// Copyright (C) 2013 Fabio D'Urso <fabiodurso at hotmail.it>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -115,19 +116,21 @@
GfxResources(const GfxResources &) = delete;
GfxResources& operator=(const GfxResources &other) = delete;
- GfxFont *lookupFont(char *name);
- Object lookupXObject(char *name);
- Object lookupXObjectNF(char *name);
- Object lookupMarkedContentNF(char *name);
+ GfxFont *lookupFont(const char *name);
+ const GfxFont *lookupFont(const char *name) const;
+ Object lookupXObject(const char *name);
+ Object lookupXObjectNF(const char *name);
+ Object lookupMarkedContentNF(const char *name);
Object lookupColorSpace(const char *name);
- GfxPattern *lookupPattern(char *name, OutputDev *out, GfxState *state);
- GfxShading *lookupShading(char *name, OutputDev *out, GfxState *state);
- Object lookupGState(char *name);
- Object lookupGStateNF(char *name);
+ GfxPattern *lookupPattern(const char *name, OutputDev *out, GfxState *state);
+ GfxShading *lookupShading(const char *name, OutputDev *out, GfxState *state);
+ Object lookupGState(const char *name);
+ Object lookupGStateNF(const char *name);
GfxResources *getNext() { return next; }
private:
+ GfxFont *doLookupFont(const char *name) const;
GfxFontDict *fonts;
Object xObjDict;
@@ -358,8 +361,8 @@
void opMoveShowText(Object args[], int numArgs);
void opMoveSetShowText(Object args[], int numArgs);
void opShowSpaceText(Object args[], int numArgs);
- void doShowText(GooString *s);
- void doIncCharCount(GooString *s);
+ void doShowText(const GooString *s);
+ void doIncCharCount(const GooString *s);
// XObject operators
void opXObject(Object args[], int numArgs);
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxFont.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxFont.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxFont.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -32,6 +32,7 @@
// Copyright (C) 2012, 2017 Thomas Freitag <Thomas.Freitag at alfa.de>
// Copyright (C) 2013-2016, 2018 Jason Crain <jason at aquaticape.us>
// Copyright (C) 2014 Olly Betts <olly at survex.com>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -870,7 +871,7 @@
// Parse character names of the form 'Axx', 'xx', 'Ann', 'ABnn', or
// 'nn', where 'A' and 'B' are any letters, 'xx' is two hex digits,
// and 'nn' is decimal digits.
-static GBool parseNumericName(char *s, GBool hex, unsigned int *u) {
+static GBool parseNumericName(const char *s, GBool hex, unsigned int *u) {
char *endptr;
// Strip leading alpha characters.
@@ -1553,9 +1554,9 @@
return 0;
}
-int Gfx8BitFont::getNextChar(char *s, int len, CharCode *code,
+int Gfx8BitFont::getNextChar(const char *s, int len, CharCode *code,
Unicode **u, int *uLen,
- double *dx, double *dy, double *ox, double *oy) {
+ double *dx, double *dy, double *ox, double *oy) const {
CharCode c;
*code = c = (CharCode)(*s & 0xff);
@@ -1565,8 +1566,7 @@
return 1;
}
-CharCodeToUnicode *Gfx8BitFont::getToUnicode() {
- ctu->incRefCnt();
+const CharCodeToUnicode *Gfx8BitFont::getToUnicode() const {
return ctu;
}
@@ -2051,9 +2051,9 @@
}
}
-int GfxCIDFont::getNextChar(char *s, int len, CharCode *code,
+int GfxCIDFont::getNextChar(const char *s, int len, CharCode *code,
Unicode **u, int *uLen,
- double *dx, double *dy, double *ox, double *oy) {
+ double *dx, double *dy, double *ox, double *oy) const {
CID cid;
CharCode dummy;
double w, h, vx, vy;
@@ -2125,10 +2125,7 @@
return cMap ? cMap->getWMode() : 0;
}
-CharCodeToUnicode *GfxCIDFont::getToUnicode() {
- if (ctu) {
- ctu->incRefCnt();
- }
+const CharCodeToUnicode *GfxCIDFont::getToUnicode() const {
return ctu;
}
@@ -2324,7 +2321,7 @@
} else {
error(errSyntaxError, -1, "Unknown character collection {0:t}\n",
getCollection());
- if ((ctu = getToUnicode()) != nullptr) {
+ if (ctu) {
CharCode cid;
for (cid = 0;cid < n ;cid++) {
Unicode *ucode;
@@ -2337,7 +2334,6 @@
humap[cid*N_UCS_CANDIDATES+i] = 0;
}
}
- ctu->decRefCnt();
}
}
// map CID -> Unicode -> GID
@@ -2395,7 +2391,7 @@
return codeToGID;
}
-double GfxCIDFont::getWidth(CID cid) {
+double GfxCIDFont::getWidth(CID cid) const {
double w;
int a, b, m;
@@ -2419,7 +2415,7 @@
return w;
}
-double GfxCIDFont::getWidth (char* s, int len) {
+double GfxCIDFont::getWidth (char* s, int len) const {
int nUsed;
CharCode c;
@@ -2482,7 +2478,7 @@
gfree(fonts);
}
-GfxFont *GfxFontDict::lookup(char *tag) {
+GfxFont *GfxFontDict::lookup(const char *tag) {
int i;
for (i = 0; i < numFonts; ++i) {
@@ -2506,7 +2502,7 @@
h *= 16777619;
}
- void hash(char *p, int n) {
+ void hash(const char *p, int n) {
int i;
for (i = 0; i < n; ++i) {
hash(p[i]);
@@ -2531,8 +2527,8 @@
void GfxFontDict::hashFontObject1(Object *obj, FNVHash *h) {
Object obj2;
- GooString *s;
- char *p;
+ const GooString *s;
+ const char *p;
double r;
int n, i;
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxFont.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxFont.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxFont.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -23,6 +23,7 @@
// Copyright (C) 2011, 2012, 2014 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2015, 2018 Jason Crain <jason at aquaticape.us>
// Copyright (C) 2015 Thomas Freitag <Thomas.Freitag at alfa.de>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -189,30 +190,30 @@
void decRefCnt();
// Get font tag.
- GooString *getTag() { return tag; }
+ const GooString *getTag() const { return tag; }
// Get font dictionary ID.
- Ref *getID() { return &id; }
+ const Ref *getID() const { return &id; }
// Does this font match the tag?
- GBool matches(char *tagA) { return !tag->cmp(tagA); }
+ GBool matches(const char *tagA) const { return !tag->cmp(tagA); }
// Get font family name.
GooString *getFamily() { return family; }
// Get font stretch.
- Stretch getStretch() { return stretch; }
+ Stretch getStretch() const { return stretch; }
// Get font weight.
- Weight getWeight() { return weight; }
+ Weight getWeight() const { return weight; }
// Get the original font name (ignornig any munging that might have
// been done to map to a canonical Base-14 font name).
- GooString *getName() { return name; }
+ const GooString *getName() const { return name; }
// Get font type.
- GfxFontType getType() { return type; }
- virtual GBool isCIDFont() { return gFalse; }
+ GfxFontType getType() const { return type; }
+ virtual GBool isCIDFont() const { return gFalse; }
// Get embedded font ID, i.e., a ref for the font file stream.
// Returns false if there is no embedded font.
@@ -242,7 +243,7 @@
GBool isBold() { return flags & fontBold; }
// Return the Unicode map.
- virtual CharCodeToUnicode *getToUnicode() = 0;
+ virtual const CharCodeToUnicode *getToUnicode() const = 0;
// Return the font matrix.
double *getFontMatrix() { return fontMat; }
@@ -273,9 +274,9 @@
// is the number of entries available in <u>, and <uLen> is set to
// the number actually used. Returns the number of bytes used by
// the char code.
- virtual int getNextChar(char *s, int len, CharCode *code,
+ virtual int getNextChar(const char *s, int len, CharCode *code,
Unicode **u, int *uLen,
- double *dx, double *dy, double *ox, double *oy) = 0;
+ double *dx, double *dy, double *ox, double *oy) const = 0;
// Does this font have a toUnicode map?
GBool hasToUnicodeCMap() { return hasToUnicode; }
@@ -329,15 +330,15 @@
Gfx8BitFont(XRef *xref, const char *tagA, Ref idA, GooString *nameA,
GfxFontType typeA, Ref embFontIDA, Dict *fontDict);
- int getNextChar(char *s, int len, CharCode *code,
+ int getNextChar(const char *s, int len, CharCode *code,
Unicode **u, int *uLen,
- double *dx, double *dy, double *ox, double *oy) override;
+ double *dx, double *dy, double *ox, double *oy) const override;
// Return the encoding.
char **getEncoding() { return enc; }
// Return the Unicode map.
- CharCodeToUnicode *getToUnicode() override;
+ const CharCodeToUnicode *getToUnicode() const override;
// Return the character name associated with <code>.
char *getCharName(int code) { return enc[code]; }
@@ -392,17 +393,17 @@
GfxCIDFont(XRef *xref, const char *tagA, Ref idA, GooString *nameA,
GfxFontType typeA, Ref embFontIDA, Dict *fontDict);
- GBool isCIDFont() override { return gTrue; }
+ GBool isCIDFont() const override { return gTrue; }
- int getNextChar(char *s, int len, CharCode *code,
+ int getNextChar(const char *s, int len, CharCode *code,
Unicode **u, int *uLen,
- double *dx, double *dy, double *ox, double *oy) override;
+ double *dx, double *dy, double *ox, double *oy) const override;
// Return the writing mode (0=horizontal, 1=vertical).
int getWMode() override;
// Return the Unicode map.
- CharCodeToUnicode *getToUnicode() override;
+ const CharCodeToUnicode *getToUnicode() const override;
// Get the collection name (<registry>-<ordering>).
GooString *getCollection();
@@ -414,7 +415,7 @@
int *getCodeToGIDMap(FoFiTrueType *ff, int *length);
- double getWidth(char* s, int len);
+ double getWidth(char* s, int len) const;
private:
~GfxCIDFont();
@@ -421,7 +422,7 @@
int mapCodeToGID(FoFiTrueType *ff, int cmapi,
Unicode unicode, GBool wmode);
- double getWidth(CID cid); // Get width of a character.
+ double getWidth(CID cid) const; // Get width of a character.
GooString *collection; // collection name
CMap *cMap; // char code --> CID
@@ -451,7 +452,7 @@
GfxFontDict& operator=(const GfxFontDict &) = delete;
// Get the specified font.
- GfxFont *lookup(char *tag);
+ GfxFont *lookup(const char *tag);
// Iterative access.
int getNumFonts() { return numFonts; }
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxState.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxState.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/GfxState.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -30,6 +30,7 @@
// Copyright (C) 2015 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2016 Marek Kasik <mkasik at redhat.com>
// Copyright (C) 2017 Oliver Sander <oliver.sander at tu-dresden.de>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -43,6 +44,7 @@
#endif
#include <algorithm>
+#include <memory>
#include <stddef.h>
#include <math.h>
#include <string.h>
@@ -2481,7 +2483,7 @@
GfxColorSpace *baseA;
int indexHighA;
Object obj1;
- char *s;
+ const char *s;
int i, j;
if (arr->getLength() != 4) {
@@ -4914,10 +4916,17 @@
}
}
delete bitBuf;
- if (typeA == 5 && nVerticesA > 0) {
+ if (typeA == 5 && nVerticesA > 0 && vertsPerRow > 0) {
nRows = nVerticesA / vertsPerRow;
nTrianglesA = (nRows - 1) * 2 * (vertsPerRow - 1);
- trianglesA = (int (*)[3])gmallocn(nTrianglesA * 3, sizeof(int));
+ trianglesA = (int (*)[3])gmallocn_checkoverflow(nTrianglesA * 3, sizeof(int));
+ if (unlikely(!trianglesA)) {
+ gfree(verticesA);
+ for (i = 0; i < nFuncsA; ++i) {
+ delete funcsA[i];
+ }
+ return nullptr;
+ }
k = 0;
for (i = 0; i < nRows - 1; ++i) {
for (j = 0; j < vertsPerRow - 1; ++j) {
@@ -5100,7 +5109,6 @@
Guint xi, yi;
double c[4][gfxColorMaxComps];
Guint ci;
- GfxShadingBitBuf *bitBuf;
Object obj1;
int i, j;
@@ -5178,7 +5186,7 @@
nPatchesA = 0;
patchesA = nullptr;
patchesSize = 0;
- bitBuf = new GfxShadingBitBuf(str);
+ std::unique_ptr<GfxShadingBitBuf> bitBuf(new GfxShadingBitBuf(str));
while (1) {
if (!bitBuf->getBits(flagBits, &flag)) {
break;
@@ -5274,6 +5282,7 @@
break;
case 1:
if (nPatchesA == 0) {
+ gfree(patchesA);
return nullptr;
}
p->x[0][0] = patchesA[nPatchesA-1].x[0][3];
@@ -5309,6 +5318,7 @@
break;
case 2:
if (nPatchesA == 0) {
+ gfree(patchesA);
return nullptr;
}
p->x[0][0] = patchesA[nPatchesA-1].x[3][3];
@@ -5344,6 +5354,7 @@
break;
case 3:
if (nPatchesA == 0) {
+ gfree(patchesA);
return nullptr;
}
p->x[0][0] = patchesA[nPatchesA-1].x[3][0];
@@ -5422,6 +5433,7 @@
break;
case 1:
if (nPatchesA == 0) {
+ gfree(patchesA);
return nullptr;
}
p->x[0][0] = patchesA[nPatchesA-1].x[0][3];
@@ -5465,6 +5477,7 @@
break;
case 2:
if (nPatchesA == 0) {
+ gfree(patchesA);
return nullptr;
}
p->x[0][0] = patchesA[nPatchesA-1].x[3][3];
@@ -5508,6 +5521,7 @@
break;
case 3:
if (nPatchesA == 0) {
+ gfree(patchesA);
return nullptr;
}
p->x[0][0] = patchesA[nPatchesA-1].x[3][0];
@@ -5554,7 +5568,6 @@
++nPatchesA;
bitBuf->flushBits();
}
- delete bitBuf;
if (typeA == 6) {
for (i = 0; i < nPatchesA; ++i) {
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/GlobalParams.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/GlobalParams.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/GlobalParams.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -37,6 +37,7 @@
// Copyright (C) 2013, 2014 Jason Crain <jason at aquaticape.us>
// Copyright (C) 2017 Christoph Cullmann <cullmann at kde.org>
// Copyright (C) 2017 Jean Ghali <jghali at libertysurf.fr>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -262,7 +263,7 @@
~SysFontList();
SysFontList(const SysFontList &) = delete;
SysFontList& operator=(const SysFontList &) = delete;
- SysFontInfo *find(GooString *name, GBool isFixedWidth, GBool exact);
+ SysFontInfo *find(const GooString *name, GBool isFixedWidth, GBool exact);
#ifdef _WIN32
void scanWindowsFonts(GooString *winFontDir);
@@ -288,7 +289,7 @@
deleteGooList(fonts, SysFontInfo);
}
-SysFontInfo *SysFontList::find(GooString *name, GBool fixedWidth, GBool exact) {
+SysFontInfo *SysFontList::find(const GooString *name, GBool fixedWidth, GBool exact) {
GooString *name2;
GBool bold, italic, oblique;
SysFontInfo *fi;
@@ -953,7 +954,7 @@
return lang;
}
-static FcPattern *buildFcPattern(GfxFont *font, GooString *base14Name)
+static FcPattern *buildFcPattern(GfxFont *font, const GooString *base14Name)
{
int weight = -1,
slant = -1,
@@ -965,12 +966,13 @@
FcPattern *p;
// this is all heuristics will be overwritten if font had proper info
- name = (base14Name == nullptr) ? font->getName()->getCString() : base14Name->getCString();
-
+ GooString copiedNameGooString(((base14Name == nullptr) ? font->getName() : base14Name)->getCString());
+ name = copiedNameGooString.getCString();
+
modifiers = strchr (name, ',');
if (modifiers == nullptr)
modifiers = strchr (name, '-');
-
+
// remove the - from the names, for some reason, Fontconfig does not
// understand "MS-Mincho" but does with "MS Mincho"
int len = strlen(name);
@@ -1106,7 +1108,7 @@
SysFontInfo *fi = nullptr;
FcPattern *p=nullptr;
GooString *path = nullptr;
- GooString *fontName = font->getName();
+ const GooString *fontName = font->getName();
GooString substituteName;
if (!fontName) return nullptr;
lockGlobalParams;
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/GlobalParamsWin.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/GlobalParamsWin.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/GlobalParamsWin.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -10,6 +10,7 @@
// Copyright (C) 2013 Dmytro Morgun <lztoad at gmail.com>
// Copyright (C) 2017 Christoph Cullmann <cullmann at kde.org>
// Copyright (C) 2017, 2018 Albert Astals Cid <aacid at kde.org>
+ // Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
TODO: instead of a fixed mapping defined in displayFontTab, it could
scan the whole fonts directory, parse TTF files and build font
@@ -553,7 +554,7 @@
GooString *base14Name) {
SysFontInfo *fi;
GooString *path = nullptr;
- GooString *fontName = font->getName();
+ const GooString *fontName = font->getName();
if (!fontName) return nullptr;
lockGlobalParams;
setupBaseFonts(nullptr);
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/JPEG2000Stream.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/JPEG2000Stream.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/JPEG2000Stream.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -4,7 +4,7 @@
//
// A JPX stream decoder using OpenJPEG
//
-// Copyright 2008-2010, 2012, 2017 Albert Astals Cid <aacid at kde.org>
+// Copyright 2008-2010, 2012, 2017, 2018 Albert Astals Cid <aacid at kde.org>
// Copyright 2011 Daniel Glöckner <daniel-gl at gmx.net>
// Copyright 2014, 2016 Thomas Freitag <Thomas.Freitag at alfa.de>
// Copyright 2013, 2014 Adrian Johnson <ajohnson at redneon.com>
@@ -39,7 +39,6 @@
int ccounter;
int npixels;
int ncomps;
- GBool indexed;
GBool inited;
int smaskInData;
void init2(OPJ_CODEC_FORMAT format, unsigned char *data, int length, GBool indexed);
@@ -81,7 +80,6 @@
priv->image = nullptr;
priv->npixels = 0;
priv->ncomps = 0;
- priv->indexed = gFalse;
}
JPXStream::~JPXStream() {
@@ -223,9 +221,10 @@
int bufSize = BUFFER_INITIAL_SIZE;
if (oLen.isInt()) bufSize = oLen.getInt();
+ GBool indexed = gFalse;
if (cspace.isArray() && cspace.arrayGetLength() > 0) {
- Object cstype = cspace.arrayGet(0);
- if (cstype.isName("Indexed")) priv->indexed = gTrue;
+ const Object cstype = cspace.arrayGet(0);
+ if (cstype.isName("Indexed")) indexed = gTrue;
}
priv->smaskInData = 0;
@@ -233,7 +232,7 @@
int length = 0;
unsigned char *buf = str->toUnsignedChars(&length, bufSize);
- priv->init2(OPJ_CODEC_JP2, buf, length, priv->indexed);
+ priv->init2(OPJ_CODEC_JP2, buf, length, indexed);
gfree(buf);
if (priv->image) {
@@ -264,7 +263,7 @@
sgndcorr = 1 << (priv->image->comps[0].prec - 1);
for (int i = 0; i < priv->npixels; i++) {
int r = priv->image->comps[component].data[i];
- *(cdata++) = adjustComp(r, adjust, depth, sgndcorr, priv->indexed);
+ *(cdata++) = adjustComp(r, adjust, depth, sgndcorr, indexed);
}
}
} else {
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Link.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Link.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Link.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -16,10 +16,12 @@
// Copyright (C) 2006, 2008 Pino Toscano <pino at kde.org>
// Copyright (C) 2007, 2010, 2011 Carlos Garcia Campos <carlosgc at gnome.org>
// Copyright (C) 2008 Hugo Mercier <hmercier31 at gmail.com>
-// Copyright (C) 2008-2010, 2012-2014, 2016, 2017 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008-2010, 2012-2014, 2016-2018 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2009 Kovid Goyal <kovid at kovidgoyal.net>
// Copyright (C) 2009 Ilya Gorenbein <igorenbein at finjan.com>
// Copyright (C) 2012 Tobias Koening <tobias.koenig at kdab.com>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
+// Copyright (C) 2018 Intevation GmbH <intevation at intevation.de>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -50,8 +52,14 @@
//------------------------------------------------------------------------
// LinkAction
//------------------------------------------------------------------------
+LinkAction::LinkAction() : nextActionList(nullptr) {
+}
-LinkAction *LinkAction::parseDest(Object *obj) {
+LinkAction::~LinkAction() {
+ delete nextActionList;
+}
+
+LinkAction *LinkAction::parseDest(const Object *obj) {
LinkAction *action;
action = new LinkGoTo(obj);
@@ -62,7 +70,14 @@
return action;
}
-LinkAction *LinkAction::parseAction(Object *obj, GooString *baseURI) {
+LinkAction *LinkAction::parseAction(const Object *obj, const GooString *baseURI)
+{
+ std::set<int> seenNextActions;
+ return parseAction(obj, baseURI, &seenNextActions);
+}
+
+LinkAction *LinkAction::parseAction(const Object *obj, const GooString *baseURI,
+ std::set<int> *seenNextActions) {
LinkAction *action;
if (!obj->isDict()) {
@@ -119,6 +134,10 @@
} else if (obj2.isName("SetOCGState")) {
action = new LinkOCGState(obj);
+ // Hide action
+ } else if (obj2.isName("Hide")) {
+ action = new LinkHide(obj);
+
// unknown action
} else if (obj2.isName()) {
action = new LinkUnknown(obj2.getName());
@@ -134,14 +153,73 @@
delete action;
return nullptr;
}
+
+ if (!action) {
+ return nullptr;
+ }
+
+ // parse the next actions
+ const Object nextObj = obj->dictLookup("Next");
+ GooList *actionList = nullptr;
+ if (nextObj.isDict()) {
+
+ // Prevent circles in the tree by checking the ref against used refs in
+ // our current tree branch.
+ const Object nextRefObj = obj->dictLookupNF("Next");
+ if (nextRefObj.isRef()) {
+ const Ref ref = nextRefObj.getRef();
+ if (!seenNextActions->insert(ref.num).second) {
+ error(errSyntaxWarning, -1, "parseAction: Circular next actions detected.");
+ return action;
+ }
+ }
+
+ actionList = new GooList(1);
+ actionList->append(parseAction(&nextObj, nullptr, seenNextActions));
+ } else if (nextObj.isArray()) {
+ const Array *a = nextObj.getArray();
+ const int n = a->getLength();
+ actionList = new GooList(n);
+ for (int i = 0; i < n; ++i) {
+ const Object obj3 = a->get(i);
+ if (!obj3.isDict()) {
+ error(errSyntaxWarning, -1, "parseAction: Next array does not contain only dicts");
+ continue;
+ }
+
+ // Similar circle check as above.
+ const Object obj3Ref = a->getNF(i);
+ if (obj3Ref.isRef()) {
+ const Ref ref = obj3Ref.getRef();
+ if (!seenNextActions->insert(ref.num).second) {
+ error(errSyntaxWarning, -1, "parseAction: Circular next actions detected in array.");
+ return action;
+ }
+ }
+
+ actionList->append(parseAction(&obj3, nullptr, seenNextActions));
+ }
+ }
+
+ action->setNextActions(actionList);
+
return action;
}
+const GooList *LinkAction::nextActions() const {
+ return nextActionList;
+}
+
+void LinkAction::setNextActions(GooList *actions) {
+ delete nextActionList;
+ nextActionList = actions;
+}
+
//------------------------------------------------------------------------
// LinkDest
//------------------------------------------------------------------------
-LinkDest::LinkDest(Array *a) {
+LinkDest::LinkDest(const Array *a) {
// initialize fields
left = bottom = right = top = zoom = 0;
changeLeft = changeTop = changeZoom = gFalse;
@@ -339,7 +417,7 @@
return;
}
-LinkDest::LinkDest(LinkDest *dest) {
+LinkDest::LinkDest(const LinkDest *dest) {
kind = dest->kind;
pageIsRef = dest->pageIsRef;
if (pageIsRef)
@@ -361,7 +439,7 @@
// LinkGoTo
//------------------------------------------------------------------------
-LinkGoTo::LinkGoTo(Object *destObj) {
+LinkGoTo::LinkGoTo(const Object *destObj) {
dest = nullptr;
namedDest = nullptr;
@@ -441,7 +519,7 @@
// LinkLaunch
//------------------------------------------------------------------------
-LinkLaunch::LinkLaunch(Object *actionObj) {
+LinkLaunch::LinkLaunch(const Object *actionObj) {
fileName = nullptr;
params = nullptr;
@@ -489,8 +567,8 @@
// LinkURI
//------------------------------------------------------------------------
-LinkURI::LinkURI(Object *uriObj, GooString *baseURI) {
- GooString *uri2;
+LinkURI::LinkURI(const Object *uriObj, const GooString *baseURI) {
+ const GooString *uri2;
int n;
char c;
@@ -538,7 +616,7 @@
// LinkNamed
//------------------------------------------------------------------------
-LinkNamed::LinkNamed(Object *nameObj) {
+LinkNamed::LinkNamed(const Object *nameObj) {
name = nullptr;
if (nameObj->isName()) {
name = new GooString(nameObj->getName());
@@ -555,7 +633,7 @@
// LinkMovie
//------------------------------------------------------------------------
-LinkMovie::LinkMovie(Object *obj) {
+LinkMovie::LinkMovie(const Object *obj) {
annotRef.num = -1;
annotTitle = nullptr;
@@ -576,7 +654,7 @@
tmp = obj->dictLookup("Operation");
if (tmp.isName()) {
- char *name = tmp.getName();
+ const char *name = tmp.getName();
if (!strcmp(name, "Play")) {
operation = operationTypePlay;
@@ -603,7 +681,7 @@
// LinkSound
//------------------------------------------------------------------------
-LinkSound::LinkSound(Object *soundObj) {
+LinkSound::LinkSound(const Object *soundObj) {
volume = 1.0;
sync = gFalse;
repeat = gFalse;
@@ -645,7 +723,7 @@
// LinkRendition
//------------------------------------------------------------------------
-LinkRendition::LinkRendition(Object *obj) {
+LinkRendition::LinkRendition(const Object *obj) {
operation = NoRendition;
media = nullptr;
js = nullptr;
@@ -742,7 +820,7 @@
//------------------------------------------------------------------------
// LinkOCGState
//------------------------------------------------------------------------
-LinkOCGState::LinkOCGState(Object *obj) {
+LinkOCGState::LinkOCGState(const Object *obj) {
stateList = new GooList();
preserveRB = gTrue;
@@ -756,7 +834,7 @@
if (stList)
stateList->append(stList);
- char *name = obj2.getName();
+ const char *name = obj2.getName();
stList = new StateList();
stList->list = new GooList();
if (!strcmp (name, "ON")) {
@@ -810,10 +888,34 @@
}
//------------------------------------------------------------------------
+// LinkHide
+//------------------------------------------------------------------------
+
+LinkHide::LinkHide(const Object *hideObj) {
+ targetName = nullptr;
+ show = false; // Default
+
+ if (hideObj->isDict()) {
+ const Object targetObj = hideObj->dictLookup("T");
+ if (targetObj.isString()) {
+ targetName = targetObj.getString()->copy();
+ }
+ const Object shouldHide = hideObj->dictLookup("H");
+ if (shouldHide.isBool()) {
+ show = !shouldHide.getBool();
+ }
+ }
+}
+
+LinkHide::~LinkHide() {
+ delete targetName;
+}
+
+//------------------------------------------------------------------------
// LinkUnknown
//------------------------------------------------------------------------
-LinkUnknown::LinkUnknown(char *actionA) {
+LinkUnknown::LinkUnknown(const char *actionA) {
action = new GooString(actionA);
}
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Link.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Link.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Link.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -18,6 +18,8 @@
// Copyright (C) 2010, 2011 Carlos Garcia Campos <carlosgc at gnome.org>
// Copyright (C) 2012 Tobias Koening <tobias.koenig at kdab.com>
// Copyright (C) 2018 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
+// Copyright (C) 2018 Intevation GmbH <intevation at intevation.de>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -32,6 +34,8 @@
#endif
#include "Object.h"
+#include <memory>
+#include <set>
class GooString;
class GooList;
@@ -57,6 +61,7 @@
actionSound, // sound action
actionJavaScript, // JavaScript action
actionOCGState, // Set-OCG-State action
+ actionHide, // Hide action
actionUnknown // anything else
};
@@ -63,24 +68,36 @@
class LinkAction {
public:
- LinkAction() = default;
+ LinkAction();
LinkAction(const LinkAction &) = delete;
LinkAction& operator=(const LinkAction &other) = delete;
// Destructor.
- virtual ~LinkAction() {}
+ virtual ~LinkAction();
// Was the LinkAction created successfully?
- virtual GBool isOk() = 0;
+ virtual GBool isOk() const = 0;
// Check link action type.
- virtual LinkActionKind getKind() = 0;
+ virtual LinkActionKind getKind() const = 0;
// Parse a destination (old-style action) name, string, or array.
- static LinkAction *parseDest(Object *obj);
+ static LinkAction *parseDest(const Object *obj);
// Parse an action dictionary.
- static LinkAction *parseAction(Object *obj, GooString *baseURI = NULL);
+ static LinkAction *parseAction(const Object *obj, const GooString *baseURI = nullptr);
+
+ // A List of the next actions to execute in order.
+ // The list contains pointer to LinkAction objects.
+ const GooList *nextActions() const;
+
+ // Sets the next action list. Takes ownership of the actions.
+ void setNextActions(GooList *actions);
+
+private:
+ static LinkAction *parseAction(const Object *obj, const GooString *baseURI, std::set<int> *seenNextActions);
+
+ GooList *nextActionList;
};
//------------------------------------------------------------------------
@@ -102,27 +119,27 @@
public:
// Build a LinkDest from the array.
- LinkDest(Array *a);
+ LinkDest(const Array *a);
// Copy a LinkDest.
- LinkDest *copy() { return new LinkDest(this); }
+ LinkDest *copy() const { return new LinkDest(this); }
// Was the LinkDest created successfully?
- GBool isOk() { return ok; }
+ GBool isOk() const { return ok; }
// Accessors.
- LinkDestKind getKind() { return kind; }
- GBool isPageRef() { return pageIsRef; }
- int getPageNum() { return pageNum; }
- Ref getPageRef() { return pageRef; }
- double getLeft() { return left; }
- double getBottom() { return bottom; }
- double getRight() { return right; }
- double getTop() { return top; }
- double getZoom() { return zoom; }
- GBool getChangeLeft() { return changeLeft; }
- GBool getChangeTop() { return changeTop; }
- GBool getChangeZoom() { return changeZoom; }
+ LinkDestKind getKind() const { return kind; }
+ GBool isPageRef() const { return pageIsRef; }
+ int getPageNum() const { return pageNum; }
+ Ref getPageRef() const { return pageRef; }
+ double getLeft() const { return left; }
+ double getBottom() const { return bottom; }
+ double getRight() const { return right; }
+ double getTop() const { return top; }
+ double getZoom() const { return zoom; }
+ GBool getChangeLeft() const { return changeLeft; }
+ GBool getChangeTop() const { return changeTop; }
+ GBool getChangeZoom() const { return changeZoom; }
private:
@@ -141,7 +158,7 @@
// destFitV/BV use changeLeft
GBool ok; // set if created successfully
- LinkDest(LinkDest *dest);
+ LinkDest(const LinkDest *dest);
};
//------------------------------------------------------------------------
@@ -152,18 +169,18 @@
public:
// Build a LinkGoTo from a destination (dictionary, name, or string).
- LinkGoTo(Object *destObj);
+ LinkGoTo(const Object *destObj);
// Destructor.
~LinkGoTo();
// Was the LinkGoTo created successfully?
- GBool isOk() override { return dest || namedDest; }
+ GBool isOk() const override { return dest || namedDest; }
// Accessors.
- LinkActionKind getKind() override { return actionGoTo; }
- LinkDest *getDest() { return dest; }
- GooString *getNamedDest() { return namedDest; }
+ LinkActionKind getKind() const override { return actionGoTo; }
+ const LinkDest *getDest() const { return dest; }
+ const GooString *getNamedDest() const { return namedDest; }
private:
@@ -188,13 +205,13 @@
~LinkGoToR();
// Was the LinkGoToR created successfully?
- GBool isOk() override { return fileName && (dest || namedDest); }
+ GBool isOk() const override { return fileName && (dest || namedDest); }
// Accessors.
- LinkActionKind getKind() override { return actionGoToR; }
- GooString *getFileName() { return fileName; }
- LinkDest *getDest() { return dest; }
- GooString *getNamedDest() { return namedDest; }
+ LinkActionKind getKind() const override { return actionGoToR; }
+ const GooString *getFileName() const { return fileName; }
+ const LinkDest *getDest() const { return dest; }
+ const GooString *getNamedDest() const { return namedDest; }
private:
@@ -213,18 +230,18 @@
public:
// Build a LinkLaunch from an action dictionary.
- LinkLaunch(Object *actionObj);
+ LinkLaunch(const Object *actionObj);
// Destructor.
~LinkLaunch();
// Was the LinkLaunch created successfully?
- GBool isOk() override { return fileName != NULL; }
+ GBool isOk() const override { return fileName != NULL; }
// Accessors.
- LinkActionKind getKind() override { return actionLaunch; }
- GooString *getFileName() { return fileName; }
- GooString *getParams() { return params; }
+ LinkActionKind getKind() const override { return actionLaunch; }
+ const GooString *getFileName() const { return fileName; }
+ const GooString *getParams() const { return params; }
private:
@@ -240,17 +257,17 @@
public:
// Build a LinkURI given the URI (string) and base URI.
- LinkURI(Object *uriObj, GooString *baseURI);
+ LinkURI(const Object *uriObj, const GooString *baseURI);
// Destructor.
~LinkURI();
// Was the LinkURI created successfully?
- GBool isOk() override { return uri != NULL; }
+ GBool isOk() const override { return uri != NULL; }
// Accessors.
- LinkActionKind getKind() override { return actionURI; }
- GooString *getURI() { return uri; }
+ LinkActionKind getKind() const override { return actionURI; }
+ const GooString *getURI() const { return uri; }
private:
@@ -265,14 +282,14 @@
public:
// Build a LinkNamed given the action name.
- LinkNamed(Object *nameObj);
+ LinkNamed(const Object *nameObj);
~LinkNamed();
- GBool isOk() override { return name != NULL; }
+ GBool isOk() const override { return name != NULL; }
- LinkActionKind getKind() override { return actionNamed; }
- GooString *getName() { return name; }
+ LinkActionKind getKind() const override { return actionNamed; }
+ const GooString *getName() const { return name; }
private:
@@ -294,21 +311,21 @@
operationTypeStop
};
- LinkMovie(Object *obj);
+ LinkMovie(const Object *obj);
~LinkMovie();
- GBool isOk() override { return annotRef.num >= 0 || annotTitle != NULL; }
- LinkActionKind getKind() override { return actionMovie; }
+ GBool isOk() const override { return annotRef.num >= 0 || annotTitle != NULL; }
+ LinkActionKind getKind() const override { return actionMovie; }
// a movie action stores either an indirect reference to a movie annotation
// or the movie annotation title
- GBool hasAnnotRef() { return annotRef.num >= 0; }
- GBool hasAnnotTitle() { return annotTitle != NULL; }
- Ref *getAnnotRef() { return &annotRef; }
- GooString *getAnnotTitle() { return annotTitle; }
+ GBool hasAnnotRef() const { return annotRef.num >= 0; }
+ GBool hasAnnotTitle() const { return annotTitle != NULL; }
+ const Ref *getAnnotRef() const { return &annotRef; }
+ const GooString *getAnnotTitle() const { return annotTitle; }
- OperationType getOperation() { return operation; }
+ OperationType getOperation() const { return operation; }
private:
@@ -336,25 +353,25 @@
ResumeRendition
};
- LinkRendition(Object *Obj);
+ LinkRendition(const Object *Obj);
~LinkRendition();
- GBool isOk() override { return true; }
+ GBool isOk() const override { return true; }
- LinkActionKind getKind() override { return actionRendition; }
+ LinkActionKind getKind() const override { return actionRendition; }
- GBool hasRenditionObject() { return renditionObj.isDict(); }
- Object* getRenditionObject() { return &renditionObj; }
+ GBool hasRenditionObject() const { return renditionObj.isDict(); }
+ const Object* getRenditionObject() const { return &renditionObj; }
- GBool hasScreenAnnot() { return screenRef.isRef(); }
- Ref getScreenAnnot() { return screenRef.getRef(); }
+ GBool hasScreenAnnot() const { return screenRef.isRef(); }
+ Ref getScreenAnnot() const { return screenRef.getRef(); }
- RenditionOperation getOperation() { return operation; }
+ RenditionOperation getOperation() const { return operation; }
- MediaRendition* getMedia() { return media; }
+ const MediaRendition* getMedia() const { return media; }
- GooString *getScript() { return js; }
+ const GooString *getScript() const { return js; }
private:
@@ -374,19 +391,19 @@
class LinkSound: public LinkAction {
public:
- LinkSound(Object *soundObj);
+ LinkSound(const Object *soundObj);
~LinkSound();
- GBool isOk() override { return sound != NULL; }
+ GBool isOk() const override { return sound != NULL; }
- LinkActionKind getKind() override { return actionSound; }
+ LinkActionKind getKind() const override { return actionSound; }
- double getVolume() { return volume; }
- GBool getSynchronous() { return sync; }
- GBool getRepeat() { return repeat; }
- GBool getMix() { return mix; }
- Sound *getSound() { return sound; }
+ double getVolume() const { return volume; }
+ GBool getSynchronous() const { return sync; }
+ GBool getRepeat() const { return repeat; }
+ GBool getMix() const { return mix; }
+ Sound *getSound() const { return sound; }
private:
@@ -409,10 +426,10 @@
~LinkJavaScript();
- GBool isOk() override { return js != NULL; }
+ GBool isOk() const override { return js != NULL; }
- LinkActionKind getKind() override { return actionJavaScript; }
- GooString *getScript() { return js; }
+ LinkActionKind getKind() const override { return actionJavaScript; }
+ const GooString *getScript() const { return js; }
private:
@@ -424,13 +441,13 @@
//------------------------------------------------------------------------
class LinkOCGState: public LinkAction {
public:
- LinkOCGState(Object *obj);
+ LinkOCGState(const Object *obj);
~LinkOCGState();
- GBool isOk() override { return stateList != NULL; }
+ GBool isOk() const override { return stateList != NULL; }
- LinkActionKind getKind() override { return actionOCGState; }
+ LinkActionKind getKind() const override { return actionOCGState; }
enum State { On, Off, Toggle};
struct StateList {
@@ -442,8 +459,8 @@
GooList *list;
};
- GooList *getStateList() { return stateList; }
- GBool getPreserveRB() { return preserveRB; }
+ const GooList *getStateList() const { return stateList; }
+ GBool getPreserveRB() const { return preserveRB; }
private:
GooList *stateList;
@@ -451,6 +468,39 @@
};
//------------------------------------------------------------------------
+// LinkHide
+//------------------------------------------------------------------------
+
+class LinkHide: public LinkAction {
+public:
+ LinkHide(const Object *hideObj);
+
+ ~LinkHide();
+
+ GBool isOk() const override { return targetName != nullptr; }
+ LinkActionKind getKind() const override { return actionHide; }
+
+ // According to spec the target can be either:
+ // a) A text string containing the fully qualified name of the target
+ // field.
+ // b) An indirect reference to an annotation dictionary.
+ // c) An array of "such dictionaries or text strings".
+ //
+ // While b / c appear to be very uncommon and can't easily be
+ // created with Adobe Acrobat DC. So only support hide
+ // actions with named targets (yet).
+ GBool hasTargetName() const { return targetName != nullptr; }
+ const GooString *getTargetName() const { return targetName; }
+
+ // Should this action show or hide.
+ GBool isShowAction() const { return show; }
+
+private:
+ GooString *targetName;
+ GBool show;
+};
+
+//------------------------------------------------------------------------
// LinkUnknown
//------------------------------------------------------------------------
@@ -458,17 +508,17 @@
public:
// Build a LinkUnknown with the specified action type.
- LinkUnknown(char *actionA);
+ LinkUnknown(const char *actionA);
// Destructor.
~LinkUnknown();
// Was the LinkUnknown create successfully?
- GBool isOk() override { return action != NULL; }
+ GBool isOk() const override { return action != NULL; }
// Accessors.
- LinkActionKind getKind() override { return actionUnknown; }
- GooString *getAction() { return action; }
+ LinkActionKind getKind() const override { return actionUnknown; }
+ const GooString *getAction() const { return action; }
private:
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/MarkedContentOutputDev.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/MarkedContentOutputDev.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/MarkedContentOutputDev.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -69,7 +69,7 @@
}
-void MarkedContentOutputDev::beginMarkedContent(char *name, Dict *properties)
+void MarkedContentOutputDev::beginMarkedContent(const char *name, Dict *properties)
{
int id = -1;
if (properties)
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/MarkedContentOutputDev.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/MarkedContentOutputDev.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/MarkedContentOutputDev.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -109,7 +109,7 @@
CharCode c, int nBytes,
Unicode *u, int uLen) override;
- void beginMarkedContent(char *name, Dict *properties) override;
+ void beginMarkedContent(const char *name, Dict *properties) override;
void endMarkedContent(GfxState *state) override;
const TextSpanArray& getTextSpans() const;
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Movie.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Movie.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Movie.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -6,7 +6,7 @@
// Hugo Mercier <hmercier31[at]gmail.com> (c) 2008
// Pino Toscano <pino at kde.org> (c) 2008
// Carlos Garcia Campos <carlosgc at gnome.org> (c) 2010
-// Albert Astals Cid <aacid at kde.org> (c) 2010, 2017
+// Albert Astals Cid <aacid at kde.org> (c) 2010, 2017, 2018
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -46,7 +46,7 @@
MovieActivationParameters::~MovieActivationParameters() {
}
-void MovieActivationParameters::parseMovieActivation(Object* aDict) {
+void MovieActivationParameters::parseMovieActivation(const Object* aDict) {
Object obj1 = aDict->dictLookup("Start");
if (obj1.isNull()) {
if (obj1.isInt()) {
@@ -125,7 +125,7 @@
obj1 = aDict->dictLookup("Mode");
if (obj1.isName()) {
- char* name = obj1.getName();
+ const char* name = obj1.getName();
if (!strcmp(name, "Once")) {
repeatMode = repeatModeOnce;
} else if (!strcmp(name, "Open")) {
@@ -172,7 +172,7 @@
}
}
-void Movie::parseMovie (Object *movieDict) {
+void Movie::parseMovie (const Object *movieDict) {
fileName = nullptr;
rotationAngle = 0;
width = -1;
@@ -230,7 +230,7 @@
delete fileName;
}
-Movie::Movie(Object *movieDict) {
+Movie::Movie(const Object *movieDict) {
ok = gTrue;
if (movieDict->isDict())
@@ -239,7 +239,7 @@
ok = gFalse;
}
-Movie::Movie(Object *movieDict, Object *aDict) {
+Movie::Movie(const Object *movieDict, const Object *aDict) {
ok = gTrue;
if (movieDict->isDict()) {
@@ -274,6 +274,6 @@
*heightA = int(height * double(MA.znum) / MA.zdenum);
}
-Movie* Movie::copy() {
+Movie* Movie::copy() const {
return new Movie(*this);
}
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Movie.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Movie.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Movie.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -33,7 +33,7 @@
~MovieActivationParameters();
// parse from a "Movie Activation" dictionary
- void parseMovieActivation(Object* actObj);
+ void parseMovieActivation(const Object* actObj);
enum MovieRepeatMode {
repeatModeOnce,
@@ -70,30 +70,30 @@
class Movie {
public:
- Movie(Object *objMovie, Object *objAct);
- Movie(Object *objMovie);
+ Movie(const Object *objMovie, const Object *objAct);
+ Movie(const Object *objMovie);
Movie(const Movie &movie);
~Movie();
Movie& operator=(const Movie &) = delete;
- GBool isOk() { return ok; }
- MovieActivationParameters* getActivationParameters() { return &MA; }
+ GBool isOk() const { return ok; }
+ const MovieActivationParameters* getActivationParameters() const { return &MA; }
- GooString* getFileName() { return fileName; }
+ const GooString* getFileName() const { return fileName; }
- Gushort getRotationAngle() { return rotationAngle; }
- void getAspect (int *widthA, int *heightA) { *widthA = width; *heightA = height; }
+ Gushort getRotationAngle() const { return rotationAngle; }
+ void getAspect (int *widthA, int *heightA) const { *widthA = width; *heightA = height; }
- Object getPoster() { return poster.copy(); }
- GBool getShowPoster() { return showPoster; }
+ Object getPoster() const { return poster.copy(); }
+ GBool getShowPoster() const { return showPoster; }
- GBool getUseFloatingWindow() { return MA.floatingWindow; }
+ GBool getUseFloatingWindow() const { return MA.floatingWindow; }
void getFloatingWindowSize(int *width, int *height);
- Movie* copy();
+ Movie* copy() const ;
private:
- void parseMovie (Object *movieDict);
+ void parseMovie (const Object *movieDict);
GBool ok;
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Object.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Object.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Object.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -22,6 +22,7 @@
// Copyright (C) 2013, 2017, 2018 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2013 Adrian Perez de Castro <aperez at igalia.com>
// Copyright (C) 2016 Jakub Alba <jakubalba at gmail.com>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -236,12 +237,12 @@
}
return type == objInt ? (double)intg : type == objInt64 ? (double)int64g : real;
}
- GooString *getString() const { OBJECT_TYPE_CHECK(objString); return string; }
+ const GooString *getString() const { OBJECT_TYPE_CHECK(objString); return string; }
// After takeString() the only method that should be called for the object is free()
// because the object it's not expected to have a NULL string.
GooString *takeString() {
OBJECT_TYPE_CHECK(objString); GooString *s = string; string = nullptr; return s; }
- char *getName() const { OBJECT_TYPE_CHECK(objName); return cString; }
+ const char *getName() const { OBJECT_TYPE_CHECK(objName); return cString; }
Array *getArray() const { OBJECT_TYPE_CHECK(objArray); return array; }
Dict *getDict() const { OBJECT_TYPE_CHECK(objDict); return dict; }
Stream *getStream() const { OBJECT_TYPE_CHECK(objStream); return stream; }
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/OptionalContent.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/OptionalContent.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/OptionalContent.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -5,7 +5,7 @@
// Copyright 2007 Brad Hards <bradh at kde.org>
// Copyright 2008 Pino Toscano <pino at kde.org>
// Copyright 2008, 2010 Carlos Garcia Campos <carlosgc at gnome.org>
-// Copyright 2008, 2010, 2011, 2017 Albert Astals Cid <aacid at kde.org>
+// Copyright 2008, 2010, 2011, 2017, 2018 Albert Astals Cid <aacid at kde.org>
// Copyright 2008 Mark Kaplan <mkaplan at finjan.com>
//
// Released under the GPL (version 2, or later, at your option)
@@ -133,7 +133,7 @@
}
-bool OCGs::hasOCGs()
+bool OCGs::hasOCGs() const
{
return ( optionalContentGroups->getLength() > 0 );
}
@@ -374,7 +374,7 @@
m_state = On;
}
-GooString* OptionalContentGroup::getName() const
+const GooString* OptionalContentGroup::getName() const
{
return m_name;
}
@@ -447,7 +447,7 @@
children = nullptr;
}
-OCDisplayNode::OCDisplayNode(GooString *nameA) {
+OCDisplayNode::OCDisplayNode(const GooString *nameA) {
name = new GooString(nameA);
ocg = nullptr;
children = nullptr;
@@ -489,7 +489,7 @@
}
}
-int OCDisplayNode::getNumChildren() {
+int OCDisplayNode::getNumChildren() const {
if (!children) {
return 0;
}
@@ -496,6 +496,6 @@
return children->getLength();
}
-OCDisplayNode *OCDisplayNode::getChild(int idx) {
+OCDisplayNode *OCDisplayNode::getChild(int idx) const {
return (OCDisplayNode *)children->get(idx);
}
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/OptionalContent.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/OptionalContent.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/OptionalContent.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -39,9 +39,9 @@
OCGs& operator=(const OCGs &) = delete;
// Is OCGS valid?
- GBool isOk() { return ok; }
+ GBool isOk() const { return ok; }
- bool hasOCGs();
+ bool hasOCGs() const;
GooList *getOCGs() const { return optionalContentGroups; }
OptionalContentGroup* findOcgByRef( const Ref &ref);
@@ -96,7 +96,7 @@
OptionalContentGroup(const OptionalContentGroup &) = delete;
OptionalContentGroup& operator=(const OptionalContentGroup &) = delete;
- GooString* getName() const;
+ const GooString* getName() const;
Ref getRef() const;
void setRef(const Ref ref);
@@ -127,14 +127,14 @@
OCDisplayNode(const OCDisplayNode &) = delete;
OCDisplayNode& operator=(const OCDisplayNode &) = delete;
- GooString *getName() { return name; }
- OptionalContentGroup *getOCG() { return ocg; }
- int getNumChildren();
- OCDisplayNode *getChild(int idx);
+ const GooString *getName() const { return name; }
+ const OptionalContentGroup *getOCG() const { return ocg; }
+ int getNumChildren() const;
+ OCDisplayNode *getChild(int idx) const;
private:
- OCDisplayNode(GooString *nameA);
+ OCDisplayNode(const GooString *nameA);
OCDisplayNode(OptionalContentGroup *ocgA);
void addChild(OCDisplayNode *child);
void addChildren(GooList *childrenA);
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Outline.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Outline.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Outline.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -14,10 +14,11 @@
// under GPL version 2 or later
//
// Copyright (C) 2005 Marco Pesenti Gritti <mpg at redhat.com>
-// Copyright (C) 2008, 2016, 2017 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008, 2016-2018 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2009 Nick Jones <nick.jones at network-box.com>
// Copyright (C) 2016 Jason Crain <jason at aquaticape.us>
// Copyright (C) 2017 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -41,7 +42,7 @@
//------------------------------------------------------------------------
-Outline::Outline(Object *outlineObj, XRef *xref) {
+Outline::Outline(const Object *outlineObj, XRef *xref) {
items = nullptr;
if (!outlineObj->isDict()) {
return;
@@ -58,7 +59,7 @@
//------------------------------------------------------------------------
-OutlineItem::OutlineItem(Dict *dict, int refNumA, OutlineItem *parentA, XRef *xrefA) {
+OutlineItem::OutlineItem(const Dict *dict, int refNumA, OutlineItem *parentA, XRef *xrefA) {
Object obj1;
refNum = refNumA;
@@ -71,7 +72,7 @@
obj1 = dict->lookup("Title");
if (obj1.isString()) {
- GooString *s = obj1.getString();
+ const GooString *s = obj1.getString();
titleLen = TextStringToUCS4(s, &title);
} else {
titleLen = 0;
@@ -110,7 +111,7 @@
}
}
-GooList *OutlineItem::readItemList(OutlineItem *parent, Object *firstItemRef, XRef *xrefA) {
+GooList *OutlineItem::readItemList(OutlineItem *parent, const Object *firstItemRef, XRef *xrefA) {
GooList *items = new GooList();
char* alreadyRead = (char *)gmalloc(xrefA->getNumObjects());
@@ -122,7 +123,7 @@
parentO = parentO->parent;
}
- Object *p = firstItemRef;
+ const Object *p = firstItemRef;
while (p->isRef() &&
(p->getRefNum() >= 0) &&
(p->getRefNum() < xrefA->getNumObjects()) &&
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Outline.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Outline.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Outline.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -41,13 +41,13 @@
class Outline {
public:
- Outline(Object *outlineObj, XRef *xref);
+ Outline(const Object *outlineObj, XRef *xref);
~Outline();
Outline(const Outline &) = delete;
Outline& operator=(const Outline &) = delete;
- GooList *getItems() { return items; }
+ const GooList *getItems() const { return items; }
private:
@@ -60,23 +60,23 @@
class OutlineItem {
public:
- OutlineItem(Dict *dict, int refNumA, OutlineItem *parentA, XRef *xrefA);
+ OutlineItem(const Dict *dict, int refNumA, OutlineItem *parentA, XRef *xrefA);
~OutlineItem();
OutlineItem(const OutlineItem &) = delete;
OutlineItem& operator=(const OutlineItem &) = delete;
- static GooList *readItemList(OutlineItem *parent, Object *firstItemRef, XRef *xrefA);
+ static GooList *readItemList(OutlineItem *parent, const Object *firstItemRef, XRef *xrefA);
void open();
void close();
- Unicode *getTitle() { return title; }
- int getTitleLength() { return titleLen; }
- LinkAction *getAction() { return action; }
- GBool isOpen() { return startsOpen; }
- GBool hasKids() { return firstRef.isRef(); }
- GooList *getKids() { return kids; }
+ const Unicode *getTitle() const { return title; }
+ int getTitleLength() const { return titleLen; }
+ const LinkAction *getAction() const { return action; }
+ GBool isOpen() const { return startsOpen; }
+ GBool hasKids() const { return firstRef.isRef(); }
+ const GooList *getKids() const { return kids; }
private:
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/OutputDev.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/OutputDev.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/OutputDev.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -160,13 +160,13 @@
void OutputDev::endMarkedContent(GfxState *state) {
}
-void OutputDev::beginMarkedContent(char *name, Dict *properties) {
+void OutputDev::beginMarkedContent(const char *name, Dict *properties) {
}
-void OutputDev::markPoint(char *name) {
+void OutputDev::markPoint(const char *name) {
}
-void OutputDev::markPoint(char *name, Dict *properties) {
+void OutputDev::markPoint(const char *name, Dict *properties) {
}
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/OutputDev.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/OutputDev.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/OutputDev.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -23,7 +23,8 @@
// Copyright (C) 2010 Christian Feuers\xE4nger <cfeuersaenger at googlemail.com>
// Copyright (C) 2012 Fabio D'Urso <fabiodurso at hotmail.it>
// Copyright (C) 2012 William Bader <williambader at hotmail.com>
-// Copyright (C) 2017 Oliver Sander <oliver.sander at tu-dresden.de>
+// Copyright (C) 2017, 2018 Oliver Sander <oliver.sander at tu-dresden.de>
+// Copyright (C) 2018 Klar\xE4lvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -247,7 +248,7 @@
//----- text drawing
virtual void beginStringOp(GfxState * /*state*/) {}
virtual void endStringOp(GfxState * /*state*/) {}
- virtual void beginString(GfxState * /*state*/, GooString * /*s*/) {}
+ virtual void beginString(GfxState * /*state*/, const GooString * /*s*/) {}
virtual void endString(GfxState * /*state*/) {}
// Draw one glyph at a specified position
@@ -263,7 +264,7 @@
double /*dx*/, double /*dy*/,
double /*originX*/, double /*originY*/,
CharCode /*code*/, int /*nBytes*/, Unicode * /*u*/, int /*uLen*/) {}
- virtual void drawString(GfxState * /*state*/, GooString * /*s*/) {}
+ virtual void drawString(GfxState * /*state*/, const GooString * /*s*/) {}
virtual GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/,
double /*dx*/, double /*dy*/,
CharCode /*code*/, Unicode * /*u*/, int /*uLen*/);
@@ -271,10 +272,15 @@
virtual void beginTextObject(GfxState * /*state*/) {}
virtual void endTextObject(GfxState * /*state*/) {}
virtual void incCharCount(int /*nChars*/) {}
- virtual void beginActualText(GfxState * /*state*/, GooString * /*text*/ ) {}
+ virtual void beginActualText(GfxState * /*state*/, const GooString * /*text*/ ) {}
virtual void endActualText(GfxState * /*state*/) {}
//----- image drawing
+ // Draw an image mask. An image mask is a one-bit-per-pixel image, where each pixel
+ // can only be 'fill color' or 'transparent'.
+ //
+ // If 'invert' is false, a sample value of 0 marks the page with the current color,
+ // and a 1 leaves the previous contents unchanged. If 'invert' is true, these meanings are reversed.
virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
int width, int height, GBool invert, GBool interpolate,
GBool inlineImg);
@@ -303,9 +309,9 @@
//----- grouping operators
virtual void endMarkedContent(GfxState *state);
- virtual void beginMarkedContent(char *name, Dict *properties);
- virtual void markPoint(char *name);
- virtual void markPoint(char *name, Dict *properties);
+ virtual void beginMarkedContent(const char *name, Dict *properties);
+ virtual void markPoint(const char *name);
+ virtual void markPoint(const char *name, Dict *properties);
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/PDFDoc.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/PDFDoc.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/PDFDoc.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -38,6 +38,8 @@
// Copyright (C) 2017 Jean Ghali <jghali at libertysurf.fr>
// Copyright (C) 2017 Fredrik Fornwall <fredrik at fornwall.net>
// Copyright (C) 2018 Ben Timby <btimby at gmail.com>
+// Copyright (C) 2018 Evangelos Foutras <evangelos at foutrelis.com>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -409,24 +411,30 @@
char *p;
char *tokptr;
int i;
- int c;
+ int bytesRead;
pdfMajorVersion = 0;
pdfMinorVersion = 0;
+
+ // read up to headerSearchSize bytes from the beginning of the document
for (i = 0; i < headerSearchSize; ++i) {
- if ((c = str->getChar()) == EOF) {
- error(errSyntaxWarning, -1, "EOF while reading header (continuing anyway)");
- return;
- }
+ const int c = str->getChar();
+ if (c == EOF)
+ break;
hdrBuf[i] = c;
}
- hdrBuf[headerSearchSize] = '\0';
- for (i = 0; i < headerSearchSize - 5; ++i) {
+ bytesRead = i;
+ hdrBuf[bytesRead] = '\0';
+
+ // find the start of the PDF header if it exists and parse the version
+ bool headerFound = false;
+ for (i = 0; i < bytesRead - 5; ++i) {
if (!strncmp(&hdrBuf[i], "%PDF-", 5)) {
+ headerFound = true;
break;
}
}
- if (i >= headerSearchSize - 5) {
+ if (!headerFound) {
error(errSyntaxWarning, -1, "May not be a PDF file (continuing anyway)");
return;
}
@@ -676,7 +684,7 @@
}
static GBool
-get_id (GooString *encodedidstring, GooString *id) {
+get_id (const GooString *encodedidstring, GooString *id) {
const char *encodedid = encodedidstring->getCString();
char pdfid[pdfIdLength + 1];
int n;
@@ -1178,7 +1186,7 @@
outStr->printf("\r\nendstream\r\n");
}
-void PDFDoc::writeString (GooString* s, OutStream* outStr, Guchar *fileKey,
+void PDFDoc::writeString (const GooString* s, OutStream* outStr, Guchar *fileKey,
CryptAlgorithm encAlgorithm, int keyLength, int objNum, int objGen)
{
// Encrypt string if encryption is enabled
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/PDFDoc.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/PDFDoc.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/PDFDoc.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -30,6 +30,7 @@
// Copyright (C) 2015 André Guerreiro <aguerreiro1985 at gmail.com>
// Copyright (C) 2015 André Esser <bepandre at hotmail.com>
// Copyright (C) 2016 Jakub Alba <jakubalba at gmail.com>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -192,7 +193,7 @@
// Find a named destination. Returns the link destination, or
// NULL if <name> is not a destination.
- LinkDest *findDest(GooString *name)
+ LinkDest *findDest(const GooString *name)
{ return catalog->findDest(name); }
// Process the links for a page.
@@ -329,7 +330,7 @@
static void writeRawStream (Stream* str, OutStream* outStr);
void writeXRefTableTrailer (Goffset uxrefOffset, XRef *uxref, GBool writeAllEntries,
int uxrefSize, OutStream* outStr, GBool incrUpdate);
- static void writeString (GooString* s, OutStream* outStr, Guchar *fileKey,
+ static void writeString (const GooString* s, OutStream* outStr, Guchar *fileKey,
CryptAlgorithm encAlgorithm, int keyLength, int objNum, int objGen);
void saveIncrementalUpdate (OutStream* outStr);
void saveCompleteRewrite (OutStream* outStr);
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/PDFDocEncoding.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/PDFDocEncoding.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/PDFDocEncoding.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -29,6 +29,6 @@
extern Unicode pdfDocEncoding[256];
-char* pdfDocEncodingToUTF16 (GooString* orig, int* length);
+char* pdfDocEncodingToUTF16 (const GooString* orig, int* length);
#endif
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/PSOutputDev.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/PSOutputDev.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/PSOutputDev.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -31,6 +31,7 @@
// Copyright (C) 2014 Till Kamppeter <till.kamppeter at gmail.com>
// Copyright (C) 2015 Marek Kasik <mkasik at redhat.com>
// Copyright (C) 2016 Caolán McNamara <caolanm at redhat.com>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -1535,7 +1536,6 @@
int pageRotate, char *psTitle) {
PSOutPaperSize *size;
double x1, y1, x2, y2;
- int i;
switch (mode) {
case psModePS:
@@ -1581,7 +1581,7 @@
switch (mode) {
case psModePS:
- for (i = 0; i < paperSizes->getLength(); ++i) {
+ for (int i = 0; i < paperSizes->getLength(); ++i) {
size = (PSOutPaperSize *)paperSizes->get(i);
writePSFmt("%%{0:s} {1:t} {2:d} {3:d} 0 () ()\n",
i==0 ? "DocumentMedia:" : "+", size->name, size->w, size->h);
@@ -2866,8 +2866,9 @@
// Make a unique PS font name, based on the names given in the PDF
// font object, and an object ID (font file object for
-GooString *PSOutputDev::makePSFontName(GfxFont *font, Ref *id) {
- GooString *psName, *s;
+GooString *PSOutputDev::makePSFontName(GfxFont *font, const Ref *id) {
+ GooString *psName;
+ const GooString *s;
if ((s = font->getEmbeddedFontName())) {
psName = filterPSName(s);
@@ -5007,13 +5008,13 @@
}
}
-void PSOutputDev::drawString(GfxState *state, GooString *s) {
+void PSOutputDev::drawString(GfxState *state, const GooString *s) {
GfxFont *font;
int wMode;
int *codeToGID;
GooString *s2;
double dx, dy, originX, originY;
- char *p;
+ const char *p;
UnicodeMap *uMap;
CharCode code;
Unicode *u;
@@ -7433,7 +7434,7 @@
va_end(args);
}
-void PSOutputDev::writePSString(GooString *s) {
+void PSOutputDev::writePSString(const GooString *s) {
Guchar *p;
int n, line;
char buf[8];
@@ -7479,7 +7480,7 @@
}
}
-GooString *PSOutputDev::filterPSName(GooString *name) {
+GooString *PSOutputDev::filterPSName(const GooString *name) {
GooString *name2;
char buf[8];
int i;
@@ -7578,7 +7579,7 @@
}
// Write a DSC-compliant <textline>.
-void PSOutputDev::writePSTextLine(GooString *s) {
+void PSOutputDev::writePSTextLine(const GooString *s) {
int i, j, step;
int c;
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/PSOutputDev.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/PSOutputDev.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/PSOutputDev.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -24,6 +24,7 @@
// Copyright (C) 2010 Hib Eris <hib at hiberis.nl>
// Copyright (C) 2011, 2014, 2017 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2012 Fabio D'Urso <fabiodurso at hotmail.it>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -252,7 +253,7 @@
void clipToStrokePath(GfxState *state) override;
//----- text drawing
- void drawString(GfxState *state, GooString *s) override;
+ void drawString(GfxState *state, const GooString *s) override;
void beginTextObject(GfxState *state) override;
void endTextObject(GfxState *state) override;
@@ -372,7 +373,7 @@
GBool needVerticalMetrics);
void setupEmbeddedOpenTypeCFFFont(GfxFont *font, Ref *id, GooString *psName);
void setupType3Font(GfxFont *font, GooString *psName, Dict *parentResDict);
- GooString *makePSFontName(GfxFont *font, Ref *id);
+ GooString *makePSFontName(GfxFont *font, const Ref *id);
void setupImages(Dict *resDict);
void setupImage(Ref id, Stream *str, GBool mask);
void setupForms(Dict *resDict);
@@ -422,7 +423,7 @@
double *x1, double *y1);
#endif
void cvtFunction(Function *func, GBool invertPSFunction = gFalse);
- GooString *filterPSName(GooString *name);
+ GooString *filterPSName(const GooString *name);
// Write the document-level setup.
void writeDocSetup(PDFDoc *doc, Catalog *catalog, const std::vector<int> &pages, GBool duplexA);
@@ -431,10 +432,10 @@
void writePS(const char *s);
void writePSBuf(const char *s, int len);
void writePSFmt(const char *fmt, ...);
- void writePSString(GooString *s);
+ void writePSString(const GooString *s);
void writePSName(const char *s);
GooString *filterPSLabel(GooString *label, GBool *needParens=nullptr);
- void writePSTextLine(GooString *s);
+ void writePSTextLine(const GooString *s);
PSLevel level; // PostScript level (1, 2, separation)
PSOutMode mode; // PostScript mode (PS, EPS, form)
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Page.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Page.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Page.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -91,9 +91,9 @@
PDFRectangle *getTrimBox() { return &trimBox; }
PDFRectangle *getArtBox() { return &artBox; }
int getRotate() { return rotate; }
- GooString *getLastModified()
+ const GooString *getLastModified() const
{ return lastModified.isString()
- ? lastModified.getString() : (GooString *)NULL; }
+ ? lastModified.getString() : nullptr; }
Dict *getBoxColorInfo()
{ return boxColorInfo.isDict() ? boxColorInfo.getDict() : (Dict *)NULL; }
Dict *getGroup()
@@ -171,7 +171,7 @@
PDFRectangle *getTrimBox() { return attrs->getTrimBox(); }
PDFRectangle *getArtBox() { return attrs->getArtBox(); }
int getRotate() { return attrs->getRotate(); }
- GooString *getLastModified() { return attrs->getLastModified(); }
+ const GooString *getLastModified() const { return attrs->getLastModified(); }
Dict *getBoxColorInfo() { return attrs->getBoxColorInfo(); }
Dict *getGroup() { return attrs->getGroup(); }
Stream *getMetadata() { return attrs->getMetadata(); }
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Parser.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Parser.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Parser.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -19,6 +19,7 @@
// Copyright (C) 2012 Hib Eris <hib at hiberis.nl>
// Copyright (C) 2013 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -71,7 +72,8 @@
Object obj;
Stream *str;
DecryptStream *decrypt;
- GooString *s, *s2;
+ const GooString *s;
+ GooString *s2;
int c;
// refill buffer after inline image data
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Rendition.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Rendition.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Rendition.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -7,7 +7,7 @@
// Pino Toscano <pino at kde.org> (c) 2008
// Carlos Garcia Campos <carlosgc at gnome.org> (c) 2010
// Tobias Koenig <tobias.koenig at kdab.com> (c) 2012
-// Albert Astals Cid <aacid at kde.org> (C) 2017
+// Albert Astals Cid <aacid at kde.org> (C) 2017, 2018
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -177,7 +177,7 @@
if (tmp.isDict()) {
Object oname = tmp.dictLookup("S");
if (oname.isName()) {
- char* name = oname.getName();
+ const char* name = oname.getName();
if (!strcmp(name, "F"))
duration = -1; // infinity
else if (!strcmp(name, "T")) {
@@ -371,7 +371,7 @@
}
-MediaRendition* MediaRendition::copy()
+MediaRendition* MediaRendition::copy() const
{
return new MediaRendition(*this);
}
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Rendition.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Rendition.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Rendition.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -123,21 +123,21 @@
~MediaRendition();
MediaRendition& operator=(const MediaRendition &) = delete;
- GBool isOk () { return ok; }
+ GBool isOk () const { return ok; }
- MediaParameters* getMHParameters() { return &MH; }
- MediaParameters* getBEParameters() { return &BE; }
+ const MediaParameters* getMHParameters() const { return &MH; }
+ const MediaParameters* getBEParameters() const { return &BE; }
- GooString* getContentType() { return contentType; }
- GooString* getFileName() { return fileName; }
+ const GooString* getContentType() const { return contentType; }
+ const GooString* getFileName() const { return fileName; }
- GBool getIsEmbedded() { return isEmbedded; }
- Stream* getEmbbededStream() { return isEmbedded ? embeddedStreamObject.getStream() : nullptr; }
- Object* getEmbbededStreamObject() { return isEmbedded ? &embeddedStreamObject : nullptr; }
+ GBool getIsEmbedded() const { return isEmbedded; }
+ Stream* getEmbbededStream() const { return isEmbedded ? embeddedStreamObject.getStream() : nullptr; }
+ const Object* getEmbbededStreamObject() const { return isEmbedded ? &embeddedStreamObject : nullptr; }
// write embedded stream to file
void outputToFile(FILE*);
- MediaRendition* copy();
+ MediaRendition* copy() const;
private:
GBool ok;
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Sound.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Sound.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Sound.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,6 +1,6 @@
/* Sound.cc - an object that holds the sound structure
* Copyright (C) 2006-2007, Pino Toscano <pino at kde.org>
- * Copyright (C) 2009, 2017, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2009, 2017, 2018, Albert Astals Cid <aacid at kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@
}
}
-Sound::Sound(Object *obj, bool readAttrs)
+Sound::Sound(const Object *obj, bool readAttrs)
{
streamObj = obj->copy();
@@ -116,7 +116,7 @@
return streamObj.getStream();
}
-Sound *Sound::copy()
+Sound *Sound::copy() const
{
Sound *newsound = new Sound(&streamObj, false);
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Sound.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Sound.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Sound.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -50,21 +50,21 @@
Sound(const Sound &) = delete;
Sound& operator=(const Sound &) = delete;
- Object *getObject() { return &streamObj; }
+ const Object *getObject() const { return &streamObj; }
Stream *getStream();
- SoundKind getSoundKind() { return kind; }
- GooString *getFileName() { return fileName; }
- double getSamplingRate() { return samplingRate; }
- int getChannels() { return channels; }
- int getBitsPerSample() { return bitsPerSample; }
- SoundEncoding getEncoding() { return encoding; }
+ SoundKind getSoundKind() const { return kind; }
+ const GooString *getFileName() const { return fileName; }
+ double getSamplingRate() const { return samplingRate; }
+ int getChannels() const { return channels; }
+ int getBitsPerSample() const { return bitsPerSample; }
+ SoundEncoding getEncoding() const { return encoding; }
- Sound *copy();
+ Sound *copy() const;
private:
// Create a sound. The Object obj is ensured to be a Stream with a Dict
- Sound(Object *obj, bool readAttrs = true);
+ Sound(const Object *obj, bool readAttrs = true);
Object streamObj;
SoundKind kind;
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/SplashOutputDev.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/SplashOutputDev.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/SplashOutputDev.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -38,6 +38,7 @@
// Copyright (C) 2015 Kenji Uno <ku at digitaldolphins.jp>
// Copyright (C) 2016 Takahiro Hashimoto <kenya888.en at gmail.com>
// Copyright (C) 2017 Even Rouault <even.rouault at spatialys.com>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -1196,7 +1197,7 @@
class SplashOutFontFileID: public SplashFontFileID {
public:
- SplashOutFontFileID(Ref *rA) { r = *rA; }
+ SplashOutFontFileID(const Ref *rA) { r = *rA; }
~SplashOutFontFileID() {}
@@ -1222,7 +1223,7 @@
class T3FontCache {
public:
- T3FontCache(Ref *fontID, double m11A, double m12A,
+ T3FontCache(const Ref *fontID, double m11A, double m12A,
double m21A, double m22A,
int glyphXA, int glyphYA, int glyphWA, int glyphHA,
GBool aa, GBool validBBoxA);
@@ -1229,7 +1230,7 @@
~T3FontCache();
T3FontCache(const T3FontCache &) = delete;
T3FontCache& operator=(const T3FontCache &) = delete;
- GBool matches(Ref *idA, double m11A, double m12A,
+ GBool matches(const Ref *idA, double m11A, double m12A,
double m21A, double m22A)
{ return fontID.num == idA->num && fontID.gen == idA->gen &&
m11 == m11A && m12 == m12A && m21 == m21A && m22 == m22A; }
@@ -1246,7 +1247,7 @@
T3FontCacheTag *cacheTags; // cache tags, i.e., char codes
};
-T3FontCache::T3FontCache(Ref *fontIDA, double m11A, double m12A,
+T3FontCache::T3FontCache(const Ref *fontIDA, double m11A, double m12A,
double m21A, double m22A,
int glyphXA, int glyphYA, int glyphWA, int glyphHA,
GBool validBBoxA, GBool aa) {
@@ -2501,7 +2502,7 @@
double dx, double dy,
CharCode code, Unicode *u, int uLen) {
GfxFont *gfxFont;
- Ref *fontID;
+ const Ref *fontID;
double *ctm, *bbox;
T3FontCache *t3Font;
T3GlyphStack *t3gs;
@@ -3978,8 +3979,7 @@
maskStr->reset();
maskStr->doGetChars(maskWidth * maskHeight, data);
maskStr->close();
- maskStr = new MemStream((char *)data, 0, maskWidth * maskHeight, maskStr->getDictObject()->copy());
- ((MemStream *) maskStr)->setNeedFree(gTrue);
+ maskStr = new AutoFreeMemStream((char *)data, 0, maskWidth * maskHeight, maskStr->getDictObject()->copy());
}
imgMaskData.imgStr = new ImageStream(maskStr, maskWidth,
maskColorMap->getNumPixelComps(),
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/SplashOutputDev.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/SplashOutputDev.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/SplashOutputDev.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -407,7 +407,7 @@
SplashPattern *getColor(GfxCMYK *cmyk);
SplashPattern *getColor(GfxColor *deviceN);
#endif
- void getMatteColor( SplashColorMode colorMode, GfxImageColorMap *colorMap, GfxColor * matteColor, SplashColor splashMatteColor);
+ static void getMatteColor( SplashColorMode colorMode, GfxImageColorMap *colorMap, GfxColor * matteColor, SplashColor splashMatteColor);
void setOverprintMask(GfxColorSpace *colorSpace, GBool overprintFlag,
int overprintMode, GfxColor *singleColor, GBool grayIndexed = gFalse);
SplashPath *convertPath(GfxState *state, GfxPath *path,
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Stream.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Stream.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Stream.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -14,7 +14,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2005 Jeff Muizelaar <jeff at infidigm.net>
-// Copyright (C) 2006-2010, 2012-2014, 2016, 2017 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006-2010, 2012-2014, 2016, 2017, 2018 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2007 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
// Copyright (C) 2008 Julien Rebetez <julien at fhtagn.net>
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc at gnome.org>
@@ -208,7 +208,7 @@
return str;
}
-Stream *Stream::makeFilter(char *name, Stream *str, Object *params, int recursion, Dict *dict) {
+Stream *Stream::makeFilter(const char *name, Stream *str, Object *params, int recursion, Dict *dict) {
int pred; // parameters
int colors;
int bits;
@@ -951,89 +951,6 @@
}
//------------------------------------------------------------------------
-// MemStream
-//------------------------------------------------------------------------
-
-MemStream::MemStream(char *bufA, Goffset startA, Goffset lengthA, Object &&dictA):
- BaseStream(std::move(dictA), lengthA) {
- buf = bufA;
- start = startA;
- length = lengthA;
- bufEnd = buf + start + length;
- bufPtr = buf + start;
- needFree = gFalse;
-}
-
-MemStream::~MemStream() {
- if (needFree) {
- gfree(buf);
- }
-}
-
-BaseStream *MemStream::copy() {
- return new MemStream(buf, start, length, dict.copy());
-}
-
-Stream *MemStream::makeSubStream(Goffset startA, GBool limited,
- Goffset lengthA, Object &&dictA) {
- MemStream *subStr;
- Goffset newLength;
-
- if (!limited || startA + lengthA > start + length) {
- newLength = start + length - startA;
- } else {
- newLength = lengthA;
- }
- subStr = new MemStream(buf, startA, newLength, std::move(dictA));
- return subStr;
-}
-
-void MemStream::reset() {
- bufPtr = buf + start;
-}
-
-void MemStream::close() {
-}
-
-int MemStream::getChars(int nChars, Guchar *buffer) {
- int n;
-
- if (nChars <= 0) {
- return 0;
- }
- if (bufEnd - bufPtr < nChars) {
- n = (int)(bufEnd - bufPtr);
- } else {
- n = nChars;
- }
- memcpy(buffer, bufPtr, n);
- bufPtr += n;
- return n;
-}
-
-void MemStream::setPos(Goffset pos, int dir) {
- Guint i;
-
- if (dir >= 0) {
- i = pos;
- } else {
- i = start + length - pos;
- }
- if (i < start) {
- i = start;
- } else if (i > start + length) {
- i = start + length;
- }
- bufPtr = buf + i;
-}
-
-void MemStream::moveStart(Goffset delta) {
- start += delta;
- length -= delta;
- bufPtr = buf + start;
-}
-
-//------------------------------------------------------------------------
// EmbedStream
//------------------------------------------------------------------------
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Stream.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Stream.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Stream.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -238,7 +238,7 @@
virtual GBool hasGetChars() { return false; }
virtual int getChars(int nChars, Guchar *buffer);
- Stream *makeFilter(char *name, Stream *str, Object *params, int recursion = 0, Dict *dict = nullptr);
+ Stream *makeFilter(const char *name, Stream *str, Object *params, int recursion = 0, Dict *dict = nullptr);
int ref; // reference count
#ifdef MULTITHREADED
@@ -567,45 +567,125 @@
// MemStream
//------------------------------------------------------------------------
-class MemStream: public BaseStream {
+template<typename T>
+class BaseMemStream: public BaseStream {
public:
- MemStream(char *bufA, Goffset startA, Goffset lengthA, Object &&dictA);
- ~MemStream();
- BaseStream *copy() override;
- Stream *makeSubStream(Goffset start, GBool limited,
- Goffset lengthA, Object &&dictA) override;
+ BaseMemStream(T *bufA, Goffset startA, Goffset lengthA, Object &&dictA) : BaseStream(std::move(dictA), lengthA) {
+ buf = bufA;
+ start = startA;
+ length = lengthA;
+ bufEnd = buf + start + length;
+ bufPtr = buf + start;
+ }
+
+ BaseStream *copy() override {
+ return new BaseMemStream(buf, start, length, dict.copy());
+ }
+
+ Stream *makeSubStream(Goffset startA, GBool limited, Goffset lengthA, Object &&dictA) override {
+ Goffset newLength;
+
+ if (!limited || startA + lengthA > start + length) {
+ newLength = start + length - startA;
+ } else {
+ newLength = lengthA;
+ }
+ return new BaseMemStream(buf, startA, newLength, std::move(dictA));
+ }
+
StreamKind getKind() override { return strWeird; }
- void reset() override;
- void close() override;
+
+ void reset() override {
+ bufPtr = buf + start;
+ }
+
+ void close() override { }
+
int getChar() override
{ return (bufPtr < bufEnd) ? (*bufPtr++ & 0xff) : EOF; }
+
int lookChar() override
{ return (bufPtr < bufEnd) ? (*bufPtr & 0xff) : EOF; }
+
Goffset getPos() override { return (int)(bufPtr - buf); }
- void setPos(Goffset pos, int dir = 0) override;
+
+ void setPos(Goffset pos, int dir = 0) override {
+ Guint i;
+
+ if (dir >= 0) {
+ i = pos;
+ } else {
+ i = start + length - pos;
+ }
+ if (i < start) {
+ i = start;
+ } else if (i > start + length) {
+ i = start + length;
+ }
+ bufPtr = buf + i;
+ }
+
Goffset getStart() override { return start; }
- void moveStart(Goffset delta) override;
- //if needFree = true, the stream will delete buf when it is destroyed
- //otherwise it will not touch it. Default value is false
- virtual void setNeedFree (GBool val) { needFree = val; }
+ void moveStart(Goffset delta) override {
+ start += delta;
+ length -= delta;
+ bufPtr = buf + start;
+ }
int getUnfilteredChar () override { return getChar(); }
+
void unfilteredReset () override { reset (); }
+protected:
+ T *buf;
+
private:
GBool hasGetChars() override { return true; }
- int getChars(int nChars, Guchar *buffer) override;
- char *buf;
+ int getChars(int nChars, Guchar *buffer) override {
+ int n;
+
+ if (nChars <= 0) {
+ return 0;
+ }
+ if (bufEnd - bufPtr < nChars) {
+ n = (int)(bufEnd - bufPtr);
+ } else {
+ n = nChars;
+ }
+ memcpy(buffer, bufPtr, n);
+ bufPtr += n;
+ return n;
+ }
+
Goffset start;
- char *bufEnd;
- char *bufPtr;
- GBool needFree;
+ T *bufEnd;
+ T *bufPtr;
};
+class MemStream : public BaseMemStream<const char>
+{
+public:
+ MemStream(const char *bufA, Goffset startA, Goffset lengthA, Object &&dictA)
+ : BaseMemStream(bufA, startA, lengthA, std::move(dictA))
+ { }
+};
+
+class AutoFreeMemStream : public BaseMemStream<char>
+{
+public:
+ AutoFreeMemStream(char *bufA, Goffset startA, Goffset lengthA, Object &&dictA)
+ : BaseMemStream(bufA, startA, lengthA, std::move(dictA))
+ { }
+
+ ~AutoFreeMemStream()
+ { gfree(buf); }
+};
+
+
//------------------------------------------------------------------------
// EmbedStream
//
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/StructElement.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/StructElement.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/StructElement.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -9,6 +9,7 @@
// Copyright 2014, 2017, 2018 Albert Astals Cid <aacid at kde.org>
// Copyright 2015 Dmytro Morgun <lztoad at gmail.com>
// Copyright 2018 Adrian Johnson <ajohnson at redneon.com>
+// Copyright 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
//========================================================================
@@ -777,7 +778,7 @@
obj = property->lookup("N");
if (obj.isString()) {
- GooString *s = obj.getString();
+ const GooString *s = obj.getString();
name = s->getCString();
nameLen = s->getLength();
} else if (obj.isName())
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/TextOutputDev.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/TextOutputDev.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/TextOutputDev.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -36,6 +36,7 @@
// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
// Copyright (C) 2013 Ed Catmur <ed at catmur.co.uk>
// Copyright (C) 2016 Khaled Hosny <khaledhosny at eglug.org>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -5518,7 +5519,7 @@
actualTextNBytes += nBytes;
}
-void ActualText::begin(GfxState *state, GooString *text) {
+void ActualText::begin(GfxState *state, const GooString *text) {
if (actualText)
delete actualText;
actualText = new GooString(text);
@@ -5641,7 +5642,7 @@
text->updateFont(state);
}
-void TextOutputDev::beginString(GfxState *state, GooString *s) {
+void TextOutputDev::beginString(GfxState *state, const GooString *s) {
}
void TextOutputDev::endString(GfxState *state) {
@@ -5658,7 +5659,7 @@
text->incCharCount(nChars);
}
-void TextOutputDev::beginActualText(GfxState *state, GooString *text)
+void TextOutputDev::beginActualText(GfxState *state, const GooString *text)
{
actualText->begin(state, text);
}
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/TextOutputDev.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/TextOutputDev.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/TextOutputDev.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -21,6 +21,7 @@
// Copyright (C) 2010 Brian Ewins <brian.ewins at gmail.com>
// Copyright (C) 2012, 2013, 2015, 2016 Jason Crain <jason at aquaticape.us>
// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -732,7 +733,7 @@
void addChar(GfxState *state, double x, double y,
double dx, double dy,
CharCode c, int nBytes, Unicode *u, int uLen);
- void begin(GfxState *state, GooString *text);
+ void begin(GfxState *state, const GooString *text);
void end(GfxState *state);
private:
@@ -812,7 +813,7 @@
void updateFont(GfxState *state) override;
//----- text drawing
- void beginString(GfxState *state, GooString *s) override;
+ void beginString(GfxState *state, const GooString *s) override;
void endString(GfxState *state) override;
void drawChar(GfxState *state, double x, double y,
double dx, double dy,
@@ -819,7 +820,7 @@
double originX, double originY,
CharCode c, int nBytes, Unicode *u, int uLen) override;
void incCharCount(int nChars) override;
- void beginActualText(GfxState *state, GooString *text) override;
+ void beginActualText(GfxState *state, const GooString *text) override;
void endActualText(GfxState *state) override;
//----- path painting
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/UTF.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/UTF.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/UTF.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -18,6 +18,7 @@
// Copyright (C) 2012 Hib Eris <hib at hiberis.nl>
// Copyright (C) 2016, 2018 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2016 Jason Crain <jason at aquaticape.us>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -85,7 +86,7 @@
return len;
}
-int TextStringToUCS4(GooString *textStr, Unicode **ucs4)
+int TextStringToUCS4(const GooString *textStr, Unicode **ucs4)
{
int i, len;
const char *s;
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/UTF.h
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/UTF.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/UTF.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -6,6 +6,7 @@
//
// Copyright (C) 2012, 2017 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2016 Jason Crain <jason at aquaticape.us>
+// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
//
//========================================================================
@@ -34,7 +35,7 @@
// ucs4 - if the number of UCS-4 characters is > 0, allocates and
// returns UCS-4 string. Free with gfree.
// returns number of UCS-4 characters
-int TextStringToUCS4(GooString *textStr, Unicode **ucs4);
+int TextStringToUCS4(const GooString *textStr, Unicode **ucs4);
// check if UCS-4 character is valid
bool UnicodeIsValid(Unicode ucs4);
Modified: branches/stable/source/src/libs/poppler/version.ac
===================================================================
--- branches/stable/source/src/libs/poppler/version.ac 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/poppler/version.ac 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,4 +1,4 @@
-dnl $Id: version.ac 47014 2018-03-18 21:59:37Z kakuto $
+dnl $Id: version.ac 47480 2018-04-29 00:37:13Z kakuto $
dnl Copyright 2018 Karl Berry <tex-live at tug.org>
dnl Copyright 2011-2015 Peter Breitenlohner <tex-live at tug.org>
dnl
@@ -9,4 +9,4 @@
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current poppler version
-m4_define([poppler_version], [0.63.0])
+m4_define([poppler_version], [0.64.0])
Modified: branches/stable/source/src/libs/xpdf/Makefile.in
===================================================================
--- branches/stable/source/src/libs/xpdf/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/xpdf/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -181,7 +181,61 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = @XPDF_TREE@/fofi/$(DEPDIR)/FoFiBase.Po \
+ @XPDF_TREE@/fofi/$(DEPDIR)/FoFiEncodings.Po \
+ @XPDF_TREE@/fofi/$(DEPDIR)/FoFiIdentifier.Po \
+ @XPDF_TREE@/fofi/$(DEPDIR)/FoFiTrueType.Po \
+ @XPDF_TREE@/fofi/$(DEPDIR)/FoFiType1.Po \
+ @XPDF_TREE@/fofi/$(DEPDIR)/FoFiType1C.Po \
+ @XPDF_TREE@/goo/$(DEPDIR)/FixedPoint.Po \
+ @XPDF_TREE@/goo/$(DEPDIR)/GHash.Po \
+ @XPDF_TREE@/goo/$(DEPDIR)/GList.Po \
+ @XPDF_TREE@/goo/$(DEPDIR)/GString.Po \
+ @XPDF_TREE@/goo/$(DEPDIR)/gfile.Po \
+ @XPDF_TREE@/goo/$(DEPDIR)/gmem.Po \
+ @XPDF_TREE@/goo/$(DEPDIR)/gmempp.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/AcroForm.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/Annot.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/Array.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/BuiltinFont.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/BuiltinFontTables.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/CMap.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/Catalog.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/CharCodeToUnicode.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/Decrypt.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/Dict.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/Error.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/FontEncodingTables.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/Form.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/Function.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/Gfx.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/GfxFont.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/GfxState.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/GlobalParams.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/JArithmeticDecoder.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/JBIG2Stream.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/JPXStream.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/Lexer.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/Link.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/NameToCharCode.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/Object.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/OptionalContent.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/Outline.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/OutputDev.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/PDFDoc.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/PDFDocEncoding.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/PSTokenizer.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/Page.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/Parser.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/SecurityHandler.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/Stream.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/TextString.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/UTF8.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/UnicodeMap.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/XFAForm.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/XRef.Po \
+ @XPDF_TREE@/xpdf/$(DEPDIR)/Zoox.Po
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -218,7 +272,7 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- cscope distdir dist dist-all distcheck
+ cscope distdir distdir-am dist dist-all distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
$(LISP)aconf.h.in
# Read a list of newline-separated strings from the standard input,
@@ -509,8 +563,8 @@
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__empty):
@@ -702,61 +756,67 @@
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/fofi/$(DEPDIR)/FoFiBase.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/fofi/$(DEPDIR)/FoFiEncodings.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/fofi/$(DEPDIR)/FoFiIdentifier.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/fofi/$(DEPDIR)/FoFiTrueType.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/fofi/$(DEPDIR)/FoFiType1.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/fofi/$(DEPDIR)/FoFiType1C.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/goo/$(DEPDIR)/FixedPoint.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/goo/$(DEPDIR)/GHash.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/goo/$(DEPDIR)/GList.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/goo/$(DEPDIR)/GString.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/goo/$(DEPDIR)/gfile.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/goo/$(DEPDIR)/gmem.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/goo/$(DEPDIR)/gmempp.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/AcroForm.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Annot.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Array.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/BuiltinFont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/BuiltinFontTables.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/CMap.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Catalog.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/CharCodeToUnicode.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Decrypt.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Dict.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Error.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/FontEncodingTables.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Form.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Function.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Gfx.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/GfxFont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/GfxState.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/GlobalParams.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/JArithmeticDecoder.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/JBIG2Stream.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/JPXStream.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Lexer.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Link.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/NameToCharCode.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Object.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/OptionalContent.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Outline.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/OutputDev.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/PDFDoc.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/PDFDocEncoding.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/PSTokenizer.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Page.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Parser.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/SecurityHandler.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Stream.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/TextString.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/UTF8.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/UnicodeMap.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/XFAForm.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/XRef.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Zoox.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/fofi/$(DEPDIR)/FoFiBase.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/fofi/$(DEPDIR)/FoFiEncodings.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/fofi/$(DEPDIR)/FoFiIdentifier.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/fofi/$(DEPDIR)/FoFiTrueType.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/fofi/$(DEPDIR)/FoFiType1.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/fofi/$(DEPDIR)/FoFiType1C.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/goo/$(DEPDIR)/FixedPoint.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/goo/$(DEPDIR)/GHash.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/goo/$(DEPDIR)/GList.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/goo/$(DEPDIR)/GString.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/goo/$(DEPDIR)/gfile.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/goo/$(DEPDIR)/gmem.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/goo/$(DEPDIR)/gmempp.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/AcroForm.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Annot.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Array.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/BuiltinFont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/BuiltinFontTables.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/CMap.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Catalog.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/CharCodeToUnicode.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Decrypt.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Dict.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Error.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/FontEncodingTables.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Form.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Function.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Gfx.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/GfxFont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/GfxState.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/GlobalParams.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/JArithmeticDecoder.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/JBIG2Stream.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/JPXStream.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Lexer.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Link.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/NameToCharCode.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Object.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/OptionalContent.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Outline.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/OutputDev.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/PDFDoc.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/PDFDocEncoding.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/PSTokenizer.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Page.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Parser.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/SecurityHandler.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Stream.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/TextString.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/UTF8.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/UnicodeMap.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/XFAForm.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/XRef.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@XPDF_TREE@/xpdf/$(DEPDIR)/Zoox.Po at am__quote@ # am--include-marker
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
.cc.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -879,7 +939,10 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -1118,7 +1181,60 @@
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf @XPDF_TREE@/fofi/$(DEPDIR) @XPDF_TREE@/goo/$(DEPDIR) @XPDF_TREE@/xpdf/$(DEPDIR)
+ -rm -f @XPDF_TREE@/fofi/$(DEPDIR)/FoFiBase.Po
+ -rm -f @XPDF_TREE@/fofi/$(DEPDIR)/FoFiEncodings.Po
+ -rm -f @XPDF_TREE@/fofi/$(DEPDIR)/FoFiIdentifier.Po
+ -rm -f @XPDF_TREE@/fofi/$(DEPDIR)/FoFiTrueType.Po
+ -rm -f @XPDF_TREE@/fofi/$(DEPDIR)/FoFiType1.Po
+ -rm -f @XPDF_TREE@/fofi/$(DEPDIR)/FoFiType1C.Po
+ -rm -f @XPDF_TREE@/goo/$(DEPDIR)/FixedPoint.Po
+ -rm -f @XPDF_TREE@/goo/$(DEPDIR)/GHash.Po
+ -rm -f @XPDF_TREE@/goo/$(DEPDIR)/GList.Po
+ -rm -f @XPDF_TREE@/goo/$(DEPDIR)/GString.Po
+ -rm -f @XPDF_TREE@/goo/$(DEPDIR)/gfile.Po
+ -rm -f @XPDF_TREE@/goo/$(DEPDIR)/gmem.Po
+ -rm -f @XPDF_TREE@/goo/$(DEPDIR)/gmempp.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/AcroForm.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Annot.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Array.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/BuiltinFont.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/BuiltinFontTables.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/CMap.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Catalog.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/CharCodeToUnicode.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Decrypt.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Dict.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Error.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/FontEncodingTables.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Form.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Function.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Gfx.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/GfxFont.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/GfxState.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/GlobalParams.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/JArithmeticDecoder.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/JBIG2Stream.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/JPXStream.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Lexer.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Link.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/NameToCharCode.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Object.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/OptionalContent.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Outline.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/OutputDev.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/PDFDoc.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/PDFDocEncoding.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/PSTokenizer.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Page.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Parser.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/SecurityHandler.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Stream.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/TextString.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/UTF8.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/UnicodeMap.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/XFAForm.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/XRef.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Zoox.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-tags
@@ -1166,7 +1282,60 @@
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -rf @XPDF_TREE@/fofi/$(DEPDIR) @XPDF_TREE@/goo/$(DEPDIR) @XPDF_TREE@/xpdf/$(DEPDIR)
+ -rm -f @XPDF_TREE@/fofi/$(DEPDIR)/FoFiBase.Po
+ -rm -f @XPDF_TREE@/fofi/$(DEPDIR)/FoFiEncodings.Po
+ -rm -f @XPDF_TREE@/fofi/$(DEPDIR)/FoFiIdentifier.Po
+ -rm -f @XPDF_TREE@/fofi/$(DEPDIR)/FoFiTrueType.Po
+ -rm -f @XPDF_TREE@/fofi/$(DEPDIR)/FoFiType1.Po
+ -rm -f @XPDF_TREE@/fofi/$(DEPDIR)/FoFiType1C.Po
+ -rm -f @XPDF_TREE@/goo/$(DEPDIR)/FixedPoint.Po
+ -rm -f @XPDF_TREE@/goo/$(DEPDIR)/GHash.Po
+ -rm -f @XPDF_TREE@/goo/$(DEPDIR)/GList.Po
+ -rm -f @XPDF_TREE@/goo/$(DEPDIR)/GString.Po
+ -rm -f @XPDF_TREE@/goo/$(DEPDIR)/gfile.Po
+ -rm -f @XPDF_TREE@/goo/$(DEPDIR)/gmem.Po
+ -rm -f @XPDF_TREE@/goo/$(DEPDIR)/gmempp.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/AcroForm.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Annot.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Array.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/BuiltinFont.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/BuiltinFontTables.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/CMap.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Catalog.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/CharCodeToUnicode.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Decrypt.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Dict.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Error.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/FontEncodingTables.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Form.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Function.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Gfx.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/GfxFont.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/GfxState.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/GlobalParams.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/JArithmeticDecoder.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/JBIG2Stream.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/JPXStream.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Lexer.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Link.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/NameToCharCode.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Object.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/OptionalContent.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Outline.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/OutputDev.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/PDFDoc.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/PDFDocEncoding.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/PSTokenizer.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Page.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Parser.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/SecurityHandler.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Stream.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/TextString.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/UTF8.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/UnicodeMap.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/XFAForm.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/XRef.Po
+ -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/Zoox.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -1187,11 +1356,11 @@
.MAKE: $(am__recursive_targets) all install-am install-strip
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
- am--refresh check check-am clean clean-cscope clean-generic \
- clean-noinstLIBRARIES cscope cscopelist-am ctags ctags-am dist \
- dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
- dist-tarZ dist-xz dist-zip distcheck distclean \
- distclean-compile distclean-generic distclean-hdr \
+ am--depfiles am--refresh check check-am clean clean-cscope \
+ clean-generic clean-noinstLIBRARIES cscope cscopelist-am ctags \
+ ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \
+ dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
+ distclean distclean-compile distclean-generic distclean-hdr \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
Modified: branches/stable/source/src/libs/xpdf/aclocal.m4
===================================================================
--- branches/stable/source/src/libs/xpdf/aclocal.m4 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/xpdf/aclocal.m4 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
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.15.1], [],
+m4_if([$1], [1.16.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@
# 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.15.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -58,7 +58,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -141,7 +141,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -332,13 +332,12 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -346,49 +345,41 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ AS_CASE([$CONFIG_FILES],
+ [*\'*], [eval set x "$CONFIG_FILES"],
+ [*], [set x $CONFIG_FILES])
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`AS_DIRNAME(["$am_mf"])`
+ am_filepart=`AS_BASENAME(["$am_mf"])`
+ AM_RUN_LOG([cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles]) || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).])
+ fi
+ AS_UNSET([am_dirpart])
+ AS_UNSET([am_filepart])
+ AS_UNSET([am_mf])
+ AS_UNSET([am_rc])
+ rm -f conftest-deps.mk
}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -397,18 +388,17 @@
# -----------------------------
# This macro should only be invoked once -- use via AC_REQUIRE.
#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
+ [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -495,8 +485,8 @@
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms.
@@ -563,7 +553,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -605,7 +595,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -626,7 +616,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -648,7 +638,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -683,7 +673,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -691,49 +681,42 @@
# AM_MAKE_INCLUDE()
# -----------------
-# Check to see how make treats includes.
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+ AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+ ['0:this is the am__doit target'],
+ [AS_CASE([$s],
+ [BSD], [am__include='.include' am__quote='"'],
+ [am__include='include' am__quote=''])])
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT([${_am_result}])
+AC_SUBST([am__include])])
+AC_SUBST([am__quote])])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -772,7 +755,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -801,7 +784,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -848,7 +831,7 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -867,7 +850,7 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -948,7 +931,7 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1008,7 +991,7 @@
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1036,7 +1019,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1055,7 +1038,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Modified: branches/stable/source/src/libs/xpdf/configure
===================================================================
--- branches/stable/source/src/libs/xpdf/configure 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/xpdf/configure 2018-05-17 17:02:02 UTC (rev 797)
@@ -648,7 +648,6 @@
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
-am__quote
am__include
DEPDIR
OBJEXT
@@ -725,7 +724,8 @@
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL'
+SHELL
+am__quote'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -2248,7 +2248,7 @@
-am__api_version='1.15'
+am__api_version='1.16'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2716,46 +2716,46 @@
ac_config_commands="$ac_config_commands depfiles"
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+ (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ case $?:`cat confinc.out 2>/dev/null` in #(
+ '0:this is the am__doit target') :
+ case $s in #(
+ BSD) :
+ am__include='.include' am__quote='"' ;; #(
+ *) :
+ am__include='include' am__quote='' ;;
+esac ;; #(
+ *) :
+ ;;
esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+$as_echo "${_am_result}" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
# Check whether --enable-dependency-tracking was given.
if test "${enable_dependency_tracking+set}" = set; then :
enableval=$enable_dependency_tracking;
@@ -3811,8 +3811,8 @@
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
# We need awk for the "check" target (and possibly the TAP driver). The
@@ -3863,7 +3863,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -6892,7 +6892,7 @@
#
# INIT-COMMANDS
#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
_ACEOF
@@ -7541,29 +7541,35 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ case $CONFIG_FILES in #(
+ *\'*) :
+ eval set x "$CONFIG_FILES" ;; #(
+ *) :
+ set x $CONFIG_FILES ;; #(
+ *) :
+ ;;
+esac
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$am_mf" : 'X\(//\)[^/]' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$am_mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -7581,53 +7587,48 @@
q
}
s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$am_mf" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
}
- /^X\(\/\/\)[^/].*/{
+ /^X\/\(\/\/\)$/{
s//\1/
q
}
- /^X\(\/\/\)$/{
+ /^X\/\(\/\).*/{
s//\1/
q
}
- /^X\(\/\).*/{
- s//\1/
- q
- }
s/.*/./; q'`
- as_dir=$dirpart/$fdir; as_fn_mkdir_p
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ { echo "$as_me:$LINENO: cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles" >&5
+ (cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ { am_dirpart=; unset am_dirpart;}
+ { am_filepart=; unset am_filepart;}
+ { am_mf=; unset am_mf;}
+ { am_rc=; unset am_rc;}
+ rm -f conftest-deps.mk
}
;;
"aconf.h":H) sed -e 's/^#define PACKAGE/#define XPDF_PACKAGE/' \
Modified: branches/stable/source/src/libs/xpdf/fofi/Makefile.in
===================================================================
--- branches/stable/source/src/libs/xpdf/fofi/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/xpdf/fofi/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -239,8 +239,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_srcdir)/../../am/hdr_links.am $(am__empty):
@@ -259,7 +259,10 @@
cscope cscopelist:
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
Modified: branches/stable/source/src/libs/xpdf/goo/Makefile.in
===================================================================
--- branches/stable/source/src/libs/xpdf/goo/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/xpdf/goo/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -239,8 +239,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_srcdir)/../../am/hdr_links.am $(am__empty):
@@ -259,7 +259,10 @@
cscope cscopelist:
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
Modified: branches/stable/source/src/libs/xpdf/splash/Makefile.in
===================================================================
--- branches/stable/source/src/libs/xpdf/splash/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/xpdf/splash/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -239,8 +239,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_srcdir)/../../am/hdr_links.am $(am__empty):
@@ -259,7 +259,10 @@
cscope cscopelist:
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
Modified: branches/stable/source/src/libs/xpdf/xpdf/Makefile.in
===================================================================
--- branches/stable/source/src/libs/xpdf/xpdf/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/xpdf/xpdf/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -239,8 +239,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_srcdir)/../../am/hdr_links.am $(am__empty):
@@ -259,7 +259,10 @@
cscope cscopelist:
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
Modified: branches/stable/source/src/libs/zlib/Makefile.in
===================================================================
--- branches/stable/source/src/libs/zlib/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/zlib/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -148,7 +148,23 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = @ZLIB_TREE@/$(DEPDIR)/adler32.Po \
+ @ZLIB_TREE@/$(DEPDIR)/compress.Po \
+ @ZLIB_TREE@/$(DEPDIR)/crc32.Po \
+ @ZLIB_TREE@/$(DEPDIR)/deflate.Po \
+ @ZLIB_TREE@/$(DEPDIR)/gzclose.Po \
+ @ZLIB_TREE@/$(DEPDIR)/gzlib.Po @ZLIB_TREE@/$(DEPDIR)/gzread.Po \
+ @ZLIB_TREE@/$(DEPDIR)/gzwrite.Po \
+ @ZLIB_TREE@/$(DEPDIR)/infback.Po \
+ @ZLIB_TREE@/$(DEPDIR)/inffast.Po \
+ @ZLIB_TREE@/$(DEPDIR)/inflate.Po \
+ @ZLIB_TREE@/$(DEPDIR)/inftrees.Po \
+ @ZLIB_TREE@/$(DEPDIR)/trees.Po \
+ @ZLIB_TREE@/$(DEPDIR)/uncompr.Po \
+ @ZLIB_TREE@/$(DEPDIR)/zutil.Po \
+ @ZLIB_TREE@/test/$(DEPDIR)/example.Po \
+ @ZLIB_TREE@/test/$(DEPDIR)/minigzip.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -185,7 +201,8 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- cscope check recheck distdir dist dist-all distcheck
+ cscope check recheck distdir distdir-am dist dist-all \
+ distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
$(LISP)config.h.in
# Read a list of newline-separated strings from the standard input,
@@ -632,8 +649,8 @@
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(srcdir)/../../am/dist_hook.am $(srcdir)/../../am/rebuild.am $(am__empty):
@@ -661,6 +678,9 @@
distclean-hdr:
-rm -f config.h stamp-h1
+clean-checkPROGRAMS:
+ -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
+
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@ZLIB_TREE@/$(am__dirstamp):
@@ -704,9 +724,6 @@
$(AM_V_at)-rm -f libz.a
$(AM_V_AR)$(libz_a_AR) libz.a $(libz_a_OBJECTS) $(libz_a_LIBADD)
$(AM_V_at)$(RANLIB) libz.a
-
-clean-checkPROGRAMS:
- -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
@ZLIB_TREE@/test/$(am__dirstamp):
@$(MKDIR_P) @ZLIB_TREE@/test
@: > @ZLIB_TREE@/test/$(am__dirstamp)
@@ -734,24 +751,30 @@
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/adler32.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/compress.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/crc32.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/deflate.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/gzclose.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/gzlib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/gzread.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/gzwrite.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/infback.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/inffast.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/inflate.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/inftrees.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/trees.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/uncompr.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/zutil.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/test/$(DEPDIR)/example.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/test/$(DEPDIR)/minigzip.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/adler32.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/compress.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/crc32.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/deflate.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/gzclose.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/gzlib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/gzread.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/gzwrite.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/infback.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/inffast.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/inflate.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/inftrees.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/trees.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/uncompr.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/$(DEPDIR)/zutil.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/test/$(DEPDIR)/example.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote@@ZLIB_TREE@/test/$(DEPDIR)/minigzip.Po at am__quote@ # am--include-marker
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -994,7 +1017,7 @@
fi; \
$$success || exit 1
-check-TESTS:
+check-TESTS: $(check_PROGRAMS) $(dist_check_SCRIPTS)
@list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -1030,7 +1053,10 @@
@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -1275,7 +1301,23 @@
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf @ZLIB_TREE@/$(DEPDIR) @ZLIB_TREE@/test/$(DEPDIR)
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/adler32.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/compress.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/crc32.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/deflate.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/gzclose.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/gzlib.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/gzread.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/gzwrite.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/infback.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/inffast.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/inflate.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/inftrees.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/trees.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/uncompr.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/zutil.Po
+ -rm -f @ZLIB_TREE@/test/$(DEPDIR)/example.Po
+ -rm -f @ZLIB_TREE@/test/$(DEPDIR)/minigzip.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-tags
@@ -1323,7 +1365,23 @@
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -rf @ZLIB_TREE@/$(DEPDIR) @ZLIB_TREE@/test/$(DEPDIR)
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/adler32.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/compress.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/crc32.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/deflate.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/gzclose.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/gzlib.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/gzread.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/gzwrite.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/infback.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/inffast.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/inflate.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/inftrees.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/trees.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/uncompr.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/zutil.Po
+ -rm -f @ZLIB_TREE@/test/$(DEPDIR)/example.Po
+ -rm -f @ZLIB_TREE@/test/$(DEPDIR)/minigzip.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -1344,7 +1402,7 @@
.MAKE: $(am__recursive_targets) all check-am install-am install-strip
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
- am--refresh check check-TESTS check-am clean \
+ am--depfiles am--refresh check check-TESTS check-am clean \
clean-checkPROGRAMS clean-cscope clean-generic \
clean-noinstLIBRARIES cscope cscopelist-am ctags ctags-am dist \
dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
Modified: branches/stable/source/src/libs/zlib/aclocal.m4
===================================================================
--- branches/stable/source/src/libs/zlib/aclocal.m4 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/zlib/aclocal.m4 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
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.15.1], [],
+m4_if([$1], [1.16.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@
# 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.15.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -58,7 +58,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -141,7 +141,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -332,13 +332,12 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -346,49 +345,41 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ AS_CASE([$CONFIG_FILES],
+ [*\'*], [eval set x "$CONFIG_FILES"],
+ [*], [set x $CONFIG_FILES])
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`AS_DIRNAME(["$am_mf"])`
+ am_filepart=`AS_BASENAME(["$am_mf"])`
+ AM_RUN_LOG([cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles]) || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).])
+ fi
+ AS_UNSET([am_dirpart])
+ AS_UNSET([am_filepart])
+ AS_UNSET([am_mf])
+ AS_UNSET([am_rc])
+ rm -f conftest-deps.mk
}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -397,18 +388,17 @@
# -----------------------------
# This macro should only be invoked once -- use via AC_REQUIRE.
#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
+ [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -495,8 +485,8 @@
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms.
@@ -563,7 +553,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -605,7 +595,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -626,7 +616,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -648,7 +638,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -683,7 +673,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -691,49 +681,42 @@
# AM_MAKE_INCLUDE()
# -----------------
-# Check to see how make treats includes.
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+ AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+ ['0:this is the am__doit target'],
+ [AS_CASE([$s],
+ [BSD], [am__include='.include' am__quote='"'],
+ [am__include='include' am__quote=''])])
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT([${_am_result}])
+AC_SUBST([am__include])])
+AC_SUBST([am__quote])])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -772,7 +755,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -801,7 +784,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -848,7 +831,7 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -867,7 +850,7 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -948,7 +931,7 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1008,7 +991,7 @@
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1036,7 +1019,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1055,7 +1038,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Modified: branches/stable/source/src/libs/zlib/configure
===================================================================
--- branches/stable/source/src/libs/zlib/configure 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/zlib/configure 2018-05-17 17:02:02 UTC (rev 797)
@@ -644,7 +644,6 @@
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
-am__quote
am__include
DEPDIR
OBJEXT
@@ -721,7 +720,8 @@
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL'
+SHELL
+am__quote'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -2127,7 +2127,7 @@
-am__api_version='1.15'
+am__api_version='1.16'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2595,46 +2595,46 @@
ac_config_commands="$ac_config_commands depfiles"
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+ (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ case $?:`cat confinc.out 2>/dev/null` in #(
+ '0:this is the am__doit target') :
+ case $s in #(
+ BSD) :
+ am__include='.include' am__quote='"' ;; #(
+ *) :
+ am__include='include' am__quote='' ;;
+esac ;; #(
+ *) :
+ ;;
esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+$as_echo "${_am_result}" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
# Check whether --enable-dependency-tracking was given.
if test "${enable_dependency_tracking+set}" = set; then :
enableval=$enable_dependency_tracking;
@@ -3699,8 +3699,8 @@
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
# We need awk for the "check" target (and possibly the TAP driver). The
@@ -3751,7 +3751,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -6306,7 +6306,7 @@
#
# INIT-COMMANDS
#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
zconf_sh='$zconf_sh'
_ACEOF
@@ -6921,29 +6921,35 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ case $CONFIG_FILES in #(
+ *\'*) :
+ eval set x "$CONFIG_FILES" ;; #(
+ *) :
+ set x $CONFIG_FILES ;; #(
+ *) :
+ ;;
+esac
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$am_mf" : 'X\(//\)[^/]' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$am_mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -6961,53 +6967,48 @@
q
}
s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$am_mf" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
}
- /^X\(\/\/\)[^/].*/{
+ /^X\/\(\/\/\)$/{
s//\1/
q
}
- /^X\(\/\/\)$/{
+ /^X\/\(\/\).*/{
s//\1/
q
}
- /^X\(\/\).*/{
- s//\1/
- q
- }
s/.*/./; q'`
- as_dir=$dirpart/$fdir; as_fn_mkdir_p
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ { echo "$as_me:$LINENO: cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles" >&5
+ (cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ { am_dirpart=; unset am_dirpart;}
+ { am_filepart=; unset am_filepart;}
+ { am_mf=; unset am_mf;}
+ { am_rc=; unset am_rc;}
+ rm -f conftest-deps.mk
}
;;
"zconf.h":C) eval "$zconf_sh" zconf.h ;;
Modified: branches/stable/source/src/libs/zlib/include/Makefile.in
===================================================================
--- branches/stable/source/src/libs/zlib/include/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/libs/zlib/include/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -243,8 +243,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_srcdir)/../../am/hdr_links.am $(am__empty):
@@ -263,7 +263,10 @@
cscope cscopelist:
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
Modified: branches/stable/source/src/texk/Makefile.in
===================================================================
--- branches/stable/source/src/texk/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -238,7 +238,7 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- cscope distdir dist dist-all distcheck
+ cscope distdir distdir-am dist dist-all distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
@@ -464,8 +464,8 @@
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(srcdir)/../am/dist_hook.am $(srcdir)/../am/recurse.am $(am__empty):
@@ -584,7 +584,10 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
Modified: branches/stable/source/src/texk/README
===================================================================
--- branches/stable/source/src/texk/README 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/README 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,4 +1,4 @@
-$Id: README 47119 2018-03-25 22:51:55Z kakuto $
+$Id: README 47608 2018-05-04 04:54:00Z kakuto $
Copyright 2006-2018 TeX Users Group.
You may freely use, modify and/or distribute this file.
@@ -59,7 +59,7 @@
dvipsk - maintained here, by us
-dvisvgm 2.3.5 - checked 24mar18
+dvisvgm 2.4 - checked 04may18
http://dvisvgm.bplaced.net/Downloads
gregorio 5.1.1 - checked 25mar18
Modified: branches/stable/source/src/texk/aclocal.m4
===================================================================
--- branches/stable/source/src/texk/aclocal.m4 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/aclocal.m4 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
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.15.1], [],
+m4_if([$1], [1.16.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@
# 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.15.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -58,7 +58,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -141,7 +141,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -332,13 +332,12 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -346,49 +345,41 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ AS_CASE([$CONFIG_FILES],
+ [*\'*], [eval set x "$CONFIG_FILES"],
+ [*], [set x $CONFIG_FILES])
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`AS_DIRNAME(["$am_mf"])`
+ am_filepart=`AS_BASENAME(["$am_mf"])`
+ AM_RUN_LOG([cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles]) || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).])
+ fi
+ AS_UNSET([am_dirpart])
+ AS_UNSET([am_filepart])
+ AS_UNSET([am_mf])
+ AS_UNSET([am_rc])
+ rm -f conftest-deps.mk
}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -397,18 +388,17 @@
# -----------------------------
# This macro should only be invoked once -- use via AC_REQUIRE.
#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
+ [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -495,8 +485,8 @@
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms.
@@ -563,7 +553,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -605,7 +595,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -626,7 +616,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -648,7 +638,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -683,7 +673,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -691,49 +681,42 @@
# AM_MAKE_INCLUDE()
# -----------------
-# Check to see how make treats includes.
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+ AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+ ['0:this is the am__doit target'],
+ [AS_CASE([$s],
+ [BSD], [am__include='.include' am__quote='"'],
+ [am__include='include' am__quote=''])])
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT([${_am_result}])
+AC_SUBST([am__include])])
+AC_SUBST([am__quote])])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -772,7 +755,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -801,7 +784,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -848,7 +831,7 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -867,7 +850,7 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -948,7 +931,7 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1008,7 +991,7 @@
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1036,7 +1019,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1055,7 +1038,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Modified: branches/stable/source/src/texk/configure
===================================================================
--- branches/stable/source/src/texk/configure 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/configure 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live texk 2018.
+# Generated by GNU Autoconf 2.69 for TeX Live texk 2019/dev.
#
# Report bugs to <tex-live at tug.org>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='TeX Live texk'
PACKAGE_TARNAME='tex-live-texk'
-PACKAGE_VERSION='2018'
-PACKAGE_STRING='TeX Live texk 2018'
+PACKAGE_VERSION='2019/dev'
+PACKAGE_STRING='TeX Live texk 2019/dev'
PACKAGE_BUGREPORT='tex-live at tug.org'
PACKAGE_URL=''
@@ -606,7 +606,6 @@
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
-am__quote
am__include
DEPDIR
am__untar
@@ -684,7 +683,8 @@
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL'
+SHELL
+am__quote'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -1396,7 +1396,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures TeX Live texk 2018 to adapt to many kinds of systems.
+\`configure' configures TeX Live texk 2019/dev to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1466,7 +1466,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of TeX Live texk 2018:";;
+ short | recursive ) echo "Configuration of TeX Live texk 2019/dev:";;
esac
cat <<\_ACEOF
@@ -1757,7 +1757,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-TeX Live texk configure 2018
+TeX Live texk configure 2019/dev
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1858,7 +1858,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by TeX Live texk $as_me 2018, which was
+It was created by TeX Live texk $as_me 2019/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -5544,7 +5544,7 @@
-am__api_version='1.15'
+am__api_version='1.16'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -5970,46 +5970,46 @@
ac_config_commands="$ac_config_commands depfiles"
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+ (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ case $?:`cat confinc.out 2>/dev/null` in #(
+ '0:this is the am__doit target') :
+ case $s in #(
+ BSD) :
+ am__include='.include' am__quote='"' ;; #(
+ *) :
+ am__include='include' am__quote='' ;;
+esac ;; #(
+ *) :
+ ;;
esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+$as_echo "${_am_result}" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
# Check whether --enable-dependency-tracking was given.
if test "${enable_dependency_tracking+set}" = set; then :
enableval=$enable_dependency_tracking;
@@ -6106,7 +6106,7 @@
# Define the identity of the package.
PACKAGE='tex-live-texk'
- VERSION='2018'
+ VERSION='2019/dev'
cat >>confdefs.h <<_ACEOF
@@ -6136,8 +6136,8 @@
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
# We need awk for the "check" target (and possibly the TAP driver). The
@@ -6316,7 +6316,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -7143,7 +7143,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by TeX Live texk $as_me 2018, which was
+This file was extended by TeX Live texk $as_me 2019/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7200,7 +7200,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-TeX Live texk config.status 2018
+TeX Live texk config.status 2019/dev
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -7308,7 +7308,7 @@
#
# INIT-COMMANDS
#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
_ACEOF
@@ -7753,29 +7753,35 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ case $CONFIG_FILES in #(
+ *\'*) :
+ eval set x "$CONFIG_FILES" ;; #(
+ *) :
+ set x $CONFIG_FILES ;; #(
+ *) :
+ ;;
+esac
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$am_mf" : 'X\(//\)[^/]' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$am_mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -7793,53 +7799,48 @@
q
}
s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$am_mf" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
}
- /^X\(\/\/\)[^/].*/{
+ /^X\/\(\/\/\)$/{
s//\1/
q
}
- /^X\(\/\/\)$/{
+ /^X\/\(\/\).*/{
s//\1/
q
}
- /^X\(\/\).*/{
- s//\1/
- q
- }
s/.*/./; q'`
- as_dir=$dirpart/$fdir; as_fn_mkdir_p
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ { echo "$as_me:$LINENO: cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles" >&5
+ (cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ { am_dirpart=; unset am_dirpart;}
+ { am_filepart=; unset am_filepart;}
+ { am_mf=; unset am_mf;}
+ { am_rc=; unset am_rc;}
+ rm -f conftest-deps.mk
}
;;
Modified: branches/stable/source/src/texk/kpathsea/ChangeLog
===================================================================
--- branches/stable/source/src/texk/kpathsea/ChangeLog 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/kpathsea/ChangeLog 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,3 +1,8 @@
+2018-05-12 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * kpsewhich.c: Allow Unicode file name for pdftex in kpsewhich.
+ (Windows only)
+
2018-04-14 Karl Berry <karl at tug.org>
* TeX Live 2018 release, kpathsea 6.3.0.
Modified: branches/stable/source/src/texk/kpathsea/Makefile.in
===================================================================
--- branches/stable/source/src/texk/kpathsea/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/kpathsea/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -142,6 +142,11 @@
CONFIG_HEADER = c-auto.h
CONFIG_CLEAN_FILES = kpathsea.pc
CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \
+ "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" \
+ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" \
+ "$(DESTDIR)$(kpseincludedir)"
+PROGRAMS = $(bin_PROGRAMS)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -169,10 +174,6 @@
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
- "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" \
- "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" \
- "$(DESTDIR)$(kpseincludedir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
libkpathsea_la_DEPENDENCIES = $(LTLIBOBJS)
am__libkpathsea_la_SOURCES_DIST = tex-file.c absolute.c atou.c cnf.c \
@@ -232,7 +233,6 @@
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(AM_CFLAGS) $(CFLAGS) $(libkpathsea_la_LDFLAGS) $(LDFLAGS) -o \
$@
-PROGRAMS = $(bin_PROGRAMS)
am_kpseaccess_OBJECTS = access.$(OBJEXT)
kpseaccess_OBJECTS = $(am_kpseaccess_OBJECTS)
kpseaccess_LDADD = $(LDADD)
@@ -266,7 +266,69 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@
depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = $(DEPDIR)/putenv.Plo ./$(DEPDIR)/access.Po \
+ ./$(DEPDIR)/kpsestat.Po ./$(DEPDIR)/kpsewhich.Po \
+ ./$(DEPDIR)/libkpathsea_la-absolute.Plo \
+ ./$(DEPDIR)/libkpathsea_la-atou.Plo \
+ ./$(DEPDIR)/libkpathsea_la-cnf.Plo \
+ ./$(DEPDIR)/libkpathsea_la-concat.Plo \
+ ./$(DEPDIR)/libkpathsea_la-concat3.Plo \
+ ./$(DEPDIR)/libkpathsea_la-concatn.Plo \
+ ./$(DEPDIR)/libkpathsea_la-db.Plo \
+ ./$(DEPDIR)/libkpathsea_la-debug.Plo \
+ ./$(DEPDIR)/libkpathsea_la-dir.Plo \
+ ./$(DEPDIR)/libkpathsea_la-elt-dirs.Plo \
+ ./$(DEPDIR)/libkpathsea_la-expand.Plo \
+ ./$(DEPDIR)/libkpathsea_la-extend-fname.Plo \
+ ./$(DEPDIR)/libkpathsea_la-file-p.Plo \
+ ./$(DEPDIR)/libkpathsea_la-find-suffix.Plo \
+ ./$(DEPDIR)/libkpathsea_la-fn.Plo \
+ ./$(DEPDIR)/libkpathsea_la-fontmap.Plo \
+ ./$(DEPDIR)/libkpathsea_la-getopt.Plo \
+ ./$(DEPDIR)/libkpathsea_la-getopt1.Plo \
+ ./$(DEPDIR)/libkpathsea_la-hash.Plo \
+ ./$(DEPDIR)/libkpathsea_la-kdefault.Plo \
+ ./$(DEPDIR)/libkpathsea_la-knj.Plo \
+ ./$(DEPDIR)/libkpathsea_la-kpathsea.Plo \
+ ./$(DEPDIR)/libkpathsea_la-line.Plo \
+ ./$(DEPDIR)/libkpathsea_la-magstep.Plo \
+ ./$(DEPDIR)/libkpathsea_la-make-suffix.Plo \
+ ./$(DEPDIR)/libkpathsea_la-mingw32.Plo \
+ ./$(DEPDIR)/libkpathsea_la-path-elt.Plo \
+ ./$(DEPDIR)/libkpathsea_la-pathsearch.Plo \
+ ./$(DEPDIR)/libkpathsea_la-proginit.Plo \
+ ./$(DEPDIR)/libkpathsea_la-progname.Plo \
+ ./$(DEPDIR)/libkpathsea_la-readable.Plo \
+ ./$(DEPDIR)/libkpathsea_la-rm-suffix.Plo \
+ ./$(DEPDIR)/libkpathsea_la-str-list.Plo \
+ ./$(DEPDIR)/libkpathsea_la-str-llist.Plo \
+ ./$(DEPDIR)/libkpathsea_la-tex-file.Plo \
+ ./$(DEPDIR)/libkpathsea_la-tex-glyph.Plo \
+ ./$(DEPDIR)/libkpathsea_la-tex-hush.Plo \
+ ./$(DEPDIR)/libkpathsea_la-tex-make.Plo \
+ ./$(DEPDIR)/libkpathsea_la-tilde.Plo \
+ ./$(DEPDIR)/libkpathsea_la-uppercasify.Plo \
+ ./$(DEPDIR)/libkpathsea_la-variable.Plo \
+ ./$(DEPDIR)/libkpathsea_la-version.Plo \
+ ./$(DEPDIR)/libkpathsea_la-win32lib.Plo \
+ ./$(DEPDIR)/libkpathsea_la-xbasename.Plo \
+ ./$(DEPDIR)/libkpathsea_la-xcalloc.Plo \
+ ./$(DEPDIR)/libkpathsea_la-xdirname.Plo \
+ ./$(DEPDIR)/libkpathsea_la-xfopen.Plo \
+ ./$(DEPDIR)/libkpathsea_la-xfseek.Plo \
+ ./$(DEPDIR)/libkpathsea_la-xfseeko.Plo \
+ ./$(DEPDIR)/libkpathsea_la-xftell.Plo \
+ ./$(DEPDIR)/libkpathsea_la-xftello.Plo \
+ ./$(DEPDIR)/libkpathsea_la-xgetcwd.Plo \
+ ./$(DEPDIR)/libkpathsea_la-xmalloc.Plo \
+ ./$(DEPDIR)/libkpathsea_la-xopendir.Plo \
+ ./$(DEPDIR)/libkpathsea_la-xputenv.Plo \
+ ./$(DEPDIR)/libkpathsea_la-xrealloc.Plo \
+ ./$(DEPDIR)/libkpathsea_la-xstat.Plo \
+ ./$(DEPDIR)/libkpathsea_la-xstrdup.Plo \
+ ./$(DEPDIR)/progname_test-progname.Po ./$(DEPDIR)/readlink.Po \
+ ./$(DEPDIR)/xdirtest.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -315,7 +377,8 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- cscope check recheck distdir dist dist-all distcheck
+ cscope check recheck distdir distdir-am dist dist-all \
+ distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
$(LISP)c-auto.in
# Read a list of newline-separated strings from the standard input,
@@ -837,8 +900,8 @@
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(top_srcdir)/../../am/bin_links.am $(srcdir)/../../am/rebuild.am $(am__empty):
@@ -867,44 +930,6 @@
-rm -f c-auto.h stamp-h1
kpathsea.pc: $(top_builddir)/config.status $(srcdir)/kpathsea.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
- list2=; for p in $$list; do \
- if test -f $$p; then \
- list2="$$list2 $$p"; \
- else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
- }
-
-uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
- done
-
-clean-libLTLIBRARIES:
- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- @list='$(lib_LTLIBRARIES)'; \
- locs=`for p in $$list; do echo $$p; done | \
- sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
- sort -u`; \
- test -z "$$locs" || { \
- echo rm -f $${locs}; \
- rm -f $${locs}; \
- }
-
-libkpathsea.la: $(libkpathsea_la_OBJECTS) $(libkpathsea_la_DEPENDENCIES) $(EXTRA_libkpathsea_la_DEPENDENCIES)
- $(AM_V_CCLD)$(libkpathsea_la_LINK) -rpath $(libdir) $(libkpathsea_la_OBJECTS) $(libkpathsea_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -955,6 +980,44 @@
echo " rm -f" $$list; \
rm -f $$list
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ list2=; for p in $$list; do \
+ if test -f $$p; then \
+ list2="$$list2 $$p"; \
+ else :; fi; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+ }
+
+uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+ done
+
+clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
+libkpathsea.la: $(libkpathsea_la_OBJECTS) $(libkpathsea_la_DEPENDENCIES) $(EXTRA_libkpathsea_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(libkpathsea_la_LINK) -rpath $(libdir) $(libkpathsea_la_OBJECTS) $(libkpathsea_la_LIBADD) $(LIBS)
+
kpseaccess$(EXEEXT): $(kpseaccess_OBJECTS) $(kpseaccess_DEPENDENCIES) $(EXTRA_kpseaccess_DEPENDENCIES)
@rm -f kpseaccess$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(kpseaccess_OBJECTS) $(kpseaccess_LDADD) $(LIBS)
@@ -1020,72 +1083,78 @@
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/putenv.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/access.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kpsestat.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kpsewhich.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-absolute.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-atou.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-cnf.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-concat.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-concat3.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-concatn.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-db.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-debug.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-dir.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-elt-dirs.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-expand.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-extend-fname.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-file-p.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-find-suffix.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-fn.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-fontmap.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-getopt.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-getopt1.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-hash.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-kdefault.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-knj.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-kpathsea.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-line.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-magstep.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-make-suffix.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-mingw32.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-path-elt.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-pathsearch.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-proginit.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-progname.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-readable.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-rm-suffix.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-str-list.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-str-llist.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-tex-file.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-tex-glyph.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-tex-hush.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-tex-make.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-tilde.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-uppercasify.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-variable.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-version.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-win32lib.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xbasename.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xcalloc.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xdirname.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xfopen.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xfseek.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xfseeko.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xftell.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xftello.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xgetcwd.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xmalloc.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xopendir.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xputenv.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xrealloc.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xstat.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xstrdup.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/progname_test-progname.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/readlink.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xdirtest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/putenv.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/access.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kpsestat.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kpsewhich.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-absolute.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-atou.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-cnf.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-concat.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-concat3.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-concatn.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-db.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-debug.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-dir.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-elt-dirs.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-expand.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-extend-fname.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-file-p.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-find-suffix.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-fn.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-fontmap.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-getopt.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-getopt1.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-hash.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-kdefault.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-knj.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-kpathsea.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-line.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-magstep.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-make-suffix.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-mingw32.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-path-elt.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-pathsearch.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-proginit.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-progname.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-readable.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-rm-suffix.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-str-list.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-str-llist.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-tex-file.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-tex-glyph.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-tex-hush.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-tex-make.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-tilde.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-uppercasify.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-variable.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-version.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-win32lib.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xbasename.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xcalloc.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xdirname.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xfopen.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xfseek.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xfseeko.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xftell.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xftello.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xgetcwd.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xmalloc.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xopendir.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xputenv.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xrealloc.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xstat.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkpathsea_la-xstrdup.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/progname_test-progname.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/readlink.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xdirtest.Po at am__quote@ # am--include-marker
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -1849,7 +1918,7 @@
fi; \
$$success || exit 1
-check-TESTS:
+check-TESTS:
@list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -1885,7 +1954,10 @@
@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -2077,13 +2149,13 @@
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-recursive
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
+all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(DATA) \
$(HEADERS) c-auto.h
install-binPROGRAMS: install-libLTLIBRARIES
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -2130,7 +2202,71 @@
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf $(DEPDIR) ./$(DEPDIR)
+ -rm -f $(DEPDIR)/putenv.Plo
+ -rm -f ./$(DEPDIR)/access.Po
+ -rm -f ./$(DEPDIR)/kpsestat.Po
+ -rm -f ./$(DEPDIR)/kpsewhich.Po
+ -rm -f ./$(DEPDIR)/libkpathsea_la-absolute.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-atou.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-cnf.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-concat.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-concat3.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-concatn.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-db.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-debug.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-dir.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-elt-dirs.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-expand.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-extend-fname.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-file-p.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-find-suffix.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-fn.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-fontmap.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-getopt.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-getopt1.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-hash.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-kdefault.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-knj.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-kpathsea.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-line.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-magstep.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-make-suffix.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-mingw32.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-path-elt.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-pathsearch.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-proginit.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-progname.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-readable.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-rm-suffix.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-str-list.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-str-llist.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-tex-file.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-tex-glyph.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-tex-hush.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-tex-make.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-tilde.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-uppercasify.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-variable.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-version.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-win32lib.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xbasename.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xcalloc.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xdirname.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xfopen.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xfseek.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xfseeko.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xftell.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xftello.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xgetcwd.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xmalloc.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xopendir.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xputenv.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xrealloc.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xstat.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xstrdup.Plo
+ -rm -f ./$(DEPDIR)/progname_test-progname.Po
+ -rm -f ./$(DEPDIR)/readlink.Po
+ -rm -f ./$(DEPDIR)/xdirtest.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-libtool distclean-tags
@@ -2182,7 +2318,71 @@
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -rf $(DEPDIR) ./$(DEPDIR)
+ -rm -f $(DEPDIR)/putenv.Plo
+ -rm -f ./$(DEPDIR)/access.Po
+ -rm -f ./$(DEPDIR)/kpsestat.Po
+ -rm -f ./$(DEPDIR)/kpsewhich.Po
+ -rm -f ./$(DEPDIR)/libkpathsea_la-absolute.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-atou.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-cnf.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-concat.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-concat3.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-concatn.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-db.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-debug.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-dir.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-elt-dirs.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-expand.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-extend-fname.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-file-p.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-find-suffix.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-fn.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-fontmap.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-getopt.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-getopt1.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-hash.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-kdefault.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-knj.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-kpathsea.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-line.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-magstep.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-make-suffix.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-mingw32.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-path-elt.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-pathsearch.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-proginit.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-progname.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-readable.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-rm-suffix.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-str-list.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-str-llist.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-tex-file.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-tex-glyph.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-tex-hush.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-tex-make.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-tilde.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-uppercasify.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-variable.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-version.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-win32lib.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xbasename.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xcalloc.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xdirname.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xfopen.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xfseek.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xfseeko.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xftell.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xftello.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xgetcwd.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xmalloc.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xopendir.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xputenv.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xrealloc.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xstat.Plo
+ -rm -f ./$(DEPDIR)/libkpathsea_la-xstrdup.Plo
+ -rm -f ./$(DEPDIR)/progname_test-progname.Po
+ -rm -f ./$(DEPDIR)/readlink.Po
+ -rm -f ./$(DEPDIR)/xdirtest.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -2209,14 +2409,15 @@
install-exec-am install-strip uninstall-am
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
- am--refresh check check-TESTS check-am clean clean-binPROGRAMS \
- clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \
- cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
- dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
- distcheck distclean distclean-compile distclean-generic \
- distclean-hdr distclean-libtool distclean-tags distcleancheck \
- distdir distuninstallcheck dvi dvi-am html html-am info \
- info-am install install-am install-binPROGRAMS install-data \
+ am--depfiles am--refresh check check-TESTS check-am clean \
+ clean-binPROGRAMS clean-cscope clean-generic \
+ clean-libLTLIBRARIES clean-libtool cscope cscopelist-am ctags \
+ ctags-am dist dist-all dist-bzip2 dist-gzip dist-lzip \
+ dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
+ distclean-compile distclean-generic distclean-hdr \
+ distclean-libtool distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-binPROGRAMS install-data \
install-data-am install-data-local install-dist_web2cDATA \
install-dist_web2cSCRIPTS install-dvi install-dvi-am \
install-exec install-exec-am install-exec-hook \
@@ -2307,7 +2508,7 @@
else :; fi; \
done
-# $Id: bin_links.am 43248 2017-02-16 21:38:29Z karl $
+# $Id: Makefile.in 47714 2018-05-14 18:07:32Z karl $
# am/bin_links.am: Makefile fragment for bindir links.
.PHONY: install-bin-links uninstall-bin-links
Modified: branches/stable/source/src/texk/kpathsea/aclocal.m4
===================================================================
--- branches/stable/source/src/texk/kpathsea/aclocal.m4 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/kpathsea/aclocal.m4 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
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.15.1], [],
+m4_if([$1], [1.16.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@
# 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.15.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -58,7 +58,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -141,7 +141,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -332,13 +332,12 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -346,49 +345,41 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ AS_CASE([$CONFIG_FILES],
+ [*\'*], [eval set x "$CONFIG_FILES"],
+ [*], [set x $CONFIG_FILES])
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`AS_DIRNAME(["$am_mf"])`
+ am_filepart=`AS_BASENAME(["$am_mf"])`
+ AM_RUN_LOG([cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles]) || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).])
+ fi
+ AS_UNSET([am_dirpart])
+ AS_UNSET([am_filepart])
+ AS_UNSET([am_mf])
+ AS_UNSET([am_rc])
+ rm -f conftest-deps.mk
}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -397,18 +388,17 @@
# -----------------------------
# This macro should only be invoked once -- use via AC_REQUIRE.
#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
+ [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -495,8 +485,8 @@
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms.
@@ -563,7 +553,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -605,7 +595,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -626,7 +616,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -648,7 +638,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -683,7 +673,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -691,49 +681,42 @@
# AM_MAKE_INCLUDE()
# -----------------
-# Check to see how make treats includes.
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+ AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+ ['0:this is the am__doit target'],
+ [AS_CASE([$s],
+ [BSD], [am__include='.include' am__quote='"'],
+ [am__include='include' am__quote=''])])
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT([${_am_result}])
+AC_SUBST([am__include])])
+AC_SUBST([am__quote])])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -772,7 +755,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -801,7 +784,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -848,7 +831,7 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -867,7 +850,7 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -948,7 +931,7 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1008,7 +991,7 @@
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1036,7 +1019,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1055,7 +1038,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Modified: branches/stable/source/src/texk/kpathsea/c-auto.in
===================================================================
--- branches/stable/source/src/texk/kpathsea/c-auto.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/kpathsea/c-auto.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -23,7 +23,7 @@
#define KPATHSEA_C_AUTO_H
/* kpathsea: the version string. */
-#define KPSEVERSION "kpathsea version 6.3.0"
+#define KPSEVERSION "kpathsea version 6.3.1/dev"
/* Define to 1 if the `closedir' function returns void instead of `int'. */
#undef CLOSEDIR_VOID
Modified: branches/stable/source/src/texk/kpathsea/configure
===================================================================
--- branches/stable/source/src/texk/kpathsea/configure 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/kpathsea/configure 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Kpathsea 6.3.0.
+# Generated by GNU Autoconf 2.69 for Kpathsea 6.3.1/dev.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='Kpathsea'
PACKAGE_TARNAME='kpathsea'
-PACKAGE_VERSION='6.3.0'
-PACKAGE_STRING='Kpathsea 6.3.0'
+PACKAGE_VERSION='6.3.1/dev'
+PACKAGE_STRING='Kpathsea 6.3.1/dev'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -683,7 +683,6 @@
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
-am__quote
am__include
DEPDIR
OBJEXT
@@ -763,7 +762,8 @@
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL'
+SHELL
+am__quote'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -1339,7 +1339,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Kpathsea 6.3.0 to adapt to many kinds of systems.
+\`configure' configures Kpathsea 6.3.1/dev to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1409,7 +1409,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Kpathsea 6.3.0:";;
+ short | recursive ) echo "Configuration of Kpathsea 6.3.1/dev:";;
esac
cat <<\_ACEOF
@@ -1537,7 +1537,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Kpathsea configure 6.3.0
+Kpathsea configure 6.3.1/dev
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2376,7 +2376,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Kpathsea $as_me 6.3.0, which was
+It was created by Kpathsea $as_me 6.3.1/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2757,17 +2757,17 @@
-KPSEVERSION=6.3.0
+KPSEVERSION=6.3.1/dev
-KPSE_LT_VERSINFO=9:0:3
+KPSE_LT_VERSINFO=9:1:3
- WEB2CVERSION=" (TeX Live 2018)"
+ WEB2CVERSION=" (TeX Live 2019/dev)"
-am__api_version='1.15'
+am__api_version='1.16'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -3235,46 +3235,46 @@
ac_config_commands="$ac_config_commands depfiles"
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+ (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ case $?:`cat confinc.out 2>/dev/null` in #(
+ '0:this is the am__doit target') :
+ case $s in #(
+ BSD) :
+ am__include='.include' am__quote='"' ;; #(
+ *) :
+ am__include='include' am__quote='' ;;
+esac ;; #(
+ *) :
+ ;;
esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+$as_echo "${_am_result}" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
# Check whether --enable-dependency-tracking was given.
if test "${enable_dependency_tracking+set}" = set; then :
enableval=$enable_dependency_tracking;
@@ -8071,7 +8071,7 @@
# Define the identity of the package.
PACKAGE='kpathsea'
- VERSION='6.3.0'
+ VERSION='6.3.1/dev'
cat >>confdefs.h <<_ACEOF
@@ -8101,8 +8101,8 @@
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
# We need awk for the "check" target (and possibly the TAP driver). The
@@ -8153,7 +8153,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -14695,7 +14695,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Kpathsea $as_me 6.3.0, which was
+This file was extended by Kpathsea $as_me 6.3.1/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14761,7 +14761,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Kpathsea config.status 6.3.0
+Kpathsea config.status 6.3.1/dev
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -14880,7 +14880,7 @@
#
# INIT-COMMANDS
#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
# The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -15782,29 +15782,35 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ case $CONFIG_FILES in #(
+ *\'*) :
+ eval set x "$CONFIG_FILES" ;; #(
+ *) :
+ set x $CONFIG_FILES ;; #(
+ *) :
+ ;;
+esac
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$am_mf" : 'X\(//\)[^/]' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$am_mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -15822,53 +15828,48 @@
q
}
s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$am_mf" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
}
- /^X\(\/\/\)[^/].*/{
+ /^X\/\(\/\/\)$/{
s//\1/
q
}
- /^X\(\/\/\)$/{
+ /^X\/\(\/\).*/{
s//\1/
q
}
- /^X\(\/\).*/{
- s//\1/
- q
- }
s/.*/./; q'`
- as_dir=$dirpart/$fdir; as_fn_mkdir_p
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ { echo "$as_me:$LINENO: cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles" >&5
+ (cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ { am_dirpart=; unset am_dirpart;}
+ { am_filepart=; unset am_filepart;}
+ { am_mf=; unset am_mf;}
+ { am_rc=; unset am_rc;}
+ rm -f conftest-deps.mk
}
;;
"libtool":C)
Modified: branches/stable/source/src/texk/kpathsea/doc/Makefile.in
===================================================================
--- branches/stable/source/src/texk/kpathsea/doc/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/kpathsea/doc/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -345,8 +345,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -511,7 +511,10 @@
cscope cscopelist:
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
Modified: branches/stable/source/src/texk/kpathsea/kpsewhich.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/kpsewhich.c 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/kpathsea/kpsewhich.c 2018-05-17 17:02:02 UTC (rev 797)
@@ -773,6 +773,7 @@
#ifdef WIN32
if(strstr(kpse->program_name,"xetex") || strstr(kpse->program_name,"xelatex")
|| strstr(kpse->program_name,"uptex") || strstr(kpse->program_name,"uplatex")
+ || strstr(kpse->program_name,"pdftex")
|| strstr(kpse->program_name,"dvipdfm") || strstr(kpse->program_name,"extractbb")
|| strstr(kpse->program_name,"xbb") || strstr(kpse->program_name,"ebb")
|| strstr(kpse->program_name,"dvips") || strstr(kpse->program_name,"upmendex"))
Modified: branches/stable/source/src/texk/kpathsea/man/Makefile.in
===================================================================
--- branches/stable/source/src/texk/kpathsea/man/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/kpathsea/man/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -329,8 +329,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_srcdir)/../../am/man.am $(top_srcdir)/../../am/man1_links.am $(am__empty):
@@ -396,7 +396,10 @@
cscope cscopelist:
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
Modified: branches/stable/source/src/texk/kpathsea/version.ac
===================================================================
--- branches/stable/source/src/texk/kpathsea/version.ac 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/kpathsea/version.ac 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,4 +1,4 @@
-dnl $Id: version.ac 46759 2018-02-27 23:14:55Z karl $
+dnl $Id: version.ac 47475 2018-04-28 22:53:00Z karl $
dnl Copyright 2016-2018 Karl Berry <tex-live at tug.org>
dnl Copyright 2011-2015 Peter Breitenlohner <tex-live at tug.org>
dnl
@@ -20,4 +20,4 @@
dnl --------------------------------------------------------
dnl
dnl this file is m4-included from configure.ac
-m4_define([kpse_version], [6.3.0])
+m4_define([kpse_version], [6.3.1/dev])
Modified: branches/stable/source/src/texk/kpathsea/win32/Makefile.in
===================================================================
--- branches/stable/source/src/texk/kpathsea/win32/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/kpathsea/win32/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -160,7 +160,12 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/dirutil.Po ./$(DEPDIR)/getdestdir.Po \
+ ./$(DEPDIR)/mkpaths.Po ./$(DEPDIR)/mktexfmt.Po \
+ ./$(DEPDIR)/mktexlsr.Po ./$(DEPDIR)/mktexmf.Po \
+ ./$(DEPDIR)/mktexpk.Po ./$(DEPDIR)/mktextfm.Po \
+ ./$(DEPDIR)/mktexupd.Po ./$(DEPDIR)/mktexupdmain.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -399,8 +404,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -491,17 +496,23 @@
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dirutil.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getdestdir.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mkpaths.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mktexfmt.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mktexlsr.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mktexmf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mktexpk.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mktextfm.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mktexupd.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mktexupdmain.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dirutil.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getdestdir.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mkpaths.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mktexfmt.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mktexlsr.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mktexmf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mktexpk.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mktextfm.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mktexupd.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mktexupdmain.Po at am__quote@ # am--include-marker
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -584,7 +595,10 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -656,7 +670,16 @@
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/dirutil.Po
+ -rm -f ./$(DEPDIR)/getdestdir.Po
+ -rm -f ./$(DEPDIR)/mkpaths.Po
+ -rm -f ./$(DEPDIR)/mktexfmt.Po
+ -rm -f ./$(DEPDIR)/mktexlsr.Po
+ -rm -f ./$(DEPDIR)/mktexmf.Po
+ -rm -f ./$(DEPDIR)/mktexpk.Po
+ -rm -f ./$(DEPDIR)/mktextfm.Po
+ -rm -f ./$(DEPDIR)/mktexupd.Po
+ -rm -f ./$(DEPDIR)/mktexupdmain.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -703,7 +726,16 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/dirutil.Po
+ -rm -f ./$(DEPDIR)/getdestdir.Po
+ -rm -f ./$(DEPDIR)/mkpaths.Po
+ -rm -f ./$(DEPDIR)/mktexfmt.Po
+ -rm -f ./$(DEPDIR)/mktexlsr.Po
+ -rm -f ./$(DEPDIR)/mktexmf.Po
+ -rm -f ./$(DEPDIR)/mktexpk.Po
+ -rm -f ./$(DEPDIR)/mktextfm.Po
+ -rm -f ./$(DEPDIR)/mktexupd.Po
+ -rm -f ./$(DEPDIR)/mktexupdmain.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -725,7 +757,7 @@
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
.MAKE: install-am install-exec-am install-strip uninstall-am
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
ctags ctags-am distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
Modified: branches/stable/source/src/texk/web2c/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/ChangeLog 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/web2c/ChangeLog 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,3 +1,9 @@
+2018-05-03 Karl Berry <karl at freefriends.org>
+
+ * patgen.ch (trie_size, triec_size): increase greatly.
+ Request/patch from Werner Lemberg, 27 Apr 2018 07:51:29,
+ 03 May 2018 13:49:02.
+
2018-04-14 Karl Berry <karl at tug.org>
* TeX Live 2018 release.
Modified: branches/stable/source/src/texk/web2c/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/web2c/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -399,6 +399,61 @@
CONFIG_CLEAN_FILES = web2c-sh tangle-sh ctangleboot-sh silent-sh \
synctexdir/synctex.pc callexe.c
CONFIG_CLEAN_VPATH_FILES =
+am__EXEEXT_1 = bibtex$(EXEEXT) dvicopy$(EXEEXT) dvitype$(EXEEXT) \
+ gftodvi$(EXEEXT) gftopk$(EXEEXT) gftype$(EXEEXT) mft$(EXEEXT) \
+ patgen$(EXEEXT) pktogf$(EXEEXT) pktype$(EXEEXT) \
+ pltotf$(EXEEXT) pooltype$(EXEEXT) tftopl$(EXEEXT) \
+ vftovp$(EXEEXT) vptovf$(EXEEXT) weave$(EXEEXT)
+am__EXEEXT_2 = pbibtex$(EXEEXT) pdvitype$(EXEEXT) ppltotf$(EXEEXT) \
+ ptftopl$(EXEEXT)
+am__EXEEXT_3 = upbibtex$(EXEEXT) updvitype$(EXEEXT) uppltotf$(EXEEXT) \
+ uptftopl$(EXEEXT)
+am__EXEEXT_4 = odvicopy$(EXEEXT) odvitype$(EXEEXT) otangle$(EXEEXT) \
+ wofm2opl$(EXEEXT) wopl2ofm$(EXEEXT) wovf2ovp$(EXEEXT) \
+ wovp2ovf$(EXEEXT)
+ at WEB_TRUE@am__EXEEXT_5 = $(am__EXEEXT_1)
+ at TEX_TRUE@am__EXEEXT_6 = tex$(EXEEXT)
+ at TEX_TRUE@@WIN32_TRUE at am__EXEEXT_7 = initex$(EXEEXT)
+ at MF_TRUE@am__EXEEXT_8 = mf$(EXEEXT)
+ at MFN_TRUE@@MF_TRUE at am__EXEEXT_9 = mf-nowin$(EXEEXT)
+ at MFLUA_TRUE@am__EXEEXT_10 = mflua$(EXEEXT)
+ at MFLUAN_TRUE@@MFLUA_TRUE at am__EXEEXT_11 = mflua-nowin$(EXEEXT)
+ at MFLUAJIT_TRUE@am__EXEEXT_12 = mfluajit$(EXEEXT)
+ at MFLUAJITN_TRUE@@MFLUAJIT_TRUE at am__EXEEXT_13 = \
+ at MFLUAJITN_TRUE@@MFLUAJIT_TRUE@ mfluajit-nowin$(EXEEXT)
+ at MP_TRUE@am__EXEEXT_14 = mpost$(EXEEXT)
+ at PMP_TRUE@am__EXEEXT_15 = pmpost$(EXEEXT)
+ at UPMP_TRUE@am__EXEEXT_16 = upmpost$(EXEEXT)
+ at ETEX_TRUE@am__EXEEXT_17 = etex$(EXEEXT)
+ at PTEX_TRUE@am__EXEEXT_18 = ptex$(EXEEXT)
+ at PWEB_TRUE@am__EXEEXT_19 = $(am__EXEEXT_2)
+ at EPTEX_TRUE@am__EXEEXT_20 = eptex$(EXEEXT)
+ at UPTEX_TRUE@am__EXEEXT_21 = uptex$(EXEEXT)
+ at UPWEB_TRUE@am__EXEEXT_22 = $(am__EXEEXT_3)
+ at EUPTEX_TRUE@am__EXEEXT_23 = euptex$(EXEEXT)
+ at PDFTEX_TRUE@am__EXEEXT_24 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
+ at PDFTEX_TRUE@ pdftosrc$(EXEEXT)
+ at LUATEX_TRUE@am__EXEEXT_25 = luatex$(EXEEXT)
+ at LUATEX53_TRUE@am__EXEEXT_26 = luatex53$(EXEEXT)
+ at LUAJITTEX_TRUE@am__EXEEXT_27 = luajittex$(EXEEXT)
+ at XETEX_TRUE@am__EXEEXT_28 = xetex$(EXEEXT)
+ at OTANGLE_TRUE@am__EXEEXT_29 = $(am__EXEEXT_4)
+ at ALEPH_TRUE@am__EXEEXT_30 = aleph$(EXEEXT)
+ at SYNCTEX_TRUE@am__EXEEXT_31 = synctex$(EXEEXT)
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \
+ "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man1dir)" \
+ "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(pkgconfigdir)" \
+ "$(DESTDIR)$(syncincludedir)"
+ at MF_TRUE@@WIN32_TRUE at am__EXEEXT_32 = call_mf$(EXEEXT)
+ at MFLUA_TRUE@@WIN32_TRUE at am__EXEEXT_33 = call_mflua$(EXEEXT)
+ at MFLUAJIT_TRUE@@WIN32_TRUE at am__EXEEXT_34 = call_mfluajit$(EXEEXT)
+ at MP_TRUE@@WIN32_TRUE at am__EXEEXT_35 = call_mpost$(EXEEXT)
+ at PMP_TRUE@@WIN32_TRUE at am__EXEEXT_36 = call_pmpost$(EXEEXT)
+ at UPMP_TRUE@@WIN32_TRUE at am__EXEEXT_37 = call_upmpost$(EXEEXT)
+ at LUATEX_TRUE@@WIN32_TRUE at am__EXEEXT_38 = call_luatex$(EXEEXT)
+ at LUATEX53_TRUE@@WIN32_TRUE at am__EXEEXT_39 = call_luatex53$(EXEEXT)
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__EXEEXT_40 = call_luajittex$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -426,11 +481,8 @@
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libdir)" \
- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
- "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(pkgconfigdir)" \
- "$(DESTDIR)$(syncincludedir)"
LIBRARIES = $(lib_LIBRARIES)
+LTLIBRARIES = $(lib_LTLIBRARIES)
ARFLAGS = cru
AM_V_AR = $(am__v_AR_ at AM_V@)
am__v_AR_ = $(am__v_AR_ at AM_DEFAULT_V@)
@@ -934,7 +986,7 @@
$(nodist_libluatex_a_OBJECTS)
libmd5_a_AR = $(AR) $(ARFLAGS)
libmd5_a_LIBADD =
-am_libmd5_a_OBJECTS = libmd5/libmd5_a-md5.$(OBJEXT)
+am_libmd5_a_OBJECTS = libmd5/a-md5.$(OBJEXT)
libmd5_a_OBJECTS = $(am_libmd5_a_OBJECTS)
libmf_a_AR = $(AR) $(ARFLAGS)
libmf_a_LIBADD =
@@ -1090,7 +1142,6 @@
xetexdir/image/libxetex_a-pngimage.$(OBJEXT) $(am__objects_29) \
$(am__objects_30)
libxetex_a_OBJECTS = $(am_libxetex_a_OBJECTS)
-LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libsynctex_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
@@ -1104,57 +1155,6 @@
libsynctex_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libsynctex_la_LDFLAGS) $(LDFLAGS) -o $@
-am__EXEEXT_1 = bibtex$(EXEEXT) dvicopy$(EXEEXT) dvitype$(EXEEXT) \
- gftodvi$(EXEEXT) gftopk$(EXEEXT) gftype$(EXEEXT) mft$(EXEEXT) \
- patgen$(EXEEXT) pktogf$(EXEEXT) pktype$(EXEEXT) \
- pltotf$(EXEEXT) pooltype$(EXEEXT) tftopl$(EXEEXT) \
- vftovp$(EXEEXT) vptovf$(EXEEXT) weave$(EXEEXT)
-am__EXEEXT_2 = pbibtex$(EXEEXT) pdvitype$(EXEEXT) ppltotf$(EXEEXT) \
- ptftopl$(EXEEXT)
-am__EXEEXT_3 = upbibtex$(EXEEXT) updvitype$(EXEEXT) uppltotf$(EXEEXT) \
- uptftopl$(EXEEXT)
-am__EXEEXT_4 = odvicopy$(EXEEXT) odvitype$(EXEEXT) otangle$(EXEEXT) \
- wofm2opl$(EXEEXT) wopl2ofm$(EXEEXT) wovf2ovp$(EXEEXT) \
- wovp2ovf$(EXEEXT)
- at WEB_TRUE@am__EXEEXT_5 = $(am__EXEEXT_1)
- at TEX_TRUE@am__EXEEXT_6 = tex$(EXEEXT)
- at TEX_TRUE@@WIN32_TRUE at am__EXEEXT_7 = initex$(EXEEXT)
- at MF_TRUE@am__EXEEXT_8 = mf$(EXEEXT)
- at MFN_TRUE@@MF_TRUE at am__EXEEXT_9 = mf-nowin$(EXEEXT)
- at MFLUA_TRUE@am__EXEEXT_10 = mflua$(EXEEXT)
- at MFLUAN_TRUE@@MFLUA_TRUE at am__EXEEXT_11 = mflua-nowin$(EXEEXT)
- at MFLUAJIT_TRUE@am__EXEEXT_12 = mfluajit$(EXEEXT)
- at MFLUAJITN_TRUE@@MFLUAJIT_TRUE at am__EXEEXT_13 = \
- at MFLUAJITN_TRUE@@MFLUAJIT_TRUE@ mfluajit-nowin$(EXEEXT)
- at MP_TRUE@am__EXEEXT_14 = mpost$(EXEEXT)
- at PMP_TRUE@am__EXEEXT_15 = pmpost$(EXEEXT)
- at UPMP_TRUE@am__EXEEXT_16 = upmpost$(EXEEXT)
- at ETEX_TRUE@am__EXEEXT_17 = etex$(EXEEXT)
- at PTEX_TRUE@am__EXEEXT_18 = ptex$(EXEEXT)
- at PWEB_TRUE@am__EXEEXT_19 = $(am__EXEEXT_2)
- at EPTEX_TRUE@am__EXEEXT_20 = eptex$(EXEEXT)
- at UPTEX_TRUE@am__EXEEXT_21 = uptex$(EXEEXT)
- at UPWEB_TRUE@am__EXEEXT_22 = $(am__EXEEXT_3)
- at EUPTEX_TRUE@am__EXEEXT_23 = euptex$(EXEEXT)
- at PDFTEX_TRUE@am__EXEEXT_24 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
- at PDFTEX_TRUE@ pdftosrc$(EXEEXT)
- at LUATEX_TRUE@am__EXEEXT_25 = luatex$(EXEEXT)
- at LUATEX53_TRUE@am__EXEEXT_26 = luatex53$(EXEEXT)
- at LUAJITTEX_TRUE@am__EXEEXT_27 = luajittex$(EXEEXT)
- at XETEX_TRUE@am__EXEEXT_28 = xetex$(EXEEXT)
- at OTANGLE_TRUE@am__EXEEXT_29 = $(am__EXEEXT_4)
- at ALEPH_TRUE@am__EXEEXT_30 = aleph$(EXEEXT)
- at SYNCTEX_TRUE@am__EXEEXT_31 = synctex$(EXEEXT)
- at MF_TRUE@@WIN32_TRUE at am__EXEEXT_32 = call_mf$(EXEEXT)
- at MFLUA_TRUE@@WIN32_TRUE at am__EXEEXT_33 = call_mflua$(EXEEXT)
- at MFLUAJIT_TRUE@@WIN32_TRUE at am__EXEEXT_34 = call_mfluajit$(EXEEXT)
- at MP_TRUE@@WIN32_TRUE at am__EXEEXT_35 = call_mpost$(EXEEXT)
- at PMP_TRUE@@WIN32_TRUE at am__EXEEXT_36 = call_pmpost$(EXEEXT)
- at UPMP_TRUE@@WIN32_TRUE at am__EXEEXT_37 = call_upmpost$(EXEEXT)
- at LUATEX_TRUE@@WIN32_TRUE at am__EXEEXT_38 = call_luatex$(EXEEXT)
- at LUATEX53_TRUE@@WIN32_TRUE at am__EXEEXT_39 = call_luatex53$(EXEEXT)
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__EXEEXT_40 = call_luajittex$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
dist_aleph_OBJECTS = alephdir/aleph-aleph.$(OBJEXT) \
alephdir/aleph-alephbis.$(OBJEXT) \
alephdir/aleph-alephextra.$(OBJEXT)
@@ -1598,7 +1598,665 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/w2c
depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/aleph-aleph-pool.Po \
+ ./$(DEPDIR)/aleph-aleph0.Po ./$(DEPDIR)/aleph-alephini.Po \
+ ./$(DEPDIR)/bibtex.Po ./$(DEPDIR)/call_luajittex-callexe.Po \
+ ./$(DEPDIR)/call_luatex-callexe.Po \
+ ./$(DEPDIR)/call_luatex53-callexe.Po \
+ ./$(DEPDIR)/call_mf-callexe.Po \
+ ./$(DEPDIR)/call_mflua-callexe.Po \
+ ./$(DEPDIR)/call_mfluajit-callexe.Po \
+ ./$(DEPDIR)/call_mpost-callexe.Po \
+ ./$(DEPDIR)/call_pmpost-callexe.Po \
+ ./$(DEPDIR)/call_upmpost-callexe.Po ./$(DEPDIR)/ctangle.Po \
+ ./$(DEPDIR)/ctangleboot.Po ./$(DEPDIR)/ctie.Po \
+ ./$(DEPDIR)/cweave.Po ./$(DEPDIR)/cweb.Po \
+ ./$(DEPDIR)/cwebboot.Po ./$(DEPDIR)/dvicopy.Po \
+ ./$(DEPDIR)/dvitype.Po ./$(DEPDIR)/eptex-eptex-pool.Po \
+ ./$(DEPDIR)/eptex-eptex0.Po ./$(DEPDIR)/eptex-eptexini.Po \
+ ./$(DEPDIR)/etex-etex-pool.Po ./$(DEPDIR)/etex-etex0.Po \
+ ./$(DEPDIR)/etex-etexini.Po ./$(DEPDIR)/euptex-euptex-pool.Po \
+ ./$(DEPDIR)/euptex-euptex0.Po ./$(DEPDIR)/euptex-euptexini.Po \
+ ./$(DEPDIR)/gftodvi.Po ./$(DEPDIR)/gftopk.Po \
+ ./$(DEPDIR)/gftype.Po ./$(DEPDIR)/initex-callexe.Po \
+ ./$(DEPDIR)/liblua53tex_a-align.Po \
+ ./$(DEPDIR)/liblua53tex_a-arithmetic.Po \
+ ./$(DEPDIR)/liblua53tex_a-avlstuff.Po \
+ ./$(DEPDIR)/liblua53tex_a-buildpage.Po \
+ ./$(DEPDIR)/liblua53tex_a-commands.Po \
+ ./$(DEPDIR)/liblua53tex_a-conditional.Po \
+ ./$(DEPDIR)/liblua53tex_a-directions.Po \
+ ./$(DEPDIR)/liblua53tex_a-dofont.Po \
+ ./$(DEPDIR)/liblua53tex_a-dumpdata.Po \
+ ./$(DEPDIR)/liblua53tex_a-dvigen.Po \
+ ./$(DEPDIR)/liblua53tex_a-equivalents.Po \
+ ./$(DEPDIR)/liblua53tex_a-errors.Po \
+ ./$(DEPDIR)/liblua53tex_a-expand.Po \
+ ./$(DEPDIR)/liblua53tex_a-extensions.Po \
+ ./$(DEPDIR)/liblua53tex_a-filename.Po \
+ ./$(DEPDIR)/liblua53tex_a-helpers.Po \
+ ./$(DEPDIR)/liblua53tex_a-hnjalloc.Po \
+ ./$(DEPDIR)/liblua53tex_a-hyphen.Po \
+ ./$(DEPDIR)/liblua53tex_a-inputstack.Po \
+ ./$(DEPDIR)/liblua53tex_a-linebreak.Po \
+ ./$(DEPDIR)/liblua53tex_a-luafont.Po \
+ ./$(DEPDIR)/liblua53tex_a-luainit.Po \
+ ./$(DEPDIR)/liblua53tex_a-luanode.Po \
+ ./$(DEPDIR)/liblua53tex_a-luastuff.Po \
+ ./$(DEPDIR)/liblua53tex_a-luatoken.Po \
+ ./$(DEPDIR)/liblua53tex_a-mainbody.Po \
+ ./$(DEPDIR)/liblua53tex_a-maincontrol.Po \
+ ./$(DEPDIR)/liblua53tex_a-managed-sa.Po \
+ ./$(DEPDIR)/liblua53tex_a-mapfile.Po \
+ ./$(DEPDIR)/liblua53tex_a-mathcodes.Po \
+ ./$(DEPDIR)/liblua53tex_a-memoryword.Po \
+ ./$(DEPDIR)/liblua53tex_a-mlist.Po \
+ ./$(DEPDIR)/liblua53tex_a-mplibstuff.Po \
+ ./$(DEPDIR)/liblua53tex_a-nesting.Po \
+ ./$(DEPDIR)/liblua53tex_a-packaging.Po \
+ ./$(DEPDIR)/liblua53tex_a-pdfaction.Po \
+ ./$(DEPDIR)/liblua53tex_a-pdfannot.Po \
+ ./$(DEPDIR)/liblua53tex_a-pdfcolorstack.Po \
+ ./$(DEPDIR)/liblua53tex_a-pdfdest.Po \
+ ./$(DEPDIR)/liblua53tex_a-pdffont.Po \
+ ./$(DEPDIR)/liblua53tex_a-pdfgen.Po \
+ ./$(DEPDIR)/liblua53tex_a-pdfglyph.Po \
+ ./$(DEPDIR)/liblua53tex_a-pdfimage.Po \
+ ./$(DEPDIR)/liblua53tex_a-pdflink.Po \
+ ./$(DEPDIR)/liblua53tex_a-pdflistout.Po \
+ ./$(DEPDIR)/liblua53tex_a-pdfliteral.Po \
+ ./$(DEPDIR)/liblua53tex_a-pdfobj.Po \
+ ./$(DEPDIR)/liblua53tex_a-pdfoutline.Po \
+ ./$(DEPDIR)/liblua53tex_a-pdfpage.Po \
+ ./$(DEPDIR)/liblua53tex_a-pdfpagetree.Po \
+ ./$(DEPDIR)/liblua53tex_a-pdfrule.Po \
+ ./$(DEPDIR)/liblua53tex_a-pdfsaverestore.Po \
+ ./$(DEPDIR)/liblua53tex_a-pdfsetmatrix.Po \
+ ./$(DEPDIR)/liblua53tex_a-pdfshipout.Po \
+ ./$(DEPDIR)/liblua53tex_a-pdftables.Po \
+ ./$(DEPDIR)/liblua53tex_a-pdfthread.Po \
+ ./$(DEPDIR)/liblua53tex_a-pdftoepdf.Po \
+ ./$(DEPDIR)/liblua53tex_a-pdfxform.Po \
+ ./$(DEPDIR)/liblua53tex_a-pkin.Po \
+ ./$(DEPDIR)/liblua53tex_a-postlinebreak.Po \
+ ./$(DEPDIR)/liblua53tex_a-primitive.Po \
+ ./$(DEPDIR)/liblua53tex_a-printing.Po \
+ ./$(DEPDIR)/liblua53tex_a-scanning.Po \
+ ./$(DEPDIR)/liblua53tex_a-sfnt.Po \
+ ./$(DEPDIR)/liblua53tex_a-stringpool.Po \
+ ./$(DEPDIR)/liblua53tex_a-texdeffont.Po \
+ ./$(DEPDIR)/liblua53tex_a-texfileio.Po \
+ ./$(DEPDIR)/liblua53tex_a-texfont.Po \
+ ./$(DEPDIR)/liblua53tex_a-texlang.Po \
+ ./$(DEPDIR)/liblua53tex_a-texluac.Po \
+ ./$(DEPDIR)/liblua53tex_a-texmath.Po \
+ ./$(DEPDIR)/liblua53tex_a-texnodes.Po \
+ ./$(DEPDIR)/liblua53tex_a-textcodes.Po \
+ ./$(DEPDIR)/liblua53tex_a-textoken.Po \
+ ./$(DEPDIR)/liblua53tex_a-tfmofm.Po \
+ ./$(DEPDIR)/liblua53tex_a-tounicode.Po \
+ ./$(DEPDIR)/liblua53tex_a-tt_glyf.Po \
+ ./$(DEPDIR)/liblua53tex_a-tt_table.Po \
+ ./$(DEPDIR)/liblua53tex_a-unistring.Po \
+ ./$(DEPDIR)/liblua53tex_a-utils.Po \
+ ./$(DEPDIR)/liblua53tex_a-vfovf.Po \
+ ./$(DEPDIR)/liblua53tex_a-vfpacket.Po \
+ ./$(DEPDIR)/liblua53tex_a-writecff.Po \
+ ./$(DEPDIR)/liblua53tex_a-writeenc.Po \
+ ./$(DEPDIR)/liblua53tex_a-writefont.Po \
+ ./$(DEPDIR)/liblua53tex_a-writeimg.Po \
+ ./$(DEPDIR)/liblua53tex_a-writejbig2.Po \
+ ./$(DEPDIR)/liblua53tex_a-writejp2.Po \
+ ./$(DEPDIR)/liblua53tex_a-writejpg.Po \
+ ./$(DEPDIR)/liblua53tex_a-writepng.Po \
+ ./$(DEPDIR)/liblua53tex_a-writet1.Po \
+ ./$(DEPDIR)/liblua53tex_a-writet3.Po \
+ ./$(DEPDIR)/liblua53tex_a-writettf.Po \
+ ./$(DEPDIR)/liblua53tex_a-writetype0.Po \
+ ./$(DEPDIR)/liblua53tex_a-writetype2.Po \
+ ./$(DEPDIR)/libluajittex_a-align.Po \
+ ./$(DEPDIR)/libluajittex_a-arithmetic.Po \
+ ./$(DEPDIR)/libluajittex_a-avlstuff.Po \
+ ./$(DEPDIR)/libluajittex_a-buildpage.Po \
+ ./$(DEPDIR)/libluajittex_a-commands.Po \
+ ./$(DEPDIR)/libluajittex_a-conditional.Po \
+ ./$(DEPDIR)/libluajittex_a-directions.Po \
+ ./$(DEPDIR)/libluajittex_a-dofont.Po \
+ ./$(DEPDIR)/libluajittex_a-dumpdata.Po \
+ ./$(DEPDIR)/libluajittex_a-dvigen.Po \
+ ./$(DEPDIR)/libluajittex_a-equivalents.Po \
+ ./$(DEPDIR)/libluajittex_a-errors.Po \
+ ./$(DEPDIR)/libluajittex_a-expand.Po \
+ ./$(DEPDIR)/libluajittex_a-extensions.Po \
+ ./$(DEPDIR)/libluajittex_a-filename.Po \
+ ./$(DEPDIR)/libluajittex_a-hnjalloc.Po \
+ ./$(DEPDIR)/libluajittex_a-hyphen.Po \
+ ./$(DEPDIR)/libluajittex_a-inputstack.Po \
+ ./$(DEPDIR)/libluajittex_a-linebreak.Po \
+ ./$(DEPDIR)/libluajittex_a-luafont.Po \
+ ./$(DEPDIR)/libluajittex_a-luainit.Po \
+ ./$(DEPDIR)/libluajittex_a-luanode.Po \
+ ./$(DEPDIR)/libluajittex_a-luastuff.Po \
+ ./$(DEPDIR)/libluajittex_a-luatoken.Po \
+ ./$(DEPDIR)/libluajittex_a-mainbody.Po \
+ ./$(DEPDIR)/libluajittex_a-maincontrol.Po \
+ ./$(DEPDIR)/libluajittex_a-managed-sa.Po \
+ ./$(DEPDIR)/libluajittex_a-mapfile.Po \
+ ./$(DEPDIR)/libluajittex_a-mathcodes.Po \
+ ./$(DEPDIR)/libluajittex_a-memoryword.Po \
+ ./$(DEPDIR)/libluajittex_a-mlist.Po \
+ ./$(DEPDIR)/libluajittex_a-mplibstuff.Po \
+ ./$(DEPDIR)/libluajittex_a-nesting.Po \
+ ./$(DEPDIR)/libluajittex_a-packaging.Po \
+ ./$(DEPDIR)/libluajittex_a-pdfaction.Po \
+ ./$(DEPDIR)/libluajittex_a-pdfannot.Po \
+ ./$(DEPDIR)/libluajittex_a-pdfcolorstack.Po \
+ ./$(DEPDIR)/libluajittex_a-pdfdest.Po \
+ ./$(DEPDIR)/libluajittex_a-pdffont.Po \
+ ./$(DEPDIR)/libluajittex_a-pdfgen.Po \
+ ./$(DEPDIR)/libluajittex_a-pdfglyph.Po \
+ ./$(DEPDIR)/libluajittex_a-pdfimage.Po \
+ ./$(DEPDIR)/libluajittex_a-pdflink.Po \
+ ./$(DEPDIR)/libluajittex_a-pdflistout.Po \
+ ./$(DEPDIR)/libluajittex_a-pdfliteral.Po \
+ ./$(DEPDIR)/libluajittex_a-pdfobj.Po \
+ ./$(DEPDIR)/libluajittex_a-pdfoutline.Po \
+ ./$(DEPDIR)/libluajittex_a-pdfpage.Po \
+ ./$(DEPDIR)/libluajittex_a-pdfpagetree.Po \
+ ./$(DEPDIR)/libluajittex_a-pdfrule.Po \
+ ./$(DEPDIR)/libluajittex_a-pdfsaverestore.Po \
+ ./$(DEPDIR)/libluajittex_a-pdfsetmatrix.Po \
+ ./$(DEPDIR)/libluajittex_a-pdfshipout.Po \
+ ./$(DEPDIR)/libluajittex_a-pdftables.Po \
+ ./$(DEPDIR)/libluajittex_a-pdfthread.Po \
+ ./$(DEPDIR)/libluajittex_a-pdftoepdf.Po \
+ ./$(DEPDIR)/libluajittex_a-pdfxform.Po \
+ ./$(DEPDIR)/libluajittex_a-pkin.Po \
+ ./$(DEPDIR)/libluajittex_a-postlinebreak.Po \
+ ./$(DEPDIR)/libluajittex_a-primitive.Po \
+ ./$(DEPDIR)/libluajittex_a-printing.Po \
+ ./$(DEPDIR)/libluajittex_a-scanning.Po \
+ ./$(DEPDIR)/libluajittex_a-sfnt.Po \
+ ./$(DEPDIR)/libluajittex_a-stringpool.Po \
+ ./$(DEPDIR)/libluajittex_a-texdeffont.Po \
+ ./$(DEPDIR)/libluajittex_a-texfileio.Po \
+ ./$(DEPDIR)/libluajittex_a-texfont.Po \
+ ./$(DEPDIR)/libluajittex_a-texlang.Po \
+ ./$(DEPDIR)/libluajittex_a-texluajitc.Po \
+ ./$(DEPDIR)/libluajittex_a-texmath.Po \
+ ./$(DEPDIR)/libluajittex_a-texnodes.Po \
+ ./$(DEPDIR)/libluajittex_a-textcodes.Po \
+ ./$(DEPDIR)/libluajittex_a-textoken.Po \
+ ./$(DEPDIR)/libluajittex_a-tfmofm.Po \
+ ./$(DEPDIR)/libluajittex_a-tounicode.Po \
+ ./$(DEPDIR)/libluajittex_a-tt_glyf.Po \
+ ./$(DEPDIR)/libluajittex_a-tt_table.Po \
+ ./$(DEPDIR)/libluajittex_a-unistring.Po \
+ ./$(DEPDIR)/libluajittex_a-utils.Po \
+ ./$(DEPDIR)/libluajittex_a-vfovf.Po \
+ ./$(DEPDIR)/libluajittex_a-vfpacket.Po \
+ ./$(DEPDIR)/libluajittex_a-writecff.Po \
+ ./$(DEPDIR)/libluajittex_a-writeenc.Po \
+ ./$(DEPDIR)/libluajittex_a-writefont.Po \
+ ./$(DEPDIR)/libluajittex_a-writeimg.Po \
+ ./$(DEPDIR)/libluajittex_a-writejbig2.Po \
+ ./$(DEPDIR)/libluajittex_a-writejp2.Po \
+ ./$(DEPDIR)/libluajittex_a-writejpg.Po \
+ ./$(DEPDIR)/libluajittex_a-writepng.Po \
+ ./$(DEPDIR)/libluajittex_a-writet1.Po \
+ ./$(DEPDIR)/libluajittex_a-writet3.Po \
+ ./$(DEPDIR)/libluajittex_a-writettf.Po \
+ ./$(DEPDIR)/libluajittex_a-writetype0.Po \
+ ./$(DEPDIR)/libluajittex_a-writetype2.Po \
+ ./$(DEPDIR)/libluatex_a-align.Po \
+ ./$(DEPDIR)/libluatex_a-arithmetic.Po \
+ ./$(DEPDIR)/libluatex_a-avlstuff.Po \
+ ./$(DEPDIR)/libluatex_a-buildpage.Po \
+ ./$(DEPDIR)/libluatex_a-commands.Po \
+ ./$(DEPDIR)/libluatex_a-conditional.Po \
+ ./$(DEPDIR)/libluatex_a-directions.Po \
+ ./$(DEPDIR)/libluatex_a-dofont.Po \
+ ./$(DEPDIR)/libluatex_a-dumpdata.Po \
+ ./$(DEPDIR)/libluatex_a-dvigen.Po \
+ ./$(DEPDIR)/libluatex_a-equivalents.Po \
+ ./$(DEPDIR)/libluatex_a-errors.Po \
+ ./$(DEPDIR)/libluatex_a-expand.Po \
+ ./$(DEPDIR)/libluatex_a-extensions.Po \
+ ./$(DEPDIR)/libluatex_a-filename.Po \
+ ./$(DEPDIR)/libluatex_a-helpers.Po \
+ ./$(DEPDIR)/libluatex_a-hnjalloc.Po \
+ ./$(DEPDIR)/libluatex_a-hyphen.Po \
+ ./$(DEPDIR)/libluatex_a-inputstack.Po \
+ ./$(DEPDIR)/libluatex_a-linebreak.Po \
+ ./$(DEPDIR)/libluatex_a-luafont.Po \
+ ./$(DEPDIR)/libluatex_a-luainit.Po \
+ ./$(DEPDIR)/libluatex_a-luanode.Po \
+ ./$(DEPDIR)/libluatex_a-luastuff.Po \
+ ./$(DEPDIR)/libluatex_a-luatoken.Po \
+ ./$(DEPDIR)/libluatex_a-mainbody.Po \
+ ./$(DEPDIR)/libluatex_a-maincontrol.Po \
+ ./$(DEPDIR)/libluatex_a-managed-sa.Po \
+ ./$(DEPDIR)/libluatex_a-mapfile.Po \
+ ./$(DEPDIR)/libluatex_a-mathcodes.Po \
+ ./$(DEPDIR)/libluatex_a-memoryword.Po \
+ ./$(DEPDIR)/libluatex_a-mlist.Po \
+ ./$(DEPDIR)/libluatex_a-mplibstuff.Po \
+ ./$(DEPDIR)/libluatex_a-nesting.Po \
+ ./$(DEPDIR)/libluatex_a-packaging.Po \
+ ./$(DEPDIR)/libluatex_a-pdfaction.Po \
+ ./$(DEPDIR)/libluatex_a-pdfannot.Po \
+ ./$(DEPDIR)/libluatex_a-pdfcolorstack.Po \
+ ./$(DEPDIR)/libluatex_a-pdfdest.Po \
+ ./$(DEPDIR)/libluatex_a-pdffont.Po \
+ ./$(DEPDIR)/libluatex_a-pdfgen.Po \
+ ./$(DEPDIR)/libluatex_a-pdfglyph.Po \
+ ./$(DEPDIR)/libluatex_a-pdfimage.Po \
+ ./$(DEPDIR)/libluatex_a-pdflink.Po \
+ ./$(DEPDIR)/libluatex_a-pdflistout.Po \
+ ./$(DEPDIR)/libluatex_a-pdfliteral.Po \
+ ./$(DEPDIR)/libluatex_a-pdfobj.Po \
+ ./$(DEPDIR)/libluatex_a-pdfoutline.Po \
+ ./$(DEPDIR)/libluatex_a-pdfpage.Po \
+ ./$(DEPDIR)/libluatex_a-pdfpagetree.Po \
+ ./$(DEPDIR)/libluatex_a-pdfrule.Po \
+ ./$(DEPDIR)/libluatex_a-pdfsaverestore.Po \
+ ./$(DEPDIR)/libluatex_a-pdfsetmatrix.Po \
+ ./$(DEPDIR)/libluatex_a-pdfshipout.Po \
+ ./$(DEPDIR)/libluatex_a-pdftables.Po \
+ ./$(DEPDIR)/libluatex_a-pdfthread.Po \
+ ./$(DEPDIR)/libluatex_a-pdftoepdf.Po \
+ ./$(DEPDIR)/libluatex_a-pdfxform.Po \
+ ./$(DEPDIR)/libluatex_a-pkin.Po \
+ ./$(DEPDIR)/libluatex_a-postlinebreak.Po \
+ ./$(DEPDIR)/libluatex_a-primitive.Po \
+ ./$(DEPDIR)/libluatex_a-printing.Po \
+ ./$(DEPDIR)/libluatex_a-scanning.Po \
+ ./$(DEPDIR)/libluatex_a-sfnt.Po \
+ ./$(DEPDIR)/libluatex_a-stringpool.Po \
+ ./$(DEPDIR)/libluatex_a-texdeffont.Po \
+ ./$(DEPDIR)/libluatex_a-texfileio.Po \
+ ./$(DEPDIR)/libluatex_a-texfont.Po \
+ ./$(DEPDIR)/libluatex_a-texlang.Po \
+ ./$(DEPDIR)/libluatex_a-texluac.Po \
+ ./$(DEPDIR)/libluatex_a-texmath.Po \
+ ./$(DEPDIR)/libluatex_a-texnodes.Po \
+ ./$(DEPDIR)/libluatex_a-textcodes.Po \
+ ./$(DEPDIR)/libluatex_a-textoken.Po \
+ ./$(DEPDIR)/libluatex_a-tfmofm.Po \
+ ./$(DEPDIR)/libluatex_a-tounicode.Po \
+ ./$(DEPDIR)/libluatex_a-tt_glyf.Po \
+ ./$(DEPDIR)/libluatex_a-tt_table.Po \
+ ./$(DEPDIR)/libluatex_a-unistring.Po \
+ ./$(DEPDIR)/libluatex_a-utils.Po \
+ ./$(DEPDIR)/libluatex_a-vfovf.Po \
+ ./$(DEPDIR)/libluatex_a-vfpacket.Po \
+ ./$(DEPDIR)/libluatex_a-writecff.Po \
+ ./$(DEPDIR)/libluatex_a-writeenc.Po \
+ ./$(DEPDIR)/libluatex_a-writefont.Po \
+ ./$(DEPDIR)/libluatex_a-writeimg.Po \
+ ./$(DEPDIR)/libluatex_a-writejbig2.Po \
+ ./$(DEPDIR)/libluatex_a-writejp2.Po \
+ ./$(DEPDIR)/libluatex_a-writejpg.Po \
+ ./$(DEPDIR)/libluatex_a-writepng.Po \
+ ./$(DEPDIR)/libluatex_a-writet1.Po \
+ ./$(DEPDIR)/libluatex_a-writet3.Po \
+ ./$(DEPDIR)/libluatex_a-writettf.Po \
+ ./$(DEPDIR)/libluatex_a-writetype0.Po \
+ ./$(DEPDIR)/libluatex_a-writetype2.Po \
+ ./$(DEPDIR)/libmflua_a-mflua-pool.Po \
+ ./$(DEPDIR)/libmflua_a-mflua0.Po \
+ ./$(DEPDIR)/libmflua_a-mfluaini.Po \
+ ./$(DEPDIR)/libmfluajit_a-mfluajit-pool.Po \
+ ./$(DEPDIR)/libmfluajit_a-mfluajit0.Po \
+ ./$(DEPDIR)/libmfluajit_a-mfluajitini.Po \
+ ./$(DEPDIR)/libmplibbackends_a-pngout.Po \
+ ./$(DEPDIR)/libmplibbackends_a-svgout.Po \
+ ./$(DEPDIR)/libmplibcore_a-mp.Po \
+ ./$(DEPDIR)/libmplibcore_a-mpmath.Po \
+ ./$(DEPDIR)/libmplibcore_a-mpmathbinary.Po \
+ ./$(DEPDIR)/libmplibcore_a-mpmathdecimal.Po \
+ ./$(DEPDIR)/libmplibcore_a-mpmathdouble.Po \
+ ./$(DEPDIR)/libmplibcore_a-mpstrings.Po \
+ ./$(DEPDIR)/libmplibcore_a-psout.Po \
+ ./$(DEPDIR)/libmplibcore_a-tfmin.Po \
+ ./$(DEPDIR)/luajittex-dummy.Po ./$(DEPDIR)/luatex-dummy.Po \
+ ./$(DEPDIR)/luatex53-dummy.Po ./$(DEPDIR)/mf-mfextra.Po \
+ ./$(DEPDIR)/mf-pool.Po ./$(DEPDIR)/mf0.Po \
+ ./$(DEPDIR)/mf_nowin-mfextra.Po ./$(DEPDIR)/mfini.Po \
+ ./$(DEPDIR)/mft.Po ./$(DEPDIR)/mpost-mpost.Po \
+ ./$(DEPDIR)/mpost-mpxout.Po ./$(DEPDIR)/odvicopy.Po \
+ ./$(DEPDIR)/odvitype.Po ./$(DEPDIR)/ofm2opl.Po \
+ ./$(DEPDIR)/opl2ofm.Po ./$(DEPDIR)/otangle.Po \
+ ./$(DEPDIR)/ovf2ovp.Po ./$(DEPDIR)/ovp2ovf.Po \
+ ./$(DEPDIR)/patgen.Po ./$(DEPDIR)/pbibtex-pbibtex.Po \
+ ./$(DEPDIR)/pdftex-dummy.Po ./$(DEPDIR)/pdftex-pdftex-pool.Po \
+ ./$(DEPDIR)/pdftex-pdftex0.Po ./$(DEPDIR)/pdftex-pdftexini.Po \
+ ./$(DEPDIR)/pdftosrc-dummy.Po ./$(DEPDIR)/pdvitype-pdvitype.Po \
+ ./$(DEPDIR)/pktogf.Po ./$(DEPDIR)/pktype.Po \
+ ./$(DEPDIR)/pltotf.Po ./$(DEPDIR)/pmpost-pmp.Po \
+ ./$(DEPDIR)/pmpost-pmpmath.Po \
+ ./$(DEPDIR)/pmpost-pmpmathbinary.Po \
+ ./$(DEPDIR)/pmpost-pmpmathdecimal.Po \
+ ./$(DEPDIR)/pmpost-pmpmathdouble.Po \
+ ./$(DEPDIR)/pmpost-pmpost.Po ./$(DEPDIR)/pmpost-pmpstrings.Po \
+ ./$(DEPDIR)/pmpost-pmpxout.Po ./$(DEPDIR)/pmpost-ppngout.Po \
+ ./$(DEPDIR)/pmpost-ppsout.Po ./$(DEPDIR)/pmpost-psvgout.Po \
+ ./$(DEPDIR)/pmpost-ptfmin.Po ./$(DEPDIR)/pooltype.Po \
+ ./$(DEPDIR)/ppltotf-ppltotf.Po ./$(DEPDIR)/ptex-ptex-pool.Po \
+ ./$(DEPDIR)/ptex-ptex0.Po ./$(DEPDIR)/ptex-ptexini.Po \
+ ./$(DEPDIR)/ptftopl-ptftopl.Po ./$(DEPDIR)/tangle.Po \
+ ./$(DEPDIR)/tangleboot.Po ./$(DEPDIR)/tex-tex-pool.Po \
+ ./$(DEPDIR)/tex-tex0.Po ./$(DEPDIR)/tex-texextra.Po \
+ ./$(DEPDIR)/tex-texini.Po ./$(DEPDIR)/tftopl.Po \
+ ./$(DEPDIR)/tie-tie.Po ./$(DEPDIR)/upbibtex-upbibtex.Po \
+ ./$(DEPDIR)/updvitype-updvitype.Po ./$(DEPDIR)/upmpost-pmp.Po \
+ ./$(DEPDIR)/upmpost-pmpmath.Po \
+ ./$(DEPDIR)/upmpost-pmpmathbinary.Po \
+ ./$(DEPDIR)/upmpost-pmpmathdecimal.Po \
+ ./$(DEPDIR)/upmpost-pmpmathdouble.Po \
+ ./$(DEPDIR)/upmpost-pmpost.Po \
+ ./$(DEPDIR)/upmpost-pmpstrings.Po \
+ ./$(DEPDIR)/upmpost-pmpxout.Po ./$(DEPDIR)/upmpost-ppngout.Po \
+ ./$(DEPDIR)/upmpost-ppsout.Po ./$(DEPDIR)/upmpost-psvgout.Po \
+ ./$(DEPDIR)/upmpost-ptfmin.Po ./$(DEPDIR)/uppltotf-uppltotf.Po \
+ ./$(DEPDIR)/uptex-uptex-pool.Po ./$(DEPDIR)/uptex-uptex0.Po \
+ ./$(DEPDIR)/uptex-uptexini.Po ./$(DEPDIR)/uptftopl-uptftopl.Po \
+ ./$(DEPDIR)/vftovp.Po ./$(DEPDIR)/vptovf.Po \
+ ./$(DEPDIR)/weave.Po ./$(DEPDIR)/xetex-dummy.Po \
+ ./$(DEPDIR)/xetex-xetex-pool.Po ./$(DEPDIR)/xetex-xetex0.Po \
+ ./$(DEPDIR)/xetex-xetexini.Po \
+ alephdir/$(DEPDIR)/aleph-aleph.Po \
+ alephdir/$(DEPDIR)/aleph-alephbis.Po \
+ alephdir/$(DEPDIR)/aleph-alephextra.Po \
+ eptexdir/$(DEPDIR)/eptex-eptexextra.Po \
+ etexdir/$(DEPDIR)/etex-etexextra.Po \
+ euptexdir/$(DEPDIR)/euptex-euptexextra.Po \
+ libmd5/$(DEPDIR)/a-md5.Po libmd5/$(DEPDIR)/md5main-md5main.Po \
+ luatexdir/$(DEPDIR)/luajittex-luatex.Po \
+ luatexdir/$(DEPDIR)/luatex-luatex.Po \
+ luatexdir/$(DEPDIR)/luatex53-luatex.Po \
+ luatexdir/lua/$(DEPDIR)/liblua53tex_a-lcallbacklib.Po \
+ luatexdir/lua/$(DEPDIR)/liblua53tex_a-lepdflib.Po \
+ luatexdir/lua/$(DEPDIR)/liblua53tex_a-lfontlib.Po \
+ luatexdir/lua/$(DEPDIR)/liblua53tex_a-limglib.Po \
+ luatexdir/lua/$(DEPDIR)/liblua53tex_a-liolibext.Po \
+ luatexdir/lua/$(DEPDIR)/liblua53tex_a-lkpselib.Po \
+ luatexdir/lua/$(DEPDIR)/liblua53tex_a-llanglib.Po \
+ luatexdir/lua/$(DEPDIR)/liblua53tex_a-llfslibext.Po \
+ luatexdir/lua/$(DEPDIR)/liblua53tex_a-llualib.Po \
+ luatexdir/lua/$(DEPDIR)/liblua53tex_a-lnewtokenlib.Po \
+ luatexdir/lua/$(DEPDIR)/liblua53tex_a-lnodelib.Po \
+ luatexdir/lua/$(DEPDIR)/liblua53tex_a-loslibext.Po \
+ luatexdir/lua/$(DEPDIR)/liblua53tex_a-lpdflib.Po \
+ luatexdir/lua/$(DEPDIR)/liblua53tex_a-lpdfscannerlib.Po \
+ luatexdir/lua/$(DEPDIR)/liblua53tex_a-lstatslib.Po \
+ luatexdir/lua/$(DEPDIR)/liblua53tex_a-lstrlibext.Po \
+ luatexdir/lua/$(DEPDIR)/liblua53tex_a-ltexiolib.Po \
+ luatexdir/lua/$(DEPDIR)/liblua53tex_a-ltexlib.Po \
+ luatexdir/lua/$(DEPDIR)/liblua53tex_a-luatex-core.Po \
+ luatexdir/lua/$(DEPDIR)/libluajittex_a-lcallbacklib.Po \
+ luatexdir/lua/$(DEPDIR)/libluajittex_a-lepdflib.Po \
+ luatexdir/lua/$(DEPDIR)/libluajittex_a-lfontlib.Po \
+ luatexdir/lua/$(DEPDIR)/libluajittex_a-limglib.Po \
+ luatexdir/lua/$(DEPDIR)/libluajittex_a-liolibext.Po \
+ luatexdir/lua/$(DEPDIR)/libluajittex_a-lkpselib.Po \
+ luatexdir/lua/$(DEPDIR)/libluajittex_a-llanglib.Po \
+ luatexdir/lua/$(DEPDIR)/libluajittex_a-llfslibext.Po \
+ luatexdir/lua/$(DEPDIR)/libluajittex_a-llualib.Po \
+ luatexdir/lua/$(DEPDIR)/libluajittex_a-lnewtokenlib.Po \
+ luatexdir/lua/$(DEPDIR)/libluajittex_a-lnodelib.Po \
+ luatexdir/lua/$(DEPDIR)/libluajittex_a-loslibext.Po \
+ luatexdir/lua/$(DEPDIR)/libluajittex_a-lpdflib.Po \
+ luatexdir/lua/$(DEPDIR)/libluajittex_a-lpdfscannerlib.Po \
+ luatexdir/lua/$(DEPDIR)/libluajittex_a-lstatslib.Po \
+ luatexdir/lua/$(DEPDIR)/libluajittex_a-lstrlibext.Po \
+ luatexdir/lua/$(DEPDIR)/libluajittex_a-ltexiolib.Po \
+ luatexdir/lua/$(DEPDIR)/libluajittex_a-ltexlib.Po \
+ luatexdir/lua/$(DEPDIR)/libluajittex_a-luatex-core.Po \
+ luatexdir/lua/$(DEPDIR)/libluatex_a-lcallbacklib.Po \
+ luatexdir/lua/$(DEPDIR)/libluatex_a-lepdflib.Po \
+ luatexdir/lua/$(DEPDIR)/libluatex_a-lfontlib.Po \
+ luatexdir/lua/$(DEPDIR)/libluatex_a-limglib.Po \
+ luatexdir/lua/$(DEPDIR)/libluatex_a-liolibext.Po \
+ luatexdir/lua/$(DEPDIR)/libluatex_a-lkpselib.Po \
+ luatexdir/lua/$(DEPDIR)/libluatex_a-llanglib.Po \
+ luatexdir/lua/$(DEPDIR)/libluatex_a-llfslibext.Po \
+ luatexdir/lua/$(DEPDIR)/libluatex_a-llualib.Po \
+ luatexdir/lua/$(DEPDIR)/libluatex_a-lnewtokenlib.Po \
+ luatexdir/lua/$(DEPDIR)/libluatex_a-lnodelib.Po \
+ luatexdir/lua/$(DEPDIR)/libluatex_a-loslibext.Po \
+ luatexdir/lua/$(DEPDIR)/libluatex_a-lpdflib.Po \
+ luatexdir/lua/$(DEPDIR)/libluatex_a-lpdfscannerlib.Po \
+ luatexdir/lua/$(DEPDIR)/libluatex_a-lstatslib.Po \
+ luatexdir/lua/$(DEPDIR)/libluatex_a-lstrlibext.Po \
+ luatexdir/lua/$(DEPDIR)/libluatex_a-ltexiolib.Po \
+ luatexdir/lua/$(DEPDIR)/libluatex_a-ltexlib.Po \
+ luatexdir/lua/$(DEPDIR)/libluatex_a-luatex-core.Po \
+ luatexdir/lua/$(DEPDIR)/libmflua_a-lkpselib.Po \
+ luatexdir/lua/$(DEPDIR)/libmfluajit_a-lkpselib.Po \
+ luatexdir/luaffi/$(DEPDIR)/liblua53ffi_a-call.Po \
+ luatexdir/luaffi/$(DEPDIR)/liblua53ffi_a-ctype.Po \
+ luatexdir/luaffi/$(DEPDIR)/liblua53ffi_a-ffi.Po \
+ luatexdir/luaffi/$(DEPDIR)/liblua53ffi_a-parser.Po \
+ luatexdir/luaffi/$(DEPDIR)/libluaffi_a-call.Po \
+ luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ctype.Po \
+ luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ffi.Po \
+ luatexdir/luaffi/$(DEPDIR)/libluaffi_a-parser.Po \
+ luatexdir/luafilesystem/src/$(DEPDIR)/liblua53misc_a-lfs.Po \
+ luatexdir/luafilesystem/src/$(DEPDIR)/libluajitmisc_a-lfs.Po \
+ luatexdir/luafilesystem/src/$(DEPDIR)/libluamisc_a-lfs.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-autohint.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-clipnoui.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-cvundoes.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-dumppfa.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-encoding.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-featurefile.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-fontviewbase.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-fvcomposit.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-fvfonts.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-lookups.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-macbinary.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-macenc.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-mathconstants.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-memory.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-mm.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-namelist.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-noprefs.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-nouiutil.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-parsepfa.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-parsettf.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-parsettfatt.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-psread.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-pua.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-python.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-sfd1.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinechar.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinefill.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinefont.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splineorder2.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splineoverlap.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinerefigure.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinesave.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinesaveafm.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinestroke.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splineutil.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splineutil2.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-start.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-stemdb.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-tottf.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-tottfgpos.Po \
+ luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-ttfspecial.Po \
+ luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)/libff_a-fsys.Po \
+ luatexdir/luafontloader/src/$(DEPDIR)/liblua53tex_a-ffdummies.Po \
+ luatexdir/luafontloader/src/$(DEPDIR)/liblua53tex_a-luafflib.Po \
+ luatexdir/luafontloader/src/$(DEPDIR)/libluajittex_a-ffdummies.Po \
+ luatexdir/luafontloader/src/$(DEPDIR)/libluajittex_a-luafflib.Po \
+ luatexdir/luafontloader/src/$(DEPDIR)/libluatex_a-ffdummies.Po \
+ luatexdir/luafontloader/src/$(DEPDIR)/libluatex_a-luafflib.Po \
+ luatexdir/luamd5/$(DEPDIR)/liblua53misc_a-md5.Po \
+ luatexdir/luamd5/$(DEPDIR)/liblua53misc_a-md5lib.Po \
+ luatexdir/luamd5/$(DEPDIR)/libluajitmisc_a-md5.Po \
+ luatexdir/luamd5/$(DEPDIR)/libluajitmisc_a-md5lib.Po \
+ luatexdir/luamd5/$(DEPDIR)/libluamisc_a-md5.Po \
+ luatexdir/luamd5/$(DEPDIR)/libluamisc_a-md5lib.Po \
+ luatexdir/luapeg/$(DEPDIR)/liblua53misc_a-lpeg.Po \
+ luatexdir/luapeg/$(DEPDIR)/libluajitmisc_a-lpeg.Po \
+ luatexdir/luapeg/$(DEPDIR)/libluamisc_a-lpeg.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-auxiliar.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-buffer.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-compat.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-except.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-inet.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-io.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-lua_preload.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-luasocket.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-mime.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-options.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-select.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-serial.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-socket.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-tcp.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-timeout.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-udp.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-auxiliar.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-buffer.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-compat.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-except.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-inet.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-io.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-lua_preload.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-luasocket.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-mime.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-options.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-select.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-serial.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-socket.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-tcp.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-timeout.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-udp.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-auxiliar.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-buffer.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-compat.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-except.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-inet.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-io.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-lua_preload.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-luasocket.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-mime.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-options.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-select.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-serial.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-socket.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-tcp.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-timeout.Po \
+ luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-udp.Po \
+ luatexdir/luazip/src/$(DEPDIR)/liblua53misc_a-luazip.Po \
+ luatexdir/luazip/src/$(DEPDIR)/libluajitmisc_a-luazip.Po \
+ luatexdir/luazip/src/$(DEPDIR)/libluamisc_a-luazip.Po \
+ luatexdir/luazlib/$(DEPDIR)/liblua53misc_a-lgzip.Po \
+ luatexdir/luazlib/$(DEPDIR)/liblua53misc_a-lzlib.Po \
+ luatexdir/luazlib/$(DEPDIR)/libluajitmisc_a-lgzip.Po \
+ luatexdir/luazlib/$(DEPDIR)/libluajitmisc_a-lzlib.Po \
+ luatexdir/luazlib/$(DEPDIR)/libluamisc_a-lgzip.Po \
+ luatexdir/luazlib/$(DEPDIR)/libluamisc_a-lzlib.Po \
+ luatexdir/slnunicode/$(DEPDIR)/liblua53misc_a-slnunico.Po \
+ luatexdir/slnunicode/$(DEPDIR)/libluajitmisc_a-slnunico.Po \
+ luatexdir/slnunicode/$(DEPDIR)/libluamisc_a-slnunico.Po \
+ luatexdir/unilib/$(DEPDIR)/libunilib_a-ArabicForms.Po \
+ luatexdir/unilib/$(DEPDIR)/libunilib_a-alphabet.Po \
+ luatexdir/unilib/$(DEPDIR)/libunilib_a-char.Po \
+ luatexdir/unilib/$(DEPDIR)/libunilib_a-cjk.Po \
+ luatexdir/unilib/$(DEPDIR)/libunilib_a-gwwiconv.Po \
+ luatexdir/unilib/$(DEPDIR)/libunilib_a-ucharmap.Po \
+ luatexdir/unilib/$(DEPDIR)/libunilib_a-unialt.Po \
+ luatexdir/unilib/$(DEPDIR)/libunilib_a-usprintf.Po \
+ luatexdir/unilib/$(DEPDIR)/libunilib_a-ustring.Po \
+ luatexdir/unilib/$(DEPDIR)/libunilib_a-utype.Po \
+ luatexdir/utils/$(DEPDIR)/liblua53tex_a-avl.Po \
+ luatexdir/utils/$(DEPDIR)/libluajittex_a-avl.Po \
+ luatexdir/utils/$(DEPDIR)/libluatex_a-avl.Po \
+ mfluadir/$(DEPDIR)/libmflua_a-mfluac.Po \
+ mfluadir/$(DEPDIR)/libmfluajit_a-mfluac.Po \
+ mfluadir/$(DEPDIR)/mflua-mfluaextra.Po \
+ mfluadir/$(DEPDIR)/mflua_nowin-mfluaextra.Po \
+ mfluajitdir/$(DEPDIR)/mfluajit-mfluajitextra.Po \
+ mfluajitdir/$(DEPDIR)/mfluajit_nowin-mfluajitextra.Po \
+ mplibdir/$(DEPDIR)/libmputil_a-avl.Po \
+ mplibdir/$(DEPDIR)/libmputil_a-decContext.Po \
+ mplibdir/$(DEPDIR)/libmputil_a-decNumber.Po \
+ mplibdir/$(DEPDIR)/luajittex-lmplib.Po \
+ mplibdir/$(DEPDIR)/luatex-lmplib.Po \
+ mplibdir/$(DEPDIR)/luatex53-lmplib.Po \
+ pdftexdir/$(DEPDIR)/libpdftex_a-avl.Po \
+ pdftexdir/$(DEPDIR)/libpdftex_a-avlstuff.Po \
+ pdftexdir/$(DEPDIR)/libpdftex_a-epdf.Po \
+ pdftexdir/$(DEPDIR)/libpdftex_a-macnames.Po \
+ pdftexdir/$(DEPDIR)/libpdftex_a-mapfile.Po \
+ pdftexdir/$(DEPDIR)/libpdftex_a-pdftoepdf.Po \
+ pdftexdir/$(DEPDIR)/libpdftex_a-pkin.Po \
+ pdftexdir/$(DEPDIR)/libpdftex_a-subfont.Po \
+ pdftexdir/$(DEPDIR)/libpdftex_a-tounicode.Po \
+ pdftexdir/$(DEPDIR)/libpdftex_a-utils.Po \
+ pdftexdir/$(DEPDIR)/libpdftex_a-vfpacket.Po \
+ pdftexdir/$(DEPDIR)/libpdftex_a-writeenc.Po \
+ pdftexdir/$(DEPDIR)/libpdftex_a-writefont.Po \
+ pdftexdir/$(DEPDIR)/libpdftex_a-writeimg.Po \
+ pdftexdir/$(DEPDIR)/libpdftex_a-writejbig2.Po \
+ pdftexdir/$(DEPDIR)/libpdftex_a-writejpg.Po \
+ pdftexdir/$(DEPDIR)/libpdftex_a-writepng.Po \
+ pdftexdir/$(DEPDIR)/libpdftex_a-writet1.Po \
+ pdftexdir/$(DEPDIR)/libpdftex_a-writet3.Po \
+ pdftexdir/$(DEPDIR)/libpdftex_a-writettf.Po \
+ pdftexdir/$(DEPDIR)/libpdftex_a-writezip.Po \
+ pdftexdir/$(DEPDIR)/pdftex-pdftexextra.Po \
+ pdftexdir/$(DEPDIR)/pdftosrc-pdftosrc.Po \
+ pdftexdir/$(DEPDIR)/ttf2afm-macnames.Po \
+ pdftexdir/$(DEPDIR)/ttf2afm-ttf2afm.Po \
+ pdftexdir/regex/$(DEPDIR)/libpdftex_a-regcomp.Po \
+ pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex.Po \
+ pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex_internal.Po \
+ pdftexdir/regex/$(DEPDIR)/libpdftex_a-regexec.Po \
+ ptexdir/$(DEPDIR)/libkanji_a-kanji.Po \
+ ptexdir/$(DEPDIR)/ptex-ptexextra.Po \
+ synctexdir/$(DEPDIR)/eptex-synctex.Po \
+ synctexdir/$(DEPDIR)/etex-synctex.Po \
+ synctexdir/$(DEPDIR)/euptex-synctex.Po \
+ synctexdir/$(DEPDIR)/liblua53tex_a-synctex.Po \
+ synctexdir/$(DEPDIR)/libluajittex_a-synctex.Po \
+ synctexdir/$(DEPDIR)/libluatex_a-synctex.Po \
+ synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser.Po \
+ synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser_utils.Po \
+ synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser.Plo \
+ synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser_utils.Plo \
+ synctexdir/$(DEPDIR)/pdftex-synctex.Po \
+ synctexdir/$(DEPDIR)/ptex-synctex.Po \
+ synctexdir/$(DEPDIR)/synctex-synctex_main.Po \
+ synctexdir/$(DEPDIR)/tex-synctex.Po \
+ synctexdir/$(DEPDIR)/uptex-synctex.Po \
+ synctexdir/$(DEPDIR)/xetex-synctex.Po \
+ uptexdir/$(DEPDIR)/libukanji_a-kanji.Po \
+ uptexdir/$(DEPDIR)/libukanji_a-kanji_dump.Po \
+ uptexdir/$(DEPDIR)/uptex-uptexextra.Po \
+ xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst.Po \
+ xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst_Mac.Po \
+ xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr.Po \
+ xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_FC.Po \
+ xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_Mac.Po \
+ xetexdir/$(DEPDIR)/libxetex_a-XeTeXLayoutInterface.Po \
+ xetexdir/$(DEPDIR)/libxetex_a-XeTeXOTMath.Po \
+ xetexdir/$(DEPDIR)/libxetex_a-XeTeX_ext.Po \
+ xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Po \
+ xetexdir/$(DEPDIR)/libxetex_a-XeTeX_pic.Po \
+ xetexdir/$(DEPDIR)/libxetex_a-hz.Po \
+ xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Po \
+ xetexdir/$(DEPDIR)/libxetex_a-trans.Po \
+ xetexdir/$(DEPDIR)/xetex-xetexextra.Po \
+ xetexdir/image/$(DEPDIR)/libxetex_a-bmpimage.Po \
+ xetexdir/image/$(DEPDIR)/libxetex_a-jpegimage.Po \
+ xetexdir/image/$(DEPDIR)/libxetex_a-mfileio.Po \
+ xetexdir/image/$(DEPDIR)/libxetex_a-numbers.Po \
+ xetexdir/image/$(DEPDIR)/libxetex_a-pngimage.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -1771,7 +2429,8 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- cscope check recheck distdir dist dist-all distcheck
+ cscope check recheck distdir distdir-am dist dist-all \
+ distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
$(LISP)c-auto.in
# Read a list of newline-separated strings from the standard input,
@@ -4143,8 +4802,8 @@
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luaffi.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__empty):
@@ -4189,6 +4848,64 @@
cd $(top_builddir) && $(SHELL) ./config.status $@
synctexdir/synctex.pc: $(top_builddir)/config.status $(top_srcdir)/synctexdir/synctex.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p \
+ || test -f $$p1 \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
+
+clean-noinstPROGRAMS:
+ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
install-libLIBRARIES: $(lib_LIBRARIES)
@$(NORMAL_INSTALL)
@list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
@@ -4220,6 +4937,41 @@
clean-libLIBRARIES:
-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
+
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ list2=; for p in $$list; do \
+ if test -f $$p; then \
+ list2="$$list2 $$p"; \
+ else :; fi; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+ }
+
+uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+ done
+
+clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
luatexdir/luafontloader/fontforge/fontforge/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luafontloader/fontforge/fontforge
@: > luatexdir/luafontloader/fontforge/fontforge/$(am__dirstamp)
@@ -4955,7 +5707,7 @@
libmd5/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) libmd5/$(DEPDIR)
@: > libmd5/$(DEPDIR)/$(am__dirstamp)
-libmd5/libmd5_a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \
+libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \
libmd5/$(DEPDIR)/$(am__dirstamp)
libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES)
@@ -5216,41 +5968,6 @@
$(AM_V_at)-rm -f libxetex.a
$(AM_V_AR)$(libxetex_a_AR) libxetex.a $(libxetex_a_OBJECTS) $(libxetex_a_LIBADD)
$(AM_V_at)$(RANLIB) libxetex.a
-
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
- list2=; for p in $$list; do \
- if test -f $$p; then \
- list2="$$list2 $$p"; \
- else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
- }
-
-uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
- done
-
-clean-libLTLIBRARIES:
- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- @list='$(lib_LTLIBRARIES)'; \
- locs=`for p in $$list; do echo $$p; done | \
- sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
- sort -u`; \
- test -z "$$locs" || { \
- echo rm -f $${locs}; \
- rm -f $${locs}; \
- }
synctexdir/libsynctex_la-synctex_parser.lo: \
synctexdir/$(am__dirstamp) \
synctexdir/$(DEPDIR)/$(am__dirstamp)
@@ -5260,64 +5977,6 @@
libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES)
$(AM_V_CCLD)$(libsynctex_la_LINK) $(libsynctex_la_OBJECTS) $(libsynctex_la_LIBADD) $(LIBS)
-install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
- fi; \
- for p in $$list; do echo "$$p $$p"; done | \
- sed 's/$(EXEEXT)$$//' | \
- while read p p1; do if test -f $$p \
- || test -f $$p1 \
- ; then echo "$$p"; echo "$$p"; else :; fi; \
- done | \
- sed -e 'p;s,.*/,,;n;h' \
- -e 's|.*|.|' \
- -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
- sed 'N;N;N;s,\n, ,g' | \
- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
- if ($$2 == $$4) files[d] = files[d] " " $$1; \
- else { print "f", $$3 "/" $$4, $$1; } } \
- END { for (d in files) print "f", d, files[d] }' | \
- while read type dir files; do \
- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
- test -z "$$files" || { \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
- } \
- ; done
-
-uninstall-binPROGRAMS:
- @$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
- files=`for p in $$list; do echo "$$p"; done | \
- sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
- -e 's/$$/$(EXEEXT)/' \
- `; \
- test -n "$$list" || exit 0; \
- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
-
-clean-noinstPROGRAMS:
- @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
alephdir/$(am__dirstamp):
@$(MKDIR_P) alephdir
@: > alephdir/$(am__dirstamp)
@@ -5752,714 +6411,720 @@
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aleph-aleph-pool.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aleph-aleph0.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aleph-alephini.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/bibtex.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/call_luajittex-callexe.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/call_luatex-callexe.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/call_luatex53-callexe.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/call_mf-callexe.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/call_mflua-callexe.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/call_mfluajit-callexe.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/call_mpost-callexe.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/call_pmpost-callexe.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/call_upmpost-callexe.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ctangle.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ctangleboot.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ctie.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cweave.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cweb.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cwebboot.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dvicopy.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dvitype.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/eptex-eptex-pool.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/eptex-eptex0.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/eptex-eptexini.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/etex-etex-pool.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/etex-etex0.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/etex-etexini.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/euptex-euptex-pool.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/euptex-euptex0.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/euptex-euptexini.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gftodvi.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gftopk.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gftype.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/initex-callexe.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-align.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-arithmetic.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-avlstuff.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-buildpage.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-commands.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-conditional.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-directions.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-dofont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-dumpdata.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-dvigen.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-equivalents.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-errors.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-expand.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-extensions.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-filename.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-helpers.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-hnjalloc.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-hyphen.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-inputstack.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-linebreak.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-luafont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-luainit.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-luanode.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-luastuff.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-luatoken.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-mainbody.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-maincontrol.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-managed-sa.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-mapfile.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-mathcodes.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-memoryword.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-mlist.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-mplibstuff.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-nesting.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-packaging.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfaction.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfannot.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfcolorstack.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfdest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdffont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfgen.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfglyph.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfimage.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdflink.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdflistout.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfliteral.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfobj.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfoutline.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfpage.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfpagetree.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfrule.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfsaverestore.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfsetmatrix.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfshipout.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdftables.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfthread.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdftoepdf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfxform.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pkin.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-postlinebreak.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-primitive.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-printing.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-scanning.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-sfnt.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-stringpool.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-texdeffont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-texfileio.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-texfont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-texlang.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-texluac.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-texmath.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-texnodes.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-textcodes.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-textoken.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-tfmofm.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-tounicode.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-tt_glyf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-tt_table.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-unistring.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-utils.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-vfovf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-vfpacket.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writecff.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writeenc.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writefont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writeimg.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writejbig2.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writejp2.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writejpg.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writepng.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writet1.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writet3.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writettf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writetype0.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writetype2.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-align.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-arithmetic.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-avlstuff.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-buildpage.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-commands.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-conditional.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-directions.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-dofont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-dumpdata.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-dvigen.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-equivalents.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-errors.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-expand.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-extensions.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-filename.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-hnjalloc.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-hyphen.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-inputstack.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-linebreak.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-luafont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-luainit.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-luanode.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-luastuff.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-luatoken.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-mainbody.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-maincontrol.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-managed-sa.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-mapfile.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-mathcodes.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-memoryword.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-mlist.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-mplibstuff.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-nesting.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-packaging.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfaction.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfannot.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfcolorstack.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfdest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdffont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfgen.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfglyph.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfimage.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdflink.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdflistout.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfliteral.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfobj.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfoutline.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfpage.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfpagetree.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfrule.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfsaverestore.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfsetmatrix.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfshipout.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdftables.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfthread.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdftoepdf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfxform.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pkin.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-postlinebreak.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-primitive.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-printing.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-scanning.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-sfnt.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-stringpool.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-texdeffont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-texfileio.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-texfont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-texlang.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-texluajitc.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-texmath.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-texnodes.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-textcodes.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-textoken.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-tfmofm.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-tounicode.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-tt_glyf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-tt_table.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-unistring.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-utils.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-vfovf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-vfpacket.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writecff.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writeenc.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writefont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writeimg.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writejbig2.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writejp2.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writejpg.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writepng.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writet1.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writet3.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writettf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writetype0.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writetype2.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-align.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-arithmetic.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-avlstuff.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-buildpage.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-commands.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-conditional.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-directions.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-dofont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-dumpdata.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-dvigen.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-equivalents.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-errors.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-expand.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-extensions.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-filename.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-helpers.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-hnjalloc.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-hyphen.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-inputstack.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-linebreak.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-luafont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-luainit.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-luanode.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-luastuff.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-luatoken.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-mainbody.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-maincontrol.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-managed-sa.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-mapfile.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-mathcodes.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-memoryword.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-mlist.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-mplibstuff.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-nesting.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-packaging.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfaction.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfannot.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfcolorstack.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfdest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdffont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfgen.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfglyph.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfimage.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdflink.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdflistout.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfliteral.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfobj.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfoutline.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfpage.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfpagetree.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfrule.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfsaverestore.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfsetmatrix.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfshipout.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdftables.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfthread.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdftoepdf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfxform.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pkin.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-postlinebreak.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-primitive.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-printing.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-scanning.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-sfnt.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-stringpool.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-texdeffont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-texfileio.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-texfont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-texlang.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-texluac.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-texmath.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-texnodes.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-textcodes.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-textoken.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-tfmofm.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-tounicode.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-tt_glyf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-tt_table.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-unistring.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-utils.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-vfovf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-vfpacket.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writecff.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writeenc.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writefont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writeimg.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writejbig2.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writejp2.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writejpg.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writepng.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writet1.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writet3.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writettf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writetype0.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writetype2.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmflua_a-mflua-pool.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmflua_a-mflua0.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmflua_a-mfluaini.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmfluajit_a-mfluajit-pool.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmfluajit_a-mfluajit0.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmfluajit_a-mfluajitini.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibbackends_a-pngout.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibbackends_a-svgout.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-mp.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-mpmath.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-mpmathbinary.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-mpmathdecimal.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-mpmathdouble.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-mpstrings.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-psout.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-tfmin.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/luajittex-dummy.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/luatex-dummy.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/luatex53-dummy.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mf-mfextra.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mf-pool.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mf0.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mf_nowin-mfextra.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mfini.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mft.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mpost-mpost.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mpost-mpxout.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/odvicopy.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/odvitype.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ofm2opl.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/opl2ofm.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/otangle.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ovf2ovp.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ovp2ovf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/patgen.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pbibtex-pbibtex.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdftex-dummy.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdftex-pdftex-pool.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdftex-pdftex0.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdftex-pdftexini.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdftosrc-dummy.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdvitype-pdvitype.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pktogf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pktype.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pltotf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-pmp.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-pmpmath.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-pmpmathbinary.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-pmpmathdecimal.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-pmpmathdouble.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-pmpost.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-pmpstrings.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-pmpxout.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-ppngout.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-ppsout.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-psvgout.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-ptfmin.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pooltype.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ppltotf-ppltotf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptex-ptex-pool.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptex-ptex0.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptex-ptexini.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptftopl-ptftopl.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tangle.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tangleboot.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tex-tex-pool.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tex-tex0.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tex-texextra.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tex-texini.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tftopl.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tie-tie.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upbibtex-upbibtex.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/updvitype-updvitype.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-pmp.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-pmpmath.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-pmpmathbinary.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-pmpmathdecimal.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-pmpmathdouble.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-pmpost.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-pmpstrings.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-pmpxout.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-ppngout.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-ppsout.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-psvgout.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-ptfmin.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/uppltotf-uppltotf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/uptex-uptex-pool.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/uptex-uptex0.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/uptex-uptexini.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/uptftopl-uptftopl.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vftovp.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vptovf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/weave.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xetex-dummy.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xetex-xetex-pool.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xetex-xetex0.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xetex-xetexini.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at alephdir/$(DEPDIR)/aleph-aleph.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at alephdir/$(DEPDIR)/aleph-alephbis.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at alephdir/$(DEPDIR)/aleph-alephextra.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at eptexdir/$(DEPDIR)/eptex-eptexextra.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at etexdir/$(DEPDIR)/etex-etexextra.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at euptexdir/$(DEPDIR)/euptex-euptexextra.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at libmd5/$(DEPDIR)/libmd5_a-md5.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at libmd5/$(DEPDIR)/md5main-md5main.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/$(DEPDIR)/luajittex-luatex.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/$(DEPDIR)/luatex-luatex.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/$(DEPDIR)/luatex53-luatex.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lcallbacklib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lepdflib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lfontlib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-limglib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-liolibext.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lkpselib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-llanglib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-llfslibext.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-llualib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lnewtokenlib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lnodelib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-loslibext.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lpdflib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lpdfscannerlib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lstatslib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lstrlibext.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-ltexiolib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-ltexlib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-luatex-core.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lcallbacklib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lepdflib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lfontlib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-limglib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-liolibext.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lkpselib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-llanglib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-llfslibext.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-llualib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lnewtokenlib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lnodelib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-loslibext.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lpdflib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lpdfscannerlib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lstatslib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lstrlibext.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-ltexiolib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-ltexlib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-luatex-core.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lcallbacklib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lepdflib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lfontlib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-limglib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-liolibext.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lkpselib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-llanglib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-llfslibext.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-llualib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lnewtokenlib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lnodelib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-loslibext.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lpdflib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lpdfscannerlib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lstatslib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lstrlibext.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-ltexiolib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-ltexlib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-luatex-core.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libmflua_a-lkpselib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libmfluajit_a-lkpselib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaffi/$(DEPDIR)/liblua53ffi_a-call.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaffi/$(DEPDIR)/liblua53ffi_a-ctype.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaffi/$(DEPDIR)/liblua53ffi_a-ffi.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaffi/$(DEPDIR)/liblua53ffi_a-parser.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaffi/$(DEPDIR)/libluaffi_a-call.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ctype.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ffi.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaffi/$(DEPDIR)/libluaffi_a-parser.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafilesystem/src/$(DEPDIR)/liblua53misc_a-lfs.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafilesystem/src/$(DEPDIR)/libluajitmisc_a-lfs.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafilesystem/src/$(DEPDIR)/libluamisc_a-lfs.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-autohint.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-clipnoui.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-cvundoes.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-dumppfa.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-encoding.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-featurefile.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-fontviewbase.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-fvcomposit.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-fvfonts.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-lookups.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-macbinary.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-macenc.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-mathconstants.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-memory.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-mm.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-namelist.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-noprefs.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-nouiutil.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-parsepfa.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-parsettf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-parsettfatt.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-psread.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-pua.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-python.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-sfd1.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinechar.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinefill.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinefont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splineorder2.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splineoverlap.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinerefigure.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinesave.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinesaveafm.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinestroke.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splineutil.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splineutil2.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-start.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-stemdb.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-tottf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-tottfgpos.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-ttfspecial.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)/libff_a-fsys.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/src/$(DEPDIR)/liblua53tex_a-ffdummies.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/src/$(DEPDIR)/liblua53tex_a-luafflib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/src/$(DEPDIR)/libluajittex_a-ffdummies.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/src/$(DEPDIR)/libluajittex_a-luafflib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/src/$(DEPDIR)/libluatex_a-ffdummies.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/src/$(DEPDIR)/libluatex_a-luafflib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luamd5/$(DEPDIR)/liblua53misc_a-md5.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luamd5/$(DEPDIR)/liblua53misc_a-md5lib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luamd5/$(DEPDIR)/libluajitmisc_a-md5.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luamd5/$(DEPDIR)/libluajitmisc_a-md5lib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luamd5/$(DEPDIR)/libluamisc_a-md5.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luamd5/$(DEPDIR)/libluamisc_a-md5lib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapeg/$(DEPDIR)/liblua53misc_a-lpeg.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapeg/$(DEPDIR)/libluajitmisc_a-lpeg.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapeg/$(DEPDIR)/libluamisc_a-lpeg.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-auxiliar.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-buffer.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-compat.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-except.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-inet.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-io.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-lua_preload.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-luasocket.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-mime.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-options.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-select.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-serial.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-socket.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-tcp.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-timeout.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-udp.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-auxiliar.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-buffer.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-compat.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-except.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-inet.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-io.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-lua_preload.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-luasocket.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-mime.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-options.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-select.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-serial.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-socket.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-tcp.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-timeout.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-udp.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-auxiliar.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-buffer.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-compat.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-except.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-inet.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-io.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-lua_preload.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-luasocket.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-mime.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-options.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-select.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-serial.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-socket.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-tcp.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-timeout.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-udp.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luazip/src/$(DEPDIR)/liblua53misc_a-luazip.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luazip/src/$(DEPDIR)/libluajitmisc_a-luazip.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luazip/src/$(DEPDIR)/libluamisc_a-luazip.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luazlib/$(DEPDIR)/liblua53misc_a-lgzip.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luazlib/$(DEPDIR)/liblua53misc_a-lzlib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luazlib/$(DEPDIR)/libluajitmisc_a-lgzip.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luazlib/$(DEPDIR)/libluajitmisc_a-lzlib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luazlib/$(DEPDIR)/libluamisc_a-lgzip.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luazlib/$(DEPDIR)/libluamisc_a-lzlib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/slnunicode/$(DEPDIR)/liblua53misc_a-slnunico.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/slnunicode/$(DEPDIR)/libluajitmisc_a-slnunico.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/slnunicode/$(DEPDIR)/libluamisc_a-slnunico.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-ArabicForms.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-alphabet.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-char.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-cjk.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-gwwiconv.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-ucharmap.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-unialt.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-usprintf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-ustring.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-utype.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/utils/$(DEPDIR)/liblua53tex_a-avl.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/utils/$(DEPDIR)/libluajittex_a-avl.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/utils/$(DEPDIR)/libluatex_a-avl.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at mfluadir/$(DEPDIR)/libmflua_a-mfluac.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at mfluadir/$(DEPDIR)/libmfluajit_a-mfluac.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at mfluadir/$(DEPDIR)/mflua-mfluaextra.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at mfluadir/$(DEPDIR)/mflua_nowin-mfluaextra.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at mfluajitdir/$(DEPDIR)/mfluajit-mfluajitextra.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at mfluajitdir/$(DEPDIR)/mfluajit_nowin-mfluajitextra.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at mplibdir/$(DEPDIR)/libmputil_a-avl.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at mplibdir/$(DEPDIR)/libmputil_a-decContext.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at mplibdir/$(DEPDIR)/libmputil_a-decNumber.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at mplibdir/$(DEPDIR)/luajittex-lmplib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at mplibdir/$(DEPDIR)/luatex-lmplib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at mplibdir/$(DEPDIR)/luatex53-lmplib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-avl.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-avlstuff.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-epdf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-macnames.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-mapfile.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-pdftoepdf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-pkin.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-subfont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-tounicode.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-utils.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-vfpacket.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-writeenc.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-writefont.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-writeimg.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-writejbig2.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-writejpg.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-writepng.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-writet1.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-writet3.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-writettf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-writezip.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/pdftex-pdftexextra.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/pdftosrc-pdftosrc.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/ttf2afm-macnames.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/ttf2afm-ttf2afm.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/regex/$(DEPDIR)/libpdftex_a-regcomp.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex_internal.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/regex/$(DEPDIR)/libpdftex_a-regexec.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ptexdir/$(DEPDIR)/libkanji_a-kanji.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ptexdir/$(DEPDIR)/ptex-ptexextra.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/eptex-synctex.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/etex-synctex.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/euptex-synctex.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/liblua53tex_a-synctex.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/libluajittex_a-synctex.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/libluatex_a-synctex.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser_utils.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser_utils.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/pdftex-synctex.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/ptex-synctex.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/synctex-synctex_main.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/tex-synctex.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/uptex-synctex.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/xetex-synctex.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at uptexdir/$(DEPDIR)/libukanji_a-kanji.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at uptexdir/$(DEPDIR)/libukanji_a-kanji_dump.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at uptexdir/$(DEPDIR)/uptex-uptexextra.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst_Mac.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_FC.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_Mac.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-XeTeXLayoutInterface.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-XeTeXOTMath.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-XeTeX_ext.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-XeTeX_pic.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-hz.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-trans.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/xetex-xetexextra.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/image/$(DEPDIR)/libxetex_a-bmpimage.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/image/$(DEPDIR)/libxetex_a-jpegimage.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/image/$(DEPDIR)/libxetex_a-mfileio.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/image/$(DEPDIR)/libxetex_a-numbers.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/image/$(DEPDIR)/libxetex_a-pngimage.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aleph-aleph-pool.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aleph-aleph0.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aleph-alephini.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/bibtex.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/call_luajittex-callexe.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/call_luatex-callexe.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/call_luatex53-callexe.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/call_mf-callexe.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/call_mflua-callexe.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/call_mfluajit-callexe.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/call_mpost-callexe.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/call_pmpost-callexe.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/call_upmpost-callexe.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ctangle.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ctangleboot.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ctie.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cweave.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cweb.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cwebboot.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dvicopy.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dvitype.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/eptex-eptex-pool.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/eptex-eptex0.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/eptex-eptexini.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/etex-etex-pool.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/etex-etex0.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/etex-etexini.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/euptex-euptex-pool.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/euptex-euptex0.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/euptex-euptexini.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gftodvi.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gftopk.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gftype.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/initex-callexe.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-align.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-arithmetic.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-avlstuff.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-buildpage.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-commands.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-conditional.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-directions.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-dofont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-dumpdata.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-dvigen.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-equivalents.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-errors.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-expand.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-extensions.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-filename.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-helpers.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-hnjalloc.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-hyphen.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-inputstack.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-linebreak.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-luafont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-luainit.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-luanode.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-luastuff.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-luatoken.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-mainbody.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-maincontrol.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-managed-sa.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-mapfile.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-mathcodes.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-memoryword.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-mlist.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-mplibstuff.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-nesting.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-packaging.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfaction.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfannot.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfcolorstack.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfdest.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdffont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfgen.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfglyph.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfimage.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdflink.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdflistout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfliteral.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfobj.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfoutline.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfpage.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfpagetree.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfrule.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfsaverestore.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfsetmatrix.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfshipout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdftables.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfthread.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdftoepdf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pdfxform.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-pkin.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-postlinebreak.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-primitive.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-printing.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-scanning.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-sfnt.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-stringpool.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-texdeffont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-texfileio.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-texfont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-texlang.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-texluac.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-texmath.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-texnodes.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-textcodes.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-textoken.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-tfmofm.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-tounicode.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-tt_glyf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-tt_table.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-unistring.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-utils.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-vfovf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-vfpacket.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writecff.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writeenc.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writefont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writeimg.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writejbig2.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writejp2.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writejpg.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writepng.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writet1.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writet3.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writettf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writetype0.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/liblua53tex_a-writetype2.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-align.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-arithmetic.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-avlstuff.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-buildpage.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-commands.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-conditional.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-directions.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-dofont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-dumpdata.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-dvigen.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-equivalents.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-errors.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-expand.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-extensions.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-filename.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-hnjalloc.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-hyphen.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-inputstack.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-linebreak.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-luafont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-luainit.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-luanode.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-luastuff.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-luatoken.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-mainbody.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-maincontrol.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-managed-sa.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-mapfile.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-mathcodes.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-memoryword.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-mlist.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-mplibstuff.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-nesting.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-packaging.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfaction.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfannot.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfcolorstack.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfdest.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdffont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfgen.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfglyph.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfimage.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdflink.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdflistout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfliteral.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfobj.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfoutline.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfpage.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfpagetree.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfrule.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfsaverestore.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfsetmatrix.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfshipout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdftables.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfthread.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdftoepdf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pdfxform.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-pkin.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-postlinebreak.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-primitive.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-printing.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-scanning.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-sfnt.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-stringpool.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-texdeffont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-texfileio.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-texfont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-texlang.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-texluajitc.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-texmath.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-texnodes.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-textcodes.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-textoken.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-tfmofm.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-tounicode.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-tt_glyf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-tt_table.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-unistring.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-utils.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-vfovf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-vfpacket.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writecff.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writeenc.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writefont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writeimg.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writejbig2.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writejp2.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writejpg.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writepng.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writet1.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writet3.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writettf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writetype0.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluajittex_a-writetype2.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-align.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-arithmetic.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-avlstuff.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-buildpage.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-commands.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-conditional.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-directions.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-dofont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-dumpdata.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-dvigen.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-equivalents.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-errors.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-expand.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-extensions.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-filename.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-helpers.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-hnjalloc.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-hyphen.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-inputstack.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-linebreak.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-luafont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-luainit.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-luanode.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-luastuff.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-luatoken.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-mainbody.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-maincontrol.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-managed-sa.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-mapfile.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-mathcodes.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-memoryword.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-mlist.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-mplibstuff.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-nesting.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-packaging.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfaction.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfannot.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfcolorstack.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfdest.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdffont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfgen.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfglyph.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfimage.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdflink.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdflistout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfliteral.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfobj.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfoutline.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfpage.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfpagetree.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfrule.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfsaverestore.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfsetmatrix.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfshipout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdftables.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfthread.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdftoepdf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pdfxform.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-pkin.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-postlinebreak.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-primitive.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-printing.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-scanning.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-sfnt.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-stringpool.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-texdeffont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-texfileio.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-texfont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-texlang.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-texluac.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-texmath.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-texnodes.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-textcodes.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-textoken.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-tfmofm.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-tounicode.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-tt_glyf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-tt_table.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-unistring.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-utils.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-vfovf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-vfpacket.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writecff.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writeenc.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writefont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writeimg.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writejbig2.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writejp2.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writejpg.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writepng.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writet1.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writet3.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writettf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writetype0.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libluatex_a-writetype2.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmflua_a-mflua-pool.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmflua_a-mflua0.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmflua_a-mfluaini.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmfluajit_a-mfluajit-pool.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmfluajit_a-mfluajit0.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmfluajit_a-mfluajitini.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibbackends_a-pngout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibbackends_a-svgout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-mp.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-mpmath.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-mpmathbinary.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-mpmathdecimal.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-mpmathdouble.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-mpstrings.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-psout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmplibcore_a-tfmin.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/luajittex-dummy.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/luatex-dummy.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/luatex53-dummy.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mf-mfextra.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mf-pool.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mf0.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mf_nowin-mfextra.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mfini.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mft.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mpost-mpost.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mpost-mpxout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/odvicopy.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/odvitype.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ofm2opl.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/opl2ofm.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/otangle.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ovf2ovp.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ovp2ovf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/patgen.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pbibtex-pbibtex.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdftex-dummy.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdftex-pdftex-pool.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdftex-pdftex0.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdftex-pdftexini.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdftosrc-dummy.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pdvitype-pdvitype.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pktogf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pktype.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pltotf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-pmp.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-pmpmath.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-pmpmathbinary.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-pmpmathdecimal.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-pmpmathdouble.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-pmpost.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-pmpstrings.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-pmpxout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-ppngout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-ppsout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-psvgout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-ptfmin.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pooltype.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ppltotf-ppltotf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptex-ptex-pool.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptex-ptex0.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptex-ptexini.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptftopl-ptftopl.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tangle.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tangleboot.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tex-tex-pool.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tex-tex0.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tex-texextra.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tex-texini.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tftopl.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tie-tie.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upbibtex-upbibtex.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/updvitype-updvitype.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-pmp.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-pmpmath.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-pmpmathbinary.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-pmpmathdecimal.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-pmpmathdouble.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-pmpost.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-pmpstrings.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-pmpxout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-ppngout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-ppsout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-psvgout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/upmpost-ptfmin.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/uppltotf-uppltotf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/uptex-uptex-pool.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/uptex-uptex0.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/uptex-uptexini.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/uptftopl-uptftopl.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vftovp.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vptovf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/weave.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xetex-dummy.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xetex-xetex-pool.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xetex-xetex0.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xetex-xetexini.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at alephdir/$(DEPDIR)/aleph-aleph.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at alephdir/$(DEPDIR)/aleph-alephbis.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at alephdir/$(DEPDIR)/aleph-alephextra.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at eptexdir/$(DEPDIR)/eptex-eptexextra.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at etexdir/$(DEPDIR)/etex-etexextra.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at euptexdir/$(DEPDIR)/euptex-euptexextra.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at libmd5/$(DEPDIR)/a-md5.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at libmd5/$(DEPDIR)/md5main-md5main.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/$(DEPDIR)/luajittex-luatex.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/$(DEPDIR)/luatex-luatex.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/$(DEPDIR)/luatex53-luatex.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lcallbacklib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lepdflib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lfontlib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-limglib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-liolibext.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lkpselib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-llanglib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-llfslibext.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-llualib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lnewtokenlib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lnodelib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-loslibext.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lpdflib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lpdfscannerlib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lstatslib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-lstrlibext.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-ltexiolib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-ltexlib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/liblua53tex_a-luatex-core.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lcallbacklib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lepdflib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lfontlib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-limglib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-liolibext.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lkpselib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-llanglib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-llfslibext.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-llualib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lnewtokenlib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lnodelib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-loslibext.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lpdflib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lpdfscannerlib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lstatslib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-lstrlibext.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-ltexiolib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-ltexlib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluajittex_a-luatex-core.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lcallbacklib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lepdflib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lfontlib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-limglib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-liolibext.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lkpselib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-llanglib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-llfslibext.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-llualib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lnewtokenlib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lnodelib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-loslibext.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lpdflib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lpdfscannerlib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lstatslib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-lstrlibext.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-ltexiolib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-ltexlib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libluatex_a-luatex-core.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libmflua_a-lkpselib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/lua/$(DEPDIR)/libmfluajit_a-lkpselib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaffi/$(DEPDIR)/liblua53ffi_a-call.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaffi/$(DEPDIR)/liblua53ffi_a-ctype.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaffi/$(DEPDIR)/liblua53ffi_a-ffi.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaffi/$(DEPDIR)/liblua53ffi_a-parser.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaffi/$(DEPDIR)/libluaffi_a-call.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ctype.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ffi.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luaffi/$(DEPDIR)/libluaffi_a-parser.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafilesystem/src/$(DEPDIR)/liblua53misc_a-lfs.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafilesystem/src/$(DEPDIR)/libluajitmisc_a-lfs.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafilesystem/src/$(DEPDIR)/libluamisc_a-lfs.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-autohint.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-clipnoui.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-cvundoes.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-dumppfa.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-encoding.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-featurefile.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-fontviewbase.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-fvcomposit.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-fvfonts.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-lookups.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-macbinary.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-macenc.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-mathconstants.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-memory.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-mm.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-namelist.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-noprefs.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-nouiutil.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-parsepfa.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-parsettf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-parsettfatt.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-psread.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-pua.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-python.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-sfd1.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinechar.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinefill.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinefont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splineorder2.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splineoverlap.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinerefigure.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinesave.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinesaveafm.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinestroke.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splineutil.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splineutil2.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-start.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-stemdb.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-tottf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-tottfgpos.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-ttfspecial.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)/libff_a-fsys.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/src/$(DEPDIR)/liblua53tex_a-ffdummies.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/src/$(DEPDIR)/liblua53tex_a-luafflib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/src/$(DEPDIR)/libluajittex_a-ffdummies.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/src/$(DEPDIR)/libluajittex_a-luafflib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/src/$(DEPDIR)/libluatex_a-ffdummies.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luafontloader/src/$(DEPDIR)/libluatex_a-luafflib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luamd5/$(DEPDIR)/liblua53misc_a-md5.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luamd5/$(DEPDIR)/liblua53misc_a-md5lib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luamd5/$(DEPDIR)/libluajitmisc_a-md5.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luamd5/$(DEPDIR)/libluajitmisc_a-md5lib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luamd5/$(DEPDIR)/libluamisc_a-md5.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luamd5/$(DEPDIR)/libluamisc_a-md5lib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapeg/$(DEPDIR)/liblua53misc_a-lpeg.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapeg/$(DEPDIR)/libluajitmisc_a-lpeg.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luapeg/$(DEPDIR)/libluamisc_a-lpeg.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-auxiliar.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-buffer.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-compat.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-except.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-inet.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-io.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-lua_preload.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-luasocket.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-mime.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-options.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-select.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-serial.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-socket.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-tcp.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-timeout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-udp.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-auxiliar.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-buffer.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-compat.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-except.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-inet.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-io.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-lua_preload.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-luasocket.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-mime.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-options.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-select.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-serial.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-socket.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-tcp.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-timeout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-udp.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-auxiliar.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-buffer.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-compat.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-except.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-inet.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-io.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-lua_preload.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-luasocket.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-mime.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-options.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-select.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-serial.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-socket.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-tcp.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-timeout.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-udp.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luazip/src/$(DEPDIR)/liblua53misc_a-luazip.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luazip/src/$(DEPDIR)/libluajitmisc_a-luazip.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luazip/src/$(DEPDIR)/libluamisc_a-luazip.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luazlib/$(DEPDIR)/liblua53misc_a-lgzip.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luazlib/$(DEPDIR)/liblua53misc_a-lzlib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luazlib/$(DEPDIR)/libluajitmisc_a-lgzip.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luazlib/$(DEPDIR)/libluajitmisc_a-lzlib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luazlib/$(DEPDIR)/libluamisc_a-lgzip.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/luazlib/$(DEPDIR)/libluamisc_a-lzlib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/slnunicode/$(DEPDIR)/liblua53misc_a-slnunico.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/slnunicode/$(DEPDIR)/libluajitmisc_a-slnunico.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/slnunicode/$(DEPDIR)/libluamisc_a-slnunico.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-ArabicForms.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-alphabet.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-char.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-cjk.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-gwwiconv.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-ucharmap.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-unialt.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-usprintf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-ustring.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/unilib/$(DEPDIR)/libunilib_a-utype.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/utils/$(DEPDIR)/liblua53tex_a-avl.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/utils/$(DEPDIR)/libluajittex_a-avl.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at luatexdir/utils/$(DEPDIR)/libluatex_a-avl.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at mfluadir/$(DEPDIR)/libmflua_a-mfluac.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at mfluadir/$(DEPDIR)/libmfluajit_a-mfluac.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at mfluadir/$(DEPDIR)/mflua-mfluaextra.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at mfluadir/$(DEPDIR)/mflua_nowin-mfluaextra.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at mfluajitdir/$(DEPDIR)/mfluajit-mfluajitextra.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at mfluajitdir/$(DEPDIR)/mfluajit_nowin-mfluajitextra.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at mplibdir/$(DEPDIR)/libmputil_a-avl.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at mplibdir/$(DEPDIR)/libmputil_a-decContext.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at mplibdir/$(DEPDIR)/libmputil_a-decNumber.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at mplibdir/$(DEPDIR)/luajittex-lmplib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at mplibdir/$(DEPDIR)/luatex-lmplib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at mplibdir/$(DEPDIR)/luatex53-lmplib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-avl.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-avlstuff.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-epdf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-macnames.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-mapfile.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-pdftoepdf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-pkin.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-subfont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-tounicode.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-utils.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-vfpacket.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-writeenc.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-writefont.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-writeimg.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-writejbig2.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-writejpg.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-writepng.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-writet1.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-writet3.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-writettf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/libpdftex_a-writezip.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/pdftex-pdftexextra.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/pdftosrc-pdftosrc.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/ttf2afm-macnames.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/$(DEPDIR)/ttf2afm-ttf2afm.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/regex/$(DEPDIR)/libpdftex_a-regcomp.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex_internal.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/regex/$(DEPDIR)/libpdftex_a-regexec.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ptexdir/$(DEPDIR)/libkanji_a-kanji.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ptexdir/$(DEPDIR)/ptex-ptexextra.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/eptex-synctex.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/etex-synctex.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/euptex-synctex.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/liblua53tex_a-synctex.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/libluajittex_a-synctex.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/libluatex_a-synctex.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser_utils.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser_utils.Plo at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/pdftex-synctex.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/ptex-synctex.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/synctex-synctex_main.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/tex-synctex.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/uptex-synctex.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/xetex-synctex.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at uptexdir/$(DEPDIR)/libukanji_a-kanji.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at uptexdir/$(DEPDIR)/libukanji_a-kanji_dump.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at uptexdir/$(DEPDIR)/uptex-uptexextra.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst_Mac.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_FC.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_Mac.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-XeTeXLayoutInterface.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-XeTeXOTMath.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-XeTeX_ext.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-XeTeX_pic.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-hz.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/libxetex_a-trans.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/$(DEPDIR)/xetex-xetexextra.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/image/$(DEPDIR)/libxetex_a-bmpimage.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/image/$(DEPDIR)/libxetex_a-jpegimage.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/image/$(DEPDIR)/libxetex_a-mfileio.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/image/$(DEPDIR)/libxetex_a-numbers.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at xetexdir/image/$(DEPDIR)/libxetex_a-pngimage.Po at am__quote@ # am--include-marker
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -13022,19 +13687,19 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-unistring.obj `if test -f 'unistring.c'; then $(CYGPATH_W) 'unistring.c'; else $(CYGPATH_W) '$(srcdir)/unistring.c'; fi`
-libmd5/libmd5_a-md5.o: libmd5/md5.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmd5_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmd5/libmd5_a-md5.o -MD -MP -MF libmd5/$(DEPDIR)/libmd5_a-md5.Tpo -c -o libmd5/libmd5_a-md5.o `test -f 'libmd5/md5.c' || echo '$(srcdir)/'`libmd5/md5.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libmd5/$(DEPDIR)/libmd5_a-md5.Tpo libmd5/$(DEPDIR)/libmd5_a-md5.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libmd5/md5.c' object='libmd5/libmd5_a-md5.o' libtool=no @AMDEPBACKSLASH@
+libmd5/a-md5.o: libmd5/md5.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmd5_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmd5/a-md5.o -MD -MP -MF libmd5/$(DEPDIR)/a-md5.Tpo -c -o libmd5/a-md5.o `test -f 'libmd5/md5.c' || echo '$(srcdir)/'`libmd5/md5.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libmd5/$(DEPDIR)/a-md5.Tpo libmd5/$(DEPDIR)/a-md5.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libmd5/md5.c' object='libmd5/a-md5.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmd5_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmd5/libmd5_a-md5.o `test -f 'libmd5/md5.c' || echo '$(srcdir)/'`libmd5/md5.c
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmd5_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmd5/a-md5.o `test -f 'libmd5/md5.c' || echo '$(srcdir)/'`libmd5/md5.c
-libmd5/libmd5_a-md5.obj: libmd5/md5.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmd5_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmd5/libmd5_a-md5.obj -MD -MP -MF libmd5/$(DEPDIR)/libmd5_a-md5.Tpo -c -o libmd5/libmd5_a-md5.obj `if test -f 'libmd5/md5.c'; then $(CYGPATH_W) 'libmd5/md5.c'; else $(CYGPATH_W) '$(srcdir)/libmd5/md5.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libmd5/$(DEPDIR)/libmd5_a-md5.Tpo libmd5/$(DEPDIR)/libmd5_a-md5.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libmd5/md5.c' object='libmd5/libmd5_a-md5.obj' libtool=no @AMDEPBACKSLASH@
+libmd5/a-md5.obj: libmd5/md5.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmd5_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmd5/a-md5.obj -MD -MP -MF libmd5/$(DEPDIR)/a-md5.Tpo -c -o libmd5/a-md5.obj `if test -f 'libmd5/md5.c'; then $(CYGPATH_W) 'libmd5/md5.c'; else $(CYGPATH_W) '$(srcdir)/libmd5/md5.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libmd5/$(DEPDIR)/a-md5.Tpo libmd5/$(DEPDIR)/a-md5.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libmd5/md5.c' object='libmd5/a-md5.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmd5_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmd5/libmd5_a-md5.obj `if test -f 'libmd5/md5.c'; then $(CYGPATH_W) 'libmd5/md5.c'; else $(CYGPATH_W) '$(srcdir)/libmd5/md5.c'; fi`
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmd5_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmd5/a-md5.obj `if test -f 'libmd5/md5.c'; then $(CYGPATH_W) 'libmd5/md5.c'; else $(CYGPATH_W) '$(srcdir)/libmd5/md5.c'; fi`
luatexdir/lua/libmflua_a-lkpselib.o: luatexdir/lua/lkpselib.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmflua_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/lua/libmflua_a-lkpselib.o -MD -MP -MF luatexdir/lua/$(DEPDIR)/libmflua_a-lkpselib.Tpo -c -o luatexdir/lua/libmflua_a-lkpselib.o `test -f 'luatexdir/lua/lkpselib.c' || echo '$(srcdir)/'`luatexdir/lua/lkpselib.c
@@ -16352,7 +17017,7 @@
fi; \
$$success || exit 1
-check-TESTS:
+check-TESTS:
@list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -16402,7 +17067,10 @@
@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -16596,13 +17264,13 @@
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-recursive
-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(MANS) \
+all-am: Makefile $(PROGRAMS) $(LIBRARIES) $(LTLIBRARIES) $(MANS) \
$(DATA) $(HEADERS) ff-config.h
install-binPROGRAMS: install-libLTLIBRARIES
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(syncincludedir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(syncincludedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
@@ -16708,7 +17376,713 @@
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf ./$(DEPDIR) alephdir/$(DEPDIR) eptexdir/$(DEPDIR) etexdir/$(DEPDIR) euptexdir/$(DEPDIR) libmd5/$(DEPDIR) luatexdir/$(DEPDIR) luatexdir/lua/$(DEPDIR) luatexdir/luaffi/$(DEPDIR) luatexdir/luafilesystem/src/$(DEPDIR) luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR) luatexdir/luafontloader/fontforge/gutils/$(DEPDIR) luatexdir/luafontloader/src/$(DEPDIR) luatexdir/luamd5/$(DEPDIR) luatexdir/luapeg/$(DEPDIR) luatexdir/luasocket/src/$(DEPDIR) luatexdir/luazip/src/$(DEPDIR) luatexdir/luazlib/$(DEPDIR) luatexdir/slnunicode/$(DEPDIR) luatexdir/unilib/$(DEPDIR) luatexdir/utils/$(DEPDIR) mfluadir/$(DEPDIR) mfluajitdir/$(DEPDIR) mplibdir/$(DEPDIR) pdftexdir/$(DEPDIR) pdftexdir/regex/$(DEPDIR) ptexdir/$(DEPDIR) synctexdir/$(DEPDIR) uptexdir/$(DEPDIR) xetexdir/$(DEPDIR) xetexdir/image/$(DEPDIR)
+ -rm -f ./$(DEPDIR)/aleph-aleph-pool.Po
+ -rm -f ./$(DEPDIR)/aleph-aleph0.Po
+ -rm -f ./$(DEPDIR)/aleph-alephini.Po
+ -rm -f ./$(DEPDIR)/bibtex.Po
+ -rm -f ./$(DEPDIR)/call_luajittex-callexe.Po
+ -rm -f ./$(DEPDIR)/call_luatex-callexe.Po
+ -rm -f ./$(DEPDIR)/call_luatex53-callexe.Po
+ -rm -f ./$(DEPDIR)/call_mf-callexe.Po
+ -rm -f ./$(DEPDIR)/call_mflua-callexe.Po
+ -rm -f ./$(DEPDIR)/call_mfluajit-callexe.Po
+ -rm -f ./$(DEPDIR)/call_mpost-callexe.Po
+ -rm -f ./$(DEPDIR)/call_pmpost-callexe.Po
+ -rm -f ./$(DEPDIR)/call_upmpost-callexe.Po
+ -rm -f ./$(DEPDIR)/ctangle.Po
+ -rm -f ./$(DEPDIR)/ctangleboot.Po
+ -rm -f ./$(DEPDIR)/ctie.Po
+ -rm -f ./$(DEPDIR)/cweave.Po
+ -rm -f ./$(DEPDIR)/cweb.Po
+ -rm -f ./$(DEPDIR)/cwebboot.Po
+ -rm -f ./$(DEPDIR)/dvicopy.Po
+ -rm -f ./$(DEPDIR)/dvitype.Po
+ -rm -f ./$(DEPDIR)/eptex-eptex-pool.Po
+ -rm -f ./$(DEPDIR)/eptex-eptex0.Po
+ -rm -f ./$(DEPDIR)/eptex-eptexini.Po
+ -rm -f ./$(DEPDIR)/etex-etex-pool.Po
+ -rm -f ./$(DEPDIR)/etex-etex0.Po
+ -rm -f ./$(DEPDIR)/etex-etexini.Po
+ -rm -f ./$(DEPDIR)/euptex-euptex-pool.Po
+ -rm -f ./$(DEPDIR)/euptex-euptex0.Po
+ -rm -f ./$(DEPDIR)/euptex-euptexini.Po
+ -rm -f ./$(DEPDIR)/gftodvi.Po
+ -rm -f ./$(DEPDIR)/gftopk.Po
+ -rm -f ./$(DEPDIR)/gftype.Po
+ -rm -f ./$(DEPDIR)/initex-callexe.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-align.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-arithmetic.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-avlstuff.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-buildpage.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-commands.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-conditional.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-directions.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-dofont.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-dumpdata.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-dvigen.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-equivalents.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-errors.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-expand.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-extensions.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-filename.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-helpers.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-hnjalloc.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-hyphen.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-inputstack.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-linebreak.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-luafont.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-luainit.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-luanode.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-luastuff.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-luatoken.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-mainbody.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-maincontrol.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-managed-sa.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-mapfile.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-mathcodes.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-memoryword.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-mlist.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-mplibstuff.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-nesting.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-packaging.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfaction.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfannot.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfcolorstack.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfdest.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdffont.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfgen.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfglyph.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfimage.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdflink.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdflistout.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfliteral.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfobj.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfoutline.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfpage.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfpagetree.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfrule.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfsaverestore.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfsetmatrix.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfshipout.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdftables.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfthread.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdftoepdf.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfxform.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pkin.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-postlinebreak.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-primitive.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-printing.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-scanning.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-sfnt.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-stringpool.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-texdeffont.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-texfileio.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-texfont.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-texlang.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-texluac.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-texmath.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-texnodes.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-textcodes.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-textoken.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-tfmofm.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-tounicode.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-tt_glyf.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-tt_table.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-unistring.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-utils.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-vfovf.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-vfpacket.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writecff.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writeenc.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writefont.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writeimg.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writejbig2.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writejp2.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writejpg.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writepng.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writet1.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writet3.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writettf.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writetype0.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writetype2.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-align.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-arithmetic.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-avlstuff.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-buildpage.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-commands.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-conditional.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-directions.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-dofont.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-dumpdata.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-dvigen.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-equivalents.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-errors.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-expand.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-extensions.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-filename.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-hnjalloc.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-hyphen.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-inputstack.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-linebreak.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-luafont.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-luainit.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-luanode.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-luastuff.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-luatoken.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-mainbody.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-maincontrol.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-managed-sa.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-mapfile.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-mathcodes.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-memoryword.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-mlist.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-mplibstuff.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-nesting.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-packaging.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfaction.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfannot.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfcolorstack.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfdest.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdffont.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfgen.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfglyph.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfimage.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdflink.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdflistout.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfliteral.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfobj.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfoutline.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfpage.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfpagetree.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfrule.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfsaverestore.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfsetmatrix.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfshipout.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdftables.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfthread.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdftoepdf.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfxform.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pkin.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-postlinebreak.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-primitive.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-printing.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-scanning.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-sfnt.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-stringpool.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-texdeffont.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-texfileio.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-texfont.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-texlang.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-texluajitc.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-texmath.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-texnodes.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-textcodes.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-textoken.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-tfmofm.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-tounicode.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-tt_glyf.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-tt_table.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-unistring.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-utils.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-vfovf.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-vfpacket.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writecff.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writeenc.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writefont.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writeimg.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writejbig2.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writejp2.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writejpg.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writepng.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writet1.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writet3.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writettf.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writetype0.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writetype2.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-align.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-arithmetic.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-avlstuff.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-buildpage.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-commands.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-conditional.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-directions.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-dofont.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-dumpdata.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-dvigen.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-equivalents.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-errors.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-expand.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-extensions.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-filename.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-helpers.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-hnjalloc.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-hyphen.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-inputstack.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-linebreak.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-luafont.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-luainit.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-luanode.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-luastuff.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-luatoken.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-mainbody.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-maincontrol.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-managed-sa.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-mapfile.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-mathcodes.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-memoryword.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-mlist.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-mplibstuff.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-nesting.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-packaging.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfaction.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfannot.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfcolorstack.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfdest.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdffont.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfgen.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfglyph.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfimage.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdflink.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdflistout.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfliteral.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfobj.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfoutline.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfpage.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfpagetree.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfrule.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfsaverestore.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfsetmatrix.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfshipout.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdftables.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfthread.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdftoepdf.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfxform.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pkin.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-postlinebreak.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-primitive.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-printing.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-scanning.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-sfnt.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-stringpool.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-texdeffont.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-texfileio.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-texfont.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-texlang.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-texluac.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-texmath.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-texnodes.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-textcodes.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-textoken.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-tfmofm.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-tounicode.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-tt_glyf.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-tt_table.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-unistring.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-utils.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-vfovf.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-vfpacket.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writecff.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writeenc.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writefont.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writeimg.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writejbig2.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writejp2.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writejpg.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writepng.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writet1.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writet3.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writettf.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writetype0.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writetype2.Po
+ -rm -f ./$(DEPDIR)/libmflua_a-mflua-pool.Po
+ -rm -f ./$(DEPDIR)/libmflua_a-mflua0.Po
+ -rm -f ./$(DEPDIR)/libmflua_a-mfluaini.Po
+ -rm -f ./$(DEPDIR)/libmfluajit_a-mfluajit-pool.Po
+ -rm -f ./$(DEPDIR)/libmfluajit_a-mfluajit0.Po
+ -rm -f ./$(DEPDIR)/libmfluajit_a-mfluajitini.Po
+ -rm -f ./$(DEPDIR)/libmplibbackends_a-pngout.Po
+ -rm -f ./$(DEPDIR)/libmplibbackends_a-svgout.Po
+ -rm -f ./$(DEPDIR)/libmplibcore_a-mp.Po
+ -rm -f ./$(DEPDIR)/libmplibcore_a-mpmath.Po
+ -rm -f ./$(DEPDIR)/libmplibcore_a-mpmathbinary.Po
+ -rm -f ./$(DEPDIR)/libmplibcore_a-mpmathdecimal.Po
+ -rm -f ./$(DEPDIR)/libmplibcore_a-mpmathdouble.Po
+ -rm -f ./$(DEPDIR)/libmplibcore_a-mpstrings.Po
+ -rm -f ./$(DEPDIR)/libmplibcore_a-psout.Po
+ -rm -f ./$(DEPDIR)/libmplibcore_a-tfmin.Po
+ -rm -f ./$(DEPDIR)/luajittex-dummy.Po
+ -rm -f ./$(DEPDIR)/luatex-dummy.Po
+ -rm -f ./$(DEPDIR)/luatex53-dummy.Po
+ -rm -f ./$(DEPDIR)/mf-mfextra.Po
+ -rm -f ./$(DEPDIR)/mf-pool.Po
+ -rm -f ./$(DEPDIR)/mf0.Po
+ -rm -f ./$(DEPDIR)/mf_nowin-mfextra.Po
+ -rm -f ./$(DEPDIR)/mfini.Po
+ -rm -f ./$(DEPDIR)/mft.Po
+ -rm -f ./$(DEPDIR)/mpost-mpost.Po
+ -rm -f ./$(DEPDIR)/mpost-mpxout.Po
+ -rm -f ./$(DEPDIR)/odvicopy.Po
+ -rm -f ./$(DEPDIR)/odvitype.Po
+ -rm -f ./$(DEPDIR)/ofm2opl.Po
+ -rm -f ./$(DEPDIR)/opl2ofm.Po
+ -rm -f ./$(DEPDIR)/otangle.Po
+ -rm -f ./$(DEPDIR)/ovf2ovp.Po
+ -rm -f ./$(DEPDIR)/ovp2ovf.Po
+ -rm -f ./$(DEPDIR)/patgen.Po
+ -rm -f ./$(DEPDIR)/pbibtex-pbibtex.Po
+ -rm -f ./$(DEPDIR)/pdftex-dummy.Po
+ -rm -f ./$(DEPDIR)/pdftex-pdftex-pool.Po
+ -rm -f ./$(DEPDIR)/pdftex-pdftex0.Po
+ -rm -f ./$(DEPDIR)/pdftex-pdftexini.Po
+ -rm -f ./$(DEPDIR)/pdftosrc-dummy.Po
+ -rm -f ./$(DEPDIR)/pdvitype-pdvitype.Po
+ -rm -f ./$(DEPDIR)/pktogf.Po
+ -rm -f ./$(DEPDIR)/pktype.Po
+ -rm -f ./$(DEPDIR)/pltotf.Po
+ -rm -f ./$(DEPDIR)/pmpost-pmp.Po
+ -rm -f ./$(DEPDIR)/pmpost-pmpmath.Po
+ -rm -f ./$(DEPDIR)/pmpost-pmpmathbinary.Po
+ -rm -f ./$(DEPDIR)/pmpost-pmpmathdecimal.Po
+ -rm -f ./$(DEPDIR)/pmpost-pmpmathdouble.Po
+ -rm -f ./$(DEPDIR)/pmpost-pmpost.Po
+ -rm -f ./$(DEPDIR)/pmpost-pmpstrings.Po
+ -rm -f ./$(DEPDIR)/pmpost-pmpxout.Po
+ -rm -f ./$(DEPDIR)/pmpost-ppngout.Po
+ -rm -f ./$(DEPDIR)/pmpost-ppsout.Po
+ -rm -f ./$(DEPDIR)/pmpost-psvgout.Po
+ -rm -f ./$(DEPDIR)/pmpost-ptfmin.Po
+ -rm -f ./$(DEPDIR)/pooltype.Po
+ -rm -f ./$(DEPDIR)/ppltotf-ppltotf.Po
+ -rm -f ./$(DEPDIR)/ptex-ptex-pool.Po
+ -rm -f ./$(DEPDIR)/ptex-ptex0.Po
+ -rm -f ./$(DEPDIR)/ptex-ptexini.Po
+ -rm -f ./$(DEPDIR)/ptftopl-ptftopl.Po
+ -rm -f ./$(DEPDIR)/tangle.Po
+ -rm -f ./$(DEPDIR)/tangleboot.Po
+ -rm -f ./$(DEPDIR)/tex-tex-pool.Po
+ -rm -f ./$(DEPDIR)/tex-tex0.Po
+ -rm -f ./$(DEPDIR)/tex-texextra.Po
+ -rm -f ./$(DEPDIR)/tex-texini.Po
+ -rm -f ./$(DEPDIR)/tftopl.Po
+ -rm -f ./$(DEPDIR)/tie-tie.Po
+ -rm -f ./$(DEPDIR)/upbibtex-upbibtex.Po
+ -rm -f ./$(DEPDIR)/updvitype-updvitype.Po
+ -rm -f ./$(DEPDIR)/upmpost-pmp.Po
+ -rm -f ./$(DEPDIR)/upmpost-pmpmath.Po
+ -rm -f ./$(DEPDIR)/upmpost-pmpmathbinary.Po
+ -rm -f ./$(DEPDIR)/upmpost-pmpmathdecimal.Po
+ -rm -f ./$(DEPDIR)/upmpost-pmpmathdouble.Po
+ -rm -f ./$(DEPDIR)/upmpost-pmpost.Po
+ -rm -f ./$(DEPDIR)/upmpost-pmpstrings.Po
+ -rm -f ./$(DEPDIR)/upmpost-pmpxout.Po
+ -rm -f ./$(DEPDIR)/upmpost-ppngout.Po
+ -rm -f ./$(DEPDIR)/upmpost-ppsout.Po
+ -rm -f ./$(DEPDIR)/upmpost-psvgout.Po
+ -rm -f ./$(DEPDIR)/upmpost-ptfmin.Po
+ -rm -f ./$(DEPDIR)/uppltotf-uppltotf.Po
+ -rm -f ./$(DEPDIR)/uptex-uptex-pool.Po
+ -rm -f ./$(DEPDIR)/uptex-uptex0.Po
+ -rm -f ./$(DEPDIR)/uptex-uptexini.Po
+ -rm -f ./$(DEPDIR)/uptftopl-uptftopl.Po
+ -rm -f ./$(DEPDIR)/vftovp.Po
+ -rm -f ./$(DEPDIR)/vptovf.Po
+ -rm -f ./$(DEPDIR)/weave.Po
+ -rm -f ./$(DEPDIR)/xetex-dummy.Po
+ -rm -f ./$(DEPDIR)/xetex-xetex-pool.Po
+ -rm -f ./$(DEPDIR)/xetex-xetex0.Po
+ -rm -f ./$(DEPDIR)/xetex-xetexini.Po
+ -rm -f alephdir/$(DEPDIR)/aleph-aleph.Po
+ -rm -f alephdir/$(DEPDIR)/aleph-alephbis.Po
+ -rm -f alephdir/$(DEPDIR)/aleph-alephextra.Po
+ -rm -f eptexdir/$(DEPDIR)/eptex-eptexextra.Po
+ -rm -f etexdir/$(DEPDIR)/etex-etexextra.Po
+ -rm -f euptexdir/$(DEPDIR)/euptex-euptexextra.Po
+ -rm -f libmd5/$(DEPDIR)/a-md5.Po
+ -rm -f libmd5/$(DEPDIR)/md5main-md5main.Po
+ -rm -f luatexdir/$(DEPDIR)/luajittex-luatex.Po
+ -rm -f luatexdir/$(DEPDIR)/luatex-luatex.Po
+ -rm -f luatexdir/$(DEPDIR)/luatex53-luatex.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-lcallbacklib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-lepdflib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-lfontlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-limglib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-liolibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-lkpselib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-llanglib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-llfslibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-llualib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-lnewtokenlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-lnodelib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-loslibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-lpdflib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-lpdfscannerlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-lstatslib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-lstrlibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-ltexiolib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-ltexlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-luatex-core.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-lcallbacklib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-lepdflib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-lfontlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-limglib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-liolibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-lkpselib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-llanglib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-llfslibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-llualib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-lnewtokenlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-lnodelib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-loslibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-lpdflib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-lpdfscannerlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-lstatslib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-lstrlibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-ltexiolib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-ltexlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-luatex-core.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-lcallbacklib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-lepdflib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-lfontlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-limglib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-liolibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-lkpselib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-llanglib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-llfslibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-llualib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-lnewtokenlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-lnodelib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-loslibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-lpdflib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-lpdfscannerlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-lstatslib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-lstrlibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-ltexiolib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-ltexlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-luatex-core.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libmflua_a-lkpselib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libmfluajit_a-lkpselib.Po
+ -rm -f luatexdir/luaffi/$(DEPDIR)/liblua53ffi_a-call.Po
+ -rm -f luatexdir/luaffi/$(DEPDIR)/liblua53ffi_a-ctype.Po
+ -rm -f luatexdir/luaffi/$(DEPDIR)/liblua53ffi_a-ffi.Po
+ -rm -f luatexdir/luaffi/$(DEPDIR)/liblua53ffi_a-parser.Po
+ -rm -f luatexdir/luaffi/$(DEPDIR)/libluaffi_a-call.Po
+ -rm -f luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ctype.Po
+ -rm -f luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ffi.Po
+ -rm -f luatexdir/luaffi/$(DEPDIR)/libluaffi_a-parser.Po
+ -rm -f luatexdir/luafilesystem/src/$(DEPDIR)/liblua53misc_a-lfs.Po
+ -rm -f luatexdir/luafilesystem/src/$(DEPDIR)/libluajitmisc_a-lfs.Po
+ -rm -f luatexdir/luafilesystem/src/$(DEPDIR)/libluamisc_a-lfs.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-autohint.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-clipnoui.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-cvundoes.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-dumppfa.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-encoding.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-featurefile.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-fontviewbase.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-fvcomposit.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-fvfonts.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-lookups.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-macbinary.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-macenc.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-mathconstants.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-memory.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-mm.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-namelist.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-noprefs.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-nouiutil.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-parsepfa.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-parsettf.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-parsettfatt.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-psread.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-pua.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-python.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-sfd1.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinechar.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinefill.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinefont.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splineorder2.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splineoverlap.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinerefigure.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinesave.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinesaveafm.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinestroke.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splineutil.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splineutil2.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-start.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-stemdb.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-tottf.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-tottfgpos.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-ttfspecial.Po
+ -rm -f luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)/libff_a-fsys.Po
+ -rm -f luatexdir/luafontloader/src/$(DEPDIR)/liblua53tex_a-ffdummies.Po
+ -rm -f luatexdir/luafontloader/src/$(DEPDIR)/liblua53tex_a-luafflib.Po
+ -rm -f luatexdir/luafontloader/src/$(DEPDIR)/libluajittex_a-ffdummies.Po
+ -rm -f luatexdir/luafontloader/src/$(DEPDIR)/libluajittex_a-luafflib.Po
+ -rm -f luatexdir/luafontloader/src/$(DEPDIR)/libluatex_a-ffdummies.Po
+ -rm -f luatexdir/luafontloader/src/$(DEPDIR)/libluatex_a-luafflib.Po
+ -rm -f luatexdir/luamd5/$(DEPDIR)/liblua53misc_a-md5.Po
+ -rm -f luatexdir/luamd5/$(DEPDIR)/liblua53misc_a-md5lib.Po
+ -rm -f luatexdir/luamd5/$(DEPDIR)/libluajitmisc_a-md5.Po
+ -rm -f luatexdir/luamd5/$(DEPDIR)/libluajitmisc_a-md5lib.Po
+ -rm -f luatexdir/luamd5/$(DEPDIR)/libluamisc_a-md5.Po
+ -rm -f luatexdir/luamd5/$(DEPDIR)/libluamisc_a-md5lib.Po
+ -rm -f luatexdir/luapeg/$(DEPDIR)/liblua53misc_a-lpeg.Po
+ -rm -f luatexdir/luapeg/$(DEPDIR)/libluajitmisc_a-lpeg.Po
+ -rm -f luatexdir/luapeg/$(DEPDIR)/libluamisc_a-lpeg.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-auxiliar.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-buffer.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-compat.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-except.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-inet.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-io.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-lua_preload.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-luasocket.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-mime.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-options.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-select.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-serial.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-socket.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-tcp.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-timeout.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-udp.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-auxiliar.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-buffer.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-compat.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-except.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-inet.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-io.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-lua_preload.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-luasocket.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-mime.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-options.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-select.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-serial.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-socket.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-tcp.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-timeout.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-udp.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-auxiliar.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-buffer.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-compat.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-except.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-inet.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-io.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-lua_preload.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-luasocket.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-mime.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-options.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-select.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-serial.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-socket.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-tcp.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-timeout.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-udp.Po
+ -rm -f luatexdir/luazip/src/$(DEPDIR)/liblua53misc_a-luazip.Po
+ -rm -f luatexdir/luazip/src/$(DEPDIR)/libluajitmisc_a-luazip.Po
+ -rm -f luatexdir/luazip/src/$(DEPDIR)/libluamisc_a-luazip.Po
+ -rm -f luatexdir/luazlib/$(DEPDIR)/liblua53misc_a-lgzip.Po
+ -rm -f luatexdir/luazlib/$(DEPDIR)/liblua53misc_a-lzlib.Po
+ -rm -f luatexdir/luazlib/$(DEPDIR)/libluajitmisc_a-lgzip.Po
+ -rm -f luatexdir/luazlib/$(DEPDIR)/libluajitmisc_a-lzlib.Po
+ -rm -f luatexdir/luazlib/$(DEPDIR)/libluamisc_a-lgzip.Po
+ -rm -f luatexdir/luazlib/$(DEPDIR)/libluamisc_a-lzlib.Po
+ -rm -f luatexdir/slnunicode/$(DEPDIR)/liblua53misc_a-slnunico.Po
+ -rm -f luatexdir/slnunicode/$(DEPDIR)/libluajitmisc_a-slnunico.Po
+ -rm -f luatexdir/slnunicode/$(DEPDIR)/libluamisc_a-slnunico.Po
+ -rm -f luatexdir/unilib/$(DEPDIR)/libunilib_a-ArabicForms.Po
+ -rm -f luatexdir/unilib/$(DEPDIR)/libunilib_a-alphabet.Po
+ -rm -f luatexdir/unilib/$(DEPDIR)/libunilib_a-char.Po
+ -rm -f luatexdir/unilib/$(DEPDIR)/libunilib_a-cjk.Po
+ -rm -f luatexdir/unilib/$(DEPDIR)/libunilib_a-gwwiconv.Po
+ -rm -f luatexdir/unilib/$(DEPDIR)/libunilib_a-ucharmap.Po
+ -rm -f luatexdir/unilib/$(DEPDIR)/libunilib_a-unialt.Po
+ -rm -f luatexdir/unilib/$(DEPDIR)/libunilib_a-usprintf.Po
+ -rm -f luatexdir/unilib/$(DEPDIR)/libunilib_a-ustring.Po
+ -rm -f luatexdir/unilib/$(DEPDIR)/libunilib_a-utype.Po
+ -rm -f luatexdir/utils/$(DEPDIR)/liblua53tex_a-avl.Po
+ -rm -f luatexdir/utils/$(DEPDIR)/libluajittex_a-avl.Po
+ -rm -f luatexdir/utils/$(DEPDIR)/libluatex_a-avl.Po
+ -rm -f mfluadir/$(DEPDIR)/libmflua_a-mfluac.Po
+ -rm -f mfluadir/$(DEPDIR)/libmfluajit_a-mfluac.Po
+ -rm -f mfluadir/$(DEPDIR)/mflua-mfluaextra.Po
+ -rm -f mfluadir/$(DEPDIR)/mflua_nowin-mfluaextra.Po
+ -rm -f mfluajitdir/$(DEPDIR)/mfluajit-mfluajitextra.Po
+ -rm -f mfluajitdir/$(DEPDIR)/mfluajit_nowin-mfluajitextra.Po
+ -rm -f mplibdir/$(DEPDIR)/libmputil_a-avl.Po
+ -rm -f mplibdir/$(DEPDIR)/libmputil_a-decContext.Po
+ -rm -f mplibdir/$(DEPDIR)/libmputil_a-decNumber.Po
+ -rm -f mplibdir/$(DEPDIR)/luajittex-lmplib.Po
+ -rm -f mplibdir/$(DEPDIR)/luatex-lmplib.Po
+ -rm -f mplibdir/$(DEPDIR)/luatex53-lmplib.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-avl.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-avlstuff.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-epdf.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-macnames.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-mapfile.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-pdftoepdf.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-pkin.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-subfont.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-tounicode.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-utils.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-vfpacket.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-writeenc.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-writefont.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-writeimg.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-writejbig2.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-writejpg.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-writepng.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-writet1.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-writet3.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-writettf.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-writezip.Po
+ -rm -f pdftexdir/$(DEPDIR)/pdftex-pdftexextra.Po
+ -rm -f pdftexdir/$(DEPDIR)/pdftosrc-pdftosrc.Po
+ -rm -f pdftexdir/$(DEPDIR)/ttf2afm-macnames.Po
+ -rm -f pdftexdir/$(DEPDIR)/ttf2afm-ttf2afm.Po
+ -rm -f pdftexdir/regex/$(DEPDIR)/libpdftex_a-regcomp.Po
+ -rm -f pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex.Po
+ -rm -f pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex_internal.Po
+ -rm -f pdftexdir/regex/$(DEPDIR)/libpdftex_a-regexec.Po
+ -rm -f ptexdir/$(DEPDIR)/libkanji_a-kanji.Po
+ -rm -f ptexdir/$(DEPDIR)/ptex-ptexextra.Po
+ -rm -f synctexdir/$(DEPDIR)/eptex-synctex.Po
+ -rm -f synctexdir/$(DEPDIR)/etex-synctex.Po
+ -rm -f synctexdir/$(DEPDIR)/euptex-synctex.Po
+ -rm -f synctexdir/$(DEPDIR)/liblua53tex_a-synctex.Po
+ -rm -f synctexdir/$(DEPDIR)/libluajittex_a-synctex.Po
+ -rm -f synctexdir/$(DEPDIR)/libluatex_a-synctex.Po
+ -rm -f synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser.Po
+ -rm -f synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser_utils.Po
+ -rm -f synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser.Plo
+ -rm -f synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser_utils.Plo
+ -rm -f synctexdir/$(DEPDIR)/pdftex-synctex.Po
+ -rm -f synctexdir/$(DEPDIR)/ptex-synctex.Po
+ -rm -f synctexdir/$(DEPDIR)/synctex-synctex_main.Po
+ -rm -f synctexdir/$(DEPDIR)/tex-synctex.Po
+ -rm -f synctexdir/$(DEPDIR)/uptex-synctex.Po
+ -rm -f synctexdir/$(DEPDIR)/xetex-synctex.Po
+ -rm -f uptexdir/$(DEPDIR)/libukanji_a-kanji.Po
+ -rm -f uptexdir/$(DEPDIR)/libukanji_a-kanji_dump.Po
+ -rm -f uptexdir/$(DEPDIR)/uptex-uptexextra.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst_Mac.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_FC.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_Mac.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-XeTeXLayoutInterface.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-XeTeXOTMath.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-XeTeX_ext.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-XeTeX_pic.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-hz.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-trans.Po
+ -rm -f xetexdir/$(DEPDIR)/xetex-xetexextra.Po
+ -rm -f xetexdir/image/$(DEPDIR)/libxetex_a-bmpimage.Po
+ -rm -f xetexdir/image/$(DEPDIR)/libxetex_a-jpegimage.Po
+ -rm -f xetexdir/image/$(DEPDIR)/libxetex_a-mfileio.Po
+ -rm -f xetexdir/image/$(DEPDIR)/libxetex_a-numbers.Po
+ -rm -f xetexdir/image/$(DEPDIR)/libxetex_a-pngimage.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-libtool distclean-tags
@@ -16759,7 +18133,713 @@
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -rf ./$(DEPDIR) alephdir/$(DEPDIR) eptexdir/$(DEPDIR) etexdir/$(DEPDIR) euptexdir/$(DEPDIR) libmd5/$(DEPDIR) luatexdir/$(DEPDIR) luatexdir/lua/$(DEPDIR) luatexdir/luaffi/$(DEPDIR) luatexdir/luafilesystem/src/$(DEPDIR) luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR) luatexdir/luafontloader/fontforge/gutils/$(DEPDIR) luatexdir/luafontloader/src/$(DEPDIR) luatexdir/luamd5/$(DEPDIR) luatexdir/luapeg/$(DEPDIR) luatexdir/luasocket/src/$(DEPDIR) luatexdir/luazip/src/$(DEPDIR) luatexdir/luazlib/$(DEPDIR) luatexdir/slnunicode/$(DEPDIR) luatexdir/unilib/$(DEPDIR) luatexdir/utils/$(DEPDIR) mfluadir/$(DEPDIR) mfluajitdir/$(DEPDIR) mplibdir/$(DEPDIR) pdftexdir/$(DEPDIR) pdftexdir/regex/$(DEPDIR) ptexdir/$(DEPDIR) synctexdir/$(DEPDIR) uptexdir/$(DEPDIR) xetexdir/$(DEPDIR) xetexdir/image/$(DEPDIR)
+ -rm -f ./$(DEPDIR)/aleph-aleph-pool.Po
+ -rm -f ./$(DEPDIR)/aleph-aleph0.Po
+ -rm -f ./$(DEPDIR)/aleph-alephini.Po
+ -rm -f ./$(DEPDIR)/bibtex.Po
+ -rm -f ./$(DEPDIR)/call_luajittex-callexe.Po
+ -rm -f ./$(DEPDIR)/call_luatex-callexe.Po
+ -rm -f ./$(DEPDIR)/call_luatex53-callexe.Po
+ -rm -f ./$(DEPDIR)/call_mf-callexe.Po
+ -rm -f ./$(DEPDIR)/call_mflua-callexe.Po
+ -rm -f ./$(DEPDIR)/call_mfluajit-callexe.Po
+ -rm -f ./$(DEPDIR)/call_mpost-callexe.Po
+ -rm -f ./$(DEPDIR)/call_pmpost-callexe.Po
+ -rm -f ./$(DEPDIR)/call_upmpost-callexe.Po
+ -rm -f ./$(DEPDIR)/ctangle.Po
+ -rm -f ./$(DEPDIR)/ctangleboot.Po
+ -rm -f ./$(DEPDIR)/ctie.Po
+ -rm -f ./$(DEPDIR)/cweave.Po
+ -rm -f ./$(DEPDIR)/cweb.Po
+ -rm -f ./$(DEPDIR)/cwebboot.Po
+ -rm -f ./$(DEPDIR)/dvicopy.Po
+ -rm -f ./$(DEPDIR)/dvitype.Po
+ -rm -f ./$(DEPDIR)/eptex-eptex-pool.Po
+ -rm -f ./$(DEPDIR)/eptex-eptex0.Po
+ -rm -f ./$(DEPDIR)/eptex-eptexini.Po
+ -rm -f ./$(DEPDIR)/etex-etex-pool.Po
+ -rm -f ./$(DEPDIR)/etex-etex0.Po
+ -rm -f ./$(DEPDIR)/etex-etexini.Po
+ -rm -f ./$(DEPDIR)/euptex-euptex-pool.Po
+ -rm -f ./$(DEPDIR)/euptex-euptex0.Po
+ -rm -f ./$(DEPDIR)/euptex-euptexini.Po
+ -rm -f ./$(DEPDIR)/gftodvi.Po
+ -rm -f ./$(DEPDIR)/gftopk.Po
+ -rm -f ./$(DEPDIR)/gftype.Po
+ -rm -f ./$(DEPDIR)/initex-callexe.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-align.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-arithmetic.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-avlstuff.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-buildpage.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-commands.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-conditional.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-directions.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-dofont.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-dumpdata.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-dvigen.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-equivalents.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-errors.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-expand.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-extensions.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-filename.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-helpers.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-hnjalloc.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-hyphen.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-inputstack.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-linebreak.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-luafont.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-luainit.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-luanode.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-luastuff.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-luatoken.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-mainbody.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-maincontrol.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-managed-sa.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-mapfile.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-mathcodes.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-memoryword.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-mlist.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-mplibstuff.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-nesting.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-packaging.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfaction.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfannot.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfcolorstack.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfdest.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdffont.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfgen.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfglyph.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfimage.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdflink.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdflistout.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfliteral.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfobj.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfoutline.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfpage.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfpagetree.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfrule.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfsaverestore.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfsetmatrix.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfshipout.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdftables.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfthread.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdftoepdf.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pdfxform.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-pkin.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-postlinebreak.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-primitive.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-printing.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-scanning.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-sfnt.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-stringpool.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-texdeffont.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-texfileio.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-texfont.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-texlang.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-texluac.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-texmath.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-texnodes.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-textcodes.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-textoken.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-tfmofm.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-tounicode.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-tt_glyf.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-tt_table.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-unistring.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-utils.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-vfovf.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-vfpacket.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writecff.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writeenc.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writefont.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writeimg.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writejbig2.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writejp2.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writejpg.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writepng.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writet1.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writet3.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writettf.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writetype0.Po
+ -rm -f ./$(DEPDIR)/liblua53tex_a-writetype2.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-align.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-arithmetic.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-avlstuff.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-buildpage.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-commands.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-conditional.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-directions.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-dofont.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-dumpdata.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-dvigen.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-equivalents.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-errors.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-expand.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-extensions.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-filename.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-hnjalloc.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-hyphen.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-inputstack.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-linebreak.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-luafont.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-luainit.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-luanode.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-luastuff.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-luatoken.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-mainbody.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-maincontrol.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-managed-sa.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-mapfile.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-mathcodes.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-memoryword.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-mlist.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-mplibstuff.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-nesting.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-packaging.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfaction.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfannot.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfcolorstack.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfdest.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdffont.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfgen.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfglyph.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfimage.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdflink.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdflistout.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfliteral.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfobj.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfoutline.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfpage.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfpagetree.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfrule.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfsaverestore.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfsetmatrix.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfshipout.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdftables.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfthread.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdftoepdf.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pdfxform.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-pkin.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-postlinebreak.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-primitive.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-printing.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-scanning.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-sfnt.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-stringpool.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-texdeffont.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-texfileio.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-texfont.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-texlang.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-texluajitc.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-texmath.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-texnodes.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-textcodes.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-textoken.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-tfmofm.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-tounicode.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-tt_glyf.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-tt_table.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-unistring.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-utils.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-vfovf.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-vfpacket.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writecff.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writeenc.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writefont.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writeimg.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writejbig2.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writejp2.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writejpg.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writepng.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writet1.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writet3.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writettf.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writetype0.Po
+ -rm -f ./$(DEPDIR)/libluajittex_a-writetype2.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-align.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-arithmetic.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-avlstuff.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-buildpage.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-commands.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-conditional.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-directions.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-dofont.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-dumpdata.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-dvigen.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-equivalents.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-errors.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-expand.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-extensions.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-filename.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-helpers.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-hnjalloc.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-hyphen.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-inputstack.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-linebreak.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-luafont.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-luainit.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-luanode.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-luastuff.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-luatoken.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-mainbody.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-maincontrol.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-managed-sa.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-mapfile.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-mathcodes.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-memoryword.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-mlist.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-mplibstuff.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-nesting.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-packaging.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfaction.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfannot.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfcolorstack.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfdest.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdffont.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfgen.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfglyph.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfimage.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdflink.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdflistout.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfliteral.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfobj.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfoutline.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfpage.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfpagetree.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfrule.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfsaverestore.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfsetmatrix.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfshipout.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdftables.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfthread.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdftoepdf.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pdfxform.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-pkin.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-postlinebreak.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-primitive.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-printing.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-scanning.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-sfnt.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-stringpool.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-texdeffont.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-texfileio.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-texfont.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-texlang.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-texluac.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-texmath.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-texnodes.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-textcodes.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-textoken.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-tfmofm.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-tounicode.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-tt_glyf.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-tt_table.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-unistring.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-utils.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-vfovf.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-vfpacket.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writecff.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writeenc.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writefont.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writeimg.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writejbig2.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writejp2.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writejpg.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writepng.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writet1.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writet3.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writettf.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writetype0.Po
+ -rm -f ./$(DEPDIR)/libluatex_a-writetype2.Po
+ -rm -f ./$(DEPDIR)/libmflua_a-mflua-pool.Po
+ -rm -f ./$(DEPDIR)/libmflua_a-mflua0.Po
+ -rm -f ./$(DEPDIR)/libmflua_a-mfluaini.Po
+ -rm -f ./$(DEPDIR)/libmfluajit_a-mfluajit-pool.Po
+ -rm -f ./$(DEPDIR)/libmfluajit_a-mfluajit0.Po
+ -rm -f ./$(DEPDIR)/libmfluajit_a-mfluajitini.Po
+ -rm -f ./$(DEPDIR)/libmplibbackends_a-pngout.Po
+ -rm -f ./$(DEPDIR)/libmplibbackends_a-svgout.Po
+ -rm -f ./$(DEPDIR)/libmplibcore_a-mp.Po
+ -rm -f ./$(DEPDIR)/libmplibcore_a-mpmath.Po
+ -rm -f ./$(DEPDIR)/libmplibcore_a-mpmathbinary.Po
+ -rm -f ./$(DEPDIR)/libmplibcore_a-mpmathdecimal.Po
+ -rm -f ./$(DEPDIR)/libmplibcore_a-mpmathdouble.Po
+ -rm -f ./$(DEPDIR)/libmplibcore_a-mpstrings.Po
+ -rm -f ./$(DEPDIR)/libmplibcore_a-psout.Po
+ -rm -f ./$(DEPDIR)/libmplibcore_a-tfmin.Po
+ -rm -f ./$(DEPDIR)/luajittex-dummy.Po
+ -rm -f ./$(DEPDIR)/luatex-dummy.Po
+ -rm -f ./$(DEPDIR)/luatex53-dummy.Po
+ -rm -f ./$(DEPDIR)/mf-mfextra.Po
+ -rm -f ./$(DEPDIR)/mf-pool.Po
+ -rm -f ./$(DEPDIR)/mf0.Po
+ -rm -f ./$(DEPDIR)/mf_nowin-mfextra.Po
+ -rm -f ./$(DEPDIR)/mfini.Po
+ -rm -f ./$(DEPDIR)/mft.Po
+ -rm -f ./$(DEPDIR)/mpost-mpost.Po
+ -rm -f ./$(DEPDIR)/mpost-mpxout.Po
+ -rm -f ./$(DEPDIR)/odvicopy.Po
+ -rm -f ./$(DEPDIR)/odvitype.Po
+ -rm -f ./$(DEPDIR)/ofm2opl.Po
+ -rm -f ./$(DEPDIR)/opl2ofm.Po
+ -rm -f ./$(DEPDIR)/otangle.Po
+ -rm -f ./$(DEPDIR)/ovf2ovp.Po
+ -rm -f ./$(DEPDIR)/ovp2ovf.Po
+ -rm -f ./$(DEPDIR)/patgen.Po
+ -rm -f ./$(DEPDIR)/pbibtex-pbibtex.Po
+ -rm -f ./$(DEPDIR)/pdftex-dummy.Po
+ -rm -f ./$(DEPDIR)/pdftex-pdftex-pool.Po
+ -rm -f ./$(DEPDIR)/pdftex-pdftex0.Po
+ -rm -f ./$(DEPDIR)/pdftex-pdftexini.Po
+ -rm -f ./$(DEPDIR)/pdftosrc-dummy.Po
+ -rm -f ./$(DEPDIR)/pdvitype-pdvitype.Po
+ -rm -f ./$(DEPDIR)/pktogf.Po
+ -rm -f ./$(DEPDIR)/pktype.Po
+ -rm -f ./$(DEPDIR)/pltotf.Po
+ -rm -f ./$(DEPDIR)/pmpost-pmp.Po
+ -rm -f ./$(DEPDIR)/pmpost-pmpmath.Po
+ -rm -f ./$(DEPDIR)/pmpost-pmpmathbinary.Po
+ -rm -f ./$(DEPDIR)/pmpost-pmpmathdecimal.Po
+ -rm -f ./$(DEPDIR)/pmpost-pmpmathdouble.Po
+ -rm -f ./$(DEPDIR)/pmpost-pmpost.Po
+ -rm -f ./$(DEPDIR)/pmpost-pmpstrings.Po
+ -rm -f ./$(DEPDIR)/pmpost-pmpxout.Po
+ -rm -f ./$(DEPDIR)/pmpost-ppngout.Po
+ -rm -f ./$(DEPDIR)/pmpost-ppsout.Po
+ -rm -f ./$(DEPDIR)/pmpost-psvgout.Po
+ -rm -f ./$(DEPDIR)/pmpost-ptfmin.Po
+ -rm -f ./$(DEPDIR)/pooltype.Po
+ -rm -f ./$(DEPDIR)/ppltotf-ppltotf.Po
+ -rm -f ./$(DEPDIR)/ptex-ptex-pool.Po
+ -rm -f ./$(DEPDIR)/ptex-ptex0.Po
+ -rm -f ./$(DEPDIR)/ptex-ptexini.Po
+ -rm -f ./$(DEPDIR)/ptftopl-ptftopl.Po
+ -rm -f ./$(DEPDIR)/tangle.Po
+ -rm -f ./$(DEPDIR)/tangleboot.Po
+ -rm -f ./$(DEPDIR)/tex-tex-pool.Po
+ -rm -f ./$(DEPDIR)/tex-tex0.Po
+ -rm -f ./$(DEPDIR)/tex-texextra.Po
+ -rm -f ./$(DEPDIR)/tex-texini.Po
+ -rm -f ./$(DEPDIR)/tftopl.Po
+ -rm -f ./$(DEPDIR)/tie-tie.Po
+ -rm -f ./$(DEPDIR)/upbibtex-upbibtex.Po
+ -rm -f ./$(DEPDIR)/updvitype-updvitype.Po
+ -rm -f ./$(DEPDIR)/upmpost-pmp.Po
+ -rm -f ./$(DEPDIR)/upmpost-pmpmath.Po
+ -rm -f ./$(DEPDIR)/upmpost-pmpmathbinary.Po
+ -rm -f ./$(DEPDIR)/upmpost-pmpmathdecimal.Po
+ -rm -f ./$(DEPDIR)/upmpost-pmpmathdouble.Po
+ -rm -f ./$(DEPDIR)/upmpost-pmpost.Po
+ -rm -f ./$(DEPDIR)/upmpost-pmpstrings.Po
+ -rm -f ./$(DEPDIR)/upmpost-pmpxout.Po
+ -rm -f ./$(DEPDIR)/upmpost-ppngout.Po
+ -rm -f ./$(DEPDIR)/upmpost-ppsout.Po
+ -rm -f ./$(DEPDIR)/upmpost-psvgout.Po
+ -rm -f ./$(DEPDIR)/upmpost-ptfmin.Po
+ -rm -f ./$(DEPDIR)/uppltotf-uppltotf.Po
+ -rm -f ./$(DEPDIR)/uptex-uptex-pool.Po
+ -rm -f ./$(DEPDIR)/uptex-uptex0.Po
+ -rm -f ./$(DEPDIR)/uptex-uptexini.Po
+ -rm -f ./$(DEPDIR)/uptftopl-uptftopl.Po
+ -rm -f ./$(DEPDIR)/vftovp.Po
+ -rm -f ./$(DEPDIR)/vptovf.Po
+ -rm -f ./$(DEPDIR)/weave.Po
+ -rm -f ./$(DEPDIR)/xetex-dummy.Po
+ -rm -f ./$(DEPDIR)/xetex-xetex-pool.Po
+ -rm -f ./$(DEPDIR)/xetex-xetex0.Po
+ -rm -f ./$(DEPDIR)/xetex-xetexini.Po
+ -rm -f alephdir/$(DEPDIR)/aleph-aleph.Po
+ -rm -f alephdir/$(DEPDIR)/aleph-alephbis.Po
+ -rm -f alephdir/$(DEPDIR)/aleph-alephextra.Po
+ -rm -f eptexdir/$(DEPDIR)/eptex-eptexextra.Po
+ -rm -f etexdir/$(DEPDIR)/etex-etexextra.Po
+ -rm -f euptexdir/$(DEPDIR)/euptex-euptexextra.Po
+ -rm -f libmd5/$(DEPDIR)/a-md5.Po
+ -rm -f libmd5/$(DEPDIR)/md5main-md5main.Po
+ -rm -f luatexdir/$(DEPDIR)/luajittex-luatex.Po
+ -rm -f luatexdir/$(DEPDIR)/luatex-luatex.Po
+ -rm -f luatexdir/$(DEPDIR)/luatex53-luatex.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-lcallbacklib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-lepdflib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-lfontlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-limglib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-liolibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-lkpselib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-llanglib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-llfslibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-llualib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-lnewtokenlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-lnodelib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-loslibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-lpdflib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-lpdfscannerlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-lstatslib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-lstrlibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-ltexiolib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-ltexlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/liblua53tex_a-luatex-core.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-lcallbacklib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-lepdflib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-lfontlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-limglib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-liolibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-lkpselib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-llanglib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-llfslibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-llualib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-lnewtokenlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-lnodelib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-loslibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-lpdflib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-lpdfscannerlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-lstatslib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-lstrlibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-ltexiolib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-ltexlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluajittex_a-luatex-core.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-lcallbacklib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-lepdflib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-lfontlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-limglib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-liolibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-lkpselib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-llanglib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-llfslibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-llualib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-lnewtokenlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-lnodelib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-loslibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-lpdflib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-lpdfscannerlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-lstatslib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-lstrlibext.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-ltexiolib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-ltexlib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libluatex_a-luatex-core.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libmflua_a-lkpselib.Po
+ -rm -f luatexdir/lua/$(DEPDIR)/libmfluajit_a-lkpselib.Po
+ -rm -f luatexdir/luaffi/$(DEPDIR)/liblua53ffi_a-call.Po
+ -rm -f luatexdir/luaffi/$(DEPDIR)/liblua53ffi_a-ctype.Po
+ -rm -f luatexdir/luaffi/$(DEPDIR)/liblua53ffi_a-ffi.Po
+ -rm -f luatexdir/luaffi/$(DEPDIR)/liblua53ffi_a-parser.Po
+ -rm -f luatexdir/luaffi/$(DEPDIR)/libluaffi_a-call.Po
+ -rm -f luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ctype.Po
+ -rm -f luatexdir/luaffi/$(DEPDIR)/libluaffi_a-ffi.Po
+ -rm -f luatexdir/luaffi/$(DEPDIR)/libluaffi_a-parser.Po
+ -rm -f luatexdir/luafilesystem/src/$(DEPDIR)/liblua53misc_a-lfs.Po
+ -rm -f luatexdir/luafilesystem/src/$(DEPDIR)/libluajitmisc_a-lfs.Po
+ -rm -f luatexdir/luafilesystem/src/$(DEPDIR)/libluamisc_a-lfs.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-autohint.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-clipnoui.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-cvundoes.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-dumppfa.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-encoding.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-featurefile.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-fontviewbase.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-fvcomposit.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-fvfonts.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-lookups.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-macbinary.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-macenc.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-mathconstants.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-memory.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-mm.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-namelist.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-noprefs.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-nouiutil.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-parsepfa.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-parsettf.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-parsettfatt.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-psread.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-pua.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-python.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-sfd1.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinechar.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinefill.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinefont.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splineorder2.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splineoverlap.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinerefigure.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinesave.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinesaveafm.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splinestroke.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splineutil.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-splineutil2.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-start.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-stemdb.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-tottf.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-tottfgpos.Po
+ -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-ttfspecial.Po
+ -rm -f luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)/libff_a-fsys.Po
+ -rm -f luatexdir/luafontloader/src/$(DEPDIR)/liblua53tex_a-ffdummies.Po
+ -rm -f luatexdir/luafontloader/src/$(DEPDIR)/liblua53tex_a-luafflib.Po
+ -rm -f luatexdir/luafontloader/src/$(DEPDIR)/libluajittex_a-ffdummies.Po
+ -rm -f luatexdir/luafontloader/src/$(DEPDIR)/libluajittex_a-luafflib.Po
+ -rm -f luatexdir/luafontloader/src/$(DEPDIR)/libluatex_a-ffdummies.Po
+ -rm -f luatexdir/luafontloader/src/$(DEPDIR)/libluatex_a-luafflib.Po
+ -rm -f luatexdir/luamd5/$(DEPDIR)/liblua53misc_a-md5.Po
+ -rm -f luatexdir/luamd5/$(DEPDIR)/liblua53misc_a-md5lib.Po
+ -rm -f luatexdir/luamd5/$(DEPDIR)/libluajitmisc_a-md5.Po
+ -rm -f luatexdir/luamd5/$(DEPDIR)/libluajitmisc_a-md5lib.Po
+ -rm -f luatexdir/luamd5/$(DEPDIR)/libluamisc_a-md5.Po
+ -rm -f luatexdir/luamd5/$(DEPDIR)/libluamisc_a-md5lib.Po
+ -rm -f luatexdir/luapeg/$(DEPDIR)/liblua53misc_a-lpeg.Po
+ -rm -f luatexdir/luapeg/$(DEPDIR)/libluajitmisc_a-lpeg.Po
+ -rm -f luatexdir/luapeg/$(DEPDIR)/libluamisc_a-lpeg.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-auxiliar.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-buffer.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-compat.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-except.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-inet.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-io.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-lua_preload.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-luasocket.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-mime.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-options.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-select.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-serial.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-socket.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-tcp.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-timeout.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/liblua53socket_a-udp.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-auxiliar.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-buffer.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-compat.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-except.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-inet.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-io.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-lua_preload.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-luasocket.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-mime.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-options.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-select.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-serial.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-socket.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-tcp.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-timeout.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluajitsocket_a-udp.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-auxiliar.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-buffer.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-compat.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-except.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-inet.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-io.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-lua_preload.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-luasocket.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-mime.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-options.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-select.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-serial.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-socket.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-tcp.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-timeout.Po
+ -rm -f luatexdir/luasocket/src/$(DEPDIR)/libluasocket_a-udp.Po
+ -rm -f luatexdir/luazip/src/$(DEPDIR)/liblua53misc_a-luazip.Po
+ -rm -f luatexdir/luazip/src/$(DEPDIR)/libluajitmisc_a-luazip.Po
+ -rm -f luatexdir/luazip/src/$(DEPDIR)/libluamisc_a-luazip.Po
+ -rm -f luatexdir/luazlib/$(DEPDIR)/liblua53misc_a-lgzip.Po
+ -rm -f luatexdir/luazlib/$(DEPDIR)/liblua53misc_a-lzlib.Po
+ -rm -f luatexdir/luazlib/$(DEPDIR)/libluajitmisc_a-lgzip.Po
+ -rm -f luatexdir/luazlib/$(DEPDIR)/libluajitmisc_a-lzlib.Po
+ -rm -f luatexdir/luazlib/$(DEPDIR)/libluamisc_a-lgzip.Po
+ -rm -f luatexdir/luazlib/$(DEPDIR)/libluamisc_a-lzlib.Po
+ -rm -f luatexdir/slnunicode/$(DEPDIR)/liblua53misc_a-slnunico.Po
+ -rm -f luatexdir/slnunicode/$(DEPDIR)/libluajitmisc_a-slnunico.Po
+ -rm -f luatexdir/slnunicode/$(DEPDIR)/libluamisc_a-slnunico.Po
+ -rm -f luatexdir/unilib/$(DEPDIR)/libunilib_a-ArabicForms.Po
+ -rm -f luatexdir/unilib/$(DEPDIR)/libunilib_a-alphabet.Po
+ -rm -f luatexdir/unilib/$(DEPDIR)/libunilib_a-char.Po
+ -rm -f luatexdir/unilib/$(DEPDIR)/libunilib_a-cjk.Po
+ -rm -f luatexdir/unilib/$(DEPDIR)/libunilib_a-gwwiconv.Po
+ -rm -f luatexdir/unilib/$(DEPDIR)/libunilib_a-ucharmap.Po
+ -rm -f luatexdir/unilib/$(DEPDIR)/libunilib_a-unialt.Po
+ -rm -f luatexdir/unilib/$(DEPDIR)/libunilib_a-usprintf.Po
+ -rm -f luatexdir/unilib/$(DEPDIR)/libunilib_a-ustring.Po
+ -rm -f luatexdir/unilib/$(DEPDIR)/libunilib_a-utype.Po
+ -rm -f luatexdir/utils/$(DEPDIR)/liblua53tex_a-avl.Po
+ -rm -f luatexdir/utils/$(DEPDIR)/libluajittex_a-avl.Po
+ -rm -f luatexdir/utils/$(DEPDIR)/libluatex_a-avl.Po
+ -rm -f mfluadir/$(DEPDIR)/libmflua_a-mfluac.Po
+ -rm -f mfluadir/$(DEPDIR)/libmfluajit_a-mfluac.Po
+ -rm -f mfluadir/$(DEPDIR)/mflua-mfluaextra.Po
+ -rm -f mfluadir/$(DEPDIR)/mflua_nowin-mfluaextra.Po
+ -rm -f mfluajitdir/$(DEPDIR)/mfluajit-mfluajitextra.Po
+ -rm -f mfluajitdir/$(DEPDIR)/mfluajit_nowin-mfluajitextra.Po
+ -rm -f mplibdir/$(DEPDIR)/libmputil_a-avl.Po
+ -rm -f mplibdir/$(DEPDIR)/libmputil_a-decContext.Po
+ -rm -f mplibdir/$(DEPDIR)/libmputil_a-decNumber.Po
+ -rm -f mplibdir/$(DEPDIR)/luajittex-lmplib.Po
+ -rm -f mplibdir/$(DEPDIR)/luatex-lmplib.Po
+ -rm -f mplibdir/$(DEPDIR)/luatex53-lmplib.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-avl.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-avlstuff.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-epdf.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-macnames.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-mapfile.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-pdftoepdf.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-pkin.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-subfont.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-tounicode.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-utils.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-vfpacket.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-writeenc.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-writefont.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-writeimg.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-writejbig2.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-writejpg.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-writepng.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-writet1.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-writet3.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-writettf.Po
+ -rm -f pdftexdir/$(DEPDIR)/libpdftex_a-writezip.Po
+ -rm -f pdftexdir/$(DEPDIR)/pdftex-pdftexextra.Po
+ -rm -f pdftexdir/$(DEPDIR)/pdftosrc-pdftosrc.Po
+ -rm -f pdftexdir/$(DEPDIR)/ttf2afm-macnames.Po
+ -rm -f pdftexdir/$(DEPDIR)/ttf2afm-ttf2afm.Po
+ -rm -f pdftexdir/regex/$(DEPDIR)/libpdftex_a-regcomp.Po
+ -rm -f pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex.Po
+ -rm -f pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex_internal.Po
+ -rm -f pdftexdir/regex/$(DEPDIR)/libpdftex_a-regexec.Po
+ -rm -f ptexdir/$(DEPDIR)/libkanji_a-kanji.Po
+ -rm -f ptexdir/$(DEPDIR)/ptex-ptexextra.Po
+ -rm -f synctexdir/$(DEPDIR)/eptex-synctex.Po
+ -rm -f synctexdir/$(DEPDIR)/etex-synctex.Po
+ -rm -f synctexdir/$(DEPDIR)/euptex-synctex.Po
+ -rm -f synctexdir/$(DEPDIR)/liblua53tex_a-synctex.Po
+ -rm -f synctexdir/$(DEPDIR)/libluajittex_a-synctex.Po
+ -rm -f synctexdir/$(DEPDIR)/libluatex_a-synctex.Po
+ -rm -f synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser.Po
+ -rm -f synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser_utils.Po
+ -rm -f synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser.Plo
+ -rm -f synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser_utils.Plo
+ -rm -f synctexdir/$(DEPDIR)/pdftex-synctex.Po
+ -rm -f synctexdir/$(DEPDIR)/ptex-synctex.Po
+ -rm -f synctexdir/$(DEPDIR)/synctex-synctex_main.Po
+ -rm -f synctexdir/$(DEPDIR)/tex-synctex.Po
+ -rm -f synctexdir/$(DEPDIR)/uptex-synctex.Po
+ -rm -f synctexdir/$(DEPDIR)/xetex-synctex.Po
+ -rm -f uptexdir/$(DEPDIR)/libukanji_a-kanji.Po
+ -rm -f uptexdir/$(DEPDIR)/libukanji_a-kanji_dump.Po
+ -rm -f uptexdir/$(DEPDIR)/uptex-uptexextra.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst_Mac.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_FC.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_Mac.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-XeTeXLayoutInterface.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-XeTeXOTMath.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-XeTeX_ext.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-XeTeX_pic.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-hz.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Po
+ -rm -f xetexdir/$(DEPDIR)/libxetex_a-trans.Po
+ -rm -f xetexdir/$(DEPDIR)/xetex-xetexextra.Po
+ -rm -f xetexdir/image/$(DEPDIR)/libxetex_a-bmpimage.Po
+ -rm -f xetexdir/image/$(DEPDIR)/libxetex_a-jpegimage.Po
+ -rm -f xetexdir/image/$(DEPDIR)/libxetex_a-mfileio.Po
+ -rm -f xetexdir/image/$(DEPDIR)/libxetex_a-numbers.Po
+ -rm -f xetexdir/image/$(DEPDIR)/libxetex_a-pngimage.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -16787,13 +18867,13 @@
install-exec-am install-strip uninstall-am
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
- am--refresh check check-TESTS check-am clean clean-binPROGRAMS \
- clean-cscope clean-generic clean-libLIBRARIES \
- clean-libLTLIBRARIES clean-libtool clean-local \
- clean-noinstPROGRAMS cscope cscopelist-am ctags ctags-am dist \
- dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
- dist-tarZ dist-xz dist-zip distcheck distclean \
- distclean-compile distclean-generic distclean-hdr \
+ am--depfiles am--refresh check check-TESTS check-am clean \
+ clean-binPROGRAMS clean-cscope clean-generic \
+ clean-libLIBRARIES clean-libLTLIBRARIES clean-libtool \
+ clean-local clean-noinstPROGRAMS cscope cscopelist-am ctags \
+ ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \
+ dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
+ distclean distclean-compile distclean-generic distclean-hdr \
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-binPROGRAMS install-data \
@@ -18003,7 +20083,7 @@
synctexdir/synctex.log: synctex$(EXEEXT)
libmd5/md5.log: md5main$(EXEEXT)
-# $Id: Makefile.in 47053 2018-03-20 22:58:40Z karl $
+# $Id: Makefile.in 47714 2018-05-14 18:07:32Z karl $
# am/bin_links.am: Makefile fragment for bindir links.
.PHONY: install-bin-links uninstall-bin-links
Modified: branches/stable/source/src/texk/web2c/aclocal.m4
===================================================================
--- branches/stable/source/src/texk/web2c/aclocal.m4 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/web2c/aclocal.m4 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
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.15.1], [],
+m4_if([$1], [1.16.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@
# 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.15.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -58,7 +58,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
# AM_COND_IF -*- Autoconf -*-
-# Copyright (C) 2008-2017 Free Software Foundation, Inc.
+# Copyright (C) 2008-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -147,7 +147,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -178,7 +178,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -369,13 +369,12 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -383,49 +382,41 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ AS_CASE([$CONFIG_FILES],
+ [*\'*], [eval set x "$CONFIG_FILES"],
+ [*], [set x $CONFIG_FILES])
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`AS_DIRNAME(["$am_mf"])`
+ am_filepart=`AS_BASENAME(["$am_mf"])`
+ AM_RUN_LOG([cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles]) || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).])
+ fi
+ AS_UNSET([am_dirpart])
+ AS_UNSET([am_filepart])
+ AS_UNSET([am_mf])
+ AS_UNSET([am_rc])
+ rm -f conftest-deps.mk
}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -434,18 +425,17 @@
# -----------------------------
# This macro should only be invoked once -- use via AC_REQUIRE.
#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
+ [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -532,8 +522,8 @@
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms.
@@ -600,7 +590,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -642,7 +632,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -663,7 +653,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -685,7 +675,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -720,7 +710,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -728,49 +718,42 @@
# AM_MAKE_INCLUDE()
# -----------------
-# Check to see how make treats includes.
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+ AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+ ['0:this is the am__doit target'],
+ [AS_CASE([$s],
+ [BSD], [am__include='.include' am__quote='"'],
+ [am__include='include' am__quote=''])])
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT([${_am_result}])
+AC_SUBST([am__include])])
+AC_SUBST([am__quote])])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -809,7 +792,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -838,7 +821,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -885,7 +868,7 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -904,7 +887,7 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -985,7 +968,7 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1045,7 +1028,7 @@
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1073,7 +1056,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1092,7 +1075,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Modified: branches/stable/source/src/texk/web2c/configure
===================================================================
--- branches/stable/source/src/texk/web2c/configure 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/web2c/configure 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Web2C 2018.
+# Generated by GNU Autoconf 2.69 for Web2C 2019/dev.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='Web2C'
PACKAGE_TARNAME='web2c'
-PACKAGE_VERSION='2018'
-PACKAGE_STRING='Web2C 2018'
+PACKAGE_VERSION='2019/dev'
+PACKAGE_STRING='Web2C 2019/dev'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -889,7 +889,6 @@
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
-am__quote
am__include
DEPDIR
OBJEXT
@@ -967,7 +966,8 @@
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL'
+SHELL
+am__quote'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -1617,7 +1617,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Web2C 2018 to adapt to many kinds of systems.
+\`configure' configures Web2C 2019/dev to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1691,7 +1691,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Web2C 2018:";;
+ short | recursive ) echo "Configuration of Web2C 2019/dev:";;
esac
cat <<\_ACEOF
@@ -1913,7 +1913,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Web2C configure 2018
+Web2C configure 2019/dev
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3002,7 +3002,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Web2C $as_me 2018, which was
+It was created by Web2C $as_me 2019/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3383,10 +3383,10 @@
-WEB2CVERSION=2018
+WEB2CVERSION=2019/dev
-am__api_version='1.15'
+am__api_version='1.16'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -3854,46 +3854,46 @@
ac_config_commands="$ac_config_commands depfiles"
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+ (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ case $?:`cat confinc.out 2>/dev/null` in #(
+ '0:this is the am__doit target') :
+ case $s in #(
+ BSD) :
+ am__include='.include' am__quote='"' ;; #(
+ *) :
+ am__include='include' am__quote='' ;;
+esac ;; #(
+ *) :
+ ;;
esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+$as_echo "${_am_result}" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
# Check whether --enable-dependency-tracking was given.
if test "${enable_dependency_tracking+set}" = set; then :
enableval=$enable_dependency_tracking;
@@ -8690,7 +8690,7 @@
# Define the identity of the package.
PACKAGE='web2c'
- VERSION='2018'
+ VERSION='2019/dev'
cat >>confdefs.h <<_ACEOF
@@ -8720,8 +8720,8 @@
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
# We need awk for the "check" target (and possibly the TAP driver). The
@@ -8772,7 +8772,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -23653,7 +23653,7 @@
Report bugs to <bug-libtool at gnu.org>."
lt_cl_version="\
-Web2C config.lt 2018
+Web2C config.lt 2019/dev
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -26871,7 +26871,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Web2C $as_me 2018, which was
+This file was extended by Web2C $as_me 2019/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -26941,7 +26941,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Web2C config.status 2018
+Web2C config.status 2019/dev
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -27060,7 +27060,7 @@
#
# INIT-COMMANDS
#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
# The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -28106,29 +28106,35 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ case $CONFIG_FILES in #(
+ *\'*) :
+ eval set x "$CONFIG_FILES" ;; #(
+ *) :
+ set x $CONFIG_FILES ;; #(
+ *) :
+ ;;
+esac
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$am_mf" : 'X\(//\)[^/]' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$am_mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -28146,53 +28152,48 @@
q
}
s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$am_mf" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
}
- /^X\(\/\/\)[^/].*/{
+ /^X\/\(\/\/\)$/{
s//\1/
q
}
- /^X\(\/\/\)$/{
+ /^X\/\(\/\).*/{
s//\1/
q
}
- /^X\(\/\).*/{
- s//\1/
- q
- }
s/.*/./; q'`
- as_dir=$dirpart/$fdir; as_fn_mkdir_p
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ { echo "$as_me:$LINENO: cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles" >&5
+ (cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ { am_dirpart=; unset am_dirpart;}
+ { am_filepart=; unset am_filepart;}
+ { am_mf=; unset am_mf;}
+ { am_rc=; unset am_rc;}
+ rm -f conftest-deps.mk
}
;;
"libtool":C)
Modified: branches/stable/source/src/texk/web2c/doc/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/doc/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/web2c/doc/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -482,8 +482,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -648,7 +648,10 @@
cscope cscopelist:
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
Modified: branches/stable/source/src/texk/web2c/lib/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/lib/ChangeLog 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/web2c/lib/ChangeLog 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,3 +1,12 @@
+2018-05-12 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ * texmfmp.c: Allow non-ascii file names for pdfTeX (w32 only).
+ Changes on 2018-05-11 were incomplete.
+
+2018-05-11 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ * texmfmp.c: Allow non-ascii file names for pdfTeX (w32 only).
+
2018-03-16 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
* texmfmp.c: Remove support of short 8.3 names (w32 only).
Modified: branches/stable/source/src/texk/web2c/lib/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/lib/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/web2c/lib/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -176,7 +176,17 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/w2c -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/basechsuffix.Po \
+ ./$(DEPDIR)/chartostring.Po ./$(DEPDIR)/coredump.Po \
+ ./$(DEPDIR)/eofeoln.Po ./$(DEPDIR)/fprintreal.Po \
+ ./$(DEPDIR)/input2int.Po ./$(DEPDIR)/inputint.Po \
+ ./$(DEPDIR)/libp_a-openclose.Po \
+ ./$(DEPDIR)/libp_a-printversion.Po ./$(DEPDIR)/main.Po \
+ ./$(DEPDIR)/openclose.Po ./$(DEPDIR)/printversion.Po \
+ ./$(DEPDIR)/setupvar.Po ./$(DEPDIR)/uexit.Po \
+ ./$(DEPDIR)/usage.Po ./$(DEPDIR)/version.Po \
+ ./$(DEPDIR)/zround.Po
am__mv = mv -f
AM_V_lt = $(am__v_lt_ at AM_V@)
am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
@@ -504,8 +514,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -536,24 +546,30 @@
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/basechsuffix.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/chartostring.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/coredump.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/eofeoln.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fprintreal.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/input2int.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/inputint.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libp_a-openclose.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libp_a-printversion.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/openclose.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/printversion.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/setupvar.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/uexit.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/usage.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/version.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/zround.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/basechsuffix.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/chartostring.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/coredump.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/eofeoln.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fprintreal.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/input2int.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/inputint.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libp_a-openclose.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libp_a-printversion.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/openclose.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/printversion.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/setupvar.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/uexit.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/usage.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/version.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/zround.Po at am__quote@ # am--include-marker
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -664,7 +680,10 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -734,7 +753,23 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/basechsuffix.Po
+ -rm -f ./$(DEPDIR)/chartostring.Po
+ -rm -f ./$(DEPDIR)/coredump.Po
+ -rm -f ./$(DEPDIR)/eofeoln.Po
+ -rm -f ./$(DEPDIR)/fprintreal.Po
+ -rm -f ./$(DEPDIR)/input2int.Po
+ -rm -f ./$(DEPDIR)/inputint.Po
+ -rm -f ./$(DEPDIR)/libp_a-openclose.Po
+ -rm -f ./$(DEPDIR)/libp_a-printversion.Po
+ -rm -f ./$(DEPDIR)/main.Po
+ -rm -f ./$(DEPDIR)/openclose.Po
+ -rm -f ./$(DEPDIR)/printversion.Po
+ -rm -f ./$(DEPDIR)/setupvar.Po
+ -rm -f ./$(DEPDIR)/uexit.Po
+ -rm -f ./$(DEPDIR)/usage.Po
+ -rm -f ./$(DEPDIR)/version.Po
+ -rm -f ./$(DEPDIR)/zround.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -780,7 +815,23 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/basechsuffix.Po
+ -rm -f ./$(DEPDIR)/chartostring.Po
+ -rm -f ./$(DEPDIR)/coredump.Po
+ -rm -f ./$(DEPDIR)/eofeoln.Po
+ -rm -f ./$(DEPDIR)/fprintreal.Po
+ -rm -f ./$(DEPDIR)/input2int.Po
+ -rm -f ./$(DEPDIR)/inputint.Po
+ -rm -f ./$(DEPDIR)/libp_a-openclose.Po
+ -rm -f ./$(DEPDIR)/libp_a-printversion.Po
+ -rm -f ./$(DEPDIR)/main.Po
+ -rm -f ./$(DEPDIR)/openclose.Po
+ -rm -f ./$(DEPDIR)/printversion.Po
+ -rm -f ./$(DEPDIR)/setupvar.Po
+ -rm -f ./$(DEPDIR)/uexit.Po
+ -rm -f ./$(DEPDIR)/usage.Po
+ -rm -f ./$(DEPDIR)/version.Po
+ -rm -f ./$(DEPDIR)/zround.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -801,16 +852,16 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \
- ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+ clean-generic clean-libtool clean-noinstLIBRARIES \
+ cscopelist-am ctags ctags-am distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am
Modified: branches/stable/source/src/texk/web2c/lib/texmfmp.c
===================================================================
--- branches/stable/source/src/texk/web2c/lib/texmfmp.c 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/web2c/lib/texmfmp.c 2018-05-17 17:02:02 UTC (rev 797)
@@ -674,7 +674,7 @@
maininit (int ac, string *av)
{
string main_input_file;
-#if (IS_upTeX || defined(XeTeX)) && defined(WIN32)
+#if (IS_upTeX || defined(XeTeX) || defined(pdfTeX)) && defined(WIN32)
string enc;
#endif
/* Save to pass along to topenin. */
@@ -703,10 +703,10 @@
kpse_set_program_name (argv[0], NULL);
initkanji ();
#endif
-#if defined(XeTeX) && defined(WIN32)
+#if (defined(XeTeX) || defined(pdfTeX)) && defined(WIN32)
kpse_set_program_name (argv[0], NULL);
#endif
-#if (IS_upTeX || defined(XeTeX)) && defined(WIN32)
+#if (IS_upTeX || defined(XeTeX) || defined(pdfTeX)) && defined(WIN32)
enc = kpse_var_value("command_line_encoding");
get_command_line_args_utf8(enc, &argc, &argv);
#endif
@@ -714,7 +714,7 @@
/* If the user says --help or --version, we need to notice early. And
since we want the --ini option, have to do it before getting into
the web (which would read the base file, etc.). */
-#if (IS_upTeX || defined(XeTeX)) && defined(WIN32)
+#if (IS_upTeX || defined(XeTeX) || defined(pdfTeX)) && defined(WIN32)
parse_options (argc, argv);
#else
parse_options (ac, av);
@@ -738,7 +738,7 @@
/* Do this early so we can inspect kpse_invocation_name and
kpse_program_name below, and because we have to do this before
any path searching. */
-#if IS_pTeX || (defined(XeTeX) && defined(WIN32))
+#if IS_pTeX || ((defined(XeTeX) || defined(pdfTeX)) && defined(WIN32))
if (user_progname)
kpse_reset_program_name (user_progname);
#else
@@ -1376,6 +1376,24 @@
/* FIXME: A new format ought to be introduced for these files. */
+#ifdef _WIN32
+#undef fopen
+#undef xfopen
+#define fopen fsyscp_fopen
+#define xfopen fsyscp_xfopen
+#include <wchar.h>
+int fsyscp_stat(const char *path, struct stat *buffer)
+{
+ wchar_t *wpath;
+ int ret;
+ wpath = get_wstring_from_mbstring(kpse_def->File_system_codepage,
+ path, wpath = NULL);
+ ret = _wstat(wpath, buffer);
+ free(wpath);
+ return ret;
+}
+#endif /* WIN32 */
+
void
readtcxfile (void)
{
@@ -3137,7 +3155,11 @@
recorder_record_input(file_name);
/* get file status */
+#ifdef _WIN32
+ if (fsyscp_stat(file_name, &file_data) == 0) {
+#else
if (stat(file_name, &file_data) == 0) {
+#endif
size_t len;
makepdftime(file_data.st_mtime, time_str, /* utc= */false);
@@ -3167,7 +3189,11 @@
recorder_record_input(file_name);
/* get file status */
+#ifdef _WIN32
+ if (fsyscp_stat(file_name, &file_data) == 0) {
+#else
if (stat(file_name, &file_data) == 0) {
+#endif
size_t len;
char buf[20];
Modified: branches/stable/source/src/texk/web2c/man/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/man/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/web2c/man/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -489,8 +489,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_srcdir)/../../am/man.am $(top_srcdir)/../../am/man1_links.am $(am__empty):
@@ -556,7 +556,10 @@
cscope cscopelist:
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
Modified: branches/stable/source/src/texk/web2c/omegafonts/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/omegafonts/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/web2c/omegafonts/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -181,7 +181,16 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/w2c -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ../$(DEPDIR)/call_omfonts-callexe.Po \
+ ./$(DEPDIR)/char_routines.Po ./$(DEPDIR)/dimen_routines.Po \
+ ./$(DEPDIR)/error_routines.Po ./$(DEPDIR)/extra_routines.Po \
+ ./$(DEPDIR)/font_routines.Po ./$(DEPDIR)/header_routines.Po \
+ ./$(DEPDIR)/ligkern_routines.Po ./$(DEPDIR)/list_routines.Po \
+ ./$(DEPDIR)/omfonts.Po ./$(DEPDIR)/out_ofm.Po \
+ ./$(DEPDIR)/out_routines.Po ./$(DEPDIR)/param_routines.Po \
+ ./$(DEPDIR)/parse_ofm.Po ./$(DEPDIR)/pl-lexer.Po \
+ ./$(DEPDIR)/pl-parser.Po ./$(DEPDIR)/print_routines.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -785,8 +794,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_srcdir)/../../am/bin_links.am $(am__empty):
@@ -883,24 +892,30 @@
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote at ../$(DEPDIR)/call_omfonts-callexe.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/char_routines.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dimen_routines.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/error_routines.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/extra_routines.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/font_routines.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/header_routines.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ligkern_routines.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/list_routines.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/omfonts.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/out_ofm.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/out_routines.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/param_routines.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/parse_ofm.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pl-lexer.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pl-parser.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/print_routines.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ../$(DEPDIR)/call_omfonts-callexe.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/char_routines.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dimen_routines.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/error_routines.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/extra_routines.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/font_routines.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/header_routines.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ligkern_routines.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/list_routines.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/omfonts.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/out_ofm.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/out_routines.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/param_routines.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/parse_ofm.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pl-lexer.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pl-parser.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/print_routines.Po at am__quote@ # am--include-marker
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -1123,7 +1138,7 @@
fi; \
$$success || exit 1
-check-TESTS:
+check-TESTS:
@list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -1159,7 +1174,10 @@
@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -1244,7 +1262,23 @@
clean-noinstPROGRAMS mostlyclean-am
distclean: distclean-am
- -rm -rf ../$(DEPDIR) ./$(DEPDIR)
+ -rm -f ../$(DEPDIR)/call_omfonts-callexe.Po
+ -rm -f ./$(DEPDIR)/char_routines.Po
+ -rm -f ./$(DEPDIR)/dimen_routines.Po
+ -rm -f ./$(DEPDIR)/error_routines.Po
+ -rm -f ./$(DEPDIR)/extra_routines.Po
+ -rm -f ./$(DEPDIR)/font_routines.Po
+ -rm -f ./$(DEPDIR)/header_routines.Po
+ -rm -f ./$(DEPDIR)/ligkern_routines.Po
+ -rm -f ./$(DEPDIR)/list_routines.Po
+ -rm -f ./$(DEPDIR)/omfonts.Po
+ -rm -f ./$(DEPDIR)/out_ofm.Po
+ -rm -f ./$(DEPDIR)/out_routines.Po
+ -rm -f ./$(DEPDIR)/param_routines.Po
+ -rm -f ./$(DEPDIR)/parse_ofm.Po
+ -rm -f ./$(DEPDIR)/pl-lexer.Po
+ -rm -f ./$(DEPDIR)/pl-parser.Po
+ -rm -f ./$(DEPDIR)/print_routines.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -1291,7 +1325,23 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ../$(DEPDIR) ./$(DEPDIR)
+ -rm -f ../$(DEPDIR)/call_omfonts-callexe.Po
+ -rm -f ./$(DEPDIR)/char_routines.Po
+ -rm -f ./$(DEPDIR)/dimen_routines.Po
+ -rm -f ./$(DEPDIR)/error_routines.Po
+ -rm -f ./$(DEPDIR)/extra_routines.Po
+ -rm -f ./$(DEPDIR)/font_routines.Po
+ -rm -f ./$(DEPDIR)/header_routines.Po
+ -rm -f ./$(DEPDIR)/ligkern_routines.Po
+ -rm -f ./$(DEPDIR)/list_routines.Po
+ -rm -f ./$(DEPDIR)/omfonts.Po
+ -rm -f ./$(DEPDIR)/out_ofm.Po
+ -rm -f ./$(DEPDIR)/out_routines.Po
+ -rm -f ./$(DEPDIR)/param_routines.Po
+ -rm -f ./$(DEPDIR)/parse_ofm.Po
+ -rm -f ./$(DEPDIR)/pl-lexer.Po
+ -rm -f ./$(DEPDIR)/pl-parser.Po
+ -rm -f ./$(DEPDIR)/print_routines.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -1313,8 +1363,8 @@
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
.MAKE: check-am install-am install-exec-am install-strip uninstall-am
-.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \
+ check-am clean clean-binPROGRAMS clean-generic clean-libtool \
clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
Modified: branches/stable/source/src/texk/web2c/otps/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/otps/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/web2c/otps/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -204,7 +204,10 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/w2c -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/otp-lexer.Po \
+ ./$(DEPDIR)/otp-parser.Po ./$(DEPDIR)/otp2ocp.Po \
+ ./$(DEPDIR)/outocp.Po ./$(DEPDIR)/routines.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -269,7 +272,7 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- check recheck distdir
+ check recheck distdir distdir-am
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
@@ -770,8 +773,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -884,12 +887,18 @@
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/otp-lexer.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/otp-parser.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/otp2ocp.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/outocp.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/routines.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/otp-lexer.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/otp-parser.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/otp2ocp.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/outocp.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/routines.Po at am__quote@ # am--include-marker
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -1186,7 +1195,7 @@
fi; \
$$success || exit 1
-check-TESTS:
+check-TESTS:
@list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -1222,7 +1231,10 @@
@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -1329,7 +1341,11 @@
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-recursive
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/otp-lexer.Po
+ -rm -f ./$(DEPDIR)/otp-parser.Po
+ -rm -f ./$(DEPDIR)/otp2ocp.Po
+ -rm -f ./$(DEPDIR)/outocp.Po
+ -rm -f ./$(DEPDIR)/routines.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -1375,7 +1391,11 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/otp-lexer.Po
+ -rm -f ./$(DEPDIR)/otp-parser.Po
+ -rm -f ./$(DEPDIR)/otp2ocp.Po
+ -rm -f ./$(DEPDIR)/outocp.Po
+ -rm -f ./$(DEPDIR)/routines.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -1398,22 +1418,23 @@
.MAKE: $(am__recursive_targets) check-am install-am install-strip
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
- check-TESTS check-am clean clean-binPROGRAMS clean-generic \
- clean-libtool cscopelist-am ctags ctags-am distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-binPROGRAMS install-binSCRIPTS \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-man1 \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \
- uninstall uninstall-am uninstall-binPROGRAMS \
- uninstall-binSCRIPTS uninstall-man uninstall-man1
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+ am--depfiles check check-TESTS check-am clean \
+ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
+ ctags ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-binPROGRAMS \
+ install-binSCRIPTS install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-man1 install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ recheck tags tags-am uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-man \
+ uninstall-man1
.PRECIOUS: Makefile
Modified: branches/stable/source/src/texk/web2c/otps/win32/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/otps/win32/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/web2c/otps/win32/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -168,7 +168,8 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/w2c -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/mkocp-mkocp.Po ./$(DEPDIR)/mkofm.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -469,8 +470,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -545,9 +546,15 @@
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mkocp-mkocp.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mkofm.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mkocp-mkocp.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mkofm.Po at am__quote@ # am--include-marker
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -644,7 +651,10 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -716,7 +726,8 @@
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/mkocp-mkocp.Po
+ -rm -f ./$(DEPDIR)/mkofm.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -762,7 +773,8 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/mkocp-mkocp.Po
+ -rm -f ./$(DEPDIR)/mkofm.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -783,7 +795,7 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
ctags ctags-am distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
Modified: branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,3 +1,12 @@
+2018-05-11 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ * ptexlib.h: Allow non-ascii file names in pdfTeX (w32 only).
+
+2018-04-28 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ * pdftoepdf-newpoppler.cc, pdftosrc-newpoppler.cc:
+ Support poppler 0.64.0.
+
2018-04-14 Karl Berry <karl at tug.org>
* TeX Live 2018 release, pdftex 1.40.19.
Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -290,7 +290,7 @@
static void copyDictEntry(Object * obj, int i)
{
Object obj1;
- copyName(obj->dictGetKey(i));
+ copyName((char *)obj->dictGetKey(i));
pdf_puts(" ");
obj1 = obj->dictGetValNF(i);
copyObject(&obj1);
@@ -355,7 +355,7 @@
if (!procset.isName())
pdftex_fail("PDF inclusion: invalid ProcSet entry type <%s>",
procset.getTypeName());
- copyName(procset.getName());
+ copyName((char *)procset.getName());
pdf_puts(" ");
}
pdf_puts("]\n");
@@ -418,7 +418,7 @@
&& fontdescRef.isRef()
&& fontdesc.isDict()
&& embeddableFont(&fontdesc)
- && (fontmap = lookup_fontmap(basefont.getName())) != NULL) {
+ && (fontmap = lookup_fontmap((char *)basefont.getName())) != NULL) {
// round /StemV value, since the PDF input is a float
// (see Font Descriptors in PDF reference), but we only store an
// integer, since we don't want to change the struct.
@@ -427,7 +427,7 @@
charset = fontdesc.dictLookup("CharSet");
if (!charset.isNull() &&
charset.isString() && is_subsetable(fontmap))
- epdf_mark_glyphs(fd, charset.getString()->getCString());
+ epdf_mark_glyphs(fd, (char *)charset.getString()->getCString());
else
embed_whole_font(fd);
addFontDesc(fontdescRef.getRef(), fd);
@@ -456,7 +456,7 @@
if (fontRef.isRef())
copyFont(obj->dictGetKey(i), &fontRef);
else if (fontRef.isDict()) { // some programs generate pdf with embedded font object
- copyName(obj->dictGetKey(i));
+ copyName((char *)obj->dictGetKey(i));
pdf_puts(" ");
copyObject(&fontRef);
}
@@ -565,7 +565,7 @@
} else if (obj->isNum()) {
pdf_printf("%s", convertNumToPDF(obj->getNum()));
} else if (obj->isString()) {
- s = obj->getString();
+ s = (GooString *)obj->getString();
p = s->getCString();
l = s->getLength();
if (strlen(p) == (unsigned int) l) {
@@ -589,7 +589,7 @@
pdf_puts(">");
}
} else if (obj->isName()) {
- copyName(obj->getName());
+ copyName((char *)obj->getName());
} else if (obj->isNull()) {
pdf_puts("null");
} else if (obj->isArray()) {
Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc 2018-05-17 17:02:02 UTC (rev 797)
@@ -109,7 +109,7 @@
fprintf(stderr, "No SourceName found\n");
exit(1);
}
- outname = srcName.getString()->getCString();
+ outname = (char *)srcName.getString()->getCString();
// We cannot free srcName, as objname shares its string.
// srcName.free();
} else if (objnum > 0) {
Modified: branches/stable/source/src/texk/web2c/pdftexdir/ptexlib.h
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/ptexlib.h 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/web2c/pdftexdir/ptexlib.h 2018-05-17 17:02:02 UTC (rev 797)
@@ -20,6 +20,13 @@
#ifndef PDFTEXLIB
# define PDFTEXLIB
+#ifdef _WIN32
+#undef fopen
+#undef xfopen
+#define fopen fsyscp_fopen
+#define xfopen fsyscp_xfopen
+#endif
+
/* WEB2C macros and prototypes */
# if !defined(PDFTEXCOERCE) && !defined(PDFETEXCOERCE)
# ifdef pdfTeX
Modified: branches/stable/source/src/texk/web2c/synctexdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/synctexdir/ChangeLog 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/web2c/synctexdir/ChangeLog 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,3 +1,8 @@
+2018-05-11 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ * synctex.c: Allow non-ascii file names also for pdfTeX
+ (w32 only).
+
2018-01-18 Karl Berry <karl at freefriends.org>
* man5/synctex.5: spacing, typos, per Debian.
Modified: branches/stable/source/src/texk/web2c/synctexdir/synctex.c
===================================================================
--- branches/stable/source/src/texk/web2c/synctexdir/synctex.c 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/web2c/synctexdir/synctex.c 2018-05-17 17:02:02 UTC (rev 797)
@@ -292,7 +292,7 @@
# define SYNCTEX_OFFSET_IS_PDF 0
# endif
-#if defined(_WIN32) && (defined(upTeX) || defined(eupTeX) || defined(XeTeX))
+#if defined(_WIN32) && (defined(pdfTeX) || defined(upTeX) || defined(eupTeX) || defined(XeTeX))
#define W32UPTEXSYNCTEX 1
#include <wchar.h>
static char *chgto_oem(char *src);
Modified: branches/stable/source/src/texk/web2c/web2c/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/web2c/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/web2c/web2c/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -115,6 +115,7 @@
CONFIG_HEADER = $(top_builddir)/kpathsea/c-auto.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+PROGRAMS = $(noinst_PROGRAMS)
ARFLAGS = cru
AM_V_AR = $(am__v_AR_ at AM_V@)
am__v_AR_ = $(am__v_AR_ at AM_DEFAULT_V@)
@@ -124,7 +125,6 @@
libweb2c_a_LIBADD =
am_libweb2c_a_OBJECTS = kps.$(OBJEXT)
libweb2c_a_OBJECTS = $(am_libweb2c_a_OBJECTS)
-PROGRAMS = $(noinst_PROGRAMS)
am_fixwrites_OBJECTS = fixwrites.$(OBJEXT)
fixwrites_OBJECTS = $(am_fixwrites_OBJECTS)
am__DEPENDENCIES_1 =
@@ -158,7 +158,11 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/kpathsea
depcomp = $(SHELL) $(top_srcdir)/../../../build-aux/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/fixwrites.Po ./$(DEPDIR)/kps.Po \
+ ./$(DEPDIR)/main.Po ./$(DEPDIR)/makecpool.Po \
+ ./$(DEPDIR)/splitup.Po ./$(DEPDIR)/web2c-lexer.Po \
+ ./$(DEPDIR)/web2c-parser.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -450,8 +454,8 @@
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -478,11 +482,6 @@
distclean-hdr:
-rm -f kpathsea/c-auto.h kpathsea/stamp-h1
-libweb2c.a: $(libweb2c_a_OBJECTS) $(libweb2c_a_DEPENDENCIES) $(EXTRA_libweb2c_a_DEPENDENCIES)
- $(AM_V_at)-rm -f libweb2c.a
- $(AM_V_AR)$(libweb2c_a_AR) libweb2c.a $(libweb2c_a_OBJECTS) $(libweb2c_a_LIBADD)
- $(AM_V_at)$(RANLIB) libweb2c.a
-
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
echo " rm -f" $$list; \
@@ -492,6 +491,11 @@
echo " rm -f" $$list; \
rm -f $$list
+libweb2c.a: $(libweb2c_a_OBJECTS) $(libweb2c_a_DEPENDENCIES) $(EXTRA_libweb2c_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libweb2c.a
+ $(AM_V_AR)$(libweb2c_a_AR) libweb2c.a $(libweb2c_a_OBJECTS) $(libweb2c_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libweb2c.a
+
fixwrites$(EXEEXT): $(fixwrites_OBJECTS) $(fixwrites_DEPENDENCIES) $(EXTRA_fixwrites_DEPENDENCIES)
@rm -f fixwrites$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(fixwrites_OBJECTS) $(fixwrites_LDADD) $(LIBS)
@@ -517,14 +521,20 @@
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fixwrites.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kps.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/makecpool.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/splitup.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/web2c-lexer.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/web2c-parser.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fixwrites.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kps.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/makecpool.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/splitup.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/web2c-lexer.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/web2c-parser.Po at am__quote@ # am--include-marker
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -623,7 +633,10 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -835,7 +848,13 @@
distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/fixwrites.Po
+ -rm -f ./$(DEPDIR)/kps.Po
+ -rm -f ./$(DEPDIR)/main.Po
+ -rm -f ./$(DEPDIR)/makecpool.Po
+ -rm -f ./$(DEPDIR)/splitup.Po
+ -rm -f ./$(DEPDIR)/web2c-lexer.Po
+ -rm -f ./$(DEPDIR)/web2c-parser.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-libtool distclean-local distclean-tags
@@ -883,7 +902,13 @@
maintainer-clean: maintainer-clean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/fixwrites.Po
+ -rm -f ./$(DEPDIR)/kps.Po
+ -rm -f ./$(DEPDIR)/main.Po
+ -rm -f ./$(DEPDIR)/makecpool.Po
+ -rm -f ./$(DEPDIR)/splitup.Po
+ -rm -f ./$(DEPDIR)/web2c-lexer.Po
+ -rm -f ./$(DEPDIR)/web2c-parser.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -904,22 +929,22 @@
.MAKE: all check install install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \
- clean-cscope clean-generic clean-libtool clean-noinstPROGRAMS \
- cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
- dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
- distcheck distclean distclean-compile distclean-generic \
- distclean-hdr distclean-libtool distclean-local distclean-tags \
- distcleancheck distdir distuninstallcheck dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-am uninstall uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles am--refresh check \
+ check-am clean clean-cscope clean-generic clean-libtool \
+ clean-noinstPROGRAMS cscope cscopelist-am ctags ctags-am dist \
+ dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+ dist-xz dist-zip distcheck distclean distclean-compile \
+ distclean-generic distclean-hdr distclean-libtool \
+ distclean-local distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am
.PRECIOUS: Makefile
Modified: branches/stable/source/src/texk/web2c/web2c/aclocal.m4
===================================================================
--- branches/stable/source/src/texk/web2c/web2c/aclocal.m4 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/web2c/web2c/aclocal.m4 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
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.15.1], [],
+m4_if([$1], [1.16.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@
# 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.15.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -58,7 +58,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -141,7 +141,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -332,13 +332,12 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -346,49 +345,41 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ AS_CASE([$CONFIG_FILES],
+ [*\'*], [eval set x "$CONFIG_FILES"],
+ [*], [set x $CONFIG_FILES])
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`AS_DIRNAME(["$am_mf"])`
+ am_filepart=`AS_BASENAME(["$am_mf"])`
+ AM_RUN_LOG([cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles]) || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).])
+ fi
+ AS_UNSET([am_dirpart])
+ AS_UNSET([am_filepart])
+ AS_UNSET([am_mf])
+ AS_UNSET([am_rc])
+ rm -f conftest-deps.mk
}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -397,18 +388,17 @@
# -----------------------------
# This macro should only be invoked once -- use via AC_REQUIRE.
#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
+ [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -495,8 +485,8 @@
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms.
@@ -563,7 +553,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -605,7 +595,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -626,7 +616,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -648,7 +638,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -683,7 +673,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -691,49 +681,42 @@
# AM_MAKE_INCLUDE()
# -----------------
-# Check to see how make treats includes.
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+ AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+ ['0:this is the am__doit target'],
+ [AS_CASE([$s],
+ [BSD], [am__include='.include' am__quote='"'],
+ [am__include='include' am__quote=''])])
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT([${_am_result}])
+AC_SUBST([am__include])])
+AC_SUBST([am__quote])])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -772,7 +755,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -801,7 +784,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -848,7 +831,7 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -867,7 +850,7 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -948,7 +931,7 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1008,7 +991,7 @@
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1036,7 +1019,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1055,7 +1038,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Modified: branches/stable/source/src/texk/web2c/web2c/configure
===================================================================
--- branches/stable/source/src/texk/web2c/web2c/configure 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/web2c/web2c/configure 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Web2C Tools 2018.
+# Generated by GNU Autoconf 2.69 for Web2C Tools 2019/dev.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='Web2C Tools'
PACKAGE_TARNAME='web2c-tools'
-PACKAGE_VERSION='2018'
-PACKAGE_STRING='Web2C Tools 2018'
+PACKAGE_VERSION='2019/dev'
+PACKAGE_STRING='Web2C Tools 2019/dev'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -681,7 +681,6 @@
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
-am__quote
am__include
DEPDIR
OBJEXT
@@ -758,7 +757,8 @@
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL'
+SHELL
+am__quote'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -1328,7 +1328,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Web2C Tools 2018 to adapt to many kinds of systems.
+\`configure' configures Web2C Tools 2019/dev to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1398,7 +1398,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Web2C Tools 2018:";;
+ short | recursive ) echo "Configuration of Web2C Tools 2019/dev:";;
esac
cat <<\_ACEOF
@@ -1521,7 +1521,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Web2C Tools configure 2018
+Web2C Tools configure 2019/dev
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2360,7 +2360,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Web2C Tools $as_me 2018, which was
+It was created by Web2C Tools $as_me 2019/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2741,7 +2741,7 @@
-am__api_version='1.15'
+am__api_version='1.16'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -3209,46 +3209,46 @@
ac_config_commands="$ac_config_commands depfiles"
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+ (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ case $?:`cat confinc.out 2>/dev/null` in #(
+ '0:this is the am__doit target') :
+ case $s in #(
+ BSD) :
+ am__include='.include' am__quote='"' ;; #(
+ *) :
+ am__include='include' am__quote='' ;;
+esac ;; #(
+ *) :
+ ;;
esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+$as_echo "${_am_result}" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
# Check whether --enable-dependency-tracking was given.
if test "${enable_dependency_tracking+set}" = set; then :
enableval=$enable_dependency_tracking;
@@ -8045,7 +8045,7 @@
# Define the identity of the package.
PACKAGE='web2c-tools'
- VERSION='2018'
+ VERSION='2019/dev'
cat >>confdefs.h <<_ACEOF
@@ -8075,8 +8075,8 @@
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
# We need awk for the "check" target (and possibly the TAP driver). The
@@ -8127,7 +8127,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -14574,7 +14574,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Web2C Tools $as_me 2018, which was
+This file was extended by Web2C Tools $as_me 2019/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14640,7 +14640,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Web2C Tools config.status 2018
+Web2C Tools config.status 2019/dev
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -14759,7 +14759,7 @@
#
# INIT-COMMANDS
#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
# The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -15657,29 +15657,35 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ case $CONFIG_FILES in #(
+ *\'*) :
+ eval set x "$CONFIG_FILES" ;; #(
+ *) :
+ set x $CONFIG_FILES ;; #(
+ *) :
+ ;;
+esac
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$am_mf" : 'X\(//\)[^/]' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$am_mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -15697,53 +15703,48 @@
q
}
s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$am_mf" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
}
- /^X\(\/\/\)[^/].*/{
+ /^X\/\(\/\/\)$/{
s//\1/
q
}
- /^X\(\/\/\)$/{
+ /^X\/\(\/\).*/{
s//\1/
q
}
- /^X\(\/\).*/{
- s//\1/
- q
- }
s/.*/./; q'`
- as_dir=$dirpart/$fdir; as_fn_mkdir_p
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ { echo "$as_me:$LINENO: cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles" >&5
+ (cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ { am_dirpart=; unset am_dirpart;}
+ { am_filepart=; unset am_filepart;}
+ { am_mf=; unset am_mf;}
+ { am_rc=; unset am_rc;}
+ rm -f conftest-deps.mk
}
;;
"libtool":C)
Modified: branches/stable/source/src/texk/web2c/window/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/window/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/texk/web2c/window/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -174,7 +174,13 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/w2c -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/amiga.Po ./$(DEPDIR)/epsf.Po \
+ ./$(DEPDIR)/hp2627.Po ./$(DEPDIR)/mftalk.Po \
+ ./$(DEPDIR)/next.Po ./$(DEPDIR)/regis.Po \
+ ./$(DEPDIR)/suntools.Po ./$(DEPDIR)/tek.Po ./$(DEPDIR)/trap.Po \
+ ./$(DEPDIR)/uniterm.Po ./$(DEPDIR)/win32.Po \
+ ./$(DEPDIR)/x11-Xlib.Po ./$(DEPDIR)/x11-Xt.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -481,8 +487,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -505,20 +511,26 @@
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/amiga.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/epsf.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hp2627.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mftalk.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/next.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regis.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/suntools.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tek.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/trap.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/uniterm.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/win32.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/x11-Xlib.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/x11-Xt.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/amiga.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/epsf.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hp2627.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mftalk.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/next.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regis.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/suntools.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tek.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/trap.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/uniterm.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/win32.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/x11-Xlib.Po at am__quote@ # am--include-marker
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/x11-Xt.Po at am__quote@ # am--include-marker
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -601,7 +613,10 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -671,7 +686,19 @@
clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/amiga.Po
+ -rm -f ./$(DEPDIR)/epsf.Po
+ -rm -f ./$(DEPDIR)/hp2627.Po
+ -rm -f ./$(DEPDIR)/mftalk.Po
+ -rm -f ./$(DEPDIR)/next.Po
+ -rm -f ./$(DEPDIR)/regis.Po
+ -rm -f ./$(DEPDIR)/suntools.Po
+ -rm -f ./$(DEPDIR)/tek.Po
+ -rm -f ./$(DEPDIR)/trap.Po
+ -rm -f ./$(DEPDIR)/uniterm.Po
+ -rm -f ./$(DEPDIR)/win32.Po
+ -rm -f ./$(DEPDIR)/x11-Xlib.Po
+ -rm -f ./$(DEPDIR)/x11-Xt.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -717,7 +744,19 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/amiga.Po
+ -rm -f ./$(DEPDIR)/epsf.Po
+ -rm -f ./$(DEPDIR)/hp2627.Po
+ -rm -f ./$(DEPDIR)/mftalk.Po
+ -rm -f ./$(DEPDIR)/next.Po
+ -rm -f ./$(DEPDIR)/regis.Po
+ -rm -f ./$(DEPDIR)/suntools.Po
+ -rm -f ./$(DEPDIR)/tek.Po
+ -rm -f ./$(DEPDIR)/trap.Po
+ -rm -f ./$(DEPDIR)/uniterm.Po
+ -rm -f ./$(DEPDIR)/win32.Po
+ -rm -f ./$(DEPDIR)/x11-Xlib.Po
+ -rm -f ./$(DEPDIR)/x11-Xt.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -738,18 +777,19 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libtool cscopelist-am ctags ctags-am distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+ clean-generic clean-libtool cscopelist-am ctags ctags-am \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am
.PRECIOUS: Makefile
Modified: branches/stable/source/src/utils/Makefile.in
===================================================================
--- branches/stable/source/src/utils/Makefile.in 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/utils/Makefile.in 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -238,7 +238,7 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- cscope distdir dist dist-all distcheck
+ cscope distdir distdir-am dist dist-all distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
@@ -461,8 +461,8 @@
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(srcdir)/../am/dist_hook.am $(srcdir)/../am/recurse.am $(am__empty):
@@ -581,7 +581,10 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
Modified: branches/stable/source/src/utils/README
===================================================================
--- branches/stable/source/src/utils/README 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/utils/README 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,4 +1,4 @@
-$Id: README 47384 2018-04-08 20:08:33Z karl $
+$Id: README 47714 2018-05-14 18:07:32Z karl $
Public domain. Originally written 2005 by Karl Berry.
Extra utilities we (optionally) compile for TeX Live.
@@ -16,7 +16,7 @@
lacheck - maintained here, by us
-m-tx 0.63 - checked 09jan18
+m-tx 0.63a - checked 29apr18
http://ctan.org/pkg/m-tx/
pmx 2.8.4 - checked 14feb18
@@ -96,7 +96,7 @@
# foil wrong attempts at dynamic linking, etc.
(cd $clisp_basedir/clisp-tools/lib && rm -f *.dylib *.la)
-clisp_ver=clisp-2.49.92
+clisp_ver=
cd $clisp_basedir
$wget https://haible.de/bruno/gnu/$clisp_ver.tar.bz2
bunzip2 -dc $clisp_ver.tar.bz2 | tar xf -
Modified: branches/stable/source/src/utils/aclocal.m4
===================================================================
--- branches/stable/source/src/utils/aclocal.m4 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/utils/aclocal.m4 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
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.15.1], [],
+m4_if([$1], [1.16.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@
# 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.15.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -58,7 +58,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -141,7 +141,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -332,13 +332,12 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -346,49 +345,41 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ AS_CASE([$CONFIG_FILES],
+ [*\'*], [eval set x "$CONFIG_FILES"],
+ [*], [set x $CONFIG_FILES])
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`AS_DIRNAME(["$am_mf"])`
+ am_filepart=`AS_BASENAME(["$am_mf"])`
+ AM_RUN_LOG([cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles]) || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).])
+ fi
+ AS_UNSET([am_dirpart])
+ AS_UNSET([am_filepart])
+ AS_UNSET([am_mf])
+ AS_UNSET([am_rc])
+ rm -f conftest-deps.mk
}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -397,18 +388,17 @@
# -----------------------------
# This macro should only be invoked once -- use via AC_REQUIRE.
#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
+ [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -495,8 +485,8 @@
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms.
@@ -563,7 +553,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -605,7 +595,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -626,7 +616,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -648,7 +638,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -683,7 +673,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -691,49 +681,42 @@
# AM_MAKE_INCLUDE()
# -----------------
-# Check to see how make treats includes.
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+ AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+ ['0:this is the am__doit target'],
+ [AS_CASE([$s],
+ [BSD], [am__include='.include' am__quote='"'],
+ [am__include='include' am__quote=''])])
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT([${_am_result}])
+AC_SUBST([am__include])])
+AC_SUBST([am__quote])])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -772,7 +755,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -801,7 +784,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -848,7 +831,7 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -867,7 +850,7 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -948,7 +931,7 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1008,7 +991,7 @@
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1036,7 +1019,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1055,7 +1038,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Modified: branches/stable/source/src/utils/configure
===================================================================
--- branches/stable/source/src/utils/configure 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/utils/configure 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live utils 2018.
+# Generated by GNU Autoconf 2.69 for TeX Live utils 2019/dev.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='TeX Live utils'
PACKAGE_TARNAME='tex-live-utils'
-PACKAGE_VERSION='2018'
-PACKAGE_STRING='TeX Live utils 2018'
+PACKAGE_VERSION='2019/dev'
+PACKAGE_STRING='TeX Live utils 2019/dev'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -606,7 +606,6 @@
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
-am__quote
am__include
DEPDIR
am__untar
@@ -684,7 +683,8 @@
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL'
+SHELL
+am__quote'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -1396,7 +1396,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures TeX Live utils 2018 to adapt to many kinds of systems.
+\`configure' configures TeX Live utils 2019/dev to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1466,7 +1466,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of TeX Live utils 2018:";;
+ short | recursive ) echo "Configuration of TeX Live utils 2019/dev:";;
esac
cat <<\_ACEOF
@@ -1757,7 +1757,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-TeX Live utils configure 2018
+TeX Live utils configure 2019/dev
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1858,7 +1858,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by TeX Live utils $as_me 2018, which was
+It was created by TeX Live utils $as_me 2019/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -5544,7 +5544,7 @@
-am__api_version='1.15'
+am__api_version='1.16'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -5970,46 +5970,46 @@
ac_config_commands="$ac_config_commands depfiles"
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+ (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ case $?:`cat confinc.out 2>/dev/null` in #(
+ '0:this is the am__doit target') :
+ case $s in #(
+ BSD) :
+ am__include='.include' am__quote='"' ;; #(
+ *) :
+ am__include='include' am__quote='' ;;
+esac ;; #(
+ *) :
+ ;;
esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+$as_echo "${_am_result}" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
# Check whether --enable-dependency-tracking was given.
if test "${enable_dependency_tracking+set}" = set; then :
enableval=$enable_dependency_tracking;
@@ -6106,7 +6106,7 @@
# Define the identity of the package.
PACKAGE='tex-live-utils'
- VERSION='2018'
+ VERSION='2019/dev'
cat >>confdefs.h <<_ACEOF
@@ -6136,8 +6136,8 @@
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
# We need awk for the "check" target (and possibly the TAP driver). The
@@ -6316,7 +6316,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -7071,7 +7071,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by TeX Live utils $as_me 2018, which was
+This file was extended by TeX Live utils $as_me 2019/dev, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7128,7 +7128,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-TeX Live utils config.status 2018
+TeX Live utils config.status 2019/dev
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -7236,7 +7236,7 @@
#
# INIT-COMMANDS
#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
_ACEOF
@@ -7681,29 +7681,35 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ case $CONFIG_FILES in #(
+ *\'*) :
+ eval set x "$CONFIG_FILES" ;; #(
+ *) :
+ set x $CONFIG_FILES ;; #(
+ *) :
+ ;;
+esac
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$am_mf" : 'X\(//\)[^/]' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$am_mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -7721,53 +7727,48 @@
q
}
s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$am_mf" : 'X\(//\)$' \| \
+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$am_mf" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
}
- /^X\(\/\/\)[^/].*/{
+ /^X\/\(\/\/\)$/{
s//\1/
q
}
- /^X\(\/\/\)$/{
+ /^X\/\(\/\).*/{
s//\1/
q
}
- /^X\(\/\).*/{
- s//\1/
- q
- }
s/.*/./; q'`
- as_dir=$dirpart/$fdir; as_fn_mkdir_p
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ { echo "$as_me:$LINENO: cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles" >&5
+ (cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ { am_dirpart=; unset am_dirpart;}
+ { am_filepart=; unset am_filepart;}
+ { am_mf=; unset am_mf;}
+ { am_rc=; unset am_rc;}
+ rm -f conftest-deps.mk
}
;;
Modified: branches/stable/source/src/version.ac
===================================================================
--- branches/stable/source/src/version.ac 2018-04-22 15:47:12 UTC (rev 796)
+++ branches/stable/source/src/version.ac 2018-05-17 17:02:02 UTC (rev 797)
@@ -1,4 +1,4 @@
-dnl $Id: version.ac 46759 2018-02-27 23:14:55Z karl $
+dnl $Id: version.ac 47474 2018-04-28 22:10:29Z karl $
dnl Copyright 2016-2018 Karl Berry <tex-live at tug.org>
dnl Copyright 2010-2015 Peter Breitenlohner <tex-live at tug.org>
dnl
@@ -9,4 +9,4 @@
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current TeX Live version
-m4_define([tex_live_version], [2018])
+m4_define([tex_live_version], [2019/dev])
More information about the pdftex-commits
mailing list