diff options
| author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2018-03-21 18:52:55 +0200 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2018-03-22 10:35:17 +0200 |
| commit | bff0c2ae9f0ba93efe387bbec603b4ddbc7ce4ce (patch) | |
| tree | c2d88b7a92bb2c556813de21cf46c01b42a673fe | |
| parent | d3f155e4588b0a2f7fa08594b0f1d2da7506e3be (diff) | |
| download | bluez-bff0c2ae9f0ba93efe387bbec603b4ddbc7ce4ce.tar.gz | |
build: Fix not disabling obexd when given --disable-obex
--disable-obex shall disable building obexd daemon.
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | Makefile.obexd | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index daf34b6ca..5ac76d81c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -223,7 +223,11 @@ test_scripts = unit_tests = include Makefile.tools + +if OBEX include Makefile.obexd +endif + include android/Makefile.am if HID2HCI diff --git a/Makefile.obexd b/Makefile.obexd index 5959f2292..6eb80c47e 100644 --- a/Makefile.obexd +++ b/Makefile.obexd @@ -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 |