g/: sync a little with gtk-doc mainline

Original commit message from CVS:
* gstdoc-scangobj:
* gtk-doc.mak:
sync a little with gtk-doc mainline

diff --git a/ChangeLog b/ChangeLog
index 6ef3351..2619e3a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-23  Stefan Kost  <ensonic@users.sf.net>
+
+       * gstdoc-scangobj:
+       * gtk-doc.mak:
+         sync a little with gtk-doc mainline
+
 2006-03-17  Wim Taymans  <wim@fluendo.com>
 
        * gst.supp:

diff --git a/gstdoc-scangobj b/gstdoc-scangobj
index ac5940c..2333afe 100755 (executable)
--- a/gstdoc-scangobj
+++ b/gstdoc-scangobj
@@ -512,6 +512,9 @@ get_type_name (GType type, gboolean * is_pointer)
      e.g. 'GtkWidget *'. */
   if (g_type_is_a (type, G_TYPE_OBJECT))
     *is_pointer = TRUE;
+    
+  if (G_TYPE_IS_CLASSED (type))
+    *is_pointer = TRUE;
 
   /* All boxed subtypes will be pointers as well. */
   if (g_type_is_a (type, G_TYPE_BOXED))

diff --git a/gtk-doc.mak b/gtk-doc.mak
index 2c5cc84..1852b90 100644 (file)
--- a/gtk-doc.mak
+++ b/gtk-doc.mak
@@ -189,6 +189,10 @@ install-data-local:
          echo '-- Installing $(srcdir)/html/$(DOC_MODULE).devhelp' ; \
          $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \
            $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp; \
+         if test -e $(srcdir)/html/$(DOC_MODULE).devhelp2; then \
+                 $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp2 \
+                  $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
+         fi; \
          echo '-- Installing $(srcdir)/html/index.sgml' ; \
          $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
                if test -e $(srcdir)/html/style.css; then \
@@ -244,7 +248,7 @@ dist-hook: dist-check-gtkdoc dist-hook-local
        -cp $(srcdir)/sgml/*.xml $(distdir)/xml
        -cp $(srcdir)/html/index.sgml $(distdir)/html
        -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
-       -cp $(srcdir)/html/$(DOC_MODULE).devhelp $(distdir)/html
+       -cp $(srcdir)/html/$(DOC_MODULE).devhelp* $(distdir)/html
 
        images=$(HTML_IMAGES) ;               \
        for i in "" $$images ; do                     \