From fc8c63acae5949ecd30c1d5cd04db6095b418e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 5 Jun 2023 10:32:42 +0200 Subject: [PATCH] Remove recursive Makefile for 'am'. * Makefile.am (SUBDIRS): Remove 'am'. (EXTRA_DIST): Add files from am/. * am/Makefile.am: Remove. * configure.ac: Don't emit 'am/Makefile'. --- Makefile.am | 4 +++- am/Makefile.am | 28 ---------------------------- configure.ac | 1 - 3 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 am/Makefile.am diff --git a/Makefile.am b/Makefile.am index 2dd30f334..3b742a41c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,7 +38,6 @@ SUBDIRS = \ examples \ test-suite \ benchmark-suite \ - am \ doc DIST_SUBDIRS = $(SUBDIRS) prebuilt @@ -70,6 +69,9 @@ libguile/guile-procedures.txt: libguile/guile-procedures.texi @mv $@.tmp $@ EXTRA_DIST = LICENSE HACKING GUILE-VERSION \ + am/maintainer-dirs \ + am/guilec \ + am/ChangeLog-2008 \ m4/ChangeLog-2008 \ m4/gnulib-cache.m4 \ ChangeLog-2008 \ diff --git a/am/Makefile.am b/am/Makefile.am deleted file mode 100644 index e2044d6aa..000000000 --- a/am/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -## Process this file with Automake to create Makefile.in -## -## Copyright (C) 2002, 2006, 2008 Free Software Foundation, Inc. -## -## This file is part of GUILE. -## -## GUILE is free software; you can redistribute it and/or modify it -## under the terms of the GNU Lesser General Public License as -## published by the Free Software Foundation; either version 3, or -## (at your option) any later version. -## -## GUILE 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 Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with GUILE; see the file COPYING.LESSER. If not, -## write to the Free Software Foundation, Inc., 51 Franklin Street, -## Fifth Floor, Boston, MA 02110-1301 USA - -AUTOMAKE_OPTIONS = gnu - -am_frags = maintainer-dirs guilec - -EXTRA_DIST = $(am_frags) ChangeLog-2008 - -## Makefile.am ends here diff --git a/configure.ac b/configure.ac index 1376e2496..1b96951c5 100644 --- a/configure.ac +++ b/configure.ac @@ -1466,7 +1466,6 @@ AC_CONFIG_FILES([libguile/gen-scmconfig.h]) AC_CONFIG_FILES([ Makefile - am/Makefile lib/Makefile benchmark-suite/Makefile doc/Makefile