From 12bb974949ceabd402d953d79ca88b230a3a5646 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 28 Apr 2008 15:22:54 +0000 Subject: [PATCH] 2008-04-28 Emmanuele Bassi * clutter/clutter-docs.sgml: Add index for the 0.8 symbols. * clutter/Makefile.am: * cogl/Makefile.am: Revert back, as EXTRA_DIST has been defined by gtk-doc.make and automake-1.9 complains loudly about a redefinition of EXTRA_DIST. --- doc/reference/ChangeLog | 9 +++++++++ doc/reference/clutter/Makefile.am | 5 ++++- doc/reference/clutter/clutter-docs.sgml | 3 +++ doc/reference/cogl/Makefile.am | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/doc/reference/ChangeLog b/doc/reference/ChangeLog index 79c950e..a322d14 100644 --- a/doc/reference/ChangeLog +++ b/doc/reference/ChangeLog @@ -1,3 +1,12 @@ +2008-04-28 Emmanuele Bassi + + * clutter/clutter-docs.sgml: Add index for the 0.8 symbols. + + * clutter/Makefile.am: + * cogl/Makefile.am: Revert back, as EXTRA_DIST has been defined + by gtk-doc.make and automake-1.9 complains loudly about a + redefinition of EXTRA_DIST. + 2008-04-22 Øyvind Kolås * clutter/Makefile.am: diff --git a/doc/reference/clutter/Makefile.am b/doc/reference/clutter/Makefile.am index a956edc..e468120 100644 --- a/doc/reference/clutter/Makefile.am +++ b/doc/reference/clutter/Makefile.am @@ -66,11 +66,14 @@ IGNORE_HFILES=\ clutter-private.h \ clutter-id-pool.h \ clutter-script-private.h \ + clutter-stage-manager.h \ + clutter-stage-window.h \ stamp-clutter-enum-types.h \ stamp-clutter-marshal.h \ cogl \ eglnative \ eglx \ + fruity \ glx \ osx \ x11 \ @@ -121,7 +124,7 @@ include $(top_srcdir)/gtk-doc.make # Other files to distribute # e.g. EXTRA_DIST += version.xml.in -EXTRA_DIST = \ +EXTRA_DIST += \ version.xml.in \ actor-box.png \ alpha-func.png \ diff --git a/doc/reference/clutter/clutter-docs.sgml b/doc/reference/clutter/clutter-docs.sgml index 444cc25..8a4c28a 100644 --- a/doc/reference/clutter/clutter-docs.sgml +++ b/doc/reference/clutter/clutter-docs.sgml @@ -457,6 +457,9 @@ Index of new symbols in 0.6 + + Index of new symbols in 0.8 + License diff --git a/doc/reference/cogl/Makefile.am b/doc/reference/cogl/Makefile.am index 39daa63..aee9282 100644 --- a/doc/reference/cogl/Makefile.am +++ b/doc/reference/cogl/Makefile.am @@ -90,4 +90,4 @@ include $(top_srcdir)/gtk-doc.make # Other files to distribute # e.g. EXTRA_DIST += version.xml.in -EXTRA_DIST = +#EXTRA_DIST += -- 2.7.4