From c5cbe91e605012df75c317743dc726215cada2d5 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 12 Nov 2014 12:37:12 +0100 Subject: [PATCH] core: move content of src/firewall-manager directory to src/ The directory firewall-manager/ only contained one source and one header file. Move them to the parent src/ directory. Signed-off-by: Thomas Haller --- src/Makefile.am | 5 ++--- src/{firewall-manager => }/nm-firewall-manager.c | 0 src/{firewall-manager => }/nm-firewall-manager.h | 0 3 files changed, 2 insertions(+), 3 deletions(-) rename src/{firewall-manager => }/nm-firewall-manager.c (100%) rename src/{firewall-manager => }/nm-firewall-manager.h (100%) diff --git a/src/Makefile.am b/src/Makefile.am index eb5c64c089..a317705110 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -210,9 +210,6 @@ nm_sources = \ dnsmasq-manager/nm-dnsmasq-utils.c \ dnsmasq-manager/nm-dnsmasq-utils.h \ \ - firewall-manager/nm-firewall-manager.c \ - firewall-manager/nm-firewall-manager.h \ - \ platform/nm-fake-platform.c \ platform/nm-fake-platform.h \ platform/nm-linux-platform.c \ @@ -304,6 +301,8 @@ nm_sources = \ nm-dispatcher.h \ nm-enum-types.c \ nm-enum-types.h \ + nm-firewall-manager.c \ + nm-firewall-manager.h \ nm-ip4-config.c \ nm-ip4-config.h \ nm-ip6-config.c \ diff --git a/src/firewall-manager/nm-firewall-manager.c b/src/nm-firewall-manager.c similarity index 100% rename from src/firewall-manager/nm-firewall-manager.c rename to src/nm-firewall-manager.c diff --git a/src/firewall-manager/nm-firewall-manager.h b/src/nm-firewall-manager.h similarity index 100% rename from src/firewall-manager/nm-firewall-manager.h rename to src/nm-firewall-manager.h