diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2013-10-25 21:21:07 +0200 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd@luon.net> | 2013-10-25 21:21:07 +0200 |
| commit | e83d1de9b746dbc078ac1cf45f1798e1bc6b7e2f (patch) | |
| tree | c36a40d79a5ae7d2bbca7d240d0a6f664049b435 /src/bluez-manager/Makefile.am | |
| parent | 26283b4c9e5035574a6c168003e7f1da53a8f32a (diff) | |
| parent | a4256940da049f91bbbea5e53e469a59ea9c10f7 (diff) | |
Merge tag 'upstream/0.9.8.8' into experimental
Upstream version 0.9.8.8
Diffstat (limited to 'src/bluez-manager/Makefile.am')
| -rw-r--r-- | src/bluez-manager/Makefile.am | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/bluez-manager/Makefile.am b/src/bluez-manager/Makefile.am index 7e7ed9a0..aee27217 100644 --- a/src/bluez-manager/Makefile.am +++ b/src/bluez-manager/Makefile.am @@ -12,13 +12,20 @@ INCLUDES = \ noinst_LTLIBRARIES = libbluez-manager.la libbluez_manager_la_SOURCES = \ - nm-bluez-manager.c \ - nm-bluez-manager.h \ - nm-bluez-adapter.c \ - nm-bluez-adapter.h \ + nm-bluez-common.h \ nm-bluez-device.c \ nm-bluez-device.h \ - nm-bluez-common.h + nm-bluez-manager.h + +if WITH_BLUEZ4 +libbluez_manager_la_SOURCES += \ + nm-bluez4-adapter.h \ + nm-bluez4-adapter.c \ + nm-bluez4-manager.c +else +libbluez_manager_la_SOURCES += \ + nm-bluez-manager.c +endif libbluez_manager_la_CPPFLAGS = \ $(DBUS_CFLAGS) \ |