diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/devices/adsl/Makefile.am (renamed from src/devices/atm/Makefile.am) | 8 | ||||
| -rw-r--r-- | src/devices/adsl/nm-atm-manager.c (renamed from src/devices/atm/nm-atm-manager.c) | 0 | ||||
| -rw-r--r-- | src/devices/adsl/nm-atm-manager.h (renamed from src/devices/atm/nm-atm-manager.h) | 0 | ||||
| -rw-r--r-- | src/devices/adsl/nm-device-adsl.c (renamed from src/devices/atm/nm-device-adsl.c) | 0 | ||||
| -rw-r--r-- | src/devices/adsl/nm-device-adsl.h (renamed from src/devices/atm/nm-device-adsl.h) | 0 | ||||
| -rw-r--r-- | src/devices/bluetooth/Makefile.am | 8 |
9 files changed, 11 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index b20f2dc639..f13dc9aea4 100644 --- a/configure.ac +++ b/configure.ac @@ -762,7 +762,7 @@ src/platform/Makefile src/platform/tests/Makefile src/rdisc/Makefile src/rdisc/tests/Makefile -src/devices/atm/Makefile +src/devices/adsl/Makefile src/devices/wimax/Makefile src/devices/bluetooth/Makefile src/devices/wwan/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in index d03f5aa8fa..36bc69ffa0 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -46,7 +46,7 @@ src/dhcp-manager/nm-dhcp-manager.c src/dns-manager/nm-dns-manager.c src/logging/nm-logging.c src/config/nm-config.c -src/devices/atm/nm-device-adsl.c +src/devices/adsl/nm-device-adsl.c src/devices/bluetooth/nm-bluez-device.c src/devices/bluetooth/nm-device-bt.c src/devices/nm-device-bond.c diff --git a/src/Makefile.am b/src/Makefile.am index 121c367a4b..f3fcfba98e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,7 @@ include $(GLIB_MAKEFILE) SUBDIRS = \ . \ - devices/atm \ + devices/adsl \ devices/wwan \ devices/bluetooth \ dhcp-manager \ diff --git a/src/devices/atm/Makefile.am b/src/devices/adsl/Makefile.am index 8d1e2b3f96..589382867a 100644 --- a/src/devices/atm/Makefile.am +++ b/src/devices/adsl/Makefile.am @@ -29,9 +29,9 @@ nm-device-adsl-glue.h: $(top_srcdir)/introspection/nm-device-adsl.xml BUILT_SOURCES = $(GLIB_GENERATED) nm-device-adsl-glue.h -pkglib_LTLIBRARIES = libnm-device-plugin-atm.la +pkglib_LTLIBRARIES = libnm-device-plugin-adsl.la -libnm_device_plugin_atm_la_SOURCES = \ +libnm_device_plugin_adsl_la_SOURCES = \ nm-atm-manager.c \ nm-atm-manager.h \ nm-device-adsl.c \ @@ -39,8 +39,8 @@ libnm_device_plugin_atm_la_SOURCES = \ \ $(BUILT_SOURCES) -libnm_device_plugin_atm_la_LDFLAGS = -module -avoid-version -libnm_device_plugin_atm_la_LIBADD = \ +libnm_device_plugin_adsl_la_LDFLAGS = -module -avoid-version +libnm_device_plugin_adsl_la_LIBADD = \ $(DBUS_LIBS) \ $(GUDEV_LIBS) diff --git a/src/devices/atm/nm-atm-manager.c b/src/devices/adsl/nm-atm-manager.c index 908e961e7d..908e961e7d 100644 --- a/src/devices/atm/nm-atm-manager.c +++ b/src/devices/adsl/nm-atm-manager.c diff --git a/src/devices/atm/nm-atm-manager.h b/src/devices/adsl/nm-atm-manager.h index 0052522075..0052522075 100644 --- a/src/devices/atm/nm-atm-manager.h +++ b/src/devices/adsl/nm-atm-manager.h diff --git a/src/devices/atm/nm-device-adsl.c b/src/devices/adsl/nm-device-adsl.c index 7fe626e7ca..7fe626e7ca 100644 --- a/src/devices/atm/nm-device-adsl.c +++ b/src/devices/adsl/nm-device-adsl.c diff --git a/src/devices/atm/nm-device-adsl.h b/src/devices/adsl/nm-device-adsl.h index b0a094dd95..b0a094dd95 100644 --- a/src/devices/atm/nm-device-adsl.h +++ b/src/devices/adsl/nm-device-adsl.h diff --git a/src/devices/bluetooth/Makefile.am b/src/devices/bluetooth/Makefile.am index 5e716af25f..e2968dbedd 100644 --- a/src/devices/bluetooth/Makefile.am +++ b/src/devices/bluetooth/Makefile.am @@ -29,9 +29,9 @@ nm-device-bt-glue.h: $(top_srcdir)/introspection/nm-device-bt.xml BUILT_SOURCES = $(GLIB_GENERATED) nm-device-bt-glue.h -pkglib_LTLIBRARIES = libnm-device-plugin-bt.la +pkglib_LTLIBRARIES = libnm-device-plugin-bluetooth.la -libnm_device_plugin_bt_la_SOURCES = \ +libnm_device_plugin_bluetooth_la_SOURCES = \ nm-bluez-manager.c \ nm-bluez-manager.h \ nm-bluez-common.h \ @@ -49,8 +49,8 @@ libnm_device_plugin_bt_la_SOURCES = \ \ $(BUILT_SOURCES) -libnm_device_plugin_bt_la_LDFLAGS = -module -avoid-version -libnm_device_plugin_bt_la_LIBADD = \ +libnm_device_plugin_bluetooth_la_LDFLAGS = -module -avoid-version +libnm_device_plugin_bluetooth_la_LIBADD = \ $(top_builddir)/src/devices/wwan/libnm-wwan.la \ $(DBUS_LIBS) \ $(GUDEV_LIBS) |