build: Remove unused -I options from AM_CPPFLAGS.

* gnulib-local/modules/gettext-runtime-misc (Makefile.am): Remove
-I$(top_srcdir)/intl from AM_CPPFLAGS.
* gettext-runtime/tests/Makefile.am (AM_CPPFLAGS): Set to empty.
* gettext-tools/gnulib-lib/Makefile.am (AM_CPPFLAGS): Remove
-I$(top_srcdir)/../gettext-runtime/intl.
* gettext-tools/gnulib-tests/Makefile.am (AM_CPPFLAGS): Update comment.
* gettext-tools/src/Makefile.am (AM_CPPFLAGS): Add comment.
* gettext-tools/libgettextpo/Makefile.am (AM_CPPFLAGS): Likewise.
* libtextstyle/lib/Makefile.am (AM_CPPFLAGS): Remove -I$(top_srcdir).

diff --git a/gettext-runtime/tests/Makefile.am b/gettext-runtime/tests/Makefile.am
index 86c945bc85862ee670012adc090e078f47a16bd7..3f5ed0575959b9ae13b355b8b790170beb9d9ba9 100644 (file)
--- 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-2006, 2008-2009, 2014-2015, 2019 Free Software Foundation, Inc.
+## Copyright (C) 2005-2023 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
@@ -21,9 +21,9 @@ EXTRA_DIST =
 
 TESTS =
 
-AM_CPPFLAGS = \
-  -I.. \
-  -I$(srcdir)/../intl
+# Note that Automake's $(DEFAULT_INCLUDES) already contains
+# -I. -I$(srcdir) -I$(top_builddir).
+AM_CPPFLAGS =
 
 check_PROGRAMS =
 

diff --git a/gettext-tools/gnulib-lib/Makefile.am b/gettext-tools/gnulib-lib/Makefile.am
index e9c517fe9d0945a6cae4f2aa3334f4f2f8ee6de0..053ba6285f3d214840fd6da4b84d9011e9564e77 100644 (file)
--- a/gettext-tools/gnulib-lib/Makefile.am
+++ b/gettext-tools/gnulib-lib/Makefile.am
@@ -36,8 +36,8 @@ pkgdata_DATA =
 
 AM_CPPFLAGS =
 
-# Hmm... is this still necessary?
-AM_CPPFLAGS += -I$(top_builddir)/../gettext-runtime/intl -I$(top_srcdir)/../gettext-runtime/intl
+# Needed for the gnulib source code that does '#include "gettext.h"'.
+AM_CPPFLAGS += -I../../gettext-runtime/intl
 # Needed so that config.h and woe32dll/export.h are found.
 AM_CPPFLAGS += -I$(top_builddir) -I$(top_srcdir)
 

diff --git a/gettext-tools/gnulib-tests/Makefile.am b/gettext-tools/gnulib-tests/Makefile.am
index d5d53cba1b0a85d688f8b2f163a91f6b34df3086..7d6b00e54eda759e2de0c292d5aa208f00eb83d5 100644 (file)
--- a/gettext-tools/gnulib-tests/Makefile.am
+++ b/gettext-tools/gnulib-tests/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-tools/gnulib-tests subdirectory of GNU gettext
-## Copyright (C) 2007, 2009-2010, 2019, 2021 Free Software Foundation, Inc.
+## Copyright (C) 2007-2023 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
@@ -21,7 +21,7 @@ include Makefile.gnulib
 
 AUTOMAKE_OPTIONS += 1.11 color-tests
 
-# Ensure that test-quotearg.c finds libintl.h.
+# Ensure that copy-acl.c, set-acl.c find libintl.h.
 AM_CPPFLAGS += -I../../gettext-runtime/intl
 
 

diff --git a/gettext-tools/libgettextpo/Makefile.am b/gettext-tools/libgettextpo/Makefile.am
index 5fc670807931981c51e306cdec758baa49d9c15a..c823a01185788b9b78089c44a50d775d97ac2c03 100644 (file)
--- a/gettext-tools/libgettextpo/Makefile.am
+++ b/gettext-tools/libgettextpo/Makefile.am
@@ -34,6 +34,7 @@ noinst_LTLIBRARIES =
 
 nodist_noinst_HEADERS = config.h
 
+# The option -I$(top_srcdir) is needed so that woe32dll/export.h is found.
 AM_CPPFLAGS = \
   -I. -I$(srcdir) \
   -I.. -I$(top_srcdir) \

diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index a537d0cf66de6bad005b1ecacfd588f4aa570a55..971dc6882569e9da6d8679b7c779d234fb23a1b4 100644 (file)
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -90,6 +90,7 @@ projectsdir = $(pkgdatadir)/projects
 pkglibdir = $(libdir)/gettext
 pkglibexecdir = $(libexecdir)/gettext
 
+# The option -I$(top_srcdir) is needed so that woe32dll/export.h is found.
 AM_CPPFLAGS = \
   -I. -I$(srcdir) \
   -I.. -I$(top_srcdir) \

diff --git a/gnulib-local/modules/gettext-runtime-misc b/gnulib-local/modules/gettext-runtime-misc
index 470b7250cccddee3869efd705a02bdae5ce29046..43121117ae3ce8f0c3c05e7e42283b1134388a20 100644 (file)
--- a/gnulib-local/modules/gettext-runtime-misc
+++ b/gnulib-local/modules/gettext-runtime-misc
@@ -9,8 +9,8 @@ configure.ac:
 Makefile.am:
 AUTOMAKE_OPTIONS += no-dependencies
 
-# Hmm... is this still necessary?
-AM_CPPFLAGS += -I$(top_builddir)/intl -I$(top_srcdir)/intl
+# Needed for the gnulib source code that does '#include "gettext.h"'.
+AM_CPPFLAGS += -I$(top_builddir)/intl
 
 # Parametrization of the 'relocatable' module.
 AM_CPPFLAGS += -DDEPENDS_ON_LIBICONV=1 -DDEPENDS_ON_LIBINTL=1

diff --git a/libtextstyle/lib/Makefile.am b/libtextstyle/lib/Makefile.am
index c7079e3b488d04d81e47c03726960263f6adb2d3..74ec39b4c2fd38aad3be94181b7802445b6d381c 100644 (file)
--- a/libtextstyle/lib/Makefile.am
+++ b/libtextstyle/lib/Makefile.am
@@ -38,7 +38,7 @@ noinst_HEADERS = notinline.h
 
 AM_CPPFLAGS = \
   -I. -I$(srcdir) \
-  -I$(top_builddir) -I$(top_srcdir) \
+  -I$(top_builddir) \
   -Iglib \
   -DIN_LIBTEXTSTYLE