2008-02-08 Emmanuele Bassi <ebassi@openedhand.com>

	* path-alpha-func.png: Image showing the effects of different
	alpha functions on the same path behaviour.

	* Makefile.am: Add fixxref options.

diff --git a/doc/reference/ChangeLog b/doc/reference/ChangeLog
index 4c1d96a..c3c2c18 100644 (file)
--- a/doc/reference/ChangeLog
+++ b/doc/reference/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-08  Emmanuele Bassi  <ebassi@openedhand.com>
+
+       * path-alpha-func.png: Image showing the effects of different
+       alpha functions on the same path behaviour.
+
+       * Makefile.am: Add fixxref options.
+
 2008-02-04  Emmanuele Bassi  <ebassi@openedhand.com>
 
        * clutter-sections.txt: Add:

diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 307a37e..b209fbd 100644 (file)
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -37,7 +37,11 @@ MKTMPL_OPTIONS=
 
 # Extra options to supply to gtkdoc-fixref. Not normally needed.
 # e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
-FIXXREF_OPTIONS=
+FIXXREF_OPTIONS=\
+       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
+       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
+       --extra-dir=$(PANGO_PREFIX)/share/gtk-doc/html/pango \
+       --extra-dir=$(GDPIXBUF_PREFIX)/share/gtk-doc/html/gdk-pixbuf
 
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
@@ -77,7 +81,7 @@ EXTRA_HFILES=\
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
-HTML_IMAGES=
+HTML_IMAGES=path-alpha-func.png
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
@@ -107,4 +111,4 @@ include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += version.xml.in
+EXTRA_DIST += version.xml.in path-alpha-func.png

diff --git a/doc/reference/path-alpha-func.png b/doc/reference/path-alpha-func.png
new file mode 100644 (file)
index 0000000..ede962a
Binary files /dev/null and b/doc/reference/path-alpha-func.png differ