[ng] cleanup: remove 'depend.am'

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

* lib/am/depend.am: Delete.
* Makefile.am (dist_am_DATA): Remove it.
* automake.in (handle_languages): Just add the list of all the '.deps'
directories to %clean_dirs, instead of processing the now-removed
'depend.am' to obtain the same effect.

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

diff --git a/Makefile.am b/Makefile.am
index 59aa1f60a3f88877b9de3710ae2cabfe2dddd2c3..081e5f159472cb27419ad93e3cbdbff6ad7f49cd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -198,7 +198,6 @@ dist_am_DATA = \
   lib/am/configure.am \
   lib/am/data.am \
   lib/am/dejagnu.am \
-  lib/am/depend.am \
   lib/am/depend2.am \
   lib/am/distdir.am \
   lib/am/footer.am \

diff --git a/automake.in b/automake.in
index a7ccc607c38427934ff4473d5421cb055305c79e..a00885e58b26d8e9dbc105c9ccb763e7fa55ff8a 100644 (file)
--- a/automake.in
+++ b/automake.in
@@ -1309,16 +1309,11 @@ sub handle_languages
            # variable expansion; generating many separate includes
            # seems safest.
            $output_rules .= "\n";
-           foreach my $iter (@deplist)
+           foreach my $depfile (@deplist)
            {
-               $output_rules .= subst ('AMDEP_TRUE') . "-include $iter\n";
+               $output_rules .= subst ('AMDEP_TRUE') . "-include $depfile\n";
+               $clean_dirs{dirname ($depfile)} = DIST_CLEAN;
            }
-
-           # Compute the set of directories to remove in distclean-depend.
-           my @depdirs = uniq (map { dirname ($_) } @deplist);
-           $output_rules .= &file_contents ('depend',
-                                            new Automake::Location,
-                                            DEPDIRS => "@depdirs");
        }
     }
     else

diff --git a/lib/am/depend.am b/lib/am/depend.am
deleted file mode 100644 (file)
index dc7bc8b..0000000
--- a/lib/am/depend.am
+++ /dev/null
@@ -1,18 +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_dirs += %DEPDIRS%
-am__maintclean_dirs += %DEPDIRS%