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 07ab851..13e2bdc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 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
          tokens
 

diff --git a/ccode/Makefile.am b/ccode/Makefile.am
index 8162dee..348d8c6 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 bc19543..2755465 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 ae085da..0681f08 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 e36538f..246b41c 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 4b97a25..47e771f 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 005aa0d..d07c76b 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 6f3edf7..6e7ddc1 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 9174b16..413586d 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 b1394b9..e2477d9 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 \