gtk-doc r603 - in trunk: . examples tests/bugs/docs tests/gobject/docs tests/gobject/docs-tmpl

[stefkost svn gnome org]

Author: stefkost
Date: Fri Oct  3 13:02:10 2008
New Revision: 603
URL: http://svn.gnome.org/viewvc/gtk-doc?rev=603&view=rev

Log:
        patch by: Simon Josefsson <simon josefsson org>
	* examples/Makefile.am:
	* tests/bugs/docs/Makefile.am:
	* tests/gobject/docs-tmpl/Makefile.am:
	* tests/gobject/docs/Makefile.am:
	  Use GTKDOC_CFLAGS instead of INCLUDES in Makefile.am. Fixes #553407.



Modified:
   trunk/ChangeLog
   trunk/examples/Makefile.am
   trunk/tests/bugs/docs/Makefile.am
   trunk/tests/gobject/docs-tmpl/Makefile.am
   trunk/tests/gobject/docs/Makefile.am

Modified: trunk/examples/Makefile.am
==============================================================================
--- trunk/examples/Makefile.am	(original)
+++ trunk/examples/Makefile.am	Fri Oct  3 13:02:10 2008
@@ -68,9 +68,9 @@
 # CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
 # Only needed if you are using gtkdoc-scangobj to dynamically query widget
 # signals and properties.
-# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
+# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES=
+GTKDOC_CFLAGS=
 GTKDOC_LIBS=
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.

Modified: trunk/tests/bugs/docs/Makefile.am
==============================================================================
--- trunk/tests/bugs/docs/Makefile.am	(original)
+++ trunk/tests/bugs/docs/Makefile.am	Fri Oct  3 13:02:10 2008
@@ -58,7 +58,7 @@
 # CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
 # Only needed if you are using gtkdoc-scangobj to dynamically query widget
 # signals and properties.
-INCLUDES = -I$(top_builddir) -I$(top_builddir)/tests/bugs/src $(TEST_DEPS_CFLAGS)
+GTKDOC_CFLAGS = -I$(top_builddir) -I$(top_builddir)/tests/bugs/src $(TEST_DEPS_CFLAGS)
 GTKDOC_LIBS = $(TEST_DEPS_LIBS) $(top_builddir)/tests/bugs/src/libtester.la
 
 # include generic part

Modified: trunk/tests/gobject/docs-tmpl/Makefile.am
==============================================================================
--- trunk/tests/gobject/docs-tmpl/Makefile.am	(original)
+++ trunk/tests/gobject/docs-tmpl/Makefile.am	Fri Oct  3 13:02:10 2008
@@ -56,7 +56,7 @@
 # CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
 # Only needed if you are using gtkdoc-scangobj to dynamically query widget
 # signals and properties.
-INCLUDES = -I$(top_builddir) -I$(top_builddir)/tests/gobject/src $(TEST_DEPS_CFLAGS)
+GTKDOC_CFLAGS = -I$(top_builddir) -I$(top_builddir)/tests/gobject/src $(TEST_DEPS_CFLAGS)
 GTKDOC_LIBS = $(TEST_DEPS_LIBS) $(top_builddir)/tests/gobject/src/libtester.la
 
 # include generic part

Modified: trunk/tests/gobject/docs/Makefile.am
==============================================================================
--- trunk/tests/gobject/docs/Makefile.am	(original)
+++ trunk/tests/gobject/docs/Makefile.am	Fri Oct  3 13:02:10 2008
@@ -56,7 +56,7 @@
 # CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
 # Only needed if you are using gtkdoc-scangobj to dynamically query widget
 # signals and properties.
-INCLUDES = -I$(top_builddir) -I$(top_builddir)/tests/gobject/src $(TEST_DEPS_CFLAGS)
+GTKDOC_CFLAGS = -I$(top_builddir) -I$(top_builddir)/tests/gobject/src $(TEST_DEPS_CFLAGS)
 GTKDOC_LIBS = $(TEST_DEPS_LIBS) $(top_builddir)/tests/gobject/src/libtester.la
 
 # include generic part