From f1a44ddebbed499c34c61c8957ad2bb2948ec330 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 24 Feb 2011 17:38:22 +0900 Subject: [PATCH] Rebuild eek.types when compiling doc from tarball. --- docs/reference/eek/Makefile.am | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/docs/reference/eek/Makefile.am b/docs/reference/eek/Makefile.am index 3ba834c6..8c08da5c 100644 --- a/docs/reference/eek/Makefile.am +++ b/docs/reference/eek/Makefile.am @@ -47,7 +47,7 @@ SCANGOBJ_OPTIONS= # Extra options to supply to gtkdoc-scan. # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" -SCAN_OPTIONS= +SCAN_OPTIONS=--rebuild-types # Extra options to supply to gtkdoc-mkdb. # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml @@ -82,6 +82,9 @@ IGNORE_HFILES = \ eek-clutter-renderer.h \ eek-clutter-section.h \ eek-clutter-key.h +if !ENABLE_CLUTTER +IGNORE_HFILES += eek-clutter-keyboard.h eek-clutter.h +endif # Images to copy into HTML directory. # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png @@ -102,16 +105,20 @@ expand_content_files=eek-overview.xml # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) GTKDOC_CFLAGS = $(GIO2_CFLAGS) -GTKDOC_LIBS = $(top_srcdir)/eek/libeek.la \ - $(top_srcdir)/eek/libeek-clutter.la \ - $(top_srcdir)/eek/libeek-gtk.la \ - $(top_srcdir)/eek/libeek-xkb.la \ - $(top_srcdir)/eek/libeek-xkl.la \ +GTKDOC_LIBS = $(top_builddir)/eek/libeek.la \ + $(top_builddir)/eek/libeek-gtk.la \ + $(top_builddir)/eek/libeek-xkb.la \ + $(top_builddir)/eek/libeek-xkl.la \ $(GIO2_LIBS) \ - $(CLUTTER_LIBS) \ $(GTK_LIBS) \ $(XKB_LIBS) +if ENABLE_CLUTTER +GTKDOC_LIBS += \ + $(top_builddir)/eek/libeek-clutter.la \ + $(CLUTTER_LIBS) +endif + # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make