libnm: merge libnm-vpn into libnm

System Internals / NetworkManager - Dan Winship [gnome.org] - 18 September 2014 10:51 UTC

There's not much point in keeping them separate: all existing libnm-glib-vpn users also link against libnm-glib, and the amount of extra code added to libnm by merging in libnm-vpn is negligible.

Additionally, nm-vpn-plugin will later need access to some libnm-internal APIs.

So, merge them together.

280b1e5 libnm: merge libnm-vpn into libnm
configure.ac | 1 -
docs/libnm/Makefile.am | 1 -
libnm/Makefile.am | 56 +++++++++++-------------------------
libnm/libnm-vpn.pc.in | 13 ---------
libnm/libnm-vpn.ver | 31 --------------------
libnm/libnm.ver | 24 ++++++++++++++++
libnm/nm-vpn-plugin-ui-interface.c | 15 ++++++++++
libnm/nm-vpn-plugin-ui-interface.h | 2 ++
libnm/nm-vpn-plugin.c | 2 +-
libnm/nm-vpn-plugin.h | 1 -
10 files changed, 59 insertions(+), 87 deletions(-)

Upstream: cgit.freedesktop.org

  • Share