libnm: merge libnm-vpn into libnm
authorDan Winship <danw@gnome.org>
Wed, 10 Sep 2014 19:46:46 +0000 (15:46 -0400)
committerDan Winship <danw@gnome.org>
Thu, 18 Sep 2014 15:51:07 +0000 (11:51 -0400)
commit280b1e506758fe41aaf2d012ba796be49c436684
treed3afc04746a10bf9157e89f58dbf22e3a1a84a4a
parentbc003f627340fd94bfe605a830fa09d010b0a1af
libnm: merge libnm-vpn into libnm

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.
configure.ac
docs/libnm/Makefile.am
libnm/Makefile.am
libnm/libnm-vpn.pc.in [deleted file]
libnm/libnm-vpn.ver [deleted file]
libnm/libnm.ver
libnm/nm-vpn-plugin-ui-interface.c
libnm/nm-vpn-plugin-ui-interface.h
libnm/nm-vpn-plugin.c
libnm/nm-vpn-plugin.h