From 92ceb73a35c775d656f8fcf821faa35da52417eb Mon Sep 17 00:00:00 2001 From: Damon Chaplin Date: Wed, 23 Jan 2002 23:52:43 +0000 Subject: [PATCH] added SCANGOBJ_OPTIONS to set the type-init-func to pass to 2002-01-23 Damon Chaplin * gtk/Makefile.am: added SCANGOBJ_OPTIONS to set the type-init-func to pass to gtkdoc-scangobj. --- docs/reference/ChangeLog | 5 +++++ docs/reference/gtk/Makefile.am | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index e0c6316761..7e7e5e0897 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,8 @@ +2002-01-23 Damon Chaplin + + * gtk/Makefile.am: added SCANGOBJ_OPTIONS to set the type-init-func + to pass to gtkdoc-scangobj. + Mon Jan 21 23:39:42 2002 Jonathan Blandford * gtk/tmpl/gtkfixed.sgml: change guint16 to gint to reflect diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index 61d40133f7..f163b95a46 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -9,6 +9,9 @@ DOC_MAIN_SGML_FILE=gtk-docs.sgml # The directory containing the source code. Relative to $(srcdir) DOC_SOURCE_DIR=../../../gtk +# Extra options to pass to gtkdoc-scangobj +SCANGOBJ_OPTIONS=--type-init-func="gtk_type_init(0)" + # Extra options to supply to gtkdoc-scan SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED" @@ -198,7 +201,7 @@ all-local: html-build.stamp scan-build.stamp: $(HFILE_GLOB) @echo '*** Scanning header files ***' if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ else \ cd $(srcdir) ; \ for i in $(SCANOBJ_FILES) ; do \