* m4/Makefile.am (MAINT_CHARSET): Removed.

	* Makefile.am (MAINT_CHARSET): Removed.
	* automake.in (maint_charset, dist_charset): Removed.
	(local_maint_charset): Removed.
	(initialize_per_input): Don't use maint_charset.
	(handle_dist): Don't compute maint_charset or check DIST_CHARSET.

diff --git a/ChangeLog b/ChangeLog
index 468e585f8daf2f2bcf5c8ffb8e0cafd6511a40c6..6f80125ae4b3c723a5bdda555dd5588d8060c58e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2001-05-28  Tom Tromey  <tromey@redhat.com>
 
+       * m4/Makefile.am (MAINT_CHARSET): Removed.
+       * Makefile.am (MAINT_CHARSET): Removed.
+       * automake.in (maint_charset, dist_charset): Removed.
+       (local_maint_charset): Removed.
+       (initialize_per_input): Don't use maint_charset.
+       (handle_dist): Don't compute maint_charset or check DIST_CHARSET.
+
        * lib/am/texibuild.am (.%SUFFIX%.info): Use MAKEINFOFLAGS and
        AM_MAKEINFOFLAGS.
        (.%SUFFIX%.dvi): Likewise.

diff --git a/Makefile.am b/Makefile.am
index 650088d5f2165d55abd777b206401aba9e4c9e91..2323573cdbbaac16c3de18893b184c62aa1db56d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,6 @@
 ## Process this file with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = gnits 1.4 dist-bzip2
-MAINT_CHARSET = latin1
 
 ## We need `.' in SUBDIRS because we want `check' to build `.' before
 ## tests.

diff --git a/Makefile.in b/Makefile.in
index c8614c55de8fea98581939e0189f6cc3de376e83..014b3b2584a9a432ceff435c23cf441c7d012031 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4f from Makefile.am.
+# Makefile.in generated automatically by automake 1.4g from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -67,7 +67,6 @@ _am_quote = @_am_quote@
 install_sh = @install_sh@
 
 AUTOMAKE_OPTIONS = gnits 1.4 dist-bzip2
-MAINT_CHARSET = latin1
 
 SUBDIRS = . m4 lib tests
 
@@ -181,16 +180,19 @@ automake.dvi: automake.texi $(srcdir)/version.texi
 .texi.info:
        @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
        cd $(srcdir) \
-         && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+         && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+              `echo $< | sed 's,.*/,,'`
 
 .texi.dvi:
        TEXINPUTS=$(top_srcdir)/lib:$$TEXINPUTS \
-         MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
+       MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
+       $(TEXI2DVI) $<
 
 .texi:
        @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
        cd $(srcdir) \
-         && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+         && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+              `echo $< | sed 's,.*/,,'`
 
 MAKEINFO = @MAKEINFO@
 TEXI2DVI = texi2dvi

diff --git a/automake.in b/automake.in
index 091ea4914adbda9d33315f3a2fa80f0b365163bb..b967edfdcea7326bcd55176b3a7dde4c50428bad 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -428,18 +428,6 @@ my %configure_vars = ();
 # global.  It is declared just for documentation purposes.
 my %vars_scanned = ();
 
-# Charsets used by maintainer and in distribution.  MAINT_CHARSET is
-# handled in a funny way: if seen in the top-level Makefile.am, it is
-# used for every directory which does not specify a different value.
-# The rationale here is that some directories (eg gettext) might be
-# distributions of other packages, and thus require their own charset
-# info.  However, the DIST_CHARSET must be the same for the entire
-# package; it can only be set at top-level.
-# FIXME: this yields bugs when rebuilding.  What to do?  Always
-# read (and sometimes discard) top-level Makefile.am?
-my $maint_charset = '';
-my $dist_charset = 'utf8';             # recode doesn't support this yet.
-
 # TRUE if --cygnus seen.
 my $cygnus_mode = 0;
 
@@ -597,9 +585,6 @@ my %options;
 # in handle_options.
 my $use_dependencies;
 
-# Per Makefile.am.
-my $local_maint_charset;
-
 # All yacc and lex source filenames for this directory.  Use
 # filenames instead of raw count so that multiple instances are
 # counted correctly (eg one yacc file can appear in multiple
@@ -759,8 +744,6 @@ sub initialize_per_input ()
 
     $use_dependencies = $cmdline_use_dependencies;
 
-    $local_maint_charset = $maint_charset;
-
     %yacc_sources = ();
     %lex_sources = ();
 
@@ -3156,28 +3139,6 @@ sub handle_dist
     # Omit the rules so that people don't try to use them.
     return if $cygnus_mode;
 
-    # Set up maint_charset.
-    $local_maint_charset = &variable_value ('MAINT_CHARSET')
-       if &variable_defined ('MAINT_CHARSET');
-    $maint_charset = $local_maint_charset
-       if $relative_dir eq '.';
-
-    if (&variable_defined ('DIST_CHARSET'))
-    {
-       &am_line_error ('DIST_CHARSET',
-                       "DIST_CHARSET defined but no MAINT_CHARSET defined")
-           if ! $local_maint_charset;
-       if ($relative_dir eq '.')
-       {
-           $dist_charset = &variable_value ('DIST_CHARSET')
-       }
-       else
-       {
-           &am_line_error ('DIST_CHARSET',
-                           "DIST_CHARSET can only be defined at top level");
-       }
-    }
-
     # Look for common files that should be included in distribution.
     foreach my $cfile (@common_files)
     {

diff --git a/m4/Makefile.am b/m4/Makefile.am
index c7421c50c171e5cf5e660d48166e15be9a12657a..4c016886b29c8e82f16a6527cc76023ee099af83 100644 (file)
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,7 +1,6 @@
 ## Process this file with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = gnits
-MAINT_CHARSET = latin1
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = ccstdc.m4 cond.m4 depend.m4 depout.m4 dmalloc.m4 \

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 22656921484f9db2e8e7bd2a3fb53346b12fd4b2..d55009e2a181650612932af882a585c473c93fb9 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -67,7 +67,6 @@ _am_quote = @_am_quote@
 install_sh = @install_sh@
 
 AUTOMAKE_OPTIONS = gnits
-MAINT_CHARSET = latin1
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = ccstdc.m4 cond.m4 depend.m4 depout.m4 dmalloc.m4 \