[ng] cleanup: remove 'libtool.am'

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

* lib/am/libtool.am: Delete.
* Makefile.am (dist_am_DATA): Remove it.
* automake.in (handle_libtool): Just add the list of all the '.libs'
directories to '%libtool_clean_directories', instead of processing the
now-removed 'libtool.am' to obtain the same effect.  Similarly, when
processing the Makefile in the top-level directory, add 'libtool' and
'config.lt' to '%clean_files'.

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

diff --git a/Makefile.am b/Makefile.am
index 081e5f159472cb27419ad93e3cbdbff6ad7f49cd..627a6fc4eb9759d85263c4a2ee3768bdc2724cc7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -210,7 +210,6 @@ dist_am_DATA = \
   lib/am/lex.am \
   lib/am/library.am \
   lib/am/libs.am \
-  lib/am/libtool.am \
   lib/am/lisp.am \
   lib/am/ltlib.am \
   lib/am/ltlibrary.am \

diff --git a/automake.in b/automake.in
index ca2035294ca3f7b0ae4713e8545e29086876853d..293471daa33ed44ca54551837594e655c5524563 100644 (file)
--- a/automake.in
+++ b/automake.in
@@ -2231,17 +2231,20 @@ sub handle_libtool
   require_conf_file_with_macro (TRUE, 'LIBTOOL', FOREIGN, @libtool_files)
     if $relative_dir eq '.' && ! $libtool_new_api;
 
-  # .libs is for Unix, _libs for DOS.
-  my @libtool_clean_directories = map { ("$_/.libs", "$_/_libs") }
-                                  (sort keys %libtool_clean_directories);
   check_user_variables 'LIBTOOLFLAGS';
 
-  # Output the libtool compilation rules.
-  # FIXME: actually, this only output the libtool cleaning rules ...
-  # FIXME: some code reorganization/refactoring is probably in order.
-  $output_rules .= &file_contents (
-    'libtool', new Automake::Location,
-    'LIBTOOL-CLEAN-DIRECTORIES' => "@libtool_clean_directories");
+  foreach my $dir (%libtool_clean_directories)
+    {
+      # '.libs' is for Unix, '_libs' for DOS.
+      $clean_dirs{"$dir/.libs"} = CLEAN;
+      $clean_dirs{"$dir/_libs"} = CLEAN;
+    }
+
+  if ($relative_dir eq '.')
+    {
+      $clean_files{"libtool"} = DIST_CLEAN;
+      $clean_files{"config.lt"} = DIST_CLEAN;
+    }
 }
 
 # handle_programs ()

diff --git a/lib/am/libtool.am b/lib/am/libtool.am
deleted file mode 100644 (file)
index 516f677..0000000
--- a/lib/am/libtool.am
+++ /dev/null
@@ -1,19 +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__clean_dirs += %LIBTOOL-CLEAN-DIRECTORIES%
-
-?TOPDIR_P?am__distclean_files += libtool config.lt