diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-09-12 17:06:39 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-09-12 17:06:39 +0200 |
| commit | c0fbd394b1db9929f0c722aa158a58fa34eeec68 (patch) | |
| tree | fd6c960419507825ae777a52dfb50c00fb9074d9 /cpp/src | |
| parent | Fix signal handling initialization in csharp Application (diff) | |
| download | ice-c0fbd394b1db9929f0c722aa158a58fa34eeec68.tar.bz2 ice-c0fbd394b1db9929f0c722aa158a58fa34eeec68.tar.xz ice-c0fbd394b1db9929f0c722aa158a58fa34eeec68.zip | |
Build system improvements and fixes
- Fixed static build failures (ICE-8509)
- Improved check for IceBT build (ICE-8353)
- Validate configs/platforms (ICE-8096)
- Removed duplicated system libs from linker flags (ICE-7670)
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceBT/Makefile.mk | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/cpp/src/IceBT/Makefile.mk b/cpp/src/IceBT/Makefile.mk index ad41973fe45..f4ba32c5002 100644 --- a/cpp/src/IceBT/Makefile.mk +++ b/cpp/src/IceBT/Makefile.mk @@ -7,22 +7,16 @@ # # ********************************************************************** -ifneq ($(filter debian ubuntu yocto poky,$(linux_id)),) - # -# Only build the IceBT plugin if pkg-config, BlueZ and D-Bus requirements are -# installed. +# Only build the IceBT plugin if Bluetooth system libraries are available (Bluez/DBus) # -ifeq ($(shell pkg-config --exists bluez dbus-1 2> /dev/null && echo yes),yes) +ifneq ($(IceBT_system_libs),) $(project)_libraries := IceBT IceBT_targetdir := $(libdir) IceBT_dependencies := Ice IceBT_cppflags := -DICEBT_API_EXPORTS $(shell pkg-config --cflags dbus-1) IceBT_sliceflags := --include-dir IceBT -IceBT_system_libs = $(IceSSL_system_libs) $(shell pkg-config --libs dbus-1) projects += $(project) endif - -endif |