diff options
| author | Stefan Kost <stefkost@src.gnome.org> | 2008-10-03 13:02:10 +0000 |
|---|---|---|
| committer | Stefan Kost <stefkost@src.gnome.org> | 2008-10-03 13:02:10 +0000 |
| commit | b7d49bada98fcc2d761f7025af4218ecd315a18a (patch) | |
| tree | 41f018fae592061cffefb9767a8f13647182f15e | |
| parent | f75c525ec5801ed666a09f7bf2eac967366f6e7d (diff) | |
| download | gtk-doc-b7d49bada98fcc2d761f7025af4218ecd315a18a.tar.gz | |
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.
svn path=/trunk/; revision=603
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | examples/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/bugs/docs/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/gobject/docs-tmpl/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/gobject/docs/Makefile.am | 2 |
5 files changed, 15 insertions, 5 deletions
@@ -1,3 +1,13 @@ +2008-10-03 Stefan Kost <ensonic@users.sf.net> + + 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. + 2008-09-24 Stefan Kost <ensonic@users.sf.net> * gtkdoc-mkdb.in: diff --git a/examples/Makefile.am b/examples/Makefile.am index bdbfe7e..6dafea6 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -68,9 +68,9 @@ expand_content_files= # 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. diff --git a/tests/bugs/docs/Makefile.am b/tests/bugs/docs/Makefile.am index a487f67..1694b33 100644 --- a/tests/bugs/docs/Makefile.am +++ b/tests/bugs/docs/Makefile.am @@ -58,7 +58,7 @@ expand_content_files= # 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 diff --git a/tests/gobject/docs-tmpl/Makefile.am b/tests/gobject/docs-tmpl/Makefile.am index eaf0739..8790f71 100644 --- a/tests/gobject/docs-tmpl/Makefile.am +++ b/tests/gobject/docs-tmpl/Makefile.am @@ -56,7 +56,7 @@ expand_content_files= # 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 diff --git a/tests/gobject/docs/Makefile.am b/tests/gobject/docs/Makefile.am index 46d99f3..a3c9e0e 100644 --- a/tests/gobject/docs/Makefile.am +++ b/tests/gobject/docs/Makefile.am @@ -56,7 +56,7 @@ expand_content_files= # 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 |