* automake.in (&pretty_print_internal): Don't output useless

spaces.
(define_pretty_variable): Don't issue the space after the `=' sign
to avoid trailing spaces in Makefile.ins.

diff --git a/ChangeLog b/ChangeLog
index 810917d2a14177a45cace067ae268583008c7de7..dc7e2278055db9f32afe61f099318b520a4547ac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-03-05  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (&pretty_print_internal): Don't output useless
+       spaces.
+       (define_pretty_variable): Don't issue the space after the `=' sign
+       to avoid trailing spaces in Makefile.ins.
+
 2001-03-05  Akim Demaille  <akim@epita.fr>
 
        * automake.in (&generate_makefile): Call &initialize_per_input

diff --git a/Makefile.in b/Makefile.in
index c77fb87611f3b49d25e88b585afa17934d3bf040..a4eb332958f8c8b228115462f6041ee142c905cf 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -119,24 +119,24 @@ FETCHFILES = config.guess config.sub
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =  automake aclocal
-SCRIPTS =  $(bin_SCRIPTS)
+CONFIG_CLEAN_FILES = automake aclocal
+SCRIPTS = $(bin_SCRIPTS)
 
-DIST_SOURCES = 
+DIST_SOURCES =
 TEXI2DVI = texi2dvi
 INFO_DEPS = automake.info
 DVIS = automake.dvi
 TEXINFOS = automake.texi
-DATA =  $(dist_pkgdata_DATA) $(dist_script_DATA)
+DATA = $(dist_pkgdata_DATA) $(dist_script_DATA)
 
-DIST_COMMON =  README $(dist_pkgdata_DATA) $(dist_script_DATA) AUTHORS \
+DIST_COMMON = README $(dist_pkgdata_DATA) $(dist_script_DATA) AUTHORS \
 COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS README-alpha \
 THANKS TODO aclocal.in aclocal.m4 ansi2knr.1 ansi2knr.c automake.in \
 compile config.guess config.sub configure configure.in depcomp \
 elisp-comp install-sh mdate-sh missing mkinstalldirs py-compile \
 stamp-vti texinfo.tex version.texi ylwrap
 
-DIST_SUBDIRS =  $(SUBDIRS)
+DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
 .SUFFIXES:
 .SUFFIXES: .dvi .info .ps .texi .texinfo .txi
@@ -147,7 +147,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4):  configure.in 
+$(ACLOCAL_M4): configure.in 
        cd $(srcdir) && $(ACLOCAL)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

diff --git a/automake.in b/automake.in
index b45eef51440b75efc69bb5ef63ded7413a7ec890..8060c6d9018a9fa7d5728424a0d437bcc738d942 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -5591,7 +5591,6 @@ sub pretty_print_internal
     my $fill_length = length ($fill);
     $fill_length += 7 * ($fill =~ tr/\t/\t/d);
 
-    my $bol = $head eq '';
     foreach (@values)
     {
        # "71" because we also print a space.
@@ -5599,13 +5598,10 @@ sub pretty_print_internal
        {
            $result .= " \\\n" . $fill;
            $column = $fill_length;
-           $bol = 1;
        }
-
-       $result .= ' ' unless $bol;
+       $result .= ' ' if $result =~ /\S\z/;
        $result .= $_;
        $column += length ($_) + 1;
-       $bol = 0;
     }
 
     $result .= "\n";
@@ -6253,7 +6249,7 @@ sub define_pretty_variable
            ${$conditional{$var}}{$cond} = $contents{$var};
        }
         my $make_condition = &make_condition ($cond);
-       &pretty_print ($make_condition . $var . ' = ',
+       &pretty_print ($make_condition . $var . ' =',
                       $make_condition, @value);
        $content_seen{$var} = 1;
     }

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 7a43018c9b3cb19fae67f9132c20d21747fca571..f91f76e308faa1951d0e5308db2929678244b091 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -90,11 +90,11 @@ winsz.m4
 EXTRA_DIST = $(m4data_DATA)
 subdir = m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_SOURCES = 
-DATA =  $(m4data_DATA)
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(m4data_DATA)
 
-DIST_COMMON =  Makefile.am Makefile.in
+DIST_COMMON = Makefile.am Makefile.in
 
 all: all-am
 .SUFFIXES:

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 9190fc04821ca3a529fd125818596afc470d893f..827cdea6e3da52ea192a32d3864cd25dbf41a9ba 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -359,9 +359,9 @@ yaccvpath.test
 EXTRA_DIST = defs ChangeLog-old $(TESTS)
 subdir = tests
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_SOURCES = 
-DIST_COMMON =  Makefile.am Makefile.in
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in
 
 all: all-am
 .SUFFIXES: