Commit 0cec10c0 authored by Thomas Haller's avatar Thomas Haller

bluez: merge file nm-bluez5-device.c into nm-bluez-device.c

The files nm-bluez-device.c and nm-bluez5-device.c are similar.
Merge them together into one file and handle the differences
using #if directives.

This commit does not actually change any functionality. All it does, is
merging the files together and separating the differences with #if#else.

The next commit will further add common functionality, so this
reduces code duplication for now.
Signed-off-by: Thomas Haller's avatarThomas Haller <thaller@redhat.com>
parent daef45bd
......@@ -260,18 +260,17 @@ nm_sources = \
nm_sources += \
bluez-manager/nm-bluez-common.h \
bluez-manager/nm-bluez-device.c \
bluez-manager/nm-bluez-device.h \
bluez-manager/nm-bluez-manager.h
if WITH_BLUEZ5
nm_sources += \
bluez-manager/nm-bluez5-device.c \
bluez-manager/nm-bluez5-manager.c
else
nm_sources += \
bluez-manager/nm-bluez-adapter.h \
bluez-manager/nm-bluez-adapter.c \
bluez-manager/nm-bluez-device.c \
bluez-manager/nm-bluez-manager.c
endif
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment