GNOME.org
 

[gcompris] Autoconf, Fix AM_CONFIG_HEADER, AM_PROG_CC_STDC and INCLUDES

commit e412eb55a1b424311c1de68d0b6cc6a32add30c5
Author: Bruno Coudoin <bcoudoin gcompris net>
Date:   Sat May 18 19:34:06 2013 +0200

    Autoconf, Fix AM_CONFIG_HEADER, AM_PROG_CC_STDC and INCLUDES
    
    Since automake 1.13, the AM_CONFIG_HEADER is obsolete and will fail unless is
    it replaced with AC_CONFIG_HEADERS.

 configure.ac                                |    4 ++--
 src/algebra_by-activity/Makefile.am         |    2 +-
 src/algebra_guesscount-activity/Makefile.am |    2 +-
 src/awele-activity/Makefile.am              |    2 +-
 src/babymatch-activity/Makefile.am          |    2 +-
 src/billard-activity/Makefile.am            |    2 +-
 src/boards/Makefile.am                      |    2 +-
 src/canal_lock-activity/Makefile.am         |    2 +-
 src/chess_computer-activity/Makefile.am     |    2 +-
 src/click_on_letter-activity/Makefile.am    |    2 +-
 src/clickgame-activity/Makefile.am          |    2 +-
 src/clockgame-activity/Makefile.am          |    2 +-
 src/crane-activity/Makefile.am              |    2 +-
 src/enumerate-activity/Makefile.am          |    2 +-
 src/erase-activity/Makefile.am              |    2 +-
 src/fifteen-activity/Makefile.am            |    2 +-
 src/gcompris/Makefile.am                    |    4 ++--
 src/gletters-activity/Makefile.am           |    2 +-
 src/goocanvas/src/Makefile.am               |    2 +-
 src/hanoi-activity/Makefile.am              |    2 +-
 src/hanoi_real-activity/Makefile.am         |    2 +-
 src/imageid-activity/Makefile.am            |    2 +-
 src/leftright-activity/Makefile.am          |    2 +-
 src/magic_hat_minus-activity/Makefile.am    |    2 +-
 src/maze-activity/Makefile.am               |    2 +-
 src/memory-activity/Makefile.am             |    2 +-
 src/missing_letter-activity/Makefile.am     |    2 +-
 src/money-activity/Makefile.am              |    2 +-
 src/paratrooper-activity/Makefile.am        |    2 +-
 src/photohunter-activity/Makefile.am        |    2 +-
 src/planegame-activity/Makefile.am          |    2 +-
 src/railroad-activity/Makefile.am           |    2 +-
 src/readingh-activity/Makefile.am           |    2 +-
 src/reversecount-activity/Makefile.am       |    2 +-
 src/scalesboard-activity/Makefile.am        |    2 +-
 src/smallnumbers-activity/Makefile.am       |    2 +-
 src/submarine-activity/Makefile.am          |    2 +-
 src/superbrain-activity/Makefile.am         |    2 +-
 src/tangram-activity/Makefile.am            |    2 +-
 src/target-activity/Makefile.am             |    2 +-
 src/traffic-activity/Makefile.am            |    2 +-
 src/wordprocessor-activity/Makefile.am      |    2 +-
 src/wordsgame-activity/Makefile.am          |    2 +-
 43 files changed, 45 insertions(+), 45 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9584e3b..f7f175e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT(gcompris, 12.11, http://gcompris.net)
 
 AM_INIT_AUTOMAKE([tar-ustar no-dist-gzip dist-bzip2 -Wno-portability])
 
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 if test -z "$enable_maintainer_mode"; then
@@ -22,7 +22,7 @@ dnl libtool versioning from libgnome
 
 AC_ISC_POSIX
 AC_PROG_CC
-AM_PROG_CC_STDC
+AC_PROG_CC
 AC_HEADER_STDC
 AM_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
diff --git a/src/algebra_by-activity/Makefile.am b/src/algebra_by-activity/Makefile.am
index cc0056a..a5b1c7a 100644
--- a/src/algebra_by-activity/Makefile.am
+++ b/src/algebra_by-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libalgebra.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/algebra_guesscount-activity/Makefile.am b/src/algebra_guesscount-activity/Makefile.am
index b70e5d1..76376dd 100644
--- a/src/algebra_guesscount-activity/Makefile.am
+++ b/src/algebra_guesscount-activity/Makefile.am
@@ -19,7 +19,7 @@ lib_LTLIBRARIES = \
        libalgebra_guesscount.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/awele-activity/Makefile.am b/src/awele-activity/Makefile.am
index 3f1dda4..53fafd4 100644
--- a/src/awele-activity/Makefile.am
+++ b/src/awele-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libawele.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/babymatch-activity/Makefile.am b/src/babymatch-activity/Makefile.am
index d38c88c..66fc7be 100644
--- a/src/babymatch-activity/Makefile.am
+++ b/src/babymatch-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libshapegame.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/billard-activity/Makefile.am b/src/billard-activity/Makefile.am
index 19bc3e4..dd4a929 100644
--- a/src/billard-activity/Makefile.am
+++ b/src/billard-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libbillard.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/boards/Makefile.am b/src/boards/Makefile.am
index f03fbef..8602434 100644
--- a/src/boards/Makefile.am
+++ b/src/boards/Makefile.am
@@ -37,7 +37,7 @@ lib_LTLIBRARIES = \
        $(python_plugin)
 
 libdir = $(plugindir)
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
diff --git a/src/canal_lock-activity/Makefile.am b/src/canal_lock-activity/Makefile.am
index 3210032..36f781e 100644
--- a/src/canal_lock-activity/Makefile.am
+++ b/src/canal_lock-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libcanal_lock.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/chess_computer-activity/Makefile.am b/src/chess_computer-activity/Makefile.am
index 868d325..37f2fe0 100644
--- a/src/chess_computer-activity/Makefile.am
+++ b/src/chess_computer-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libchess.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/click_on_letter-activity/Makefile.am b/src/click_on_letter-activity/Makefile.am
index a7b7e1b..dff01ba 100644
--- a/src/click_on_letter-activity/Makefile.am
+++ b/src/click_on_letter-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libclick_on_letter.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/clickgame-activity/Makefile.am b/src/clickgame-activity/Makefile.am
index c5edd44..88319cb 100644
--- a/src/clickgame-activity/Makefile.am
+++ b/src/clickgame-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libclickgame.la
 
 libdir = $(plugindir)
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
diff --git a/src/clockgame-activity/Makefile.am b/src/clockgame-activity/Makefile.am
index 23a5556..404d1d2 100644
--- a/src/clockgame-activity/Makefile.am
+++ b/src/clockgame-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libclockgame.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/crane-activity/Makefile.am b/src/crane-activity/Makefile.am
index d56ad6c..0ed3892 100644
--- a/src/crane-activity/Makefile.am
+++ b/src/crane-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libcrane.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/enumerate-activity/Makefile.am b/src/enumerate-activity/Makefile.am
index ac125cb..3935ba1 100644
--- a/src/enumerate-activity/Makefile.am
+++ b/src/enumerate-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libenumerate.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/erase-activity/Makefile.am b/src/erase-activity/Makefile.am
index 4b69479..78f9478 100644
--- a/src/erase-activity/Makefile.am
+++ b/src/erase-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        liberase.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/fifteen-activity/Makefile.am b/src/fifteen-activity/Makefile.am
index b63fa5d..a0cb26e 100644
--- a/src/fifteen-activity/Makefile.am
+++ b/src/fifteen-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libfifteen.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/gcompris/Makefile.am b/src/gcompris/Makefile.am
index 089cf16..0cf916d 100644
--- a/src/gcompris/Makefile.am
+++ b/src/gcompris/Makefile.am
@@ -28,7 +28,7 @@ endif
 
 bin_PROGRAMS = gcompris
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/intl \
        -DDATADIR=\""$(datadir)"\" \
        -I$(top_srcdir)/src \
@@ -139,7 +139,7 @@ EXTRA_DIST = \
 DONT_DIST_SOURCE = $(marshal_sources)
 
 if SUGAR
-INCLUDES += $(SUGAR_CFLAGS)
+AM_CPPFLAGS += $(SUGAR_CFLAGS)
 gcompris_SOURCES += \
        sugar.c sugar.h \
        sugar_gc.c sugar_gc.h \
diff --git a/src/gletters-activity/Makefile.am b/src/gletters-activity/Makefile.am
index bd29516..141e0b5 100644
--- a/src/gletters-activity/Makefile.am
+++ b/src/gletters-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libgletters.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/goocanvas/src/Makefile.am b/src/goocanvas/src/Makefile.am
index 7a73560..dea08ec 100644
--- a/src/goocanvas/src/Makefile.am
+++ b/src/goocanvas/src/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"GooCanvas\" \
        @GCOMPRIS_CFLAGS@
 
diff --git a/src/hanoi-activity/Makefile.am b/src/hanoi-activity/Makefile.am
index e9bcdaf..c30e5b6 100644
--- a/src/hanoi-activity/Makefile.am
+++ b/src/hanoi-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libhanoi.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/hanoi_real-activity/Makefile.am b/src/hanoi_real-activity/Makefile.am
index ad937dd..55a7b05 100644
--- a/src/hanoi_real-activity/Makefile.am
+++ b/src/hanoi_real-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libhanoi_real.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/imageid-activity/Makefile.am b/src/imageid-activity/Makefile.am
index 29e2d9a..6af2036 100644
--- a/src/imageid-activity/Makefile.am
+++ b/src/imageid-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libimageid.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/leftright-activity/Makefile.am b/src/leftright-activity/Makefile.am
index c6e6ce3..a24ce80 100644
--- a/src/leftright-activity/Makefile.am
+++ b/src/leftright-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libleftright.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/magic_hat_minus-activity/Makefile.am b/src/magic_hat_minus-activity/Makefile.am
index 9459f0c..6576562 100644
--- a/src/magic_hat_minus-activity/Makefile.am
+++ b/src/magic_hat_minus-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libmagic_hat.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/maze-activity/Makefile.am b/src/maze-activity/Makefile.am
index b812b7d..25c60a9 100644
--- a/src/maze-activity/Makefile.am
+++ b/src/maze-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libmaze.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/memory-activity/Makefile.am b/src/memory-activity/Makefile.am
index 568f8be..62aa3dd 100644
--- a/src/memory-activity/Makefile.am
+++ b/src/memory-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libmemory.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/missing_letter-activity/Makefile.am b/src/missing_letter-activity/Makefile.am
index 8829317..f56e447 100644
--- a/src/missing_letter-activity/Makefile.am
+++ b/src/missing_letter-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libmissingletter.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/money-activity/Makefile.am b/src/money-activity/Makefile.am
index d604439..5cb7850 100644
--- a/src/money-activity/Makefile.am
+++ b/src/money-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libmoney.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/paratrooper-activity/Makefile.am b/src/paratrooper-activity/Makefile.am
index e135e88..de62a7e 100644
--- a/src/paratrooper-activity/Makefile.am
+++ b/src/paratrooper-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libparatrooper.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/photohunter-activity/Makefile.am b/src/photohunter-activity/Makefile.am
index b7ca8d3..28b7943 100644
--- a/src/photohunter-activity/Makefile.am
+++ b/src/photohunter-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libphotohunter.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/planegame-activity/Makefile.am b/src/planegame-activity/Makefile.am
index 06d72d5..ba4aa82 100644
--- a/src/planegame-activity/Makefile.am
+++ b/src/planegame-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libplanegame.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/railroad-activity/Makefile.am b/src/railroad-activity/Makefile.am
index 656f20e..671458f 100644
--- a/src/railroad-activity/Makefile.am
+++ b/src/railroad-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        librailroad.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/readingh-activity/Makefile.am b/src/readingh-activity/Makefile.am
index e10c36b..62cd152 100644
--- a/src/readingh-activity/Makefile.am
+++ b/src/readingh-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libreading.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/reversecount-activity/Makefile.am b/src/reversecount-activity/Makefile.am
index f2077a4..11ca761 100644
--- a/src/reversecount-activity/Makefile.am
+++ b/src/reversecount-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libreversecount.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/scalesboard-activity/Makefile.am b/src/scalesboard-activity/Makefile.am
index 553bbf1..c4fe6f9 100644
--- a/src/scalesboard-activity/Makefile.am
+++ b/src/scalesboard-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libscale.la
 
 libdir = $(plugindir)
-INCLUDES = -I$(top_srcdir)/src \
+AM_CPPFLAGS = -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/smallnumbers-activity/Makefile.am b/src/smallnumbers-activity/Makefile.am
index cc0b808..301da64 100644
--- a/src/smallnumbers-activity/Makefile.am
+++ b/src/smallnumbers-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libsmallnumbers.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/submarine-activity/Makefile.am b/src/submarine-activity/Makefile.am
index bdacce8..8a7cdc9 100644
--- a/src/submarine-activity/Makefile.am
+++ b/src/submarine-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libsubmarine.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/superbrain-activity/Makefile.am b/src/superbrain-activity/Makefile.am
index 551cf59..beb1771 100644
--- a/src/superbrain-activity/Makefile.am
+++ b/src/superbrain-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libsuperbrain.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/tangram-activity/Makefile.am b/src/tangram-activity/Makefile.am
index 7b3adee..7bd9e30 100644
--- a/src/tangram-activity/Makefile.am
+++ b/src/tangram-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libtangram.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/target-activity/Makefile.am b/src/target-activity/Makefile.am
index ddacb11..818f23e 100644
--- a/src/target-activity/Makefile.am
+++ b/src/target-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libtarget.la
 
 libdir = $(plugindir)
-INCLUDES = -I$(top_srcdir)/src \
+AM_CPPFLAGS = -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/traffic-activity/Makefile.am b/src/traffic-activity/Makefile.am
index 7301ad3..6713d54 100644
--- a/src/traffic-activity/Makefile.am
+++ b/src/traffic-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libtraffic.la
 
 libdir = $(plugindir)
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
diff --git a/src/wordprocessor-activity/Makefile.am b/src/wordprocessor-activity/Makefile.am
index 032ca3a..3f7ab32 100644
--- a/src/wordprocessor-activity/Makefile.am
+++ b/src/wordprocessor-activity/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = \
        libwordprocessor.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
diff --git a/src/wordsgame-activity/Makefile.am b/src/wordsgame-activity/Makefile.am
index ec61d34..70c1efd 100644
--- a/src/wordsgame-activity/Makefile.am
+++ b/src/wordsgame-activity/Makefile.am
@@ -19,7 +19,7 @@ lib_LTLIBRARIES = \
        libwordsgame.la
 
 libdir = $(plugindir)
-INCLUDES =     -I$(top_srcdir)/src \
+AM_CPPFLAGS =  -I$(top_srcdir)/src \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/src/goocanvas/src \
        $(GCOMPRIS_CFLAGS) \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]