replace deprecated INCLUDES by AM_CPPFLAGS

2007-11-27  Juerg Billeter  <j@bitron.ch>

	* ccode/Makefile.am, compiler/Makefile.am, gee/Makefile.am,
	  gen-project/Makefile.am, gobject-introspection/Makefile.am,
	  gobject/Makefile.am, tests/Makefile.am, vala/Makefile.am,
	  vapigen/Makefile.am: replace deprecated INCLUDES by AM_CPPFLAGS

svn path=/trunk/; revision=727

diff --git a/ChangeLog b/ChangeLog
index 07ab851b4258f8a2a8ed26d3af984d5e73359de0..13e2bdcfbf6503e513dd4b19c042b3d8879bfb6c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-27  Jürg Billeter  <j@bitron.ch>
+
+       * ccode/Makefile.am, compiler/Makefile.am, gee/Makefile.am,
+         gen-project/Makefile.am, gobject-introspection/Makefile.am,
+         gobject/Makefile.am, tests/Makefile.am, vala/Makefile.am,
+         vapigen/Makefile.am: replace deprecated INCLUDES by AM_CPPFLAGS
+
 2007-11-27  Jürg Billeter  <j@bitron.ch>
 
        * gobject-introspection/cparser.y: concatenate adjacent string literal

diff --git a/ccode/Makefile.am b/ccode/Makefile.am
index 8162dee66e46ee009a7219b5298d45f62cecd184..348d8c6fd2ef29749903e1b425e1a1b3a3e93ab8 100644 (file)
--- a/ccode/Makefile.am
+++ b/ccode/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GLIB_CFLAGS) \
        $(NULL)

diff --git a/compiler/Makefile.am b/compiler/Makefile.am
index bc19543031a9f92a16f8d3e0846d73529eb053cc..27554658191dad665724abbb5b2af6f847c07ff2 100644 (file)
--- a/compiler/Makefile.am
+++ b/compiler/Makefile.am
@@ -1,8 +1,10 @@
 NULL =
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GLIB_CFLAGS) \
+       -include config.h \
+       -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
        $(NULL)
 
 BUILT_SOURCES = valac.vala.stamp
@@ -22,10 +24,6 @@ valac.vala.stamp: $(filter %.vala,$(valac_SOURCES))
        $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject --pkg gobject --pkg config --basedir $(top_srcdir) $^
        touch $@
 
-valac_CPPFLAGS = \
-       -include config.h \
-       -DPACKAGE_DATADIR=\"$(pkgdatadir)\"
-
 valac_LDADD = \
        $(GLIB_LIBS) \
        ../gobject/libvala.la \

diff --git a/gee/Makefile.am b/gee/Makefile.am
index ae085dad3f5f0871a3f4c78d26db675fce18d5b8..0681f08291c729410e797252197a14f5a837fa37 100644 (file)
--- a/gee/Makefile.am
+++ b/gee/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GLIB_CFLAGS) \
        $(NULL)

diff --git a/gen-project/Makefile.am b/gen-project/Makefile.am
index e36538f1644eacbb990823c0dbb2d8db98c4b674..246b41ce0c0ada3a6cd5c8640e6a2020a7005615 100644 (file)
--- a/gen-project/Makefile.am
+++ b/gen-project/Makefile.am
@@ -1,9 +1,11 @@
 NULL =
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
+       -include config.h \
+       -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
        $(NULL)
 
 BUILT_SOURCES = vala-gen-project.vala.stamp
@@ -23,10 +25,6 @@ vala-gen-project.vala.stamp: $(filter %.vala,$(vala_gen_project_SOURCES))
        $(VALAC) --vapidir $(srcdir)/../vapi --pkg config --pkg gtk+-2.0 --basedir $(top_srcdir) $^
        touch $@
 
-vala_gen_project_CPPFLAGS = \
-       -include config.h \
-       -DPACKAGE_DATADIR=\"$(pkgdatadir)\"
-
 vala_gen_project_LDADD = \
        $(GLIB_LIBS) \
        $(GTK_LIBS) \

diff --git a/gobject-introspection/Makefile.am b/gobject-introspection/Makefile.am
index 4b97a25f8b88fa40dd37d84db2c2f9b2a296e999..47e771fe8cd48e0a1552801551963e6b737c3b70 100644 (file)
--- a/gobject-introspection/Makefile.am
+++ b/gobject-introspection/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-INCLUDES = \
+AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(NULL)
 

diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 005aa0d589c138833836631ee7070fd7077ccd0c..d07c76b69fc6e7b6f3ee8d6d81327feb2b0690ad 100644 (file)
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GLIB_CFLAGS) \
        $(NULL)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6f3edf74a39456b9aa82a67e1d0b0f23fdf95fed..6e7ddc1b0e10ab7b61d26427f22b66133692af47 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-INCLUDES = \
+AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(ENCHANT_CFLAGS) \
        $(NULL)

diff --git a/vala/Makefile.am b/vala/Makefile.am
index 9174b16e4cbc2a8f880245e98cc2db7d9eaa1a9d..413586dddd8c9151523eb906476d641023f62aa3 100644 (file)
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GLIB_CFLAGS) \
        $(NULL)

diff --git a/vapigen/Makefile.am b/vapigen/Makefile.am
index b1394b99bb1a8d2f80a0660f31d5a718913145db..e2477d996f66ec7665833f3af863fec16f271e58 100644 (file)
--- a/vapigen/Makefile.am
+++ b/vapigen/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = \
        vala-gen-introspect \
        $(NULL)
 
-INCLUDES = \
+AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        -I$(top_srcdir) \
        -I$(top_srcdir)/gobject-introspection \