* Makefile.maint: Sync with Autoconf:

(local_updates): New.

diff --git a/ChangeLog b/ChangeLog
index 2c5e5067282a54ded109c413c72a8ba8f1161595..8a7c064e66b980406019ce9bf80db996da01d160 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-12  Akim Demaille  <akim@epita.fr>
+
+       * Makefile.maint: Sync with Autoconf:
+       (local_updates): New.
+

 2002-11-12  Akim Demaille  <akim@epita.fr>
 
        * po/POTFILES.in (src/lalr.c, src/state.c): Remove
 2002-11-12  Akim Demaille  <akim@epita.fr>
 
        * po/POTFILES.in (src/lalr.c, src/state.c): Remove

diff --git a/Makefile.am b/Makefile.am
index c78d4fbcace3dd9e7fbb9d4451f89d503b02f587..cef5fdb1f24a97b17c660466e8725d506a03821c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,12 @@
-## Process this file with automake to produce Makefile.in -*-Makefile-*-
-## Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+## Process this file with automake to create Makefile.in. -*-Makefile-*-
+
+## Makefile for Autoconf.
+## Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.

 
 ## 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
 
 ## 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

-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.

 
 ## This program is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 ## This program is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -13,33 +15,68 @@
 
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
 
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software

-## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-## 02111-1307  USA
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+## 02111-1307, USA.
+
+AUTOMAKE_OPTIONS = check-news 1.6c dist-bzip2 readme-alpha
+
+# bin/ and tests/ must be run first, as they build the tests executables
+# (tests/autom4te etc.), that we happen to use here.
+SUBDIRS = bin tests . lib config man doc
+
+ACLOCAL_AMFLAGS = -I config
+
+EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 \
+             BUGS \
+             GNUmakefile Makefile.maint
+
+MAINTAINERCLEANFILES = INSTALL
+
+## -------------------- ##
+## Forwarding targets.  ##
+## -------------------- ##

 
 

-ACLOCAL_AMFLAGS = -I m4
+html:
+       cd doc && $(MAKE) $(AM_MAKEFLAGS) $@

 
 

-SUBDIRS = config po lib data src doc m4 tests
+.PHONY: html
+
+
+## --------- ##
+## INSTALL.  ##
+## --------- ##
+
+pkgdata_DATA = INSTALL
+AM_MAKEINFOFLAGS = --no-headers --no-validate --no-split
+INSTALL: $(top_srcdir)/doc/install.texi
+       $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -o $(srcdir)/INSTALL \
+         $(top_srcdir)/doc/install.texi
+
+## maintainer-check ##
+maintainer-check: maintainer-check-tests
+maintainer-check-tests:
+       cd tests && make maintainer-check

 
 

-EXTRA_DIST = REFERENCES OChangeLog Makefile.maint GNUmakefile

 
 

-.PHONY: maintainer-check
-maintainer-check:
-       cd tests && $(MAKE) $(AM_MAKEFLAGS) $@

 
 ## ---------------------------- ##
 ## Customizing Makefile.maint.  ##
 ## ---------------------------- ##
 
 
 ## ---------------------------- ##
 ## Customizing Makefile.maint.  ##
 ## ---------------------------- ##
 

-move_if_change = $(srcdir)/config/move-if-change

 prev_version_file = $(srcdir)/config/prev-version.txt
 prev_version_file = $(srcdir)/config/prev-version.txt

+move_if_change = $(srcdir)/config/move-if-change

 release_archive_dir = releases
 
 release_archive_dir = releases
 

-# Uploading betas.

 url_dir_list = \
 url_dir_list = \

-  ftp://alpha.gnu.org/gnu/bison
+  ftp://alpha.gnu.org/gnu/autoconf

 
 # Files to update automatically.
 wget_files = $(srcdir)/config/config.guess $(srcdir)/config/config.sub \
 
 # Files to update automatically.
 wget_files = $(srcdir)/config/config.guess $(srcdir)/config/config.sub \

-            $(srcdir)/config/texinfo.tex
-
-cvs_files = $(srcdir)/config/missing
+            $(srcdir)/config/texinfo.tex \
+            $(srcdir)/doc/standards.texi $(srcdir)/doc/make-stds.texi
+cvs_files = $(srcdir)/config/elisp-comp \
+            $(srcdir)/config/mdate-sh \
+            $(srcdir)/config/missing \
+            $(srcdir)/config/install-sh \
+            $(srcdir)/config/mkinstalldirs
+local_updates = wget-update cvs-update