Re: [Help-smalltalk] [PATCH 0/5] build: refactoring and preparations for Automake-NG

[Stefano Lattarini]

On 08/21/2012 08:37 AM, Paolo Bonzini wrote:
> Il 20/08/2012 21:56, Stefano Lattarini ha scritto:
>> After these changes, the Smalltalk build system still works with
>> mainline Automake (and only with it), but will be much easier to
>> modify to convert it to Automake-NG.
> 
> Can you send a "patch 6" with the remaining changes?
> 
First of all, there still a stray use of '$(INCLUDES)' that I missed to
convert in my earlier patches.  The patch below takes care of that.

Sorry for the noise,
  Stefano

-----8<-----8<-----8<-----8<-----8<-----8<-----8<-----8<-----8<-----

>From b33b57b68023c5cc203e154360c1014792aae2c7 Mon Sep 17 00:00:00 2001
Message-Id: <address@hidden>
From: Stefano Lattarini <address@hidden>
Date: Tue, 21 Aug 2012 11:00:47 +0200
Subject: [PATCH] build: once more, use $(AM_CPPFLAGS), not $(INCLUDES)

The latter is a long-deprecated and obsolescent alias for the former.

* packages/gtk/Makefile.am (INCLUDES): Rename ...
(AM_CPPFLAGS): ... like this

Signed-off-by: Stefano Lattarini <address@hidden>
---
 ChangeLog                | 9 +++++++++
 packages/gtk/Makefile.am | 6 +++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index af14a82..4ad1f6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-08-21  Stefano Lattarini  <address@hidden>
+
+       build: once more, use $(AM_CPPFLAGS), not $(INCLUDES)
+
+       The latter is a long-deprecated and obsolescent alias for the former.
+
+       * packages/gtk/Makefile.am (INCLUDES): Rename ...
+       (AM_CPPFLAGS): ... like this
+
 2012-08-20  Stefano Lattarini  <address@hidden>

        build: reorganize some stamp files' handling
diff --git a/packages/gtk/Makefile.am b/packages/gtk/Makefile.am
index 1d32719..3229e31 100644
--- a/packages/gtk/Makefile.am
+++ b/packages/gtk/Makefile.am
@@ -29,7 +29,11 @@ testplacer_SOURCES = testplacer.c
 testplacer_LDADD = $(GLIB_LIBS) $(GTK_LIBS)


-INCLUDES = -I$(top_srcdir)/libgst -I$(top_srcdir)/lib-src 
-I$(top_srcdir)/libltdl -I$(top_srcdir)/packages/glib
+AM_CPPFLAGS = \
+  -I$(top_srcdir)/libgst \
+  -I$(top_srcdir)/lib-src \
+  -I$(top_srcdir)/libltdl \
+  -I$(top_srcdir)/packages/glib

 AM_CFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(PANGO_CFLAGS) $(ATK_CFLAGS)

-- 
1.7.12