diff options
author | Robert Bragg <robert@linux.intel.com> | 2013-01-17 22:56:41 +0000 |
---|---|---|
committer | Robert Bragg <robert@linux.intel.com> | 2013-01-22 18:00:05 +0000 |
commit | 50005a93647173222c2dfe3ca81812c3794f06be (patch) | |
tree | b613a4e767f8e4991d9a30e58d8142639e46c113 /doc | |
parent | ebdac3162a78aa647cd35bfbb4a7c0e25f477218 (diff) | |
download | cogl-50005a93647173222c2dfe3ca81812c3794f06be.tar.gz |
build: update to build with automake 1.13
This make autogen.sh look for automake-1.13 and also updates all
Makefile.am files to no longer use the INCLUDES variable which automake
1.13 warns is deprecated by AM_CPPFLAGS.
https://bugzilla.gnome.org/show_bug.cgi?id=690891
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5de5569e960102afe979a5f2f0403e1defebca62)
Diffstat (limited to 'doc')
-rw-r--r-- | doc/reference/cogl-2.0-experimental/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/reference/cogl-2.0-experimental/Makefile.am b/doc/reference/cogl-2.0-experimental/Makefile.am index 1e415cd6..8839f180 100644 --- a/doc/reference/cogl-2.0-experimental/Makefile.am +++ b/doc/reference/cogl-2.0-experimental/Makefile.am @@ -114,10 +114,10 @@ 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. AM_CPPFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -INCLUDES=-I$(top_srcdir) -I$(top_builddir)/cogl -DCOGL_ENABLE_EXPERIMENTAL_API $(COGL_DEP_CFLAGS) +AM_CPPFLAGS=-I$(top_srcdir) -I$(top_builddir)/cogl -DCOGL_ENABLE_EXPERIMENTAL_API $(COGL_DEP_CFLAGS) GTKDOC_LIBS=$(top_builddir)/cogl/libcogl.la $(COGL_DEP_LIBS) # This includes the standard gtk-doc make rules, copied by gtkdocize. |