luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-27 07:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Doc: Fix missing glibconfig.h when builddir!=srcdir

Browse Source 
Currently the doc is incomplete when builddir!=srcdir
(e.g. debian package) because glibconfig.h is generared from
configure.ac and is thus missing from srcdir. This leads to
missing doc for symbols like G_GINT64_FORMAT.

https://bugzilla.gnome.org/show_bug.cgi?id=734469
This commit is contained in:
Xavier Claessens 2015-11-02 09:36:47 -05:00
parent 86a7c864b3
commit 6f1b574cea
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/reference/gio/Makefile.am
View File

@ -13,10 +13,11 @@ SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" \
--ignore-decorators="G_GNUC_WARN_UNUSED_RESULT" --ignore-decorators="G_GNUC_WARN_UNUSED_RESULT"
# The directory containing the source code. Relative to $(srcdir) # The directory containing the source code. Relative to $(srcdir)
DOC_SOURCE_DIR=$(top_srcdir)/gio DOC_SOURCE_DIR =$(top_srcdir)/gio $(top_builddir)/gio
BUILT_HFILES=gioenumtypes.h HFILE_GLOB= \
HFILE_GLOB=$(top_srcdir)/gio/*.h $(top_srcdir)/gio/*.h \
$(top_builddir)/gio/gioenumtypes.h
CFILE_GLOB=$(top_srcdir)/gio/*.c CFILE_GLOB=$(top_srcdir)/gio/*.c
IGNORE_HFILES = \ IGNORE_HFILES = \

11
docs/reference/glib/Makefile.am
View File

@ -9,7 +9,9 @@ DOC_MODULE=glib
DOC_MAIN_SGML_FILE=glib-docs.xml DOC_MAIN_SGML_FILE=glib-docs.xml
# The directory containing the source code. Relative to $(srcdir) # The directory containing the source code. Relative to $(srcdir)
DOC_SOURCE_DIR=$(top_srcdir)/glib $(top_srcdir)/gmodule DOC_SOURCE_DIR = \
$(top_srcdir)/glib $(top_srcdir)/gmodule \
$(top_builddir)/glib $(top_builddir)/gmodule
# Extra options to supply to gtkdoc-scan # Extra options to supply to gtkdoc-scan
SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" --ignore-decorators="GLIB_VAR|G_GNUC_WARN_UNUSED_RESULT" SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" --ignore-decorators="GLIB_VAR|G_GNUC_WARN_UNUSED_RESULT"
@ -18,8 +20,11 @@ SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" --ignore-decorators="GLI
MKDB_OPTIONS=--output-format=xml --name-space=g MKDB_OPTIONS=--output-format=xml --name-space=g
# Used for dependencies # Used for dependencies
HFILE_GLOB=$(top_srcdir)/glib/*.h $(top_srcdir)/gmodule/*.h HFILE_GLOB = \
CFILE_GLOB=$(top_srcdir)/glib/*.c $(top_srcdir)/gmodule/*.c $(top_srcdir)/glib/*.h \
$(top_srcdir)/gmodule/*.h \
$(top_builddir)/glib/glibconfig.h
CFILE_GLOB= $(top_srcdir)/glib/*.c $(top_srcdir)/gmodule/*.c
# Ignore some private headers # Ignore some private headers
IGNORE_HFILES = \ IGNORE_HFILES = \

2
docs/reference/gobject/Makefile.am
View File

@ -9,7 +9,7 @@ DOC_MODULE=gobject
DOC_MAIN_SGML_FILE=gobject-docs.xml DOC_MAIN_SGML_FILE=gobject-docs.xml
# The directory containing the source code. Relative to $(srcdir) # The directory containing the source code. Relative to $(srcdir)
DOC_SOURCE_DIR=$(top_srcdir)/gobject DOC_SOURCE_DIR =$(top_srcdir)/gobject $(top_builddir)/gobject
# Extra options to supply to gtkdoc-scan # Extra options to supply to gtkdoc-scan
SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" \ SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" \