devices: rename "atm" plugin to "adsl", and "bt" to "bluetooth"

The atm/adsl plugin really is a generic ATM plugin but (a) it needs a
bit of work to do IPoATM rather than just PPPoATM and PPPoEoATM, and
(b) most people currently using NM's ATM support are using DSL devices
not actual ATM cards anyway, and have no idea what "ATM" even means.
If we add the necessary IPoATM support later we can rename the plugin
back to -atm
This commit is contained in:
Dan Winship 2014-03-19 14:16:48 -04:00
parent 73d128bbd1
commit a18248dd1b
9 changed files with 11 additions and 11 deletions

View file

@ -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

View file

@ -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

View file

@ -4,7 +4,7 @@ include $(GLIB_MAKEFILE)
SUBDIRS = \
. \
devices/atm \
devices/adsl \
devices/wwan \
devices/bluetooth \
dhcp-manager \

View file

@ -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)

View file

@ -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)