korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-12-14 14:34:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

build: Fix not disabling obexd when given --disable-obex

Browse Source 
--disable-obex shall disable building obexd daemon.
This commit is contained in:
Luiz Augusto von Dentz 2018-03-21 18:52:55 +02:00
parent d3f155e458
commit bff0c2ae9f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -223,7 +223,11 @@ test_scripts =
unit_tests =
include Makefile.tools
if OBEX
include Makefile.obexd
endif
include android/Makefile.am
if HID2HCI

5
Makefile.obexd
View File

@ -1,3 +1,4 @@
if OBEX
if SYSTEMD
systemduserunitdir = @SYSTEMD_USERUNITDIR@
@ -32,7 +33,6 @@ obexd_builtin_sources += obexd/plugins/opp.c
obexd_builtin_modules += ftp
obexd_builtin_sources += obexd/plugins/ftp.c obexd/plugins/ftp.h
if OBEX
obexd_builtin_modules += irmc
obexd_builtin_sources += obexd/plugins/irmc.c
@ -41,7 +41,6 @@ obexd_builtin_sources += obexd/plugins/pbap.c \
obexd/plugins/vcard.h obexd/plugins/vcard.c \
obexd/plugins/phonebook.h \
obexd/plugins/phonebook-dummy.c
endif
obexd_builtin_modules += mas
obexd_builtin_sources += obexd/plugins/mas.c obexd/src/map_ap.h \
@ -107,3 +106,5 @@ obexd/src/builtin.h: obexd/src/genbuiltin $(obexd_builtin_sources)
CLEANFILES += obexd/src/builtin.h $(builtin_files) obexd/src/obex.service
EXTRA_DIST += obexd/src/genbuiltin
endif