From 3ab82ea20ea754676de34bd0bb6d5d884fb87a1a Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 8 May 2013 08:37:26 -0400 Subject: [PATCH] core: move devices into a subdirectory We have lots of device types and will soon have lots more, so let's put them in their own directory. --- configure.ac | 2 +- po/POTFILES.in | 16 ++-- src/Makefile.am | 91 +++++++++++----------- src/{ => devices}/nm-device-adsl.c | 0 src/{ => devices}/nm-device-adsl.h | 0 src/{ => devices}/nm-device-bond.c | 0 src/{ => devices}/nm-device-bond.h | 0 src/{ => devices}/nm-device-bridge.c | 0 src/{ => devices}/nm-device-bridge.h | 0 src/{ => devices}/nm-device-bt.c | 0 src/{ => devices}/nm-device-bt.h | 0 src/{ => devices}/nm-device-ethernet.c | 0 src/{ => devices}/nm-device-ethernet.h | 0 src/{ => devices}/nm-device-factory.h | 0 src/{ => devices}/nm-device-generic.c | 0 src/{ => devices}/nm-device-generic.h | 0 src/{ => devices}/nm-device-infiniband.c | 0 src/{ => devices}/nm-device-infiniband.h | 0 src/{ => devices}/nm-device-modem.c | 0 src/{ => devices}/nm-device-modem.h | 0 src/{ => devices}/nm-device-olpc-mesh.c | 0 src/{ => devices}/nm-device-olpc-mesh.h | 0 src/{ => devices}/nm-device-private.h | 0 src/{ => devices}/nm-device-vlan.c | 0 src/{ => devices}/nm-device-vlan.h | 0 src/{ => devices}/nm-device-wifi.c | 0 src/{ => devices}/nm-device-wifi.h | 0 src/{ => devices}/nm-device-wired.c | 0 src/{ => devices}/nm-device-wired.h | 0 src/{ => devices}/nm-device.c | 0 src/{ => devices}/nm-device.h | 0 src/{ => devices}/wimax/Makefile.am | 1 + src/{ => devices}/wimax/iwmxsdk.c | 0 src/{ => devices}/wimax/iwmxsdk.h | 0 src/{ => devices}/wimax/nm-device-wimax.c | 0 src/{ => devices}/wimax/nm-device-wimax.h | 0 src/{ => devices}/wimax/nm-wimax-factory.c | 0 src/{ => devices}/wimax/nm-wimax-nsp.c | 0 src/{ => devices}/wimax/nm-wimax-nsp.h | 0 src/{ => devices}/wimax/nm-wimax-types.h | 0 src/{ => devices}/wimax/nm-wimax-util.c | 0 src/{ => devices}/wimax/nm-wimax-util.h | 0 src/settings/nm-settings.c | 4 +- 43 files changed, 58 insertions(+), 56 deletions(-) rename src/{ => devices}/nm-device-adsl.c (100%) rename src/{ => devices}/nm-device-adsl.h (100%) rename src/{ => devices}/nm-device-bond.c (100%) rename src/{ => devices}/nm-device-bond.h (100%) rename src/{ => devices}/nm-device-bridge.c (100%) rename src/{ => devices}/nm-device-bridge.h (100%) rename src/{ => devices}/nm-device-bt.c (100%) rename src/{ => devices}/nm-device-bt.h (100%) rename src/{ => devices}/nm-device-ethernet.c (100%) rename src/{ => devices}/nm-device-ethernet.h (100%) rename src/{ => devices}/nm-device-factory.h (100%) rename src/{ => devices}/nm-device-generic.c (100%) rename src/{ => devices}/nm-device-generic.h (100%) rename src/{ => devices}/nm-device-infiniband.c (100%) rename src/{ => devices}/nm-device-infiniband.h (100%) rename src/{ => devices}/nm-device-modem.c (100%) rename src/{ => devices}/nm-device-modem.h (100%) rename src/{ => devices}/nm-device-olpc-mesh.c (100%) rename src/{ => devices}/nm-device-olpc-mesh.h (100%) rename src/{ => devices}/nm-device-private.h (100%) rename src/{ => devices}/nm-device-vlan.c (100%) rename src/{ => devices}/nm-device-vlan.h (100%) rename src/{ => devices}/nm-device-wifi.c (100%) rename src/{ => devices}/nm-device-wifi.h (100%) rename src/{ => devices}/nm-device-wired.c (100%) rename src/{ => devices}/nm-device-wired.h (100%) rename src/{ => devices}/nm-device.c (100%) rename src/{ => devices}/nm-device.h (100%) rename src/{ => devices}/wimax/Makefile.am (97%) rename src/{ => devices}/wimax/iwmxsdk.c (100%) rename src/{ => devices}/wimax/iwmxsdk.h (100%) rename src/{ => devices}/wimax/nm-device-wimax.c (100%) rename src/{ => devices}/wimax/nm-device-wimax.h (100%) rename src/{ => devices}/wimax/nm-wimax-factory.c (100%) rename src/{ => devices}/wimax/nm-wimax-nsp.c (100%) rename src/{ => devices}/wimax/nm-wimax-nsp.h (100%) rename src/{ => devices}/wimax/nm-wimax-types.h (100%) rename src/{ => devices}/wimax/nm-wimax-util.c (100%) rename src/{ => devices}/wimax/nm-wimax-util.h (100%) diff --git a/configure.ac b/configure.ac index 8d3276bb48..38f2138e1d 100644 --- a/configure.ac +++ b/configure.ac @@ -672,7 +672,7 @@ src/settings/plugins/keyfile/tests/keyfiles/Makefile src/settings/plugins/example/Makefile src/settings/tests/Makefile src/platform/tests/Makefile -src/wimax/Makefile +src/devices/wimax/Makefile libnm-util/libnm-util.pc libnm-util/Makefile libnm-util/tests/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in index 43b8fc186b..a3c523b685 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -44,14 +44,14 @@ src/config/nm-config.c src/modem-manager/nm-modem-cdma.c src/modem-manager/nm-modem-gsm.c src/modem-manager/nm-modem-broadband.c -src/nm-device-bond.c -src/nm-device-adsl.c -src/nm-device-bridge.c -src/nm-device-bt.c -src/nm-device-ethernet.c -src/nm-device-infiniband.c -src/nm-device-olpc-mesh.c -src/nm-device-vlan.c +src/devices/nm-device-bond.c +src/devices/nm-device-adsl.c +src/devices/nm-device-bridge.c +src/devices/nm-device-bt.c +src/devices/nm-device-ethernet.c +src/devices/nm-device-infiniband.c +src/devices/nm-device-olpc-mesh.c +src/devices/nm-device-vlan.c src/nm-manager.c src/nm-netlink-monitor.c src/settings/plugins/ifcfg-rh/reader.c diff --git a/src/Makefile.am b/src/Makefile.am index 52c88e71a2..f83205786c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,7 +9,7 @@ SUBDIRS = \ settings/plugins if WITH_WIMAX -SUBDIRS += wimax +SUBDIRS += devices/wimax endif if ENABLE_TESTS @@ -60,6 +60,47 @@ libNetworkManager_la_SOURCES = \ config/nm-config-device.c \ config/nm-config-device.h \ \ + devices/nm-device-interface-glue.h \ + devices/nm-device.c \ + devices/nm-device.h \ + devices/nm-device-adsl-glue.h \ + devices/nm-device-adsl.c \ + devices/nm-device-adsl.h \ + devices/nm-device-bond-glue.h \ + devices/nm-device-bond.c \ + devices/nm-device-bond.h \ + devices/nm-device-bridge-glue.h \ + devices/nm-device-bridge.c \ + devices/nm-device-bridge.h \ + devices/nm-device-bt-glue.h \ + devices/nm-device-bt.c \ + devices/nm-device-bt.h \ + devices/nm-device-ethernet-glue.h \ + devices/nm-device-ethernet.c \ + devices/nm-device-ethernet.h \ + devices/nm-device-factory.h \ + devices/nm-device-generic-glue.h \ + devices/nm-device-generic.c \ + devices/nm-device-generic.h \ + devices/nm-device-infiniband-glue.h \ + devices/nm-device-infiniband.c \ + devices/nm-device-infiniband.h \ + devices/nm-device-modem-glue.h \ + devices/nm-device-modem.c \ + devices/nm-device-modem.h \ + devices/nm-device-olpc-mesh-glue.h \ + devices/nm-device-olpc-mesh.c \ + devices/nm-device-olpc-mesh.h \ + devices/nm-device-private.h \ + devices/nm-device-vlan-glue.h \ + devices/nm-device-vlan.c \ + devices/nm-device-vlan.h \ + devices/nm-device-wifi-glue.h \ + devices/nm-device-wifi.c \ + devices/nm-device-wifi.h \ + devices/nm-device-wired.c \ + devices/nm-device-wired.h \ + \ dhcp-manager/nm-dhcp-client.c \ dhcp-manager/nm-dhcp-client.h \ dhcp-manager/nm-dhcp-dhclient.c \ @@ -191,46 +232,6 @@ libNetworkManager_la_SOURCES = \ nm-connection-provider.h \ nm-dbus-manager.c \ nm-dbus-manager.h \ - nm-device-adsl-glue.h \ - nm-device-adsl.c \ - nm-device-adsl.h \ - nm-device-bond-glue.h \ - nm-device-bond.c \ - nm-device-bond.h \ - nm-device-bridge-glue.h \ - nm-device-bridge.c \ - nm-device-bridge.h \ - nm-device-bt-glue.h \ - nm-device-bt.c \ - nm-device-bt.h \ - nm-device-ethernet-glue.h \ - nm-device-ethernet.c \ - nm-device-ethernet.h \ - nm-device-factory.h \ - nm-device-generic-glue.h \ - nm-device-generic.c \ - nm-device-generic.h \ - nm-device-infiniband-glue.h \ - nm-device-infiniband.c \ - nm-device-infiniband.h \ - nm-device-interface-glue.h \ - nm-device-modem-glue.h \ - nm-device-modem.c \ - nm-device-modem.h \ - nm-device-olpc-mesh-glue.h \ - nm-device-olpc-mesh.c \ - nm-device-olpc-mesh.h \ - nm-device-private.h \ - nm-device-vlan-glue.h \ - nm-device-vlan.c \ - nm-device-vlan.h \ - nm-device-wifi-glue.h \ - nm-device-wifi.c \ - nm-device-wifi.h \ - nm-device-wired.c \ - nm-device-wired.h \ - nm-device.c \ - nm-device.h \ nm-dhcp4-config-glue.h \ nm-dhcp4-config.c \ nm-dhcp4-config.h \ @@ -318,7 +319,7 @@ endif # dbus-glib glue. We define nm-device-interface-glue.h specially, because its # name doesn't match the general pattern. -nm-device-interface-glue.h: $(top_srcdir)/introspection/nm-device.xml +devices/nm-device-interface-glue.h: $(top_srcdir)/introspection/nm-device.xml $(AM_V_GEN) dbus-binding-tool --prefix=nm_device_interface --mode=glib-server --output=$@ $< define glue_rule @@ -326,7 +327,7 @@ $(1): $$(top_srcdir)/introspection/$(notdir $(subst -glue.h,,$(1))).xml $$(AM_V_GEN) dbus-binding-tool --prefix=$(subst -,_,$(notdir $(subst -glue.h,,$(1)))) --mode=glib-server --output=$$@ $$< endef -$(foreach f,$(filter-out nm-device-interface-glue.h,$(filter %-glue.h,$(libNetworkManager_la_SOURCES))),$(eval $(call glue_rule,$(f)))) +$(foreach f,$(filter-out devices/nm-device-interface-glue.h,$(filter %-glue.h,$(libNetworkManager_la_SOURCES))),$(eval $(call glue_rule,$(f)))) GLIB_GENERATED = nm-enum-types.h nm-enum-types.c @@ -343,8 +344,8 @@ nm_enum_types_sources = \ $(filter-out %-glue.h, $(libNetworkManager_la_SOURCES)) if WITH_WIMAX -nm_enum_types_sources += wimax/nm-device-wimax.h -INCLUDES += -Iwimax +nm_enum_types_sources += devices/wimax/nm-device-wimax.h +INCLUDES += -I$(top_srcdir)/src/devices/wimax endif AM_CPPFLAGS = \ diff --git a/src/nm-device-adsl.c b/src/devices/nm-device-adsl.c similarity index 100% rename from src/nm-device-adsl.c rename to src/devices/nm-device-adsl.c diff --git a/src/nm-device-adsl.h b/src/devices/nm-device-adsl.h similarity index 100% rename from src/nm-device-adsl.h rename to src/devices/nm-device-adsl.h diff --git a/src/nm-device-bond.c b/src/devices/nm-device-bond.c similarity index 100% rename from src/nm-device-bond.c rename to src/devices/nm-device-bond.c diff --git a/src/nm-device-bond.h b/src/devices/nm-device-bond.h similarity index 100% rename from src/nm-device-bond.h rename to src/devices/nm-device-bond.h diff --git a/src/nm-device-bridge.c b/src/devices/nm-device-bridge.c similarity index 100% rename from src/nm-device-bridge.c rename to src/devices/nm-device-bridge.c diff --git a/src/nm-device-bridge.h b/src/devices/nm-device-bridge.h similarity index 100% rename from src/nm-device-bridge.h rename to src/devices/nm-device-bridge.h diff --git a/src/nm-device-bt.c b/src/devices/nm-device-bt.c similarity index 100% rename from src/nm-device-bt.c rename to src/devices/nm-device-bt.c diff --git a/src/nm-device-bt.h b/src/devices/nm-device-bt.h similarity index 100% rename from src/nm-device-bt.h rename to src/devices/nm-device-bt.h diff --git a/src/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c similarity index 100% rename from src/nm-device-ethernet.c rename to src/devices/nm-device-ethernet.c diff --git a/src/nm-device-ethernet.h b/src/devices/nm-device-ethernet.h similarity index 100% rename from src/nm-device-ethernet.h rename to src/devices/nm-device-ethernet.h diff --git a/src/nm-device-factory.h b/src/devices/nm-device-factory.h similarity index 100% rename from src/nm-device-factory.h rename to src/devices/nm-device-factory.h diff --git a/src/nm-device-generic.c b/src/devices/nm-device-generic.c similarity index 100% rename from src/nm-device-generic.c rename to src/devices/nm-device-generic.c diff --git a/src/nm-device-generic.h b/src/devices/nm-device-generic.h similarity index 100% rename from src/nm-device-generic.h rename to src/devices/nm-device-generic.h diff --git a/src/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c similarity index 100% rename from src/nm-device-infiniband.c rename to src/devices/nm-device-infiniband.c diff --git a/src/nm-device-infiniband.h b/src/devices/nm-device-infiniband.h similarity index 100% rename from src/nm-device-infiniband.h rename to src/devices/nm-device-infiniband.h diff --git a/src/nm-device-modem.c b/src/devices/nm-device-modem.c similarity index 100% rename from src/nm-device-modem.c rename to src/devices/nm-device-modem.c diff --git a/src/nm-device-modem.h b/src/devices/nm-device-modem.h similarity index 100% rename from src/nm-device-modem.h rename to src/devices/nm-device-modem.h diff --git a/src/nm-device-olpc-mesh.c b/src/devices/nm-device-olpc-mesh.c similarity index 100% rename from src/nm-device-olpc-mesh.c rename to src/devices/nm-device-olpc-mesh.c diff --git a/src/nm-device-olpc-mesh.h b/src/devices/nm-device-olpc-mesh.h similarity index 100% rename from src/nm-device-olpc-mesh.h rename to src/devices/nm-device-olpc-mesh.h diff --git a/src/nm-device-private.h b/src/devices/nm-device-private.h similarity index 100% rename from src/nm-device-private.h rename to src/devices/nm-device-private.h diff --git a/src/nm-device-vlan.c b/src/devices/nm-device-vlan.c similarity index 100% rename from src/nm-device-vlan.c rename to src/devices/nm-device-vlan.c diff --git a/src/nm-device-vlan.h b/src/devices/nm-device-vlan.h similarity index 100% rename from src/nm-device-vlan.h rename to src/devices/nm-device-vlan.h diff --git a/src/nm-device-wifi.c b/src/devices/nm-device-wifi.c similarity index 100% rename from src/nm-device-wifi.c rename to src/devices/nm-device-wifi.c diff --git a/src/nm-device-wifi.h b/src/devices/nm-device-wifi.h similarity index 100% rename from src/nm-device-wifi.h rename to src/devices/nm-device-wifi.h diff --git a/src/nm-device-wired.c b/src/devices/nm-device-wired.c similarity index 100% rename from src/nm-device-wired.c rename to src/devices/nm-device-wired.c diff --git a/src/nm-device-wired.h b/src/devices/nm-device-wired.h similarity index 100% rename from src/nm-device-wired.h rename to src/devices/nm-device-wired.h diff --git a/src/nm-device.c b/src/devices/nm-device.c similarity index 100% rename from src/nm-device.c rename to src/devices/nm-device.c diff --git a/src/nm-device.h b/src/devices/nm-device.h similarity index 100% rename from src/nm-device.h rename to src/devices/nm-device.h diff --git a/src/wimax/Makefile.am b/src/devices/wimax/Makefile.am similarity index 97% rename from src/wimax/Makefile.am rename to src/devices/wimax/Makefile.am index b2e67663fb..ceeac04c9d 100644 --- a/src/wimax/Makefile.am +++ b/src/devices/wimax/Makefile.am @@ -1,6 +1,7 @@ INCLUDES = \ -I${top_srcdir}/src \ -I${top_srcdir}/src/logging \ + -I${top_srcdir}/src/devices \ -I${top_builddir}/include \ -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ diff --git a/src/wimax/iwmxsdk.c b/src/devices/wimax/iwmxsdk.c similarity index 100% rename from src/wimax/iwmxsdk.c rename to src/devices/wimax/iwmxsdk.c diff --git a/src/wimax/iwmxsdk.h b/src/devices/wimax/iwmxsdk.h similarity index 100% rename from src/wimax/iwmxsdk.h rename to src/devices/wimax/iwmxsdk.h diff --git a/src/wimax/nm-device-wimax.c b/src/devices/wimax/nm-device-wimax.c similarity index 100% rename from src/wimax/nm-device-wimax.c rename to src/devices/wimax/nm-device-wimax.c diff --git a/src/wimax/nm-device-wimax.h b/src/devices/wimax/nm-device-wimax.h similarity index 100% rename from src/wimax/nm-device-wimax.h rename to src/devices/wimax/nm-device-wimax.h diff --git a/src/wimax/nm-wimax-factory.c b/src/devices/wimax/nm-wimax-factory.c similarity index 100% rename from src/wimax/nm-wimax-factory.c rename to src/devices/wimax/nm-wimax-factory.c diff --git a/src/wimax/nm-wimax-nsp.c b/src/devices/wimax/nm-wimax-nsp.c similarity index 100% rename from src/wimax/nm-wimax-nsp.c rename to src/devices/wimax/nm-wimax-nsp.c diff --git a/src/wimax/nm-wimax-nsp.h b/src/devices/wimax/nm-wimax-nsp.h similarity index 100% rename from src/wimax/nm-wimax-nsp.h rename to src/devices/wimax/nm-wimax-nsp.h diff --git a/src/wimax/nm-wimax-types.h b/src/devices/wimax/nm-wimax-types.h similarity index 100% rename from src/wimax/nm-wimax-types.h rename to src/devices/wimax/nm-wimax-types.h diff --git a/src/wimax/nm-wimax-util.c b/src/devices/wimax/nm-wimax-util.c similarity index 100% rename from src/wimax/nm-wimax-util.c rename to src/devices/wimax/nm-wimax-util.c diff --git a/src/wimax/nm-wimax-util.h b/src/devices/wimax/nm-wimax-util.h similarity index 100% rename from src/wimax/nm-wimax-util.h rename to src/devices/wimax/nm-wimax-util.h diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index fdb8112328..043bb1897d 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -53,8 +53,8 @@ #include #include -#include "../nm-device-ethernet.h" -#include "../nm-device-wired.h" +#include "nm-device-ethernet.h" +#include "nm-device-wired.h" #include "nm-dbus-glib-types.h" #include "nm-settings.h" #include "nm-settings-connection.h"