From e053996881eec4d1b415655f6bb642c52bc61ba9 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 21 Nov 2016 00:26:17 +0100 Subject: [PATCH] build: rename "src/dhcp-manager" to "src/dhcp" The dhcp directory does not only contain the manager instance, but various files related to DHCP. Rename. --- .gitignore | 12 ++- Makefile.am | 80 +++++++++---------- po/POTFILES.in | 6 +- .../nm-dhcp-client-logging.h | 0 src/{dhcp-manager => dhcp}/nm-dhcp-client.c | 0 src/{dhcp-manager => dhcp}/nm-dhcp-client.h | 0 .../nm-dhcp-dhclient-utils.c | 0 .../nm-dhcp-dhclient-utils.h | 0 src/{dhcp-manager => dhcp}/nm-dhcp-dhclient.c | 0 src/{dhcp-manager => dhcp}/nm-dhcp-dhcpcd.c | 0 .../nm-dhcp-helper-api.h | 0 src/{dhcp-manager => dhcp}/nm-dhcp-helper.c | 0 src/{dhcp-manager => dhcp}/nm-dhcp-listener.c | 0 src/{dhcp-manager => dhcp}/nm-dhcp-listener.h | 0 src/{dhcp-manager => dhcp}/nm-dhcp-manager.c | 0 src/{dhcp-manager => dhcp}/nm-dhcp-manager.h | 0 src/{dhcp-manager => dhcp}/nm-dhcp-systemd.c | 0 src/{dhcp-manager => dhcp}/nm-dhcp-utils.c | 0 src/{dhcp-manager => dhcp}/nm-dhcp-utils.h | 0 .../tests/leases/basic.leases | 0 .../tests/leases/malformed1.leases | 0 .../tests/leases/malformed2.leases | 0 .../tests/leases/malformed3.leases | 0 .../tests/test-dhclient-commented-duid.leases | 0 .../tests/test-dhclient-duid.leases | 0 .../tests/test-dhcp-dhclient.c | 0 .../tests/test-dhcp-utils.c | 0 src/main.c | 2 +- 28 files changed, 52 insertions(+), 48 deletions(-) rename src/{dhcp-manager => dhcp}/nm-dhcp-client-logging.h (100%) rename src/{dhcp-manager => dhcp}/nm-dhcp-client.c (100%) rename src/{dhcp-manager => dhcp}/nm-dhcp-client.h (100%) rename src/{dhcp-manager => dhcp}/nm-dhcp-dhclient-utils.c (100%) rename src/{dhcp-manager => dhcp}/nm-dhcp-dhclient-utils.h (100%) rename src/{dhcp-manager => dhcp}/nm-dhcp-dhclient.c (100%) rename src/{dhcp-manager => dhcp}/nm-dhcp-dhcpcd.c (100%) rename src/{dhcp-manager => dhcp}/nm-dhcp-helper-api.h (100%) rename src/{dhcp-manager => dhcp}/nm-dhcp-helper.c (100%) rename src/{dhcp-manager => dhcp}/nm-dhcp-listener.c (100%) rename src/{dhcp-manager => dhcp}/nm-dhcp-listener.h (100%) rename src/{dhcp-manager => dhcp}/nm-dhcp-manager.c (100%) rename src/{dhcp-manager => dhcp}/nm-dhcp-manager.h (100%) rename src/{dhcp-manager => dhcp}/nm-dhcp-systemd.c (100%) rename src/{dhcp-manager => dhcp}/nm-dhcp-utils.c (100%) rename src/{dhcp-manager => dhcp}/nm-dhcp-utils.h (100%) rename src/{dhcp-manager => dhcp}/tests/leases/basic.leases (100%) rename src/{dhcp-manager => dhcp}/tests/leases/malformed1.leases (100%) rename src/{dhcp-manager => dhcp}/tests/leases/malformed2.leases (100%) rename src/{dhcp-manager => dhcp}/tests/leases/malformed3.leases (100%) rename src/{dhcp-manager => dhcp}/tests/test-dhclient-commented-duid.leases (100%) rename src/{dhcp-manager => dhcp}/tests/test-dhclient-duid.leases (100%) rename src/{dhcp-manager => dhcp}/tests/test-dhcp-dhclient.c (100%) rename src/{dhcp-manager => dhcp}/tests/test-dhcp-utils.c (100%) diff --git a/.gitignore b/.gitignore index bcbc43b437..b2fb349262 100644 --- a/.gitignore +++ b/.gitignore @@ -242,10 +242,10 @@ test-*.trs /src/devices/tests/test-arping /src/devices/tests/test-lldp /src/devices/wifi/tests/test-general -/src/dhcp-manager/nm-dhcp-helper -/src/dhcp-manager/tests/test-dhcp-dhclient -/src/dhcp-manager/tests/test-dhcp-options -/src/dhcp-manager/tests/test-dhcp-utils +/src/dhcp/nm-dhcp-helper +/src/dhcp/tests/test-dhcp-dhclient +/src/dhcp/tests/test-dhcp-options +/src/dhcp/tests/test-dhcp-utils /src/dnsmasq-manager/tests/test-dnsmasq-utils /src/nm-iface-helper /src/ndisc/tests/test-ndisc-fake @@ -288,6 +288,10 @@ test-*.trs /initscript/Slackware/rc.networkmanager /initscript/*/[Nn]etwork[Mm]anager /src/devices/wifi/tests/test-wifi-ap-utils +/src/dhcp-manager/nm-dhcp-helper +/src/dhcp-manager/tests/test-dhcp-dhclient +/src/dhcp-manager/tests/test-dhcp-options +/src/dhcp-manager/tests/test-dhcp-utils /src/rdisc/ /src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils /src/settings/plugins/ifnet/tests/check_ifnet diff --git a/Makefile.am b/Makefile.am index 0c95b73aba..9cb49b9efe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -951,7 +951,7 @@ src_cppflags = \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ -I$(top_srcdir)/src/devices \ - -I$(top_srcdir)/src/dhcp-manager \ + -I$(top_srcdir)/src/dhcp \ -I$(top_srcdir)/src/dns-manager \ -I$(top_srcdir)/src/dnsmasq-manager \ -I$(top_srcdir)/src/platform \ @@ -1215,14 +1215,14 @@ src_libNetworkManagerBase_la_SOURCES = \ src/nm-route-manager.c \ src/nm-route-manager.h \ \ - src/dhcp-manager/nm-dhcp-client.c \ - src/dhcp-manager/nm-dhcp-client.h \ - src/dhcp-manager/nm-dhcp-client-logging.h \ - src/dhcp-manager/nm-dhcp-utils.c \ - src/dhcp-manager/nm-dhcp-utils.h \ - src/dhcp-manager/nm-dhcp-systemd.c \ - src/dhcp-manager/nm-dhcp-manager.c \ - src/dhcp-manager/nm-dhcp-manager.h \ + src/dhcp/nm-dhcp-client.c \ + src/dhcp/nm-dhcp-client.h \ + src/dhcp/nm-dhcp-client-logging.h \ + src/dhcp/nm-dhcp-utils.c \ + src/dhcp/nm-dhcp-utils.h \ + src/dhcp/nm-dhcp-systemd.c \ + src/dhcp/nm-dhcp-manager.c \ + src/dhcp/nm-dhcp-manager.h \ \ src/main-utils.c \ src/main-utils.h \ @@ -1291,13 +1291,13 @@ src_libNetworkManager_la_SOURCES = \ src/devices/nm-device-vxlan.c \ src/devices/nm-device-vxlan.h \ \ - src/dhcp-manager/nm-dhcp-dhclient.c \ - src/dhcp-manager/nm-dhcp-dhcpcd.c \ - src/dhcp-manager/nm-dhcp-helper-api.h \ - src/dhcp-manager/nm-dhcp-listener.c \ - src/dhcp-manager/nm-dhcp-listener.h \ - src/dhcp-manager/nm-dhcp-dhclient-utils.c \ - src/dhcp-manager/nm-dhcp-dhclient-utils.h \ + src/dhcp/nm-dhcp-dhclient.c \ + src/dhcp/nm-dhcp-dhcpcd.c \ + src/dhcp/nm-dhcp-helper-api.h \ + src/dhcp/nm-dhcp-listener.c \ + src/dhcp/nm-dhcp-listener.h \ + 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 \ @@ -1506,12 +1506,12 @@ EXTRA_DIST += \ src/NetworkManager.ver-orig ############################################################################### -# src/dhcp-manager +# src/dhcp ############################################################################### -libexec_PROGRAMS += src/dhcp-manager/nm-dhcp-helper +libexec_PROGRAMS += src/dhcp/nm-dhcp-helper -src_dhcp_manager_nm_dhcp_helper_CPPFLAGS = \ +src_dhcp_nm_dhcp_helper_CPPFLAGS = \ $(GLIB_CFLAGS) \ -I$(top_srcdir)/shared \ -I${top_builddir}/shared \ @@ -1520,44 +1520,44 @@ src_dhcp_manager_nm_dhcp_helper_CPPFLAGS = \ -DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \ -DNMRUNDIR=\"$(nmrundir)\" -src_dhcp_manager_nm_dhcp_helper_SOURCES = \ - src/dhcp-manager/nm-dhcp-helper.c \ - src/dhcp-manager/nm-dhcp-helper-api.h \ +src_dhcp_nm_dhcp_helper_SOURCES = \ + src/dhcp/nm-dhcp-helper.c \ + src/dhcp/nm-dhcp-helper-api.h \ $(NULL) -src_dhcp_manager_nm_dhcp_helper_LDFLAGS = \ +src_dhcp_nm_dhcp_helper_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" -src_dhcp_manager_nm_dhcp_helper_LDADD = $(GLIB_LIBS) +src_dhcp_nm_dhcp_helper_LDADD = $(GLIB_LIBS) ############################################################################### -# src/dhcp-manager/tests +# src/dhcp/tests ############################################################################### -src_dhcp_manager_tests_cppflags = \ +src_dhcp_tests_cppflags = \ $(src_tests_cppflags) \ - -DTESTDIR="\"$(abs_srcdir)/src/dhcp-manager/tests\"" + -DTESTDIR="\"$(abs_srcdir)/src/dhcp/tests\"" -src_dhcp_manager_tests_ldadd = \ +src_dhcp_tests_ldadd = \ src/libNetworkManagerTest.la check_programs += \ - src/dhcp-manager/tests/test-dhcp-dhclient \ - src/dhcp-manager/tests/test-dhcp-utils + src/dhcp/tests/test-dhcp-dhclient \ + src/dhcp/tests/test-dhcp-utils -src_dhcp_manager_tests_test_dhcp_dhclient_CPPFLAGS = $(src_dhcp_manager_tests_cppflags) -src_dhcp_manager_tests_test_dhcp_utils_CPPFLAGS = $(src_dhcp_manager_tests_cppflags) +src_dhcp_tests_test_dhcp_dhclient_CPPFLAGS = $(src_dhcp_tests_cppflags) +src_dhcp_tests_test_dhcp_utils_CPPFLAGS = $(src_dhcp_tests_cppflags) -src_dhcp_manager_tests_test_dhcp_dhclient_LDADD = $(src_dhcp_manager_tests_ldadd) -src_dhcp_manager_tests_test_dhcp_utils_LDADD = $(src_dhcp_manager_tests_ldadd) +src_dhcp_tests_test_dhcp_dhclient_LDADD = $(src_dhcp_tests_ldadd) +src_dhcp_tests_test_dhcp_utils_LDADD = $(src_dhcp_tests_ldadd) EXTRA_DIST += \ - src/dhcp-manager/tests/test-dhclient-duid.leases \ - src/dhcp-manager/tests/test-dhclient-commented-duid.leases \ - src/dhcp-manager/tests/leases/basic.leases \ - src/dhcp-manager/tests/leases/malformed1.leases \ - src/dhcp-manager/tests/leases/malformed2.leases \ - src/dhcp-manager/tests/leases/malformed3.leases + src/dhcp/tests/test-dhclient-duid.leases \ + src/dhcp/tests/test-dhclient-commented-duid.leases \ + src/dhcp/tests/leases/basic.leases \ + src/dhcp/tests/leases/malformed1.leases \ + src/dhcp/tests/leases/malformed2.leases \ + src/dhcp/tests/leases/malformed3.leases ############################################################################### # src/ppp-manager diff --git a/po/POTFILES.in b/po/POTFILES.in index fcd6502a3d..40f620e85f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -147,9 +147,9 @@ shared/nm-utils/nm-shared-utils.c src/NetworkManagerUtils.c src/main.c src/main-utils.c -src/dhcp-manager/nm-dhcp-dhclient.c -src/dhcp-manager/nm-dhcp-dhclient-utils.c -src/dhcp-manager/nm-dhcp-manager.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/devices/adsl/nm-device-adsl.c src/devices/bluetooth/nm-bluez-device.c diff --git a/src/dhcp-manager/nm-dhcp-client-logging.h b/src/dhcp/nm-dhcp-client-logging.h similarity index 100% rename from src/dhcp-manager/nm-dhcp-client-logging.h rename to src/dhcp/nm-dhcp-client-logging.h diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c similarity index 100% rename from src/dhcp-manager/nm-dhcp-client.c rename to src/dhcp/nm-dhcp-client.c diff --git a/src/dhcp-manager/nm-dhcp-client.h b/src/dhcp/nm-dhcp-client.h similarity index 100% rename from src/dhcp-manager/nm-dhcp-client.h rename to src/dhcp/nm-dhcp-client.h diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.c b/src/dhcp/nm-dhcp-dhclient-utils.c similarity index 100% rename from src/dhcp-manager/nm-dhcp-dhclient-utils.c rename to src/dhcp/nm-dhcp-dhclient-utils.c diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.h b/src/dhcp/nm-dhcp-dhclient-utils.h similarity index 100% rename from src/dhcp-manager/nm-dhcp-dhclient-utils.h rename to src/dhcp/nm-dhcp-dhclient-utils.h diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp/nm-dhcp-dhclient.c similarity index 100% rename from src/dhcp-manager/nm-dhcp-dhclient.c rename to src/dhcp/nm-dhcp-dhclient.c diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp/nm-dhcp-dhcpcd.c similarity index 100% rename from src/dhcp-manager/nm-dhcp-dhcpcd.c rename to src/dhcp/nm-dhcp-dhcpcd.c diff --git a/src/dhcp-manager/nm-dhcp-helper-api.h b/src/dhcp/nm-dhcp-helper-api.h similarity index 100% rename from src/dhcp-manager/nm-dhcp-helper-api.h rename to src/dhcp/nm-dhcp-helper-api.h diff --git a/src/dhcp-manager/nm-dhcp-helper.c b/src/dhcp/nm-dhcp-helper.c similarity index 100% rename from src/dhcp-manager/nm-dhcp-helper.c rename to src/dhcp/nm-dhcp-helper.c diff --git a/src/dhcp-manager/nm-dhcp-listener.c b/src/dhcp/nm-dhcp-listener.c similarity index 100% rename from src/dhcp-manager/nm-dhcp-listener.c rename to src/dhcp/nm-dhcp-listener.c diff --git a/src/dhcp-manager/nm-dhcp-listener.h b/src/dhcp/nm-dhcp-listener.h similarity index 100% rename from src/dhcp-manager/nm-dhcp-listener.h rename to src/dhcp/nm-dhcp-listener.h diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp/nm-dhcp-manager.c similarity index 100% rename from src/dhcp-manager/nm-dhcp-manager.c rename to src/dhcp/nm-dhcp-manager.c diff --git a/src/dhcp-manager/nm-dhcp-manager.h b/src/dhcp/nm-dhcp-manager.h similarity index 100% rename from src/dhcp-manager/nm-dhcp-manager.h rename to src/dhcp/nm-dhcp-manager.h diff --git a/src/dhcp-manager/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c similarity index 100% rename from src/dhcp-manager/nm-dhcp-systemd.c rename to src/dhcp/nm-dhcp-systemd.c diff --git a/src/dhcp-manager/nm-dhcp-utils.c b/src/dhcp/nm-dhcp-utils.c similarity index 100% rename from src/dhcp-manager/nm-dhcp-utils.c rename to src/dhcp/nm-dhcp-utils.c diff --git a/src/dhcp-manager/nm-dhcp-utils.h b/src/dhcp/nm-dhcp-utils.h similarity index 100% rename from src/dhcp-manager/nm-dhcp-utils.h rename to src/dhcp/nm-dhcp-utils.h diff --git a/src/dhcp-manager/tests/leases/basic.leases b/src/dhcp/tests/leases/basic.leases similarity index 100% rename from src/dhcp-manager/tests/leases/basic.leases rename to src/dhcp/tests/leases/basic.leases diff --git a/src/dhcp-manager/tests/leases/malformed1.leases b/src/dhcp/tests/leases/malformed1.leases similarity index 100% rename from src/dhcp-manager/tests/leases/malformed1.leases rename to src/dhcp/tests/leases/malformed1.leases diff --git a/src/dhcp-manager/tests/leases/malformed2.leases b/src/dhcp/tests/leases/malformed2.leases similarity index 100% rename from src/dhcp-manager/tests/leases/malformed2.leases rename to src/dhcp/tests/leases/malformed2.leases diff --git a/src/dhcp-manager/tests/leases/malformed3.leases b/src/dhcp/tests/leases/malformed3.leases similarity index 100% rename from src/dhcp-manager/tests/leases/malformed3.leases rename to src/dhcp/tests/leases/malformed3.leases diff --git a/src/dhcp-manager/tests/test-dhclient-commented-duid.leases b/src/dhcp/tests/test-dhclient-commented-duid.leases similarity index 100% rename from src/dhcp-manager/tests/test-dhclient-commented-duid.leases rename to src/dhcp/tests/test-dhclient-commented-duid.leases diff --git a/src/dhcp-manager/tests/test-dhclient-duid.leases b/src/dhcp/tests/test-dhclient-duid.leases similarity index 100% rename from src/dhcp-manager/tests/test-dhclient-duid.leases rename to src/dhcp/tests/test-dhclient-duid.leases diff --git a/src/dhcp-manager/tests/test-dhcp-dhclient.c b/src/dhcp/tests/test-dhcp-dhclient.c similarity index 100% rename from src/dhcp-manager/tests/test-dhcp-dhclient.c rename to src/dhcp/tests/test-dhcp-dhclient.c diff --git a/src/dhcp-manager/tests/test-dhcp-utils.c b/src/dhcp/tests/test-dhcp-utils.c similarity index 100% rename from src/dhcp-manager/tests/test-dhcp-utils.c rename to src/dhcp/tests/test-dhcp-utils.c diff --git a/src/main.c b/src/main.c index e86d6dad96..47dc613009 100644 --- a/src/main.c +++ b/src/main.c @@ -272,7 +272,7 @@ main (int argc, char *argv[]) /* don't free these strings, we need them for the entire * process lifetime */ - nm_dhcp_helper_path = g_strdup_printf ("%s/src/dhcp-manager/nm-dhcp-helper", path); + nm_dhcp_helper_path = g_strdup_printf ("%s/src/dhcp/nm-dhcp-helper", path); g_free (path); }