diff options
author | Thomas Haller <thaller@redhat.com> | 2016-11-21 00:31:51 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2016-11-21 14:07:47 +0100 |
commit | 62c2e6ccdad091e5c8846ae378bdef676b897de6 (patch) | |
tree | 75053465e9cacf77e8bd3e45dacbe0fe32ca8f8f | |
parent | e053996881eec4d1b415655f6bb642c52bc61ba9 (diff) | |
download | NetworkManager-62c2e6ccdad091e5c8846ae378bdef676b897de6.tar.gz |
build: rename "src/dns-manager" to "src/dns"
The dns directory does not only contain the manager
instance, but various files related to DNS.
Rename.
-rw-r--r-- | Makefile.am | 22 | ||||
-rw-r--r-- | po/POTFILES.in | 2 | ||||
-rw-r--r-- | src/dns/nm-dns-dnsmasq.c (renamed from src/dns-manager/nm-dns-dnsmasq.c) | 0 | ||||
-rw-r--r-- | src/dns/nm-dns-dnsmasq.h (renamed from src/dns-manager/nm-dns-dnsmasq.h) | 0 | ||||
-rw-r--r-- | src/dns/nm-dns-manager.c (renamed from src/dns-manager/nm-dns-manager.c) | 0 | ||||
-rw-r--r-- | src/dns/nm-dns-manager.h (renamed from src/dns-manager/nm-dns-manager.h) | 0 | ||||
-rw-r--r-- | src/dns/nm-dns-plugin.c (renamed from src/dns-manager/nm-dns-plugin.c) | 0 | ||||
-rw-r--r-- | src/dns/nm-dns-plugin.h (renamed from src/dns-manager/nm-dns-plugin.h) | 0 | ||||
-rw-r--r-- | src/dns/nm-dns-systemd-resolved.c (renamed from src/dns-manager/nm-dns-systemd-resolved.c) | 0 | ||||
-rw-r--r-- | src/dns/nm-dns-systemd-resolved.h (renamed from src/dns-manager/nm-dns-systemd-resolved.h) | 0 | ||||
-rw-r--r-- | src/dns/nm-dns-unbound.c (renamed from src/dns-manager/nm-dns-unbound.c) | 0 | ||||
-rw-r--r-- | src/dns/nm-dns-unbound.h (renamed from src/dns-manager/nm-dns-unbound.h) | 0 |
12 files changed, 12 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 9cb49b9efe..c706e15b29 100644 --- a/Makefile.am +++ b/Makefile.am @@ -952,7 +952,7 @@ src_cppflags = \ -I$(top_builddir)/src \ -I$(top_srcdir)/src/devices \ -I$(top_srcdir)/src/dhcp \ - -I$(top_srcdir)/src/dns-manager \ + -I$(top_srcdir)/src/dns \ -I$(top_srcdir)/src/dnsmasq-manager \ -I$(top_srcdir)/src/platform \ -I$(top_srcdir)/src/platform/wifi \ @@ -1299,16 +1299,16 @@ src_libNetworkManager_la_SOURCES = \ src/dhcp/nm-dhcp-dhclient-utils.c \ src/dhcp/nm-dhcp-dhclient-utils.h \ \ - src/dns-manager/nm-dns-dnsmasq.c \ - src/dns-manager/nm-dns-dnsmasq.h \ - src/dns-manager/nm-dns-systemd-resolved.c \ - src/dns-manager/nm-dns-systemd-resolved.h \ - src/dns-manager/nm-dns-unbound.c \ - src/dns-manager/nm-dns-unbound.h \ - src/dns-manager/nm-dns-manager.c \ - src/dns-manager/nm-dns-manager.h \ - src/dns-manager/nm-dns-plugin.c \ - src/dns-manager/nm-dns-plugin.h \ + src/dns/nm-dns-dnsmasq.c \ + src/dns/nm-dns-dnsmasq.h \ + src/dns/nm-dns-systemd-resolved.c \ + src/dns/nm-dns-systemd-resolved.h \ + src/dns/nm-dns-unbound.c \ + src/dns/nm-dns-unbound.h \ + src/dns/nm-dns-manager.c \ + src/dns/nm-dns-manager.h \ + src/dns/nm-dns-plugin.c \ + src/dns/nm-dns-plugin.h \ \ src/dnsmasq-manager/nm-dnsmasq-manager.c \ src/dnsmasq-manager/nm-dnsmasq-manager.h \ diff --git a/po/POTFILES.in b/po/POTFILES.in index 40f620e85f..411868b8c8 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -150,7 +150,7 @@ src/main-utils.c src/dhcp/nm-dhcp-dhclient.c src/dhcp/nm-dhcp-dhclient-utils.c src/dhcp/nm-dhcp-manager.c -src/dns-manager/nm-dns-manager.c +src/dns/nm-dns-manager.c src/devices/adsl/nm-device-adsl.c src/devices/bluetooth/nm-bluez-device.c src/devices/bluetooth/nm-device-bt.c diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns/nm-dns-dnsmasq.c index 9db6ed856a..9db6ed856a 100644 --- a/src/dns-manager/nm-dns-dnsmasq.c +++ b/src/dns/nm-dns-dnsmasq.c diff --git a/src/dns-manager/nm-dns-dnsmasq.h b/src/dns/nm-dns-dnsmasq.h index cbba434bf3..cbba434bf3 100644 --- a/src/dns-manager/nm-dns-dnsmasq.h +++ b/src/dns/nm-dns-dnsmasq.h diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns/nm-dns-manager.c index 33f2074ead..33f2074ead 100644 --- a/src/dns-manager/nm-dns-manager.c +++ b/src/dns/nm-dns-manager.c diff --git a/src/dns-manager/nm-dns-manager.h b/src/dns/nm-dns-manager.h index 3deda58237..3deda58237 100644 --- a/src/dns-manager/nm-dns-manager.h +++ b/src/dns/nm-dns-manager.h diff --git a/src/dns-manager/nm-dns-plugin.c b/src/dns/nm-dns-plugin.c index 3a3bc646f7..3a3bc646f7 100644 --- a/src/dns-manager/nm-dns-plugin.c +++ b/src/dns/nm-dns-plugin.c diff --git a/src/dns-manager/nm-dns-plugin.h b/src/dns/nm-dns-plugin.h index 12109441f9..12109441f9 100644 --- a/src/dns-manager/nm-dns-plugin.h +++ b/src/dns/nm-dns-plugin.h diff --git a/src/dns-manager/nm-dns-systemd-resolved.c b/src/dns/nm-dns-systemd-resolved.c index 55a3398cad..55a3398cad 100644 --- a/src/dns-manager/nm-dns-systemd-resolved.c +++ b/src/dns/nm-dns-systemd-resolved.c diff --git a/src/dns-manager/nm-dns-systemd-resolved.h b/src/dns/nm-dns-systemd-resolved.h index 800a60c154..800a60c154 100644 --- a/src/dns-manager/nm-dns-systemd-resolved.h +++ b/src/dns/nm-dns-systemd-resolved.h diff --git a/src/dns-manager/nm-dns-unbound.c b/src/dns/nm-dns-unbound.c index 3659beacba..3659beacba 100644 --- a/src/dns-manager/nm-dns-unbound.c +++ b/src/dns/nm-dns-unbound.c diff --git a/src/dns-manager/nm-dns-unbound.h b/src/dns/nm-dns-unbound.h index 100ff2c470..100ff2c470 100644 --- a/src/dns-manager/nm-dns-unbound.h +++ b/src/dns/nm-dns-unbound.h |