Use --type-init-func to force g_thread_init to be called. [#302674]

	* docs/reference/Makefile.am (SCANGOBJ_OPTIONS): Use
	--type-init-func to force g_thread_init to be called. [#302674]

diff --git a/ChangeLog b/ChangeLog
index 0133193..1c7e473 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-05  Dan Winship  <danw@novell.com>
+
+       * docs/reference/Makefile.am (SCANGOBJ_OPTIONS): Use
+       --type-init-func to force g_thread_init to be called. [#302674]
+
 2005-04-18  Tor Lillqvist  <tml@novell.com>
 
        * configure.in: Call AC_LIBTOOL_WIN32_DLL. Check for Win32, set

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 4e57029..d80264d 100644 (file)
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -15,6 +15,9 @@ DOC_SOURCE_DIR=../../libsoup
 # Extra options to supply to gtkdoc-scan.
 SCAN_OPTIONS=
 
+# Extra options to supply to gtkdoc-scangobj.
+SCANGOBJ_OPTIONS=--type-init-func 'g_type_init(); g_thread_init(NULL)'
+
 # Extra options to supply to gtkdoc-mkdb.
 MKDB_OPTIONS=--sgml-mode --output-format=xml
 
@@ -49,12 +52,6 @@ GTKDOC_CFLAGS =                              \
 GTKDOC_LIBS = $(top_builddir)/libsoup/libsoup-$(SOUP_API_VERSION).la
 
 
-# If you need to override some of the declarations, place them in the
-# $(DOC_MODULE)-overrides.txt file and uncomment the second line here.
-DOC_OVERRIDES =
-#DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt
-
-
 # include common portion ...
 include $(top_srcdir)/gtk-doc.make