]> Pileus Git - ~andy/gtk/blobdiff - docs/reference/gtk/Makefile.am
projects / ~andy / gtk / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add ability to set a tooltip's image from a GIcon
[~andy/gtk] / docs / reference / gtk / Makefile.am
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 5f96a8d7609407d741be7a31cc25439186f09a55..6a0b30acdb7db20ed357a23cfd41270de1f5c141 100644 (file)
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -1,4 +1,5 @@
 ## Process this file with automake to produce Makefile.in
+include $(top_srcdir)/Makefile.decl
 
 AUTOMAKE_OPTIONS = 1.6
 
@@ -40,11 +41,9 @@ IGNORE_HFILES=                               \
        gtkfilesystemmodel.h            \
        gtkfilesystemunix.h             \
        gtkfilesystemwin32.h            \
-       gtkhsv.h                        \
        gtkiconcache.h                  \
         gtkiconcachevalidator.h         \
        gtkiconthemeparser.h            \
-       gtkimmodule.h                   \
        gtkintl.h                       \
        gtkkeyhash.h                    \
        gtkmarshal.h                    \
@@ -106,6 +105,9 @@ INCLUDES = \
        $(GTK_DEBUG_FLAGS)      \
        $(GTK_DEP_CFLAGS)
 
+CPPFLAGS += \
+       -UGTK_DISABLE_SINGLE_INCLUDES
+
 GTKDOC_LIBS = \
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
        $(top_builddir)/gdk/$(gdktargetlib)                             \
@@ -113,7 +115,7 @@ GTKDOC_LIBS = \
 
 
 # Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode --output-format=xml
+MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gtk
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =                                        \
@@ -124,18 +126,23 @@ content_files =                                   \
        changes-2.0.sgml                        \
        compiling.sgml                          \
        directfb.sgml                           \
+       drawing-model.xml                       \
        glossary.xml                            \
        migrating-checklist.sgml                \
+        migrating-ClientSideWindows.sgml       \
+       migrating-GtkAboutDialog.sgml           \
        migrating-GtkAction.sgml                \
+       migrating-GtkAssistant.sgml             \
+       migrating-GtkBuilder.sgml               \
+       migrating-GtkColorButton.sgml           \
        migrating-GtkComboBox.sgml              \
+       migrating-GtkEntry-icons.sgml           \
        migrating-GtkFileChooser.sgml           \
        migrating-GtkIconView.sgml              \
-       migrating-GtkAboutDialog.sgml           \
-       migrating-GtkColorButton.sgml           \
-       migrating-GtkAssistant.sgml             \
-       migrating-GtkRecentChooser.sgml         \
+       migrating-GtkLabel-links.sgml           \
        migrating-GtkLinkButton.sgml            \
-       migrating-GtkBuilder.sgml               \
+       migrating-GtkRecentChooser.sgml         \
+        migrating-GtkTooltip.sgml              \
        objects_grouped.sgml                    \
        osx.sgml                                \
        question_index.sgml                     \
@@ -150,17 +157,23 @@ content_files =                                   \
        visual_index.xml
 
 expand_content_files =                                 \
+       drawing-model.xml                       \
        glossary.xml                            \
        migrating-checklist.sgml                \
+        migrating-ClientSideWindows.sgml       \
        migrating-GtkAction.sgml                \
        migrating-GtkComboBox.sgml              \
+       migrating-GtkEntry-icons.sgml           \
        migrating-GtkFileChooser.sgml           \
        migrating-GtkIconView.sgml              \
        migrating-GtkAboutDialog.sgml           \
        migrating-GtkColorButton.sgml           \
        migrating-GtkAssistant.sgml             \
        migrating-GtkRecentChooser.sgml         \
+       migrating-GtkLabel-links.sgml           \
        migrating-GtkLinkButton.sgml            \
+       migrating-GtkBuilder.sgml               \
+       migrating-GtkTooltip.sgml               \
        tree_widget.sgml                        \
        text_widget.sgml                        \
        question_index.sgml
@@ -172,6 +185,7 @@ HTML_IMAGES = \
        $(top_srcdir)/gtk/stock-icons/20/gtk-apply.png                  \
        $(top_srcdir)/gtk/stock-icons/24/gtk-bold.png                   \
        $(top_srcdir)/gtk/stock-icons/20/gtk-cancel.png                 \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-caps-lock-warning.png      \
        $(top_srcdir)/gtk/stock-icons/24/gtk-cdrom.png                  \
        $(top_srcdir)/gtk/stock-icons/24/gtk-clear.png                  \
        $(top_srcdir)/gtk/stock-icons/24/gtk-close.png                  \
@@ -234,7 +248,11 @@ HTML_IMAGES = \
        $(top_srcdir)/gtk/stock-icons/24/gtk-paste.png                  \
        $(top_srcdir)/gtk/stock-icons/24/gtk-preferences.png            \
        $(top_srcdir)/gtk/stock-icons/24/gtk-print.png                  \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-print-error.png            \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-print-paused.png           \
        $(top_srcdir)/gtk/stock-icons/24/gtk-print-preview.png          \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-print-report.png           \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-print-warning.png          \
        $(top_srcdir)/gtk/stock-icons/24/gtk-properties.png             \
        $(top_srcdir)/gtk/stock-icons/24/gtk-quit.png                   \
        $(top_srcdir)/gtk/stock-icons/24/gtk-redo-ltr.png               \
@@ -281,6 +299,7 @@ HTML_IMAGES = \
        $(top_srcdir)/gtk/stock-icons/24/gtk-fullscreen.png             \
        $(top_srcdir)/gtk/stock-icons/24/gtk-leave-fullscreen.png       \
        $(top_srcdir)/gtk/stock-icons/24/gtk-info.png                   \
+       $(srcdir)/images/aboutdialog.png                                \
        $(srcdir)/images/accel-label.png                                \
        $(srcdir)/images/assistant.png                                  \
        $(srcdir)/images/button.png                                     \
@@ -290,6 +309,8 @@ HTML_IMAGES = \
        $(srcdir)/images/combo-box.png                                  \
        $(srcdir)/images/combo-box-entry.png                            \
        $(srcdir)/images/entry.png                                      \
+       $(srcdir)/images/figure-hierarchical-drawing.png                \
+       $(srcdir)/images/figure-windowed-label.png                      \
        $(srcdir)/images/file-button.png                                \
        $(srcdir)/images/filechooser.png                                \
        $(srcdir)/images/font-button.png                                \
@@ -319,7 +340,15 @@ HTML_IMAGES = \
        $(srcdir)/images/toolbar.png                                    \
        $(srcdir)/images/tree-view-coordinates.png                      \
        $(srcdir)/images/volumebutton.png                               \
-       $(srcdir)/images/window.png
+       $(srcdir)/images/window.png                                     \
+       $(srcdir)/images/layout-btlr.png                                \
+       $(srcdir)/images/layout-btrl.png                                \
+       $(srcdir)/images/layout-lrbt.png                                \
+       $(srcdir)/images/layout-lrtb.png                                \
+       $(srcdir)/images/layout-rlbt.png                                \
+       $(srcdir)/images/layout-rltb.png                                \
+       $(srcdir)/images/layout-tblr.png                                \
+       $(srcdir)/images/layout-tbrl.png
 
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html \
@@ -336,19 +365,21 @@ EXTRA_DIST += version.xml.in
 
 ########################################################################
 
-man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1
-
 if ENABLE_MAN
 
+man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1
+
 %.1 : %.xml 
        @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-endif
-
 BUILT_EXTRA_DIST = $(man_MANS)
 
+endif
+
 dist-hook-local: $(BUILT_EXTRA_DIST)
        files='$(BUILT_EXTRA_DIST)';                            \
        for f in $$files; do                                    \
          if test -f $$f; then d=.; else d=$(srcdir); fi;       \
          cp $$d/$$f $(distdir) || exit 1; done
+
+-include $(top_srcdir)/git.mk
Andy's GTK+ repository