From 2603b016844a238ed4e38189b9368396956a22b2 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 21 Nov 2016 00:33:50 +0100 Subject: [PATCH] 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. --- Makefile.am | 10 +++++----- src/{vpn-manager => vpn}/nm-vpn-connection.c | 0 src/{vpn-manager => vpn}/nm-vpn-connection.h | 0 src/{vpn-manager => vpn}/nm-vpn-manager.c | 0 src/{vpn-manager => vpn}/nm-vpn-manager.h | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename src/{vpn-manager => vpn}/nm-vpn-connection.c (100%) rename src/{vpn-manager => vpn}/nm-vpn-connection.h (100%) rename src/{vpn-manager => vpn}/nm-vpn-manager.c (100%) rename src/{vpn-manager => vpn}/nm-vpn-manager.h (100%) 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 similarity index 100% rename from src/vpn-manager/nm-vpn-connection.c rename to src/vpn/nm-vpn-connection.c diff --git a/src/vpn-manager/nm-vpn-connection.h b/src/vpn/nm-vpn-connection.h similarity index 100% rename from src/vpn-manager/nm-vpn-connection.h rename to src/vpn/nm-vpn-connection.h diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn/nm-vpn-manager.c similarity index 100% rename from src/vpn-manager/nm-vpn-manager.c rename to src/vpn/nm-vpn-manager.c diff --git a/src/vpn-manager/nm-vpn-manager.h b/src/vpn/nm-vpn-manager.h similarity index 100% rename from src/vpn-manager/nm-vpn-manager.h rename to src/vpn/nm-vpn-manager.h