]> Pileus Git - ~andy/gtk/blobdiff - docs/reference/gtk/Makefile.am
Make 3.0 parallel-installable to 2.x
[~andy/gtk] / docs / reference / gtk / Makefile.am
index 840646d9793e932e53db887b67ab04d85cf006a2..93b66fce8328dfff28252fad68a83e83cfb8bdf0 100644 (file)
@@ -1,4 +1,5 @@
 ## Process this file with automake to produce Makefile.in
+include $(top_srcdir)/Makefile.decl
 
 AUTOMAKE_OPTIONS = 1.6
 
@@ -9,10 +10,7 @@ DOC_MODULE=gtk
 DOC_MAIN_SGML_FILE=gtk-docs.sgml
 
 # Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED" 
-
-# Extra options to pass to gtkdoc-scangobj
-SCANGOBJ_OPTIONS=--type-init-func="gtk_type_init(0)" 
+SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED"
 
 # The directory containing the source code. Relative to $(srcdir)
 DOC_SOURCE_DIR=../../../gtk
@@ -27,34 +25,52 @@ IGNORE_HFILES=                              \
        fnmatch.h                       \
        gdk-pixbuf-loader.h             \
        gtkdebug.h                      \
+       gtkbuilderprivate.h             \
        gtkdndcursors.h                 \
        gtkentryprivate.h               \
        gtkfilechooserdefault.h         \
        gtkfilechooserembed.h           \
        gtkfilechooserentry.h           \
        gtkfilechooserprivate.h         \
+       gtkfilechoosersettings.h        \
        gtkfilechooserutils.h           \
        gtkfilesystem.h                 \
        gtkfilesystemmodel.h            \
        gtkfilesystemunix.h             \
        gtkfilesystemwin32.h            \
-       gtkhsv.h                        \
        gtkiconcache.h                  \
+        gtkiconcachevalidator.h         \
        gtkiconthemeparser.h            \
-       gtkimmodule.h                   \
        gtkintl.h                       \
        gtkkeyhash.h                    \
        gtkmarshal.h                    \
        gtkmnemonichash.h               \
        gtkpathbar.h                    \
        gtkplugprivate.h                \
+       gtkprintbackend.h               \
+       gtkprinteroption.h              \
+       gtkprinteroptionset.h           \
+       gtkprinteroptionwidget.h        \
+       gtkprinter-private.h            \
+       gtkprint-win32.h                \
+       gtkprintutils.h                 \
+       gtkprintoperation-private.h     \
        gtkprivate.h                    \
+       gtkquery.h                      \
        gtkrbtree.h                     \
+       gtkrecentchooserdefault.h       \
+       gtkrecentchooserutils.h         \
+       gtkrecentchooserprivate.h       \
+       gtksearchengine.h               \
+       gtksearchenginebeagle.h         \
+       gtksearchenginetracker.h        \
+       gtksearchenginesimple.h         \
+       gtksearchenginequartz.h         \
        gtksequence.h                   \
        gtksocketprivate.h              \
-       gtktreedatalist.h               \
-       gtktreeprivate.h                \
        gtktextbtree.h                  \
+       gtktextbufferserializ.h         \
+       gtktextchildprivate.h           \
        gtktextdisplay.h                \
        gtktextiterprivate.h            \
        gtktextlayout.h                 \
@@ -63,10 +79,17 @@ IGNORE_HFILES=                              \
        gtktexttagprivate.h             \
        gtktexttypes.h                  \
        gtktextutil.h                   \
+       gtkthemes.h                     \
        gtktoggleactionprivate.h        \
+       gtktrayicon.h                   \
+       gtktreedatalist.h               \
+       gtktreeprivate.h                \
+       gtktoolpaletteprivate.h         \
        gtktypebuiltins.h               \
        gtkxembed.h                     \
        gtkwin32embed.h                 \
+       gtkwin32embedwidget.h           \
+       gtkwindow-decorate.h            \
        xdgmime                         \
        xembed.h
 
@@ -80,6 +103,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)                             \
@@ -87,7 +113,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 =                                        \
@@ -97,141 +123,183 @@ content_files =                                  \
        changes-1.2.sgml                        \
        changes-2.0.sgml                        \
        compiling.sgml                          \
-       framebuffer.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-GtkLabel-links.sgml           \
+       migrating-GtkLinkButton.sgml            \
+       migrating-GtkRecentChooser.sgml         \
+        migrating-GtkTooltip.sgml              \
        objects_grouped.sgml                    \
+       osx.sgml                                \
        question_index.sgml                     \
        resources.sgml                          \
        text_widget.sgml                        \
        tree_widget.sgml                        \
        windows.sgml                            \
        x11.sgml                                \
-       gtk-query-immodules-2.0.xml             \
-       gtk-update-icon-cache.xml               \
+       gtk-query-immodules-3.0.xml             \
+       gtk-update-icon-cache-3.0.xml           \
+       gtk-builder-convert-3.0.xml             \
        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
 
 # Images to copy into HTML directory
 HTML_IMAGES = \
-       $(top_srcdir)/gtk/stock-icons/stock_about_24.png                \
-       $(top_srcdir)/gtk/stock-icons/stock_add_24.png                  \
-       $(top_srcdir)/gtk/stock-icons/stock_apply_20.png                \
-       $(top_srcdir)/gtk/stock-icons/stock_text_bold_24.png            \
-       $(top_srcdir)/gtk/stock-icons/stock_cancel_20.png               \
-       $(top_srcdir)/gtk/stock-icons/stock_cdrom_24.png                \
-       $(top_srcdir)/gtk/stock-icons/stock_clear_24.png                \
-       $(top_srcdir)/gtk/stock-icons/stock_close_24.png                \
-       $(top_srcdir)/gtk/stock-icons/stock_connect_24.png              \
-       $(top_srcdir)/gtk/stock-icons/stock_convert_24.png              \
-       $(top_srcdir)/gtk/stock-icons/stock_copy_24.png                 \
-       $(top_srcdir)/gtk/stock-icons/stock_cut_24.png                  \
-       $(top_srcdir)/gtk/stock-icons/stock_trash_24.png                \
-       $(top_srcdir)/gtk/stock-icons/stock_dialog_authentication_48.png \
-       $(top_srcdir)/gtk/stock-icons/stock_dialog_error_48.png         \
-       $(top_srcdir)/gtk/stock-icons/stock_dialog_info_48.png          \
-       $(top_srcdir)/gtk/stock-icons/stock_dialog_question_48.png      \
-       $(top_srcdir)/gtk/stock-icons/stock_dialog_warning_48.png       \
-       $(top_srcdir)/gtk/stock-icons/stock_directory_24.png            \
-       $(top_srcdir)/gtk/stock-icons/stock_disconnect_24.png           \
-       $(top_srcdir)/gtk/stock-icons/stock_dnd_32.png                  \
-       $(top_srcdir)/gtk/stock-icons/stock_dnd_multiple_32.png         \
-       $(top_srcdir)/gtk/stock-icons/stock_edit_24.png                 \
-       $(top_srcdir)/gtk/stock-icons/stock_exec_24.png                 \
-       $(top_srcdir)/gtk/stock-icons/stock_file_24.png                 \
-       $(top_srcdir)/gtk/stock-icons/stock_search_24.png               \
-       $(top_srcdir)/gtk/stock-icons/stock_search_replace_24.png       \
-       $(top_srcdir)/gtk/stock-icons/stock_bottom_24.png               \
-       $(top_srcdir)/gtk/stock-icons/stock_first_24.png                \
-       $(top_srcdir)/gtk/stock-icons/stock_last_24.png                 \
-       $(top_srcdir)/gtk/stock-icons/stock_top_24.png                  \
-       $(top_srcdir)/gtk/stock-icons/stock_left_arrow_24.png           \
-       $(top_srcdir)/gtk/stock-icons/stock_down_arrow_24.png           \
-       $(top_srcdir)/gtk/stock-icons/stock_right_arrow_24.png          \
-       $(top_srcdir)/gtk/stock-icons/stock_up_arrow_24.png             \
-       $(top_srcdir)/gtk/stock-icons/stock_harddisk_24.png             \
-       $(top_srcdir)/gtk/stock-icons/stock_network_24.png              \
-       $(top_srcdir)/gtk/stock-icons/stock_help_24.png                 \
-       $(top_srcdir)/gtk/stock-icons/stock_home_24.png                 \
-       $(top_srcdir)/gtk/stock-icons/stock_index_24.png                \
-       $(top_srcdir)/gtk/stock-icons/stock_text_indent_24.png          \
-       $(top_srcdir)/gtk/stock-icons/stock_text_unindent_24.png        \
-       $(top_srcdir)/gtk/stock-icons/stock_text_italic_24.png          \
-       $(top_srcdir)/gtk/stock-icons/stock_jump_to_24.png              \
-       $(top_srcdir)/gtk/stock-icons/stock_jump_to_rtl_24.png          \
-       $(top_srcdir)/gtk/stock-icons/stock_align_center_24.png         \
-       $(top_srcdir)/gtk/stock-icons/stock_align_justify_24.png        \
-       $(top_srcdir)/gtk/stock-icons/stock_align_left_24.png           \
-       $(top_srcdir)/gtk/stock-icons/stock_align_right_24.png          \
-       $(top_srcdir)/gtk/stock-icons/stock_broken_image_24.png         \
-       $(top_srcdir)/gtk/stock-icons/stock_new_24.png                  \
-       $(top_srcdir)/gtk/stock-icons/stock_no_20.png                   \
-       $(top_srcdir)/gtk/stock-icons/stock_ok_20.png                   \
-       $(top_srcdir)/gtk/stock-icons/stock_open_24.png                 \
-       $(top_srcdir)/gtk/stock-icons/stock_paste_24.png                \
-       $(top_srcdir)/gtk/stock-icons/stock_preferences_24.png          \
-       $(top_srcdir)/gtk/stock-icons/stock_print_24.png                \
-       $(top_srcdir)/gtk/stock-icons/stock_print_preview_24.png        \
-       $(top_srcdir)/gtk/stock-icons/stock_properties_24.png           \
-       $(top_srcdir)/gtk/stock-icons/stock_exit_24.png                 \
-       $(top_srcdir)/gtk/stock-icons/stock_redo_24.png                 \
-       $(top_srcdir)/gtk/stock-icons/stock_redo_rtl_24.png             \
-       $(top_srcdir)/gtk/stock-icons/stock_refresh_24.png              \
-       $(top_srcdir)/gtk/stock-icons/stock_remove_24.png               \
-       $(top_srcdir)/gtk/stock-icons/stock_revert_24.png               \
-       $(top_srcdir)/gtk/stock-icons/stock_revert_rtl_24.png           \
-       $(top_srcdir)/gtk/stock-icons/stock_save_24.png                 \
-       $(top_srcdir)/gtk/stock-icons/stock_save_as_24.png              \
-       $(top_srcdir)/gtk/stock-icons/stock_select_all_24.png           \
-       $(top_srcdir)/gtk/stock-icons/stock_colorselector_24.png        \
-       $(top_srcdir)/gtk/stock-icons/stock_color_picker_25.png         \
-       $(top_srcdir)/gtk/stock-icons/stock_font_24.png                 \
-       $(top_srcdir)/gtk/stock-icons/stock_sort_ascending_24.png       \
-       $(top_srcdir)/gtk/stock-icons/stock_sort_descending_24.png      \
-       $(top_srcdir)/gtk/stock-icons/stock_spellcheck_24.png           \
-       $(top_srcdir)/gtk/stock-icons/stock_stop_24.png                 \
-       $(top_srcdir)/gtk/stock-icons/stock_text_strikethrough_24.png   \
-       $(top_srcdir)/gtk/stock-icons/stock_undelete_24.png             \
-       $(top_srcdir)/gtk/stock-icons/stock_undelete_rtl_24.png         \
-       $(top_srcdir)/gtk/stock-icons/stock_text_underline_24.png       \
-       $(top_srcdir)/gtk/stock-icons/stock_undo_24.png                 \
-       $(top_srcdir)/gtk/stock-icons/stock_undo_rtl_24.png             \
-       $(top_srcdir)/gtk/stock-icons/stock_yes_20.png                  \
-       $(top_srcdir)/gtk/stock-icons/stock_zoom_1_24.png               \
-       $(top_srcdir)/gtk/stock-icons/stock_zoom_fit_24.png             \
-       $(top_srcdir)/gtk/stock-icons/stock_zoom_in_24.png              \
-       $(top_srcdir)/gtk/stock-icons/stock_zoom_out_24.png             \
-       $(top_srcdir)/gtk/stock-icons/stock_media_forward_24.png        \
-       $(top_srcdir)/gtk/stock-icons/stock_media_next_24.png           \
-       $(top_srcdir)/gtk/stock-icons/stock_media_pause_24.png          \
-       $(top_srcdir)/gtk/stock-icons/stock_media_play_24.png           \
-       $(top_srcdir)/gtk/stock-icons/stock_media_play_rtl_24.png       \
-       $(top_srcdir)/gtk/stock-icons/stock_media_previous_24.png       \
-       $(top_srcdir)/gtk/stock-icons/stock_media_record_24.png         \
-       $(top_srcdir)/gtk/stock-icons/stock_media_rewind_24.png         \
-       $(top_srcdir)/gtk/stock-icons/stock_media_stop_24.png           \
-       $(top_srcdir)/gtk/stock-icons/stock_fullscreen_24.png           \
-       $(top_srcdir)/gtk/stock-icons/stock_leave_fullscreen_24.png     \
-       $(top_srcdir)/gtk/stock-icons/stock_info_24.png                 \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-about.png                  \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-add.png                    \
+       $(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                  \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-connect.png                \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-convert.png                \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-copy.png                   \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-cut.png                    \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-delete.png                 \
+       $(top_srcdir)/gtk/stock-icons/48/gtk-dialog-authentication.png  \
+       $(top_srcdir)/gtk/stock-icons/48/gtk-dialog-error.png           \
+       $(top_srcdir)/gtk/stock-icons/48/gtk-dialog-info.png            \
+       $(top_srcdir)/gtk/stock-icons/48/gtk-dialog-question.png        \
+       $(top_srcdir)/gtk/stock-icons/48/gtk-dialog-warning.png         \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-directory.png              \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-disconnect.png             \
+       $(top_srcdir)/gtk/stock-icons/32/gtk-dnd.png                    \
+       $(top_srcdir)/gtk/stock-icons/32/gtk-dnd-multiple.png           \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-edit.png                   \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-execute.png                \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-file.png                   \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-find.png                   \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-find-and-replace.png       \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-goto-bottom.png            \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-goto-first-ltr.png         \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-goto-first-rtl.png         \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-goto-last-ltr.png          \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-goto-last-rtl.png          \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-goto-top.png               \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-go-back-ltr.png            \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-go-back-rtl.png            \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-go-down.png                \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-go-forward-ltr.png         \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-go-forward-rtl.png         \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-go-up.png                  \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-harddisk.png               \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-network.png                \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-help.png                   \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-home.png                   \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-index.png                  \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-indent-ltr.png             \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-indent-rtl.png             \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-unindent-ltr.png           \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-unindent-rtl.png           \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-italic.png                 \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-jump-to-ltr.png            \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-jump-to-rtl.png            \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-justify-center.png         \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-justify-fill.png           \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-justify-left.png           \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-justify-right.png          \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-missing-image.png          \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-new.png                    \
+       $(top_srcdir)/gtk/stock-icons/20/gtk-no.png                     \
+       $(top_srcdir)/gtk/stock-icons/20/gtk-ok.png                     \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-open.png                   \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-orientation-landscape.png  \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-orientation-portrait.png   \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-orientation-reverse-landscape.png \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-orientation-reverse-portrait.png \
+       $(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               \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-redo-rtl.png               \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-refresh.png                \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-remove.png                 \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-revert-to-saved-ltr.png    \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-revert-to-saved-rtl.png    \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-floppy.png                 \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-save.png                   \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-save-as.png                \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-select-all.png             \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-select-color.png           \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-color-picker.png           \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-font.png                   \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-sort-ascending.png         \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-sort-descending.png        \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-spell-check.png            \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-stop.png                   \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-strikethrough.png          \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-undelete-ltr.png           \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-undelete-rtl.png           \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-underline.png              \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-undo-ltr.png               \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-undo-rtl.png               \
+       $(top_srcdir)/gtk/stock-icons/20/gtk-yes.png                    \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-zoom-100.png               \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-zoom-fit.png               \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-zoom-in.png                \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-zoom-out.png               \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-media-forward-ltr.png      \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-media-forward-rtl.png      \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-media-next-ltr.png         \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-media-next-rtl.png         \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-media-pause.png            \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-media-play-ltr.png         \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-media-play-rtl.png         \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-media-previous-ltr.png     \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-media-previous-rtl.png     \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-media-record.png           \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-media-rewind-ltr.png       \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-media-rewind-rtl.png       \
+       $(top_srcdir)/gtk/stock-icons/24/gtk-media-stop.png             \
+       $(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                                     \
        $(srcdir)/images/check-button.png                               \
        $(srcdir)/images/color-button.png                               \
@@ -239,6 +307,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                                \
@@ -247,25 +317,46 @@ HTML_IMAGES = \
        $(srcdir)/images/icon-view.png                                  \
        $(srcdir)/images/image.png                                      \
        $(srcdir)/images/label.png                                      \
+       $(srcdir)/images/link-button.png                                \
        $(srcdir)/images/list-and-tree.png                              \
        $(srcdir)/images/menubar.png                                    \
        $(srcdir)/images/messagedialog.png                              \
        $(srcdir)/images/multiline-text.png                             \
        $(srcdir)/images/notebook.png                                   \
        $(srcdir)/images/panes.png                                      \
+       $(srcdir)/images/pagesetupdialog.png                            \
+       $(srcdir)/images/printdialog.png                                \
        $(srcdir)/images/progressbar.png                                \
        $(srcdir)/images/radio-group.png                                \
+       $(srcdir)/images/recentchooserdialog.png                        \
        $(srcdir)/images/scales.png                                     \
        $(srcdir)/images/scrolledwindow.png                             \
        $(srcdir)/images/separator.png                                  \
        $(srcdir)/images/spinbutton.png                                 \
+       $(srcdir)/images/spinner.png                                    \
        $(srcdir)/images/statusbar.png                                  \
        $(srcdir)/images/toggle-button.png                              \
        $(srcdir)/images/toolbar.png                                    \
-       $(srcdir)/images/window.png
+       $(srcdir)/images/toolpalette.png                                \
+       $(srcdir)/images/tree-view-coordinates.png                      \
+       $(srcdir)/images/volumebutton.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
+FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html \
+       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
+       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
+       --extra-dir=$(ATK_PREFIX)/share/gtk-doc/html/atk \
+       --extra-dir=$(PANGO_PREFIX)/share/gtk-doc/html/pango \
+       --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
 
 include $(top_srcdir)/gtk-doc.make
 
@@ -274,19 +365,24 @@ EXTRA_DIST += version.xml.in
 
 ########################################################################
 
-man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 
-
 if ENABLE_MAN
 
-%.1 : %.xml 
-       @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+man_MANS =                             \
+       gtk-query-immodules-3.0.1       \
+       gtk-update-icon-cache-3.0.1     \
+       gtk-builder-convert-3.0.1
 
-endif
+%.1 : %.xml
+       @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
 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