From: Bruno Haible Date: Sun, 16 Nov 2003 15:25:18 +0000 (+0000) Subject: The INCLUDES variable is deprecated. X-Git-Tag: v0.13~82 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e9e32fb729b781bb8d1cc4e0469d27e2cbf9f1b;p=thirdparty%2Fgettext.git The INCLUDES variable is deprecated. --- diff --git a/gettext-runtime/lib/ChangeLog b/gettext-runtime/lib/ChangeLog index 10fa0395e..3938b707b 100644 --- a/gettext-runtime/lib/ChangeLog +++ b/gettext-runtime/lib/ChangeLog @@ -1,3 +1,7 @@ +2003-11-15 Bruno Haible + + * Makefile.am (AM_CPPFLAGS): Renamed from INCLUDES. + 2003-10-09 Bruno Haible * 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 2edd7b2a4..a864e205f 100644 --- 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 ad633014b..03e59bc7f 100644 --- a/gettext-runtime/src/ChangeLog +++ b/gettext-runtime/src/ChangeLog @@ -1,3 +1,7 @@ +2003-11-15 Bruno Haible + + * Makefile.am (AM_CPPFLAGS): Renamed from INCLUDES. + 2003-10-09 Bruno Haible * envsubst.c: Include xalloc.h instead of xmalloc.h. diff --git a/gettext-runtime/src/Makefile.am b/gettext-runtime/src/Makefile.am index fc3650300..93ffd61af 100644 --- 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 df2a6b3d6..39e26c8cf 100644 --- a/gettext-tools/examples/ChangeLog +++ b/gettext-tools/examples/ChangeLog @@ -1,3 +1,13 @@ +2003-11-15 Bruno Haible + + * 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 * 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 9145c5063..28485dab7 100644 --- 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 c893ed04e..4f3a42294 100644 --- 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 389771580..4dc19ff92 100644 --- 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 82213fc64..a7c1fade5 100644 --- 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 a0866af72..bf252b076 100644 --- 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 e6e399ef2..99d1ee840 100644 --- 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 2fd9befae..feaad5cfa 100644 --- 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 952309f5a..f816c93a0 100644 --- a/gettext-tools/lib/ChangeLog +++ b/gettext-tools/lib/ChangeLog @@ -1,3 +1,7 @@ +2003-11-15 Bruno Haible + + * Makefile.am (AM_CPPFLAGS): Renamed from INCLUDES. + 2003-11-15 Bruno Haible * Makefile.am (docdir, examplesconfigdir, examplesconfig_DATA): New diff --git a/gettext-tools/lib/Makefile.am b/gettext-tools/lib/Makefile.am index c24b2ea88..fe2aedfc0 100644 --- 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 0e1a4b063..ea8713fc8 100644 --- a/gettext-tools/libuniname/ChangeLog +++ b/gettext-tools/libuniname/ChangeLog @@ -1,3 +1,7 @@ +2003-11-15 Bruno Haible + + * Makefile.am (AM_CPPFLAGS): Renamed from INCLUDES. + 2003-10-09 Bruno Haible * 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 f3d57eccd..d6a59b1da 100644 --- 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 cbbeecf00..56bc39f59 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,7 @@ +2003-11-15 Bruno Haible + + * Makefile.am (AM_CPPFLAGS): Renamed from INCLUDES. + 2003-11-09 Bruno Haible * 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 11ce1577c..0737e2761 100644 --- 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 b00280dab..a1963b9c7 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,3 +1,7 @@ +2003-11-15 Bruno Haible + + * Makefile.am (AM_CPPFLAGS): Renamed from INCLUDES. + 2003-11-15 Bruno Haible * 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 14de67d12..54bc68b9b 100644 --- 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