m4: remove unneeded Makefile.am

m4 files do not have to listed in EXTRA_DIST, in fact,
biarch.m4 has not been listed since its very beginning in 2013,
and nobody seems to have noticed so far.

Tested with
autoreconf -if && ./configure --enable-maintainer-mode && make && make distcheck

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>

diff --git a/ChangeLog b/ChangeLog
index 28a11e7..46568f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2020-12-15  Dmitry V. Levin  <ldv@altlinux.org>
 
+       * Makefile.am (SUBDIRS): Remove m4.
+       * configure.ac (AC_CONFIG_FILES): Remove m4/Makefile.
+
        * configure.ac (AC_CONFIG_MACRO_DIR): Remove.
 
 2020-12-12  Dmitry V. Levin  <ldv@altlinux.org>

diff --git a/Makefile.am b/Makefile.am
index f68f096..818e359 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@ AM_MAKEFLAGS = --no-print-directory
 
 pkginclude_HEADERS = version.h
 
-SUBDIRS = config m4 lib libelf libcpu backends libebl libdwelf libdwfl libdw \
+SUBDIRS = config lib libelf libcpu backends libebl libdwelf libdwfl libdw \
          libasm debuginfod src po doc tests
 
 EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \

diff --git a/configure.ac b/configure.ac
index 268a467..2d977f2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -57,8 +57,6 @@ AC_CONFIG_SRCDIR([libelf/libelf.h])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_HEADERS([config.h])
 
-AC_CONFIG_FILES([m4/Makefile])
-
 dnl The RPM spec file.  We substitute a few values in the file.
 AC_CONFIG_FILES([elfutils.spec:config/elfutils.spec.in])
 

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 8ab0ff3..78b1bbc 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2020-12-15  Dmitry V. Levin  <ldv@altlinux.org>
+
+       * Makefile.am: Remove.
+
 2019-10-28  Aaron Merey  <amerey@redhat.com>
 
        * ax_check_compile_flag.m4, ax_cxx_compile_stdcxx.m4: New files.

diff --git a/m4/Makefile.am b/m4/Makefile.am
deleted file mode 100644 (file)
index ae7a565..0000000
--- a/m4/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-## Process this file with automake to produce Makefile.in -*-Makefile-*-
-##
-## Copyright (C) 2000-2009 Red Hat, Inc.
-## This file is part of elfutils.
-##
-## This file 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 3 of the License, or
-## (at your option) any later version.
-##
-## elfutils 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/>.
-##
-
-##m4-files-begin
-EXTRA_DIST = codeset.m4 gettext.m4 iconv.m4 lcmessage.m4 progtest.m4 zip.m4 ax_check_compile_flag.m4 ax_cxx_compile_stdcxx.m4