From c617c40eb0588768fbc7806087fca7dc4920e0e6 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 1 Aug 2024 17:27:36 +0200 Subject: [PATCH] build: Enable Automake's dependency tracking. Quite often, after changing a struct defined in a .h file, I see "make check" fail. After "make clean; make", "make check" passes again. This wastes my time. Unlike 20 years ago, I don't want think about which .o files I need to erase and rebuild. Build times are now much smaller than they were 20 years ago, especially when configuring with --disable-shared and CFLAGS="-ggdb". * gnulib-local/modules/gettext-runtime-misc (configure.ac): Don't augment AUTOMAKE_OPTIONS. * gettext-runtime/Makefile.am (AUTOMAKE_OPTIONS): Remove 'no-dependencies'. * gettext-runtime/intl/Makefile.am (AUTOMAKE_OPTIONS): Likewise. * gettext-runtime/libasprintf/Makefile.am (AUTOMAKE_OPTIONS): Likewise. * gettext-runtime/src/Makefile.am (AUTOMAKE_OPTIONS): Likewise. * gettext-runtime/tests/Makefile.am (AUTOMAKE_OPTIONS): Likewise. * libtextstyle/Makefile.am (AUTOMAKE_OPTIONS): Likewise. * libtextstyle/lib/Makefile.am (AUTOMAKE_OPTIONS): Likewise. * gettext-tools/Makefile.am (AUTOMAKE_OPTIONS): Likewise. * gettext-tools/gnulib-lib/Makefile.am (AUTOMAKE_OPTIONS): Likewise. * gettext-tools/libgettextpo/Makefile.am (AUTOMAKE_OPTIONS): Likewise. * gettext-tools/libgrep/Makefile.am (AUTOMAKE_OPTIONS): Likewise. * gettext-tools/src/Makefile.am (AUTOMAKE_OPTIONS): Likewise. * gettext-tools/system-tests/Makefile.am (AUTOMAKE_OPTIONS): Likewise. * gettext-tools/tests/Makefile.am (AUTOMAKE_OPTIONS): Likewise. * gettext-tools/tests/gnulib-lib/Makefile.am (AUTOMAKE_OPTIONS): Likewise. * Makefile.am (AUTOMAKE_OPTIONS): Likewise. --- Makefile.am | 2 +- gettext-runtime/Makefile.am | 2 +- gettext-runtime/intl/Makefile.am | 4 ++-- gettext-runtime/libasprintf/Makefile.am | 4 ++-- gettext-runtime/src/Makefile.am | 4 ++-- gettext-runtime/tests/Makefile.am | 4 ++-- gettext-tools/Makefile.am | 2 +- gettext-tools/gnulib-lib/Makefile.am | 4 ++-- gettext-tools/libgettextpo/Makefile.am | 2 +- gettext-tools/libgrep/Makefile.am | 4 ++-- gettext-tools/src/Makefile.am | 2 +- gettext-tools/system-tests/Makefile.am | 4 ++-- gettext-tools/tests/Makefile.am | 2 +- gettext-tools/tests/gnulib-lib/Makefile.am | 4 ++-- gnulib-local/modules/gettext-runtime-misc | 2 -- libtextstyle/Makefile.am | 4 ++-- libtextstyle/lib/Makefile.am | 4 ++-- 17 files changed, 26 insertions(+), 28 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5eacee01b..ceddff526 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,7 +16,7 @@ ## Process this file with automake to produce Makefile.in. -AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies +AUTOMAKE_OPTIONS = 1.5 gnu ACLOCAL_AMFLAGS = -I m4 SUBDIRS = gnulib-local gettext-runtime libtextstyle gettext-tools diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am index 958e2e57c..24925e95c 100644 --- a/gettext-runtime/Makefile.am +++ b/gettext-runtime/Makefile.am @@ -16,7 +16,7 @@ ## Process this file with automake to produce Makefile.in. -AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies +AUTOMAKE_OPTIONS = 1.5 gnu ACLOCAL_AMFLAGS = -I m4 -I ../m4 -I gnulib-m4 # The list of subdirectories depends on whether --disable-libasprintf was diff --git a/gettext-runtime/intl/Makefile.am b/gettext-runtime/intl/Makefile.am index e7a8ec1b7..561d51f73 100644 --- a/gettext-runtime/intl/Makefile.am +++ b/gettext-runtime/intl/Makefile.am @@ -1,6 +1,6 @@ ## Makefile for the gettext-runtime/intl and gettext-tools/intl subdirectories ## of GNU gettext. -## Copyright (C) 1995-1998, 2000-2007, 2009-2024 Free Software Foundation, Inc. +## Copyright (C) 1995-2024 Free Software Foundation, Inc. ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU Lesser General Public License as published by @@ -17,7 +17,7 @@ ## Process this file with automake to produce Makefile.in. -AUTOMAKE_OPTIONS = 1.10 gnu no-dependencies +AUTOMAKE_OPTIONS = 1.10 gnu ACLOCAL_AMFLAGS = -I ../../m4 -I ../m4 -I gnulib-m4 SUBDIRS = gnulib-lib diff --git a/gettext-runtime/libasprintf/Makefile.am b/gettext-runtime/libasprintf/Makefile.am index fa4e4e6b8..197a51a67 100644 --- a/gettext-runtime/libasprintf/Makefile.am +++ b/gettext-runtime/libasprintf/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-runtime/libasprintf subdirectory of GNU gettext -## Copyright (C) 2002-2007, 2009-2011, 2013, 2016, 2018-2019, 2021, 2023 Free Software Foundation, Inc. +## Copyright (C) 2002-2024 Free Software Foundation, Inc. ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU Lesser General Public License as published by @@ -16,7 +16,7 @@ ## Process this file with automake to produce Makefile.in. -AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies +AUTOMAKE_OPTIONS = 1.5 gnu ACLOCAL_AMFLAGS = -I ../../m4 -I ../m4 -I gnulib-m4 SUBDIRS = gnulib-lib diff --git a/gettext-runtime/src/Makefile.am b/gettext-runtime/src/Makefile.am index f696fe94a..ed3c38c86 100644 --- a/gettext-runtime/src/Makefile.am +++ b/gettext-runtime/src/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-runtime/src subdirectory of GNU gettext -## Copyright (C) 1995-1998, 2000-2007, 2009, 2019, 2023 Free Software Foundation, Inc. +## Copyright (C) 1995-2024 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 @@ -16,7 +16,7 @@ ## Process this file with automake to produce Makefile.in. -AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies +AUTOMAKE_OPTIONS = 1.5 gnits EXTRA_DIST = MOSTLYCLEANFILES = core *.stackdump CLEANFILES = diff --git a/gettext-runtime/tests/Makefile.am b/gettext-runtime/tests/Makefile.am index 3f5ed0575..ae1905f22 100644 --- a/gettext-runtime/tests/Makefile.am +++ b/gettext-runtime/tests/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-runtime/tests subdirectory of GNU gettext -## Copyright (C) 2005-2023 Free Software Foundation, Inc. +## Copyright (C) 2005-2024 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 @@ -16,7 +16,7 @@ ## Process this file with automake to produce Makefile.in. -AUTOMAKE_OPTIONS = 1.11 gnits no-dependencies color-tests subdir-objects +AUTOMAKE_OPTIONS = 1.11 gnits color-tests subdir-objects EXTRA_DIST = TESTS = diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am index d198877ce..1d6c665a7 100644 --- a/gettext-tools/Makefile.am +++ b/gettext-tools/Makefile.am @@ -16,7 +16,7 @@ ## Process this file with automake to produce Makefile.in. -AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies +AUTOMAKE_OPTIONS = 1.5 gnu ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 -I tests/gnulib-m4 SUBDIRS = gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc diff --git a/gettext-tools/gnulib-lib/Makefile.am b/gettext-tools/gnulib-lib/Makefile.am index 83eca02aa..79f5d4d49 100644 --- a/gettext-tools/gnulib-lib/Makefile.am +++ b/gettext-tools/gnulib-lib/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-tools/gnulib-lib subdirectory of GNU gettext -## Copyright (C) 1995-1998, 2000-2006, 2009, 2016, 2019, 2021, 2023 Free Software Foundation, Inc. +## Copyright (C) 1995-2024 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 @@ -16,7 +16,7 @@ ## Process this file with automake to produce Makefile.in. -AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects no-dependencies +AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects EXTRA_DIST = BUILT_SOURCES = MOSTLYCLEANFILES = core *.stackdump diff --git a/gettext-tools/libgettextpo/Makefile.am b/gettext-tools/libgettextpo/Makefile.am index e0a7d8d48..c9248361b 100644 --- a/gettext-tools/libgettextpo/Makefile.am +++ b/gettext-tools/libgettextpo/Makefile.am @@ -16,7 +16,7 @@ ## Process this file with automake to produce Makefile.in. -AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies subdir-objects +AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects EXTRA_DIST = BUILT_SOURCES = MOSTLYCLEANFILES = core *.stackdump diff --git a/gettext-tools/libgrep/Makefile.am b/gettext-tools/libgrep/Makefile.am index 0d0d2b2c6..9353631df 100644 --- a/gettext-tools/libgrep/Makefile.am +++ b/gettext-tools/libgrep/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for libgrep directory in GNU gettext package. -## Copyright (C) 2005-2007, 2009-2010, 2014, 2021, 2023 Free Software Foundation, Inc. +## Copyright (C) 2005-2024 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 @@ -16,7 +16,7 @@ ## Process this file with automake to produce Makefile.in. -AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies subdir-objects +AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects EXTRA_DIST = BUILT_SOURCES = MOSTLYCLEANFILES = core *.stackdump diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am index 98a919c43..a2debde31 100644 --- a/gettext-tools/src/Makefile.am +++ b/gettext-tools/src/Makefile.am @@ -16,7 +16,7 @@ ## Process this file with automake to produce Makefile.in. -AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies subdir-objects +AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects EXTRA_DIST = BUILT_SOURCES = MOSTLYCLEANFILES = core *.stackdump diff --git a/gettext-tools/system-tests/Makefile.am b/gettext-tools/system-tests/Makefile.am index 63076aee1..c97699280 100644 --- a/gettext-tools/system-tests/Makefile.am +++ b/gettext-tools/system-tests/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-tools/system-tests subdirectory of GNU gettext -## Copyright (C) 1995-2023 Free Software Foundation, Inc. +## Copyright (C) 1995-2024 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 @@ -16,7 +16,7 @@ ## Process this file with automake to produce Makefile.in. -AUTOMAKE_OPTIONS = 1.11 gnits no-dependencies color-tests +AUTOMAKE_OPTIONS = 1.11 gnits color-tests EXTRA_DIST = MOSTLYCLEANFILES = core *.stackdump diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am index a6ca4f78f..019c6dd7b 100644 --- a/gettext-tools/tests/Makefile.am +++ b/gettext-tools/tests/Makefile.am @@ -16,7 +16,7 @@ ## Process this file with automake to produce Makefile.in. -AUTOMAKE_OPTIONS = 1.11 gnits no-dependencies color-tests +AUTOMAKE_OPTIONS = 1.11 gnits color-tests SUBDIRS = gnulib-lib EXTRA_DIST = MOSTLYCLEANFILES = core *.stackdump diff --git a/gettext-tools/tests/gnulib-lib/Makefile.am b/gettext-tools/tests/gnulib-lib/Makefile.am index 37ebb9618..8edd6b9ee 100644 --- a/gettext-tools/tests/gnulib-lib/Makefile.am +++ b/gettext-tools/tests/gnulib-lib/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-tools/tests/gnulib-lib subdirectory of GNU gettext -## Copyright (C) 2023 Free Software Foundation, Inc. +## Copyright (C) 2023-2024 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 @@ -16,7 +16,7 @@ ## Process this file with automake to produce Makefile.in. -AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects no-dependencies +AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects EXTRA_DIST = BUILT_SOURCES = MOSTLYCLEANFILES = core *.stackdump diff --git a/gnulib-local/modules/gettext-runtime-misc b/gnulib-local/modules/gettext-runtime-misc index 43121117a..7318cd566 100644 --- a/gnulib-local/modules/gettext-runtime-misc +++ b/gnulib-local/modules/gettext-runtime-misc @@ -7,8 +7,6 @@ Depends-on: configure.ac: Makefile.am: -AUTOMAKE_OPTIONS += no-dependencies - # Needed for the gnulib source code that does '#include "gettext.h"'. AM_CPPFLAGS += -I$(top_builddir)/intl diff --git a/libtextstyle/Makefile.am b/libtextstyle/Makefile.am index 7544f5280..c1091b513 100644 --- a/libtextstyle/Makefile.am +++ b/libtextstyle/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the toplevel directory of GNU libtextstyle -## Copyright (C) 1995-2023 Free Software Foundation, Inc. +## Copyright (C) 1995-2024 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 @@ -16,7 +16,7 @@ ## Process this file with automake to produce Makefile.in. -AUTOMAKE_OPTIONS = 1.13 gnu no-dependencies +AUTOMAKE_OPTIONS = 1.13 gnu ACLOCAL_AMFLAGS = -I m4 -I gnulib-m4 # The list of subdirectories containing Makefiles. diff --git a/libtextstyle/lib/Makefile.am b/libtextstyle/lib/Makefile.am index 943bb60e3..f869f5d72 100644 --- a/libtextstyle/lib/Makefile.am +++ b/libtextstyle/lib/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the lib subdirectory of GNU libtextstyle. -## Copyright (C) 2009-2023 Free Software Foundation, Inc. +## Copyright (C) 2009-2024 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 @@ -16,7 +16,7 @@ ## Process this file with automake to produce Makefile.in. -AUTOMAKE_OPTIONS = 1.13 gnits subdir-objects no-dependencies +AUTOMAKE_OPTIONS = 1.13 gnits subdir-objects EXTRA_DIST = BUILT_SOURCES = MOSTLYCLEANFILES = core *.stackdump -- 2.47.2