diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-11-21 00:33:50 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-11-21 14:07:47 +0100 |
| commit | 2603b016844a238ed4e38189b9368396956a22b2 (patch) | |
| tree | d8feb99a3ad4cfc27f439315d403ff3ed2584d34 | |
| parent | 62c2e6ccdad091e5c8846ae378bdef676b897de6 (diff) | |
| download | NetworkManager-2603b016844a238ed4e38189b9368396956a22b2.tar.gz | |
build: rename "src/vpn-manager" to "src/vpn"
The vpn directory does not only contain the manager
instance, but various files related to VPN.
Rename.
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | src/vpn/nm-vpn-connection.c (renamed from src/vpn-manager/nm-vpn-connection.c) | 0 | ||||
| -rw-r--r-- | src/vpn/nm-vpn-connection.h (renamed from src/vpn-manager/nm-vpn-connection.h) | 0 | ||||
| -rw-r--r-- | src/vpn/nm-vpn-manager.c (renamed from src/vpn-manager/nm-vpn-manager.c) | 0 | ||||
| -rw-r--r-- | src/vpn/nm-vpn-manager.h (renamed from src/vpn-manager/nm-vpn-manager.h) | 0 |
5 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index c706e15b29..6f202bd3fd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -960,7 +960,7 @@ src_cppflags = \ -I$(top_srcdir)/src/ndisc \ -I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/supplicant \ - -I$(top_srcdir)/src/vpn-manager \ + -I$(top_srcdir)/src/vpn \ \ -DPREFIX=\"$(prefix)\" \ -DG_LOG_DOMAIN=\""NetworkManager"\" \ @@ -1353,10 +1353,10 @@ src_libNetworkManager_la_SOURCES = \ src/supplicant/nm-supplicant-settings-verify.h \ src/supplicant/nm-supplicant-types.h \ \ - src/vpn-manager/nm-vpn-connection.c \ - src/vpn-manager/nm-vpn-connection.h \ - src/vpn-manager/nm-vpn-manager.c \ - src/vpn-manager/nm-vpn-manager.h \ + src/vpn/nm-vpn-connection.c \ + src/vpn/nm-vpn-connection.h \ + src/vpn/nm-vpn-manager.c \ + src/vpn/nm-vpn-manager.h \ \ src/nm-act-request.c \ src/nm-act-request.h \ diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn/nm-vpn-connection.c index 4158831007..4158831007 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn/nm-vpn-connection.c diff --git a/src/vpn-manager/nm-vpn-connection.h b/src/vpn/nm-vpn-connection.h index 6037295e22..6037295e22 100644 --- a/src/vpn-manager/nm-vpn-connection.h +++ b/src/vpn/nm-vpn-connection.h diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn/nm-vpn-manager.c index 8e708d125c..8e708d125c 100644 --- a/src/vpn-manager/nm-vpn-manager.c +++ b/src/vpn/nm-vpn-manager.c diff --git a/src/vpn-manager/nm-vpn-manager.h b/src/vpn/nm-vpn-manager.h index 8b1bec1e47..8b1bec1e47 100644 --- a/src/vpn-manager/nm-vpn-manager.h +++ b/src/vpn/nm-vpn-manager.h |