sd/Library_sd.mk | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit df54b0a99fd6b43548a3a7a3d44ada6c01cb2362
Author: Rene Engelhard <r...@debian.org>
AuthorDate: Thu Dec 3 23:21:49 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Dec 8 09:41:52 2020 +0100
move bluez_bluetooth_headers use_externals into ENABLE_SDREMOTE_BLUETOOTH
case
... since it's where it is used, and otherwise one gets a
-I$S/external/bluez_bluetooth when we don't want or even need that
Change-Id: If3757adb7960ad5adfc857052bb8322f8754ecdb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107178
Tested-by: Jenkins
Reviewed-by: David Tardon <dtar...@redhat.com>
(cherry picked from commit 9c98bf224d1dc8c5cb91d49273836eeb6111d697)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107298
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 43b168be8d8c..67ecf25c7289 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -99,7 +99,6 @@ $(eval $(call gb_Library_use_libraries,sd,\
))
$(eval $(call gb_Library_use_externals,sd,\
- bluez_bluetooth_headers \
boost_headers \
libxml2 \
dbus \
@@ -576,6 +575,10 @@ $(eval $(call gb_Library_add_defs,sd,\
-DENABLE_SDREMOTE_BLUETOOTH \
))
+$(eval $(call gb_Library_use_externals,sd,\
+ bluez_bluetooth_headers \
+))
+
endif # ENABLE_SDREMOTE_BLUETOOTH=TRUE
endif # ENABLE_SDREMOTE=TRUE
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
