From 17063663517f8b80dbacc5b663a757fa6aabaa6c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 21 Nov 2016 00:24:54 +0100 Subject: [PATCH] build: rename "src/supplicant-manager" to "src/supplicant" The supplicant directory does not only contain the manager instance, but various files related to wpa-supplicant. Rename. --- .gitignore | 5 ++- Makefile.am | 36 +++++++++--------- .../nm-supplicant-config.c | 0 .../nm-supplicant-config.h | 0 .../nm-supplicant-interface.c | 0 .../nm-supplicant-interface.h | 0 .../nm-supplicant-manager.c | 0 .../nm-supplicant-manager.h | 0 .../nm-supplicant-settings-verify.c | 0 .../nm-supplicant-settings-verify.h | 0 .../nm-supplicant-types.h | 0 .../tests/certs/test-ca-cert.pem | 0 .../tests/certs/test-cert.p12 | Bin .../tests/test-supplicant-config.c | 0 14 files changed, 21 insertions(+), 20 deletions(-) rename src/{supplicant-manager => supplicant}/nm-supplicant-config.c (100%) rename src/{supplicant-manager => supplicant}/nm-supplicant-config.h (100%) rename src/{supplicant-manager => supplicant}/nm-supplicant-interface.c (100%) rename src/{supplicant-manager => supplicant}/nm-supplicant-interface.h (100%) rename src/{supplicant-manager => supplicant}/nm-supplicant-manager.c (100%) rename src/{supplicant-manager => supplicant}/nm-supplicant-manager.h (100%) rename src/{supplicant-manager => supplicant}/nm-supplicant-settings-verify.c (100%) rename src/{supplicant-manager => supplicant}/nm-supplicant-settings-verify.h (100%) rename src/{supplicant-manager => supplicant}/nm-supplicant-types.h (100%) rename src/{supplicant-manager => supplicant}/tests/certs/test-ca-cert.pem (100%) rename src/{supplicant-manager => supplicant}/tests/certs/test-cert.p12 (100%) rename src/{supplicant-manager => supplicant}/tests/test-supplicant-config.c (100%) diff --git a/.gitignore b/.gitignore index 9f4dd70435..bcbc43b437 100644 --- a/.gitignore +++ b/.gitignore @@ -256,7 +256,7 @@ test-*.trs /src/settings/plugins/ifnet/tests/test-ifnet /src/settings/plugins/ifupdown/tests/test-ifupdown /src/settings/plugins/keyfile/tests/test-keyfile -/src/supplicant-manager/tests/test-supplicant-config +/src/supplicant/tests/test-supplicant-config /src/tests/config/test-config /src/tests/test-dcb /src/tests/test-general @@ -288,6 +288,7 @@ test-*.trs /initscript/Slackware/rc.networkmanager /initscript/*/[Nn]etwork[Mm]anager /src/devices/wifi/tests/test-wifi-ap-utils +/src/rdisc/ /src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils /src/settings/plugins/ifnet/tests/check_ifnet -/src/rdisc/ +/src/supplicant-manager/tests/test-supplicant-config diff --git a/Makefile.am b/Makefile.am index 40737da291..0c95b73aba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -959,7 +959,7 @@ src_cppflags = \ -I$(top_srcdir)/src/ppp-manager \ -I$(top_srcdir)/src/ndisc \ -I$(top_srcdir)/src/settings \ - -I$(top_srcdir)/src/supplicant-manager \ + -I$(top_srcdir)/src/supplicant \ -I$(top_srcdir)/src/vpn-manager \ \ -DPREFIX=\"$(prefix)\" \ @@ -1343,15 +1343,15 @@ src_libNetworkManager_la_SOURCES = \ src/settings/plugins/keyfile/nms-keyfile-writer.c \ src/settings/plugins/keyfile/nms-keyfile-writer.h \ \ - src/supplicant-manager/nm-supplicant-config.c \ - src/supplicant-manager/nm-supplicant-config.h \ - src/supplicant-manager/nm-supplicant-interface.c \ - src/supplicant-manager/nm-supplicant-interface.h \ - src/supplicant-manager/nm-supplicant-manager.c \ - src/supplicant-manager/nm-supplicant-manager.h \ - src/supplicant-manager/nm-supplicant-settings-verify.c \ - src/supplicant-manager/nm-supplicant-settings-verify.h \ - src/supplicant-manager/nm-supplicant-types.h \ + src/supplicant/nm-supplicant-config.c \ + src/supplicant/nm-supplicant-config.h \ + src/supplicant/nm-supplicant-interface.c \ + src/supplicant/nm-supplicant-interface.h \ + src/supplicant/nm-supplicant-manager.c \ + src/supplicant/nm-supplicant-manager.h \ + src/supplicant/nm-supplicant-settings-verify.c \ + 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 \ @@ -2453,7 +2453,7 @@ src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = \ -I${top_srcdir}/src/devices \ -I${top_srcdir}/src/settings \ -I${top_srcdir}/src/platform \ - -I${top_srcdir}/src/supplicant-manager \ + -I${top_srcdir}/src/supplicant \ -I${top_builddir}/introspection \ -I${top_srcdir}/shared \ -I$(top_builddir)/shared \ @@ -2689,21 +2689,21 @@ src_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_ndisc_tests_flags) src_ndisc_tests_test_ndisc_fake_LDADD = $(src_ndisc_tests_ldadd) ############################################################################### -# src/supplicant-manager/tests +# src/supplicant/tests ############################################################################### -check_programs += src/supplicant-manager/tests/test-supplicant-config +check_programs += src/supplicant/tests/test-supplicant-config -src_supplicant_manager_tests_test_supplicant_config_CPPFLAGS = \ +src_supplicant_tests_test_supplicant_config_CPPFLAGS = \ $(src_tests_cppflags) \ - -DTEST_CERT_DIR=\"$(abs_srcdir)/src/supplicant-manager/tests/certs\" + -DTEST_CERT_DIR=\"$(abs_srcdir)/src/supplicant/tests/certs\" -src_supplicant_manager_tests_test_supplicant_config_LDADD = \ +src_supplicant_tests_test_supplicant_config_LDADD = \ src/libNetworkManagerTest.la EXTRA_DIST += \ - src/supplicant-manager/tests/certs/test-ca-cert.pem \ - src/supplicant-manager/tests/certs/test-cert.p12 + src/supplicant/tests/certs/test-ca-cert.pem \ + src/supplicant/tests/certs/test-cert.p12 ############################################################################### # src/tests/config diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant/nm-supplicant-config.c similarity index 100% rename from src/supplicant-manager/nm-supplicant-config.c rename to src/supplicant/nm-supplicant-config.c diff --git a/src/supplicant-manager/nm-supplicant-config.h b/src/supplicant/nm-supplicant-config.h similarity index 100% rename from src/supplicant-manager/nm-supplicant-config.h rename to src/supplicant/nm-supplicant-config.h diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c similarity index 100% rename from src/supplicant-manager/nm-supplicant-interface.c rename to src/supplicant/nm-supplicant-interface.c diff --git a/src/supplicant-manager/nm-supplicant-interface.h b/src/supplicant/nm-supplicant-interface.h similarity index 100% rename from src/supplicant-manager/nm-supplicant-interface.h rename to src/supplicant/nm-supplicant-interface.h diff --git a/src/supplicant-manager/nm-supplicant-manager.c b/src/supplicant/nm-supplicant-manager.c similarity index 100% rename from src/supplicant-manager/nm-supplicant-manager.c rename to src/supplicant/nm-supplicant-manager.c diff --git a/src/supplicant-manager/nm-supplicant-manager.h b/src/supplicant/nm-supplicant-manager.h similarity index 100% rename from src/supplicant-manager/nm-supplicant-manager.h rename to src/supplicant/nm-supplicant-manager.h diff --git a/src/supplicant-manager/nm-supplicant-settings-verify.c b/src/supplicant/nm-supplicant-settings-verify.c similarity index 100% rename from src/supplicant-manager/nm-supplicant-settings-verify.c rename to src/supplicant/nm-supplicant-settings-verify.c diff --git a/src/supplicant-manager/nm-supplicant-settings-verify.h b/src/supplicant/nm-supplicant-settings-verify.h similarity index 100% rename from src/supplicant-manager/nm-supplicant-settings-verify.h rename to src/supplicant/nm-supplicant-settings-verify.h diff --git a/src/supplicant-manager/nm-supplicant-types.h b/src/supplicant/nm-supplicant-types.h similarity index 100% rename from src/supplicant-manager/nm-supplicant-types.h rename to src/supplicant/nm-supplicant-types.h diff --git a/src/supplicant-manager/tests/certs/test-ca-cert.pem b/src/supplicant/tests/certs/test-ca-cert.pem similarity index 100% rename from src/supplicant-manager/tests/certs/test-ca-cert.pem rename to src/supplicant/tests/certs/test-ca-cert.pem diff --git a/src/supplicant-manager/tests/certs/test-cert.p12 b/src/supplicant/tests/certs/test-cert.p12 similarity index 100% rename from src/supplicant-manager/tests/certs/test-cert.p12 rename to src/supplicant/tests/certs/test-cert.p12 diff --git a/src/supplicant-manager/tests/test-supplicant-config.c b/src/supplicant/tests/test-supplicant-config.c similarity index 100% rename from src/supplicant-manager/tests/test-supplicant-config.c rename to src/supplicant/tests/test-supplicant-config.c