The INCLUDES variable is deprecated.

diff --git a/gettext-runtime/lib/ChangeLog b/gettext-runtime/lib/ChangeLog
index 10fa0395edfc38a19f65eb66778b25011c3d364a..3938b707bd27ea8f8b2b3cc7f905034f9e13cd07 100644 (file)
--- a/gettext-runtime/lib/ChangeLog
+++ b/gettext-runtime/lib/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-15  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (AM_CPPFLAGS): Renamed from INCLUDES.
+
 2003-10-09  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (libgrt_a_SOURCES): Use xalloc.h instead of xmalloc.h.

diff --git a/gettext-runtime/lib/Makefile.am b/gettext-runtime/lib/Makefile.am
index 2edd7b2a4fc948f980fd4112f71f01284b6cecde..a864e205f21d5354946a86648c2ec113bbe2e2b4 100644 (file)
--- a/gettext-runtime/lib/Makefile.am
+++ b/gettext-runtime/lib/Makefile.am
@@ -55,7 +55,7 @@ LIBADD_SOURCE = \
 
 libgrt_a_LIBADD = @ALLOCA@ @LIBOBJS@
 
-INCLUDES = \
+AM_CPPFLAGS = \
   -I. -I$(srcdir) \
   -I.. \
   -I../intl -I$(srcdir)/../intl \

diff --git a/gettext-runtime/src/ChangeLog b/gettext-runtime/src/ChangeLog
index ad633014b8366730346ea9d1cd18007ba15d736e..03e59bc7fee20cd90322d745365378b0a9e3b861 100644 (file)
--- a/gettext-runtime/src/ChangeLog
+++ b/gettext-runtime/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-15  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (AM_CPPFLAGS): Renamed from INCLUDES.
+
 2003-10-09  Bruno Haible  <bruno@clisp.org>
 
        * envsubst.c: Include xalloc.h instead of xmalloc.h.

diff --git a/gettext-runtime/src/Makefile.am b/gettext-runtime/src/Makefile.am
index fc3650300f6efcad121300e0ea5f9bb1e0521076..93ffd61af92472512441762a9e336305455094a2 100644 (file)
--- a/gettext-runtime/src/Makefile.am
+++ b/gettext-runtime/src/Makefile.am
@@ -24,7 +24,7 @@ bin_PROGRAMS = gettext ngettext envsubst
 
 localedir = $(datadir)/locale
 
-INCLUDES = \
+AM_CPPFLAGS = \
   -I. -I$(srcdir) \
   -I.. \
   -I../intl -I$(srcdir)/../intl \

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index df2a6b3d6401a8deb392d204f9c4925665469715..39e26c8cff9acefffa459ada79900b6de9757585 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,13 @@
+2003-11-15  Bruno Haible  <bruno@clisp.org>
+
+       * hello-c/Makefile.am (AM_CPPFLAGS): Renamed from INCLUDES.
+       * hello-c-gnome/Makefile.am (AM_CPPFLAGS): Renamed from INCLUDES.
+       * hello-c++/Makefile.am (AM_CPPFLAGS): Renamed from INCLUDES.
+       * hello-c++-kde/Makefile.am (AM_CPPFLAGS): Renamed from INCLUDES.
+       * hello-c++-gnome/Makefile.am (AM_CPPFLAGS): Renamed from INCLUDES.
+       * hello-objc/Makefile.am (AM_CPPFLAGS): Renamed from INCLUDES.
+       * hello-objc-gnome/Makefile.am (AM_CPPFLAGS): Renamed from INCLUDES.
+
 2003-11-15  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am: New file.

diff --git a/gettext-tools/examples/hello-c++-gnome/Makefile.am b/gettext-tools/examples/hello-c++-gnome/Makefile.am
index 9145c50638a74b1cd5c2e6527cf6a7303b924fa3..28485dab7adcfaa6a255696c4ecebefcaabefeb6 100644 (file)
--- a/gettext-tools/examples/hello-c++-gnome/Makefile.am
+++ b/gettext-tools/examples/hello-c++-gnome/Makefile.am
@@ -22,7 +22,7 @@ localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 # Make sure the gnome.h include file is found.
-INCLUDES = $(GTKMM_CFLAGS) $(GNOME_INCLUDEDIR)
+AM_CPPFLAGS = $(GTKMM_CFLAGS) $(GNOME_INCLUDEDIR)
 
 # Link time dependencies.
 LDADD = $(GTKMM_LIBS) $(GNOME_LIBDIR) $(GNOMEUI_LIBS) @LIBINTL@

diff --git a/gettext-tools/examples/hello-c++-kde/Makefile.am b/gettext-tools/examples/hello-c++-kde/Makefile.am
index c893ed04ec7f5f045855164f10e797a6e235322b..4f3a422942a8415ac704eabead82d383857fc7b6 100644 (file)
--- a/gettext-tools/examples/hello-c++-kde/Makefile.am
+++ b/gettext-tools/examples/hello-c++-kde/Makefile.am
@@ -25,7 +25,7 @@ localedir = $(datadir)/locale
 DEFS = -DPREFIX=\"$(prefix)\" @DEFS@
 
 # Make sure the KDE, Qt, X include file is found.
-INCLUDES = $(KDE_INCLUDES) $(QT_INCLUDES) $(X_INCLUDES)
+AM_CPPFLAGS = $(KDE_INCLUDES) $(QT_INCLUDES) $(X_INCLUDES)
 
 # CXXFLAGS += $(QT_CXXFLAGS) $(PTHREAD_CFLAGS)
 

diff --git a/gettext-tools/examples/hello-c++/Makefile.am b/gettext-tools/examples/hello-c++/Makefile.am
index 38977158095bae272376956ed91bc77836f1ca8e..4dc19ff92971de9cf2d69404637dd86f7e1bfc8f 100644 (file)
--- a/gettext-tools/examples/hello-c++/Makefile.am
+++ b/gettext-tools/examples/hello-c++/Makefile.am
@@ -22,7 +22,7 @@ localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 # Make sure the gettext.h include file is found.
-INCLUDES = -I. -I$(srcdir)
+AM_CPPFLAGS = -I. -I$(srcdir)
 
 # Link time dependencies.
 LDADD = @LIBASPRINTF@ @LIBINTL@

diff --git a/gettext-tools/examples/hello-c-gnome/Makefile.am b/gettext-tools/examples/hello-c-gnome/Makefile.am
index 82213fc640b4fa4eaaa9f5128edbb34af9a71b19..a7c1fade5ce8425a0e58687688964d89ee9a8db1 100644 (file)
--- a/gettext-tools/examples/hello-c-gnome/Makefile.am
+++ b/gettext-tools/examples/hello-c-gnome/Makefile.am
@@ -22,7 +22,7 @@ localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 # Make sure the gnome.h include file is found.
-INCLUDES = $(GNOME_INCLUDEDIR)
+AM_CPPFLAGS = $(GNOME_INCLUDEDIR)
 
 # Link time dependencies.
 LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) @LIBINTL@

diff --git a/gettext-tools/examples/hello-c/Makefile.am b/gettext-tools/examples/hello-c/Makefile.am
index a0866af724e54195d94d3cc7560945881e7ca4e3..bf252b0767fa03e7b668cc504d9aae0170684550 100644 (file)
--- a/gettext-tools/examples/hello-c/Makefile.am
+++ b/gettext-tools/examples/hello-c/Makefile.am
@@ -22,7 +22,7 @@ localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 # Make sure the gettext.h include file is found.
-INCLUDES = -I. -I$(srcdir)
+AM_CPPFLAGS = -I. -I$(srcdir)
 
 # Link time dependencies.
 LDADD = @LIBINTL@

diff --git a/gettext-tools/examples/hello-objc-gnome/Makefile.am b/gettext-tools/examples/hello-objc-gnome/Makefile.am
index e6e399ef2263957ec198a3b5129d7874839cfc92..99d1ee8404e2c2e6343503dd008bb3254e2e598c 100644 (file)
--- a/gettext-tools/examples/hello-objc-gnome/Makefile.am
+++ b/gettext-tools/examples/hello-objc-gnome/Makefile.am
@@ -22,7 +22,7 @@ localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 # Make sure the gnome.h include file is found.
-INCLUDES = $(OBGNOME_INCLUDES) $(GNOME_INCLUDEDIR)
+AM_CPPFLAGS = $(OBGNOME_INCLUDES) $(GNOME_INCLUDEDIR)
 
 # Link time dependencies.
 LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) -lobgnome -lobgtk -lobjc @LIBINTL@

diff --git a/gettext-tools/examples/hello-objc/Makefile.am b/gettext-tools/examples/hello-objc/Makefile.am
index 2fd9befae250f5a63ab79169e1f291e25999bb83..feaad5cfa44eb3488ee71f6b7a09cd3d1d5fa8ef 100644 (file)
--- a/gettext-tools/examples/hello-objc/Makefile.am
+++ b/gettext-tools/examples/hello-objc/Makefile.am
@@ -22,7 +22,7 @@ localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 # Make sure the gettext.h include file is found.
-INCLUDES = -I. -I$(srcdir)
+AM_CPPFLAGS = -I. -I$(srcdir)
 
 # Link time dependencies.
 LDADD = @LIBINTL@

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 952309f5a3d17ae6d0eca7a61b13d8328d1ad904..f816c93a07d49a5d79d42598d399afdbedd391ee 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-15  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (AM_CPPFLAGS): Renamed from INCLUDES.
+
 2003-11-15  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (docdir, examplesconfigdir, examplesconfig_DATA): New

diff --git a/gettext-tools/lib/Makefile.am b/gettext-tools/lib/Makefile.am
index c24b2ea887f950befaf51a11c667e6206a30a770..fe2aedfc0f5a9bea022f994661cd241eb311ca5f 100644 (file)
--- a/gettext-tools/lib/Makefile.am
+++ b/gettext-tools/lib/Makefile.am
@@ -140,7 +140,7 @@ EXTRA_DIST += \
   gen-lbrkprop.c 3level.h Combining.txt \
   ChangeLog.0
 
-INCLUDES = -I. -I$(srcdir) -I.. -I../intl -I$(top_srcdir)/intl
+AM_CPPFLAGS = -I. -I$(srcdir) -I.. -I../intl -I$(top_srcdir)/intl
 
 DEFS = -DEXEEXT=\"$(EXEEXT)\" -DDEPENDS_ON_LIBINTL=1 -DDEPENDS_ON_LIBICONV=1 @DEFS@
 

diff --git a/gettext-tools/libuniname/ChangeLog b/gettext-tools/libuniname/ChangeLog
index 0e1a4b0637e8719fae5d9ca0a5185d8fc86a6803..ea8713fc85ab19ae3a32074a405eeeea844ec6b7 100644 (file)
--- a/gettext-tools/libuniname/ChangeLog
+++ b/gettext-tools/libuniname/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-15  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (AM_CPPFLAGS): Renamed from INCLUDES.
+
 2003-10-09  Bruno Haible  <bruno@clisp.org>
 
        * test-names.c: Include xalloc.h instead of xmalloc.h.

diff --git a/gettext-tools/libuniname/Makefile.am b/gettext-tools/libuniname/Makefile.am
index f3d57eccd2a4e8b4c587756dbf2c66d51c8457f0..d6a59b1da489e3e8b1aad88cef7e754096b929a9 100644 (file)
--- a/gettext-tools/libuniname/Makefile.am
+++ b/gettext-tools/libuniname/Makefile.am
@@ -25,7 +25,7 @@ noinst_LIBRARIES = libuniname.a
 
 libuniname_a_SOURCES = uniname.h uniname.c uninames.h
 
-INCLUDES = -I.. -I../lib -I$(top_srcdir)/lib
+AM_CPPFLAGS = -I.. -I../lib -I$(top_srcdir)/lib
 
 EXTRA_DIST += gen-uninames
 

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index cbbeecf0045c1c80739722183c0200bce1ecf71e..56bc39f599a6353c595852ba671ea6a3e48ef5f7 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-15  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (AM_CPPFLAGS): Renamed from INCLUDES.
+
 2003-11-09  Bruno Haible  <bruno@clisp.org>
 
        * msginit.c (main): Drop the blank line in --no-translator mode.

diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index 11ce1577ca2132f52373053ab5ad59535572f1cc..0737e27614a36ffd90ad675043834c925055e50c 100644 (file)
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -54,7 +54,7 @@ pkgdatadir = $(datadir)/gettext
 projectsdir = $(pkgdatadir)/projects
 pkglibdir = $(libdir)/gettext
 
-INCLUDES = \
+AM_CPPFLAGS = \
   -I. -I$(srcdir) \
   -I.. \
   -I$(top_srcdir)/libuniname \

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index b00280dab6da15ee92b8f82a0dca0d6db51260c1..a1963b9c7a8b558750912cdf303b171006098816 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-15  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (AM_CPPFLAGS): Renamed from INCLUDES.
+
 2003-11-15  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (EXTRA_DIST): Remove xg-test1.ok.po, add xg-c-1.ok.po.

diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index 14de67d129663016a0b33ce4e1ada0757e259bcd..54bc68b9bf6d11437edf8fbeeb7a6e7f591aabc6 100644 (file)
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -139,7 +139,7 @@ xg-c-1.ok.po: $(top_srcdir)/src/xgettext.c $(top_srcdir)/src/msgfmt.c
 
 # Three auxiliary programs used by the tests.
 localedir = $(datadir)/locale
-INCLUDES = \
+AM_CPPFLAGS = \
   -I.. \
   -I../lib -I$(top_srcdir)/lib \
   -I../intl