Move D-Bus related files into their own subdirectory

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 8a9c70c..d852e26 100644 (file)
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -1028,8 +1028,8 @@ endif
 
 ifdef CONFIG_CTRL_IFACE_DBUS
 DBUS_CFLAGS += -DCONFIG_CTRL_IFACE_DBUS -DDBUS_API_SUBJECT_TO_CHANGE
-DBUS_OBJS += ctrl_iface_dbus.o ctrl_iface_dbus_handlers.o
-DBUS_OBJS += dbus_dict_helpers.o
+DBUS_OBJS += dbus/ctrl_iface_dbus.o dbus/ctrl_iface_dbus_handlers.o
+DBUS_OBJS += dbus/dbus_dict_helpers.o
 ifndef DBUS_LIBS
 DBUS_LIBS := $(shell pkg-config --libs dbus-1)
 endif
@@ -1052,9 +1052,9 @@ endif
 
 ifdef CONFIG_CTRL_IFACE_DBUS_NEW
 DBUS_CFLAGS += -DCONFIG_CTRL_IFACE_DBUS_NEW
-DBUS_OBJS ?= dbus_dict_helpers.o
-DBUS_OBJS += ctrl_iface_dbus_new_helpers.o
-DBUS_OBJS += ctrl_iface_dbus_new.o ctrl_iface_dbus_new_handlers.o
+DBUS_OBJS ?= dbus/dbus_dict_helpers.o
+DBUS_OBJS += dbus/ctrl_iface_dbus_new_helpers.o
+DBUS_OBJS += dbus/ctrl_iface_dbus_new.o dbus/ctrl_iface_dbus_new_handlers.o
 ifndef DBUS_LIBS
 DBUS_LIBS := $(shell pkg-config --libs dbus-1)
 endif

diff --git a/wpa_supplicant/ctrl_iface_dbus.c b/wpa_supplicant/dbus/ctrl_iface_dbus.c
similarity index 99%
rename from wpa_supplicant/ctrl_iface_dbus.c
rename to wpa_supplicant/dbus/ctrl_iface_dbus.c
index 709e947..000f779 100644 (file)
--- a/wpa_supplicant/ctrl_iface_dbus.c
+++ b/wpa_supplicant/dbus/ctrl_iface_dbus.c
@@ -16,8 +16,8 @@
 
 #include "common.h"
 #include "eloop.h"
-#include "config.h"
-#include "wpa_supplicant_i.h"
+#include "../config.h"
+#include "../wpa_supplicant_i.h"
 #include "drivers/driver.h"
 #include "wps/wps.h"
 #include "ctrl_iface_dbus.h"

diff --git a/wpa_supplicant/ctrl_iface_dbus.h b/wpa_supplicant/dbus/ctrl_iface_dbus.h
similarity index 100%
rename from wpa_supplicant/ctrl_iface_dbus.h
rename to wpa_supplicant/dbus/ctrl_iface_dbus.h

diff --git a/wpa_supplicant/ctrl_iface_dbus_handlers.c b/wpa_supplicant/dbus/ctrl_iface_dbus_handlers.c
similarity index 99%
rename from wpa_supplicant/ctrl_iface_dbus_handlers.c
rename to wpa_supplicant/dbus/ctrl_iface_dbus_handlers.c
index 08623ec..94fb49c 100644 (file)
--- a/wpa_supplicant/ctrl_iface_dbus_handlers.c
+++ b/wpa_supplicant/dbus/ctrl_iface_dbus_handlers.c
@@ -15,18 +15,18 @@
 #include "includes.h"
 
 #include "common.h"
-#include "config.h"
-#include "wpa_supplicant_i.h"
-#include "driver_i.h"
+#include "../config.h"
+#include "../wpa_supplicant_i.h"
+#include "../driver_i.h"
 #include "ctrl_iface_dbus.h"
 #include "ctrl_iface_dbus_handlers.h"
-#include "notify.h"
+#include "../notify.h"
 #include "eap_peer/eap_methods.h"
 #include "dbus_dict_helpers.h"
 #include "common/ieee802_11_defs.h"
-#include "wpas_glue.h"
+#include "../wpas_glue.h"
 #include "eapol_supp/eapol_supp_sm.h"
-#include "wps_supplicant.h"
+#include "../wps_supplicant.h"
 #include "rsn_supp/wpa.h"
 
 extern int wpa_debug_level;

diff --git a/wpa_supplicant/ctrl_iface_dbus_handlers.h b/wpa_supplicant/dbus/ctrl_iface_dbus_handlers.h
similarity index 100%
rename from wpa_supplicant/ctrl_iface_dbus_handlers.h
rename to wpa_supplicant/dbus/ctrl_iface_dbus_handlers.h

diff --git a/wpa_supplicant/ctrl_iface_dbus_new.c b/wpa_supplicant/dbus/ctrl_iface_dbus_new.c
similarity index 99%
rename from wpa_supplicant/ctrl_iface_dbus_new.c
rename to wpa_supplicant/dbus/ctrl_iface_dbus_new.c
index 019bfb0..881c1ce 100644 (file)
--- a/wpa_supplicant/ctrl_iface_dbus_new.c
+++ b/wpa_supplicant/dbus/ctrl_iface_dbus_new.c
@@ -16,8 +16,8 @@
 #include "includes.h"
 
 #include "common.h"
-#include "config.h"
-#include "wpa_supplicant_i.h"
+#include "../config.h"
+#include "../wpa_supplicant_i.h"
 #include "drivers/driver.h"
 #include "wps/wps.h"
 #include "ctrl_iface_dbus_new_helpers.h"

diff --git a/wpa_supplicant/ctrl_iface_dbus_new.h b/wpa_supplicant/dbus/ctrl_iface_dbus_new.h
similarity index 100%
rename from wpa_supplicant/ctrl_iface_dbus_new.h
rename to wpa_supplicant/dbus/ctrl_iface_dbus_new.h

diff --git a/wpa_supplicant/ctrl_iface_dbus_new_handlers.c b/wpa_supplicant/dbus/ctrl_iface_dbus_new_handlers.c
similarity index 99%
rename from wpa_supplicant/ctrl_iface_dbus_new_handlers.c
rename to wpa_supplicant/dbus/ctrl_iface_dbus_new_handlers.c
index a017dbc..da08e00 100644 (file)
--- a/wpa_supplicant/ctrl_iface_dbus_new_handlers.c
+++ b/wpa_supplicant/dbus/ctrl_iface_dbus_new_handlers.c
@@ -16,19 +16,19 @@
 #include "includes.h"
 
 #include "common.h"
-#include "config.h"
-#include "wpa_supplicant_i.h"
-#include "driver_i.h"
+#include "../config.h"
+#include "../wpa_supplicant_i.h"
+#include "../driver_i.h"
 #include "ctrl_iface_dbus_new_helpers.h"
 #include "ctrl_iface_dbus_new.h"
 #include "ctrl_iface_dbus_new_handlers.h"
-#include "notify.h"
+#include "../notify.h"
 #include "eap_peer/eap_methods.h"
 #include "dbus_dict_helpers.h"
 #include "common/ieee802_11_defs.h"
-#include "wpas_glue.h"
+#include "../wpas_glue.h"
 #include "eapol_supp/eapol_supp_sm.h"
-#include "wps_supplicant.h"
+#include "../wps_supplicant.h"
 
 extern int wpa_debug_level;
 extern int wpa_debug_show_keys;

diff --git a/wpa_supplicant/ctrl_iface_dbus_new_handlers.h b/wpa_supplicant/dbus/ctrl_iface_dbus_new_handlers.h
similarity index 100%
rename from wpa_supplicant/ctrl_iface_dbus_new_handlers.h
rename to wpa_supplicant/dbus/ctrl_iface_dbus_new_handlers.h

diff --git a/wpa_supplicant/ctrl_iface_dbus_new_helpers.c b/wpa_supplicant/dbus/ctrl_iface_dbus_new_helpers.c
similarity index 100%
rename from wpa_supplicant/ctrl_iface_dbus_new_helpers.c
rename to wpa_supplicant/dbus/ctrl_iface_dbus_new_helpers.c

diff --git a/wpa_supplicant/ctrl_iface_dbus_new_helpers.h b/wpa_supplicant/dbus/ctrl_iface_dbus_new_helpers.h
similarity index 100%
rename from wpa_supplicant/ctrl_iface_dbus_new_helpers.h
rename to wpa_supplicant/dbus/ctrl_iface_dbus_new_helpers.h

diff --git a/wpa_supplicant/dbus-wpa_supplicant.conf b/wpa_supplicant/dbus/dbus-wpa_supplicant.conf
similarity index 100%
rename from wpa_supplicant/dbus-wpa_supplicant.conf
rename to wpa_supplicant/dbus/dbus-wpa_supplicant.conf

diff --git a/wpa_supplicant/dbus-wpa_supplicant.service b/wpa_supplicant/dbus/dbus-wpa_supplicant.service
similarity index 100%
rename from wpa_supplicant/dbus-wpa_supplicant.service
rename to wpa_supplicant/dbus/dbus-wpa_supplicant.service

diff --git a/wpa_supplicant/dbus_dict_helpers.c b/wpa_supplicant/dbus/dbus_dict_helpers.c
similarity index 100%
rename from wpa_supplicant/dbus_dict_helpers.c
rename to wpa_supplicant/dbus/dbus_dict_helpers.c

diff --git a/wpa_supplicant/dbus_dict_helpers.h b/wpa_supplicant/dbus/dbus_dict_helpers.h
similarity index 100%
rename from wpa_supplicant/dbus_dict_helpers.h
rename to wpa_supplicant/dbus/dbus_dict_helpers.h

diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c
index aa3d548..f102d33 100644 (file)
--- a/wpa_supplicant/notify.c
+++ b/wpa_supplicant/notify.c
@@ -18,8 +18,8 @@
 #include "config.h"
 #include "wpa_supplicant_i.h"
 #include "wps_supplicant.h"
-#include "ctrl_iface_dbus.h"
-#include "ctrl_iface_dbus_new.h"
+#include "dbus/ctrl_iface_dbus.h"
+#include "dbus/ctrl_iface_dbus_new.h"
 #include "notify.h"
 
 int wpas_notify_supplicant_initialized(struct wpa_global *global)