From 8a46b25cfa8c33daa8af37bb8103ca02286001b1 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 2 Jan 2018 15:47:37 +0100 Subject: all: require glib 2.40 RHEL 7.1 and Ubuntu 14.04 LTS both have this. https://bugzilla.gnome.org/show_bug.cgi?id=792323 --- docs/libnm-glib/Makefile.am | 3 --- docs/libnm-util/Makefile.am | 3 --- docs/libnm/Makefile.am | 3 --- 3 files changed, 9 deletions(-) (limited to 'docs') diff --git a/docs/libnm-glib/Makefile.am b/docs/libnm-glib/Makefile.am index 662db95ff2..5273148a94 100644 --- a/docs/libnm-glib/Makefile.am +++ b/docs/libnm-glib/Makefile.am @@ -15,9 +15,6 @@ DOC_SOURCE_DIR=$(top_srcdir)/libnm-glib # Extra options to supply to gtkdoc-scan. SCAN_OPTIONS= -# Extra options to supply to gtkdoc-scangobj. -SCANGOBJ_OPTIONS=--type-init-func 'g_type_init();' - # Extra options to supply to gtkdoc-mkdb. MKDB_OPTIONS=--sgml-mode --output-format=xml diff --git a/docs/libnm-util/Makefile.am b/docs/libnm-util/Makefile.am index 4e8ede134a..75badb7791 100644 --- a/docs/libnm-util/Makefile.am +++ b/docs/libnm-util/Makefile.am @@ -17,9 +17,6 @@ DOC_SOURCE_DIR= \ # Extra options to supply to gtkdoc-scan. SCAN_OPTIONS=--rebuild-types --rebuild-sections -# Extra options to supply to gtkdoc-scangobj. -SCANGOBJ_OPTIONS=--type-init-func 'g_type_init();' - # Extra options to supply to gtkdoc-mkdb. MKDB_OPTIONS=--sgml-mode --output-format=xml diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am index 3c1f803a4a..3ab55a8c43 100644 --- a/docs/libnm/Makefile.am +++ b/docs/libnm/Makefile.am @@ -19,9 +19,6 @@ DOC_SOURCE_DIR= \ # Extra options to supply to gtkdoc-scan. SCAN_OPTIONS=--rebuild-types --rebuild-sections -# Extra options to supply to gtkdoc-scangobj. -SCANGOBJ_OPTIONS=--type-init-func 'g_type_init();' - # Extra options to supply to gtkdoc-mkdb. MKDB_OPTIONS=--sgml-mode --output-format=xml -- cgit v1.2.1