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/Makefile.am | |
| parent | 680d3db45106e7a18665a366e1b57e58cef61506 (diff) | |
| parent | 329b15110c4b183d7a47552abe3a6a6ff933e817 (diff) | |
Merge branch 'experimental'
Diffstat (limited to 'docs/libnm/Makefile.am')
| -rw-r--r-- | docs/libnm/Makefile.am | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am index 3e0eca49..c2bcff1b 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 @@ -69,24 +66,25 @@ extra_files = libnm.png # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. -GTKDOC_CFLAGS = \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/libnm \ - -I$(top_builddir)/libnm \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ +GTKDOC_CFLAGS = \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -I$(top_srcdir)/libnm \ + -I$(top_builddir)/libnm \ -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \ - $(GLIB_CFLAGS) + $(GLIB_CFLAGS) \ + $(SANITIZER_EXEC_CFLAGS) -GTKDOC_LIBS = \ +GTKDOC_LIBS = \ $(top_builddir)/libnm/libnm.la \ - $(GLIB_LIBS) + $(GLIB_LIBS) \ + $(SANITIZER_EXEC_LDFLAGS) # include common portion ... include $(top_srcdir)/gtk-doc.make -EXTRA_DIST += version.xml.in +EXTRA_DIST += version.xml.in meson.build CLEANFILES += \ libnm-sections.txt \ |