summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJiří Techet <techet@gmail.com>2014-09-17 23:24:24 +0200
committerJiří Techet <techet@gmail.com>2014-09-17 23:24:24 +0200
commitce7cbe375f81d31421fa4872ec966fe9f53f12ec (patch)
tree2de675b16b1de3fad1b30fefcdb0b18e7f8db31c /docs
parent1bf18c23e64863812397e67a9741d8880889a530 (diff)
downloadlibchamplain-ce7cbe375f81d31421fa4872ec966fe9f53f12ec.tar.gz
Fix some compilation warnings in automake
Diffstat (limited to 'docs')
-rw-r--r--docs/reference-gtk/Makefile.am4
-rw-r--r--docs/reference/Makefile.am4
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/reference-gtk/Makefile.am b/docs/reference-gtk/Makefile.am
index a59d527..f1ad57e 100644
--- a/docs/reference-gtk/Makefile.am
+++ b/docs/reference-gtk/Makefile.am
@@ -20,11 +20,11 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
DOC_SOURCE_DIR=../../champlain-gtk
# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=--type-init-func='g_type_init()'
+SCANGOBJ_OPTIONS=
# Extra options to supply to gtkdoc-scan.
# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
-SCAN_OPTIONS=--rebuild-types
+SCAN_OPTIONS=--rebuild-types --deprecated-guards="GTK_DISABLE_DEPRECATED"
# Extra options to supply to gtkdoc-mkdb.
# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index a64b6ec..d0f019e 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -20,7 +20,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
DOC_SOURCE_DIR=../../champlain
# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=--type-init-func="g_type_init()"
+SCANGOBJ_OPTIONS=
# Extra options to supply to gtkdoc-scan.
# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
@@ -89,7 +89,7 @@ expand_content_files=
# signals and properties.
# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-GTKDOC_CFLAGS=$(DEPS_CFLAGS) -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/champlain
+GTKDOC_CFLAGS=$(DEPS_CFLAGS) -I$(top_srcdir) -I$(top_builddir)
GTKDOC_LIBS=$(DEPS_LIBS) $(top_builddir)/champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
# This includes the standard gtk-doc make rules, copied by gtkdocize.