Use name cxx.m4 instead of c++.m4 in data/location.cc

[bison.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 77c96e98165bcdbc2467081521086e4e6ed0ee23..ed266c823fa25fc0cd2e6592ba43c660874fb9c7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-## Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2004, 2005 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
@@ -13,34 +13,24 @@
 
 ## 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., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301  USA
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = config po lib data src doc m4 tests
+SUBDIRS = config po runtime-po lib data src doc examples tests
+
+# Files installed for use by Automake.
+aclocaldir = @aclocaldir@
+aclocal_DATA = m4/bison-i18n.m4
+
+EXTRA_DIST = GNUmakefile Makefile.cfg Makefile.maint \
+  OChangeLog PACKAGING \
+  djgpp/CVS djgpp/Makefile.maint djgpp/README.in \
+  djgpp/config.bat djgpp/config.sed djgpp/config.site \
+  djgpp/config_h.sed djgpp/subpipe.c djgpp/subpipe.h
 
-EXTRA_DIST = REFERENCES OChangeLog Makefile.maint GNUmakefile
 
 .PHONY: maintainer-check
 maintainer-check:
        cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
-
-## ---------------------------- ##
-## Customizing Makefile.maint.  ##
-## ---------------------------- ##
-
-move_if_change = $(srcdir)/config/move-if-change
-prev_version_file = $(srcdir)/config/prev-version.txt
-release_archive_dir = releases
-
-# Uploading betas.
-hosts = alpha
-alpha_host = alpha.gnu.org
-alpha_url_dir = gnu/bison
-
-# Files to update automatically.
-wget_files = $(srcdir)/config/config.guess $(srcdir)/config/config.sub \
-            $(srcdir)/config/texinfo.tex
-
-cvs_files = $(srcdir)/config/missing