summaryrefslogtreecommitdiff
path: root/Build/source/texk/dviljk
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-02-02 15:59:11 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-02-02 15:59:11 +0000
commitf819799e4a07199f253a7b6600b75d2e6f6ea3f6 (patch)
treee63bffc5c58a950266351a03a5e6452120e46106 /Build/source/texk/dviljk
parent3557fddb20fecc528ea2d8907772cedeaff1c92d (diff)
automake 1.11.3
git-svn-id: svn://tug.org/texlive/trunk@25277 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dviljk')
-rw-r--r--Build/source/texk/dviljk/Makefile.in35
-rw-r--r--Build/source/texk/dviljk/aclocal.m415
-rwxr-xr-xBuild/source/texk/dviljk/configure8
-rw-r--r--Build/source/texk/dviljk/win32/Makefile.in4
4 files changed, 36 insertions, 26 deletions
diff --git a/Build/source/texk/dviljk/Makefile.in b/Build/source/texk/dviljk/Makefile.in
index e69bcd4485b..f2167777396 100644
--- a/Build/source/texk/dviljk/Makefile.in
+++ b/Build/source/texk/dviljk/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -178,9 +178,11 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- { test ! -d "$(distdir)" \
- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr "$(distdir)"; }; }
+ if test -d "$(distdir)"; then \
+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -rf "$(distdir)" \
+ || { sleep 5 && rm -rf "$(distdir)"; }; \
+ else :; fi
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -400,6 +402,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/../am/bin_links.am $(top_srcdir)/../am/man1_links.am:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -427,7 +430,7 @@ distclean-hdr:
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libdvilj.a: $(libdvilj_a_OBJECTS) $(libdvilj_a_DEPENDENCIES)
+libdvilj.a: $(libdvilj_a_OBJECTS) $(libdvilj_a_DEPENDENCIES) $(EXTRA_libdvilj_a_DEPENDENCIES)
-rm -f libdvilj.a
$(libdvilj_a_AR) libdvilj.a $(libdvilj_a_OBJECTS) $(libdvilj_a_LIBADD)
$(RANLIB) libdvilj.a
@@ -474,19 +477,19 @@ clean-binPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-dvilj$(EXEEXT): $(dvilj_OBJECTS) $(dvilj_DEPENDENCIES)
+dvilj$(EXEEXT): $(dvilj_OBJECTS) $(dvilj_DEPENDENCIES) $(EXTRA_dvilj_DEPENDENCIES)
@rm -f dvilj$(EXEEXT)
$(LINK) $(dvilj_OBJECTS) $(dvilj_LDADD) $(LIBS)
-dvilj2p$(EXEEXT): $(dvilj2p_OBJECTS) $(dvilj2p_DEPENDENCIES)
+dvilj2p$(EXEEXT): $(dvilj2p_OBJECTS) $(dvilj2p_DEPENDENCIES) $(EXTRA_dvilj2p_DEPENDENCIES)
@rm -f dvilj2p$(EXEEXT)
$(LINK) $(dvilj2p_OBJECTS) $(dvilj2p_LDADD) $(LIBS)
-dvilj4$(EXEEXT): $(dvilj4_OBJECTS) $(dvilj4_DEPENDENCIES)
+dvilj4$(EXEEXT): $(dvilj4_OBJECTS) $(dvilj4_DEPENDENCIES) $(EXTRA_dvilj4_DEPENDENCIES)
@rm -f dvilj4$(EXEEXT)
$(LINK) $(dvilj4_OBJECTS) $(dvilj4_LDADD) $(LIBS)
-dvilj4l$(EXEEXT): $(dvilj4l_OBJECTS) $(dvilj4l_DEPENDENCIES)
+dvilj4l$(EXEEXT): $(dvilj4l_OBJECTS) $(dvilj4l_DEPENDENCIES) $(EXTRA_dvilj4l_DEPENDENCIES)
@rm -f dvilj4l$(EXEEXT)
$(LINK) $(dvilj4l_OBJECTS) $(dvilj4l_LDADD) $(LIBS)
-dvilj6$(EXEEXT): $(dvilj6_OBJECTS) $(dvilj6_DEPENDENCIES)
+dvilj6$(EXEEXT): $(dvilj6_OBJECTS) $(dvilj6_DEPENDENCIES) $(EXTRA_dvilj6_DEPENDENCIES)
@rm -f dvilj6$(EXEEXT)
$(LINK) $(dvilj6_OBJECTS) $(dvilj6_LDADD) $(LIBS)
install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
@@ -890,6 +893,10 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzip: distdir
+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+ $(am__remove_distdir)
+
dist-lzma: distdir
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
$(am__remove_distdir)
@@ -926,6 +933,8 @@ distcheck: dist
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.lz*) \
+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
@@ -1125,9 +1134,9 @@ uninstall-man: uninstall-man1
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-binPROGRAMS \
clean-generic clean-libtool clean-noinstLIBRARIES ctags \
- ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-lzma \
- dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
- distclean-compile distclean-generic distclean-hdr \
+ ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-lzip \
+ dist-lzma 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 \
diff --git a/Build/source/texk/dviljk/aclocal.m4 b/Build/source/texk/dviljk/aclocal.m4
index 26959064bc7..acf9e6238f2 100644
--- a/Build/source/texk/dviljk/aclocal.m4
+++ b/Build/source/texk/dviljk/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@@ -38,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
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.11.2], [],
+m4_if([$1], [1.11.3], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -54,7 +54,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.2])dnl
+[AM_AUTOMAKE_VERSION([1.11.3])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -914,7 +914,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -936,10 +936,11 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# a tarball read from stdin.
# $(am__untar) < result.tar
AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
+[# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
m4_if([$1], [v7],
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
[m4_case([$1], [ustar],, [pax],,
[m4_fatal([Unknown tar format])])
AC_MSG_CHECKING([how to create a $1 tar archive])
diff --git a/Build/source/texk/dviljk/configure b/Build/source/texk/dviljk/configure
index 2da886bb5c5..ae3a924d96c 100755
--- a/Build/source/texk/dviljk/configure
+++ b/Build/source/texk/dviljk/configure
@@ -7550,11 +7550,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
-# Always define AMTAR for backward compatibility.
+# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
diff --git a/Build/source/texk/dviljk/win32/Makefile.in b/Build/source/texk/dviljk/win32/Makefile.in
index bc93b1f5550..543c810bb5e 100644
--- a/Build/source/texk/dviljk/win32/Makefile.in
+++ b/Build/source/texk/dviljk/win32/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -286,7 +286,7 @@ clean-binPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-dvihp$(EXEEXT): $(dvihp_OBJECTS) $(dvihp_DEPENDENCIES)
+dvihp$(EXEEXT): $(dvihp_OBJECTS) $(dvihp_DEPENDENCIES) $(EXTRA_dvihp_DEPENDENCIES)
@rm -f dvihp$(EXEEXT)
$(LINK) $(dvihp_OBJECTS) $(dvihp_LDADD) $(LIBS)