[ng] cleanup: remove 'clean-hdr.am'

It's so small and dumb that it's easier and cleaner to just inline
it in the automake script.

* lib/am/clean-hdr.am: Delete.
* Makefile.am (dist_am_DATA): Remove it.
* automake.in (handle_configure): Just add the header configs and their
stamp files to '%clean_files', instead of processing the now-removed
'clean-hdr.am' to obtain the same effect.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/Makefile.am b/Makefile.am
index 627a6fc4eb9759d85263c4a2ee3768bdc2724cc7..a1f402dc66225b7e0ec517892edaf7ea70a6b439 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -192,7 +192,6 @@ dist_am_DATA = \
   lib/am/parallel-tests.am \
   lib/am/check-typos.am \
   lib/am/color-tests.am \
-  lib/am/clean-hdr.am \
   lib/am/clean.am \
   lib/am/compile.am \
   lib/am/configure.am \

diff --git a/automake.in b/automake.in
index eba5266dabbd5f1c767caa0c73b7f3990566ae64..02d8ff04b324112f5c9ca77991f3412dfabd826b 100644 (file)
--- a/automake.in
+++ b/automake.in
@@ -3657,7 +3657,6 @@ sub handle_configure ($$$@)
 
   # If we have a configure header, require it.
   my $hdr_index = 0;
-  my @distclean_config;
   foreach my $spec (@config_headers)
     {
       $hdr_index += 1;
@@ -3707,15 +3706,11 @@ sub handle_configure ($$$@)
                           CONFIG_H_PATH    => $config_h_path,
                           STAMP            => "$stamp");
 
-         push @distclean_config, $cn_sans_dir, $stamp;
+           $clean_files{$cn_sans_dir} = DIST_CLEAN;
+           $clean_files{$stamp} = DIST_CLEAN;
        }
     }
 
-  $output_rules .= file_contents ('clean-hdr',
-                                 new Automake::Location,
-                                 FILES => "@distclean_config")
-    if @distclean_config;
-
   my @config_h;
   foreach my $spec (@config_headers)
     {

diff --git a/lib/am/clean-hdr.am b/lib/am/clean-hdr.am
deleted file mode 100644 (file)
index b0ac222..0000000
--- a/lib/am/clean-hdr.am
+++ /dev/null
@@ -1,17 +0,0 @@
-## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2012 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
-## 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
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-am__distclean_files += %FILES%