Make 3.0 parallel-installable to 2.x

[~andy/gtk] / docs / reference / gtk / Makefile.am

diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 72aed7380086d5065af9740f47e713a868ff575f..93b66fce8328dfff28252fad68a83e83cfb8bdf0 100644 (file)
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -10,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
@@ -87,6 +84,7 @@ IGNORE_HFILES=                                \
        gtktrayicon.h                   \
        gtktreedatalist.h               \
        gtktreeprivate.h                \
+       gtktoolpaletteprivate.h         \
        gtktypebuiltins.h               \
        gtkxembed.h                     \
        gtkwin32embed.h                 \
@@ -129,6 +127,7 @@ content_files =                                     \
        drawing-model.xml                       \
        glossary.xml                            \
        migrating-checklist.sgml                \
+        migrating-ClientSideWindows.sgml       \
        migrating-GtkAboutDialog.sgml           \
        migrating-GtkAction.sgml                \
        migrating-GtkAssistant.sgml             \
@@ -150,15 +149,16 @@ content_files =                                   \
        tree_widget.sgml                        \
        windows.sgml                            \
        x11.sgml                                \
-       gtk-query-immodules-2.0.xml             \
-       gtk-update-icon-cache.xml               \
-       gtk-builder-convert.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           \
@@ -168,6 +168,7 @@ expand_content_files =                              \
        migrating-GtkColorButton.sgml           \
        migrating-GtkAssistant.sgml             \
        migrating-GtkRecentChooser.sgml         \
+       migrating-GtkLabel-links.sgml           \
        migrating-GtkLinkButton.sgml            \
        migrating-GtkBuilder.sgml               \
        migrating-GtkTooltip.sgml               \
@@ -332,9 +333,11 @@ HTML_IMAGES = \
        $(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/toolpalette.png                                \
        $(srcdir)/images/tree-view-coordinates.png                      \
        $(srcdir)/images/volumebutton.png                               \
        $(srcdir)/images/window.png                                     \
@@ -364,9 +367,12 @@ EXTRA_DIST += version.xml.in
 
 if ENABLE_MAN
 
-man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1
+man_MANS =                             \
+       gtk-query-immodules-3.0.1       \
+       gtk-update-icon-cache-3.0.1     \
+       gtk-builder-convert-3.0.1
 
-%.1 : %.xml 
+%.1 : %.xml
        @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
 BUILT_EXTRA_DIST = $(man_MANS)