diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-11-12 12:37:12 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-11-19 12:58:36 +0100 |
| commit | c5cbe91e605012df75c317743dc726215cada2d5 (patch) | |
| tree | 4705a9f402ea1fb3964b54e85ce6f0c5bc660444 | |
| parent | 6fd8afd39fde640d202209d9a7e2b549ab388e19 (diff) | |
| download | NetworkManager-c5cbe91e605012df75c317743dc726215cada2d5.tar.gz | |
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 <thaller@redhat.com>
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | src/nm-firewall-manager.c (renamed from src/firewall-manager/nm-firewall-manager.c) | 0 | ||||
| -rw-r--r-- | src/nm-firewall-manager.h (renamed from src/firewall-manager/nm-firewall-manager.h) | 0 |
3 files changed, 2 insertions, 3 deletions
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 index bb033818c6..bb033818c6 100644 --- a/src/firewall-manager/nm-firewall-manager.c +++ b/src/nm-firewall-manager.c diff --git a/src/firewall-manager/nm-firewall-manager.h b/src/nm-firewall-manager.h index 5ccbc72341..5ccbc72341 100644 --- a/src/firewall-manager/nm-firewall-manager.h +++ b/src/nm-firewall-manager.h |