sd/Library_sd.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
New commits: commit c08fa2bce3de3b0e0ff80903210942b31ba68bcb Author: Rene Engelhard <[email protected]> AuthorDate: Thu Dec 3 23:21:49 2020 +0100 Commit: Thorsten Behrens <[email protected]> CommitDate: Mon Dec 7 13:35:49 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 <[email protected]> (cherry picked from commit 9c98bf224d1dc8c5cb91d49273836eeb6111d697) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107297 Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 9d399e8e3f5a..d70b5216fe05 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 \ @@ -575,6 +574,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 [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
