summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2012-05-29 19:51:22 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2012-12-28 21:52:25 +0100
commitad08bbfa4f9949e7e7987d280779f3edc0e0a2cb (patch)
tree89b51d43ce229f448608c470c95c000e78be343d /lib
parentb373ad9963a3d8b0270a93110f900ef7d36c0bd2 (diff)
downloadautomake-ad08bbfa4f9949e7e7987d280779f3edc0e0a2cb.tar.gz
Drop support for DJGPP, MS-DOS, Windows 95/98/ME
Basically a backport and squash-in of three Automake-NG commits: v1.12.1-447-g041fe15, v1.12-343-g4526363, v1.12-341-gc853c20, plus proper simplifications of the ylwrap script. See also: <http://lists.gnu.org/archive/html/automake-ng/2012-05/msg00104.html> * automake.in (BEGIN): Don't override $ENV{SHELL} for DJGPP. (handle_libtool): Do not bother cleaning '_libs' directories, they are only used by Libtool on MS-DOS (and we no longer support that setup). * syntax-checks.mk (automake_diff_no): Adjust, as now there are only seven (not eight) different lines between 'automake.in' and 'automake'. * bootstrap.sh: Don't special case the default value for BOOTSTRAP_SHELL on DJGPP. While we are at, allow that variable to be overridden from the environment. Also, adjust comments: we don't use "ln -s" not because it's not properly supported by DJGPP, but because it might not be properly supported by MinGW/MSYS. * configure.ac (MODIFICATION_DELAY): Define to '2' unconditionally, as we no longer have to cater to quirks of Windows 95/98/ME. * lib/am/texibuild.am: Remove support for '*.iNN' files used on DJGPP. * lib/am/texinfos.am: Likewise. * lib/ylwrap: Remove support for DOS-specific filenames for bison output. * t/txinfo19.sh: Remove as obsolete. * t/list-of-tests.mk: Adjust. * NEWS: Update. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/am/texibuild.am3
-rw-r--r--lib/am/texinfos.am25
-rwxr-xr-xlib/ylwrap17
3 files changed, 7 insertions, 38 deletions
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index 0fe09b1f9..b60a3c95c 100644
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -30,14 +30,13 @@
## 2) If the texinfo file has some minor mistakes which cause makeinfo
## to fail, the info files are not removed. (They are needed by the
## developer while he writes documentation.)
-## *.iNN files are used on DJGPP. See the comments in install-info-am
%AM_V_MAKEINFO%restore=: && backupdir="$(am__leading_dot)am$$$$" && \
?INSRC? am__cwd=`pwd` && $(am__cd) $(srcdir) && \
rm -rf $$backupdir && mkdir $$backupdir && \
## If makeinfo is not installed we must not backup the files so
## 'missing' can do its job and touch $@ if it exists.
if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
- for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
+ for f in $@ $@-[0-9] $@-[0-9][0-9]; do \
if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
done; \
else :; fi && \
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 6d45c950a..c7b794ff7 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -194,18 +194,7 @@ install-info-am: $(INFO_DEPS)
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
esac; \
if test -f $$file; then d=.; else d=$(srcdir); fi; \
-## 8+3 filesystems cannot deal with foo.info-N filenames: they all
-## conflict. DJGPP comes with a tool, DJTAR, that will rename these
-## files to foo.iNN while extracting the archive. DJGPP's makeinfo
-## is patched to grok these filenames. However we have to account
-## for the renaming when installing the info files.
-##
-## If $file == foo.info, then $file_i == foo.i. The reason we use two
-## shell commands instead of one ('s|\.info$$|.i|') is so that a suffix-less
-## 'foo' becomes 'foo.i' too.
- file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
- for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
- $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
+ for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9]; do \
if test -f $$ifile; then \
echo "$$ifile"; \
else : ; fi; \
@@ -323,11 +312,9 @@ uninstall-info-am:
@list='$(INFO_DEPS)'; \
for file in $$list; do \
relfile=`echo "$$file" | sed 's|^.*/||'`; \
-## DJGPP-style info files. See comment in install-info-am.
- relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
(if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \
- echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
- rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
+ echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9]"; \
+ rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9]; \
else :; fi); \
done
@@ -400,10 +387,8 @@ clean-aminfo:
.PHONY maintainer-clean-am: maintainer-clean-aminfo
maintainer-clean-aminfo:
@list='$(INFO_DEPS)'; for i in $$list; do \
-## .iNN files are DJGPP-style info files.
- i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \
- echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \
- rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
+ echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9]"; \
+ rm -f $$i $$i-[0-9] $$i-[0-9][0-9]; \
done
## Use '-rf', not just '-f'; see comments in 'mostlyclean-aminfo'
## above for details.
diff --git a/lib/ylwrap b/lib/ylwrap
index b5c673d5f..d59f6aa6e 100755
--- a/lib/ylwrap
+++ b/lib/ylwrap
@@ -1,7 +1,7 @@
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
-scriptversion=2012-12-21.17; # UTC
+scriptversion=2012-12-28.20; # UTC
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
@@ -111,14 +111,6 @@ case "$input" in
esac
input_rx=`get_dirname "$input" | quote_for_sed`
-# Since DOS filename conventions don't allow two dots,
-# the DOS version of Bison writes out y_tab.c instead of y.tab.c
-# and y_tab.h instead of y.tab.h. Test to see if this is the case.
-y_tab_nodot=false
-if test -f y_tab.c || test -f y_tab.h; then
- y_tab_nodot=true
-fi
-
# The parser itself, the first file, is the destination of the .y.c
# rule in the Makefile.
parser=$1
@@ -138,13 +130,6 @@ while test "$#" -ne 0; do
break
fi
from=$1
- # Handle y_tab.c and y_tab.h output by DOS
- if $y_tab_nodot; then
- case $from in
- "y.tab.c") from=y_tab.c;;
- "y.tab.h") from=y_tab.h;;
- esac
- fi
shift
to=$1
shift