diff options
| author | Michael Biebl <biebl@debian.org> | 2018-07-03 23:54:48 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-07-03 23:54:48 +0200 |
| commit | 54de7f04d1fac5f29fd54ec4120ba2fc4f9b5714 (patch) | |
| tree | 87729385ff8de744dc44d0b4cc75916494b2fd38 /docs/libnm-util/Makefile.am | |
| parent | 680d3db45106e7a18665a366e1b57e58cef61506 (diff) | |
| parent | 329b15110c4b183d7a47552abe3a6a6ff933e817 (diff) | |
Merge branch 'experimental'
Diffstat (limited to 'docs/libnm-util/Makefile.am')
| -rw-r--r-- | docs/libnm-util/Makefile.am | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/docs/libnm-util/Makefile.am b/docs/libnm-util/Makefile.am index b1386e60..5b8d7260 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 @@ -33,7 +30,6 @@ CFILE_GLOB=$(top_srcdir)/libnm-util/*.c # Header files to ignore when scanning. IGNORE_HFILES= \ crypto.h \ - nm-setting-template.h \ nm-utils-private.h \ nm-setting-private.h \ nm-param-spec-specialized.h \ @@ -41,7 +37,7 @@ IGNORE_HFILES= \ nm-version.h # Images to copy into HTML directory. -HTML_IMAGES = +HTML_IMAGES = # Extra XML files that are included by $(DOC_MAIN_SGML_FILE). content_files = version.xml @@ -52,11 +48,10 @@ extra_files = # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. -GTKDOC_CFLAGS = \ - -I$(top_srcdir)/libnm-util \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ +GTKDOC_CFLAGS = \ + -I$(top_srcdir)/libnm-util \ -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \ - $(GLIB_CFLAGS) \ + $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) GTKDOC_LIBS = \ @@ -68,7 +63,7 @@ GTKDOC_LIBS = \ # include common portion ... include $(top_srcdir)/gtk-doc.make -EXTRA_DIST += version.xml.in +EXTRA_DIST += version.xml.in meson.build CLEANFILES += \ libnm-util-sections.txt \ |