From ec898796ed114b3801d1622713390c341120a2ec Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Fri, 11 Apr 2003 21:12:21 +0000 Subject: [PATCH] * lib/Automake/tests/Condition.pl (test_reduce_and) (test_reduce_or): Cosmetics. * lib/Automake/tests/DisjConditions.pl (test_sub_conditions): Fix a comment. * lib/Automake/DisjConditions.pm (sub_conditions): Add missing C<...> in comment. * tests/yacc8.test, configure.in: Update copyright year. --- ChangeLog | 14 ++++- Makefile.in | 91 +++++++++++++++++----------- configure.in | 2 +- lib/Automake/DisjConditions.pm | 2 +- lib/Automake/Makefile.in | 52 ++++++++++------ lib/Automake/tests/Condition.pl | 4 +- lib/Automake/tests/DisjConditions.pl | 2 +- lib/Automake/tests/Makefile.in | 23 ++++--- lib/Makefile.in | 61 ++++++++++++------- lib/am/Makefile.in | 27 +++++---- m4/Makefile.in | 29 +++++---- tests/Makefile.in | 24 ++++---- tests/yacc8.test | 2 +- 13 files changed, 205 insertions(+), 128 deletions(-) diff --git a/ChangeLog b/ChangeLog index d1bad81c..6c19021d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,14 @@ -2003-04-08 Richard Dawe +2003-04-11 Alexandre Duret-Lutz + + * lib/Automake/tests/Condition.pl (test_reduce_and) + (test_reduce_or): Cosmetics. + * lib/Automake/tests/DisjConditions.pl (test_sub_conditions): + Fix a comment. + * lib/Automake/DisjConditions.pm (sub_conditions): Add missing C<...> + in comment. + * tests/yacc8.test, configure.in: Update copyright year. + +2003-04-10 Richard Dawe * configure.in: Get the build platform name. Define MODIFICATION_DELAY as the time to wait after modifying a file, @@ -6,7 +16,7 @@ on the platform. * tests/defs.in: Define `sleep' using MODIFICATION_DELAY. -2003-04-08 Eric Siegerman (tiny change) +2003-04-10 Eric Siegerman (tiny change) * automake.texi (Public macros): Clarify that the new AM_INIT_AUTOMAKE variant is preferred, and the old one diff --git a/Makefile.in b/Makefile.in index f9980ac0..216541b1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -35,6 +34,51 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +DIST_COMMON = Makefile.in Makefile.am COPYING INSTALL NEWS README \ + AUTHORS ChangeLog THANKS aclocal.m4 configure configure.in \ + version.texi stamp-vti AUTHORS COPYING ChangeLog INSTALL NEWS \ + README THANKS TODO configure configure.in +subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno +mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs +CONFIG_CLEAN_FILES = +am__installdirs = $(DESTDIR)$(bindir) $(DESTDIR)$(infodir) +binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +SCRIPTS = $(bin_SCRIPTS) +SOURCES = +DIST_SOURCES = +TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex +am__TEXINFO_TEX_DIR = $(top_srcdir)/lib +INFO_DEPS = automake.info +DVIS = automake.dvi +PDFS = automake.pdf +PSS = automake.ps +TEXINFOS = automake.texi +TEXI2DVI = texi2dvi +TEXI2PDF = $(TEXI2DVI) --pdf --batch +DVIPS = dvips +RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ + ps-recursive install-info-recursive uninstall-info-recursive \ + all-recursive install-data-recursive install-exec-recursive \ + installdirs-recursive install-recursive uninstall-recursive \ + check-recursive installcheck-recursive +ETAGS = etags +ETAGSFLAGS = +CTAGS = ctags +CTAGSFLAGS = +DIST_SUBDIRS = $(SUBDIRS) +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); }; } +GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APIVERSION = @APIVERSION@ @@ -58,6 +102,7 @@ LIBS = @LIBS@ LN = @LN@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MODIFICATION_DELAY = @MODIFICATION_DELAY@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -74,7 +119,11 @@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ am__leading_dot = @am__leading_dot@ bindir = @bindir@ +build = @build@ build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ @@ -93,15 +142,11 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - SUBDIRS = . m4 lib tests - bin_SCRIPTS = automake aclocal info_TEXINFOS = automake.texi - CLEANFILES = $(bin_SCRIPTS) AUTOMAKESOURCES = automake.in aclocal.in - TAGS_FILES = $(AUTOMAKESOURCES) # The following requires a fixed version of the Emacs 19.30 etags. @@ -109,11 +154,9 @@ ETAGS_ARGS = --lang=none \ --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake.texi TAGS_DEPENDENCIES = automake.texi - EXTRA_DIST = ChangeLog.96 ChangeLog.98 ChangeLog.00 ChangeLog.01 ChangeLog.02 \ $(AUTOMAKESOURCES) - do_subst = sed -e 's,[@]datadir[@],$(datadir),g' -e 's,[@]PERL[@],$(PERL),g' \ -e 's,[@]configure_input[@],@configure_input@,g' \ -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ @@ -121,9 +164,7 @@ do_subst = sed -e 's,[@]datadir[@],$(datadir),g' -e 's,[@]PERL[@],$(PERL),g' \ -e 's,[@]APIVERSION[@],$(APIVERSION),g' \ -e 's,[@]SHELL[@],$(SHELL),g' - WGET = wget - FETCHFILES = \ Automake/Struct.pm \ Automake/XFile.pm \ @@ -132,30 +173,6 @@ config.guess \ config.sub \ texinfo.tex -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs -CONFIG_CLEAN_FILES = -SCRIPTS = $(bin_SCRIPTS) - -DIST_SOURCES = -TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex -am__TEXINFO_TEX_DIR = $(top_srcdir)/lib -INFO_DEPS = automake.info -DVIS = automake.dvi -PDFS = automake.pdf -PSS = automake.ps -TEXINFOS = automake.texi - -RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive install-info-recursive uninstall-info-recursive \ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive -DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ - Makefile.in NEWS THANKS TODO aclocal.m4 configure configure.in \ - stamp-vti version.texi -DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: @@ -381,9 +398,15 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ + if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + else \ + include_option=--include; \ + fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ diff --git a/configure.in b/configure.in index 96a386d7..681ad29b 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ # Process this file with autoconf to produce a configure script. -# Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify diff --git a/lib/Automake/DisjConditions.pm b/lib/Automake/DisjConditions.pm index 1a722243..93d6673a 100644 --- a/lib/Automake/DisjConditions.pm +++ b/lib/Automake/DisjConditions.pm @@ -625,7 +625,7 @@ sub simplify ($) Return the subconditions of C<$self> that contains C<$cond>, with C<$cond> stripped. More formally, return C<$res> such that C<$res-Emultiply ($cond) == $self-Emultiply ($cond)> and -C<$res> does not mention any of the variables in $cond. +C<$res> does not mention any of the variables in C<$cond>. For instance, consider: diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index 781b0fc8..d45051cd 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -35,6 +34,27 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +DIST_COMMON = Makefile.in Makefile.am $(dist_perllib_DATA) +subdir = lib/Automake +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ + ps-recursive install-info-recursive uninstall-info-recursive \ + all-recursive install-data-recursive install-exec-recursive \ + installdirs-recursive install-recursive uninstall-recursive \ + check-recursive installcheck-recursive +am__installdirs = $(DESTDIR)$(perllibdir) +dist_perllibDATA_INSTALL = $(INSTALL_DATA) +DATA = $(dist_perllib_DATA) +ETAGS = etags +ETAGSFLAGS = +CTAGS = ctags +CTAGSFLAGS = +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APIVERSION = @APIVERSION@ @@ -58,6 +78,7 @@ LIBS = @LIBS@ LN = @LN@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MODIFICATION_DELAY = @MODIFICATION_DELAY@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -74,7 +95,11 @@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ am__leading_dot = @am__leading_dot@ bindir = @bindir@ +build = @build@ build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ @@ -93,9 +118,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - SUBDIRS = tests - perllibdir = $(pkgvdatadir)/Automake dist_perllib_DATA = \ ChannelDefs.pm \ @@ -107,21 +130,6 @@ dist_perllib_DATA = \ Struct.pm \ XFile.pm -subdir = lib/Automake -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DATA = $(dist_perllib_DATA) - - -RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive install-info-recursive uninstall-info-recursive \ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive -DIST_COMMON = $(dist_perllib_DATA) Makefile.am Makefile.in -DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: @@ -230,9 +238,15 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ + if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + else \ + include_option=--include; \ + fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ diff --git a/lib/Automake/tests/Condition.pl b/lib/Automake/tests/Condition.pl index 900f847e..5998a64e 100644 --- a/lib/Automake/tests/Condition.pl +++ b/lib/Automake/tests/Condition.pl @@ -157,7 +157,7 @@ sub test_reduce_and () if ($result ne $exresult) { - print '"'.join(",", @$inref) . '" => "' . + print '"' . join(",", @$inref) . '" => "' . $result . '" expected "' . $exresult . '"' . "\n"; $failed = 1; @@ -233,7 +233,7 @@ sub test_reduce_or () if ($result ne $exresult) { - print '"'.join(",", @$inref) . '" => "' . + print '"' . join(",", @$inref) . '" => "' . $result . '" expected "' . $exresult . '"' . "\n"; $failed = 1; diff --git a/lib/Automake/tests/DisjConditions.pl b/lib/Automake/tests/DisjConditions.pl index 9df54deb..1d56ae4f 100644 --- a/lib/Automake/tests/DisjConditions.pl +++ b/lib/Automake/tests/DisjConditions.pl @@ -309,7 +309,7 @@ sub test_sub_conditions () my $t2 = new Automake::Condition @{$t->[1]}; my $t3 = build_set @{$t->[2]}; - # Make sure simplify() yields the expected result. + # Make sure sub_conditions() yields the expected result. my $s = $t1->sub_conditions ($t2); if ($s != $t3) { diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in index 6621b50c..9050a37e 100644 --- a/lib/Automake/tests/Makefile.in +++ b/lib/Automake/tests/Makefile.in @@ -13,7 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -21,7 +20,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -35,6 +33,14 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +DIST_COMMON = Makefile.in Makefile.am +subdir = lib/Automake/tests +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APIVERSION = @APIVERSION@ @@ -58,6 +64,7 @@ LIBS = @LIBS@ LN = @LN@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MODIFICATION_DELAY = @MODIFICATION_DELAY@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -74,7 +81,11 @@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ am__leading_dot = @am__leading_dot@ bindir = @bindir@ +build = @build@ build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ @@ -93,20 +104,12 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - TESTS_ENVIRONMENT = $(PERL) -Mstrict -I $(top_srcdir)/lib -w TESTS = \ Condition.pl \ DisjConditions.pl - EXTRA_DIST = $(TESTS) -subdir = lib/Automake/tests -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: diff --git a/lib/Makefile.in b/lib/Makefile.in index a19ee853..0eaa3915 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -35,6 +34,32 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +DIST_COMMON = Makefile.in Makefile.am $(dist_pkgvdata_DATA) \ + $(dist_script_DATA) COPYING INSTALL ansi2knr.1 ansi2knr.c \ + compile config.guess config.sub depcomp elisp-comp install-sh \ + mdate-sh missing mkinstalldirs py-compile texinfo.tex ylwrap \ + config.guess config.sub +subdir = lib +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ + ps-recursive install-info-recursive uninstall-info-recursive \ + all-recursive install-data-recursive install-exec-recursive \ + installdirs-recursive install-recursive uninstall-recursive \ + check-recursive installcheck-recursive +am__installdirs = $(DESTDIR)$(pkgvdatadir) $(DESTDIR)$(scriptdir) +dist_pkgvdataDATA_INSTALL = $(INSTALL_DATA) +dist_scriptDATA_INSTALL = $(INSTALL_DATA) +DATA = $(dist_pkgvdata_DATA) $(dist_script_DATA) +ETAGS = etags +ETAGSFLAGS = +CTAGS = ctags +CTAGSFLAGS = +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APIVERSION = @APIVERSION@ @@ -58,6 +83,7 @@ LIBS = @LIBS@ LN = @LN@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MODIFICATION_DELAY = @MODIFICATION_DELAY@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -74,7 +100,11 @@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ am__leading_dot = @am__leading_dot@ bindir = @bindir@ +build = @build@ build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ @@ -93,33 +123,12 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - SUBDIRS = Automake am - dist_pkgvdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 - scriptdir = $(pkgvdatadir) dist_script_DATA = config.guess config.sub install-sh mdate-sh missing \ mkinstalldirs elisp-comp ylwrap acinstall depcomp compile py-compile -subdir = lib -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DATA = $(dist_pkgvdata_DATA) $(dist_script_DATA) - - -RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive install-info-recursive uninstall-info-recursive \ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive -DIST_COMMON = $(dist_pkgvdata_DATA) $(dist_script_DATA) COPYING INSTALL \ - Makefile.am Makefile.in ansi2knr.1 ansi2knr.c compile \ - config.guess config.sub depcomp elisp-comp install-sh mdate-sh \ - missing mkinstalldirs py-compile texinfo.tex ylwrap -DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: @@ -246,9 +255,15 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ + if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + else \ + include_option=--include; \ + fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index 57c10b35..888b4d14 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -35,6 +34,17 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +DIST_COMMON = Makefile.in Makefile.am $(dist_am_DATA) +subdir = lib/am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__installdirs = $(DESTDIR)$(amdir) +dist_amDATA_INSTALL = $(INSTALL_DATA) +DATA = $(dist_am_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APIVERSION = @APIVERSION@ @@ -58,6 +68,7 @@ LIBS = @LIBS@ LN = @LN@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MODIFICATION_DELAY = @MODIFICATION_DELAY@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -74,7 +85,11 @@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ am__leading_dot = @am__leading_dot@ bindir = @bindir@ +build = @build@ build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ @@ -93,9 +108,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - amdir = $(pkgvdatadir)/am - dist_am_DATA = ansi2knr.am check.am clean-hdr.am clean.am compile.am \ configure.am data.am dejagnu.am depend.am depend2.am distdir.am \ footer.am header-vars.am header.am install.am java.am lang-compile.am \ @@ -104,14 +117,6 @@ mans-vars.am mans.am multilib.am program.am progs.am python.am \ remake-hdr.am scripts.am subdirs.am tags.am texi-vers.am texibuild.am \ texinfos.am yacc.am -subdir = lib/am -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DATA = $(dist_am_DATA) - -DIST_COMMON = $(dist_am_DATA) Makefile.am Makefile.in all: all-am .SUFFIXES: diff --git a/m4/Makefile.in b/m4/Makefile.in index bdd20941..08e4eb2f 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -21,7 +21,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -35,6 +34,18 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +DIST_COMMON = Makefile.in Makefile.am amversion.in $(dist_m4data_DATA) +subdir = m4 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs +CONFIG_CLEAN_FILES = amversion.m4 +SOURCES = +DIST_SOURCES = +am__installdirs = $(DESTDIR)$(m4datadir) $(DESTDIR)$(m4datadir) +dist_m4dataDATA_INSTALL = $(INSTALL_DATA) +nodist_m4dataDATA_INSTALL = $(INSTALL_DATA) +DATA = $(dist_m4data_DATA) $(nodist_m4data_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APIVERSION = @APIVERSION@ @@ -58,6 +69,7 @@ LIBS = @LIBS@ LN = @LN@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MODIFICATION_DELAY = @MODIFICATION_DELAY@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -74,7 +86,11 @@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ am__leading_dot = @am__leading_dot@ bindir = @bindir@ +build = @build@ build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ @@ -93,9 +109,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - m4datadir = $(datadir)/aclocal-$(APIVERSION) - dist_m4data_DATA = \ as.m4 \ auxdir.m4 \ @@ -127,18 +141,9 @@ runlog.m4 \ sanity.m4 \ strip.m4 - nodist_m4data_DATA = amversion.m4 DISTCLEANFILES = amversion.m4 EXTRA_DIST = dirlist -subdir = m4 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs -CONFIG_CLEAN_FILES = amversion.m4 -DIST_SOURCES = -DATA = $(dist_m4data_DATA) $(nodist_m4data_DATA) - -DIST_COMMON = $(dist_m4data_DATA) Makefile.am Makefile.in amversion.in all: all-am .SUFFIXES: diff --git a/tests/Makefile.in b/tests/Makefile.in index 80914311..65f4a8bd 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -13,7 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -21,7 +20,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -35,6 +33,14 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +DIST_COMMON = Makefile.in Makefile.am defs.in README +subdir = tests +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs +CONFIG_CLEAN_FILES = defs +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APIVERSION = @APIVERSION@ @@ -58,6 +64,7 @@ LIBS = @LIBS@ LN = @LN@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MODIFICATION_DELAY = @MODIFICATION_DELAY@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -74,7 +81,11 @@ VERSION = @VERSION@ ac_ct_STRIP = @ac_ct_STRIP@ am__leading_dot = @am__leading_dot@ bindir = @bindir@ +build = @build@ build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ @@ -93,9 +104,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - XFAIL_TESTS = subdir5.test auxdir2.test cond17.test - TESTS = \ acinclude.test \ aclibobj.test \ @@ -555,17 +564,10 @@ yacc8.test \ yaccpp.test \ yaccvpath.test - EXTRA_DIST = ChangeLog-old $(TESTS) # Each test case depends on defs. check_SCRIPTS = defs -subdir = tests -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs -CONFIG_CLEAN_FILES = defs -DIST_SOURCES = -DIST_COMMON = README Makefile.am Makefile.in defs.in all: all-am .SUFFIXES: diff --git a/tests/yacc8.test b/tests/yacc8.test index e1229b11..01d774d7 100755 --- a/tests/yacc8.test +++ b/tests/yacc8.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003 Free Software Foundation, Inc. # # This file is part of GNU Automake. # -- 2.43.5