diff options
| author | Dan Winship <danw@gnome.org> | 2014-09-10 15:46:46 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-09-18 11:51:07 -0400 |
| commit | 280b1e506758fe41aaf2d012ba796be49c436684 (patch) | |
| tree | d3afc04746a10bf9157e89f58dbf22e3a1a84a4a /docs | |
| parent | bc003f627340fd94bfe605a830fa09d010b0a1af (diff) | |
| download | NetworkManager-280b1e506758fe41aaf2d012ba796be49c436684.tar.gz | |
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.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/libnm/Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am index c99e242512..fb9e0bb519 100644 --- a/docs/libnm/Makefile.am +++ b/docs/libnm/Makefile.am @@ -67,7 +67,6 @@ GTKDOC_CFLAGS = \ GTKDOC_LIBS = \ $(top_builddir)/libnm/libnm.la \ - $(top_builddir)/libnm/libnm-vpn.la \ $(GLIB_LIBS) |