diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2018-08-24 11:00:09 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2018-08-24 11:06:47 +0200 |
| commit | b7db94545968c37886b7111d8c85f62eb063fbb4 (patch) | |
| tree | 7c2aedd497b1fdcb26bf9d49f98cc63a530baf2e /docs/libnm/Makefile.am | |
| parent | 9d5cdc3adde9e7e57bf5a0e754e563b6a9e8e513 (diff) | |
| parent | caf1db9d6fbc056cc6c76a24574890f6c7895f3d (diff) | |
Import Debian changes 1.12.2-0ubuntu3
network-manager (1.12.2-0ubuntu3) cosmic; urgency=medium
* debian/rules:
- use --with-libnm-glib, the default reversed since that's a legacy
library but we still need it for unity-control-center
network-manager (1.12.2-0ubuntu2) cosmic; urgency=medium
* debian/patches/git-newglib-test.patch:
- backport upstream commit to fix the tests with the new glib
network-manager (1.12.2-0ubuntu1) cosmic; urgency=medium
* New upstream version
* d/p/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch,
d/p/e91f1a7d2a6b8400b6b331d5b72287dcb5164a39.patch,
d/p/git_thunderbolt_connect.patch:
- removed, those changes are in the new version
* Backport Debian changes
* Update symbols file for libnm0
* Enable iwd support
* Drop version requirements when oldstable ships a newer version
* Drop dh_strip override, the dbgsym migration is done
* Rebase patches
* Make sure the example server.conf is actually installed
* Update install path for plugins, it now includes a version number
* Drop libnl3 build dependency.
Upstream has copied the code directly from libnl3 for the few functions it
needs with a few small modifications.
* Drop libiw build dependency.
Hasn't been needed for a long time and was simply a left over from older
releases.
* Bump Standards-Version to 4.1.5
* Fix compile error due to NM_AVAILABLE_IN_1_12_2 macro (Closes: #905372)
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 \ |