Repository.mk | 1 bluez_bluetooth/README | 4 bluez_bluetooth/inc/bluetooth/bluetooth.h | 70 -- bluez_bluetooth/inc/bluetooth/hci.h | 718 --------------------- bluez_bluetooth/inc/bluetooth/hci_lib.h | 24 bluez_bluetooth/inc/bluetooth/l2cap.h | 87 -- bluez_bluetooth/inc/bluetooth/rfcomm.h | 47 - bluez_bluetooth/inc/bluetooth/sco.h | 32 external/bluez_bluetooth/README | 4 external/bluez_bluetooth/inc/bluetooth/bluetooth.h | 70 ++ external/bluez_bluetooth/inc/bluetooth/hci.h | 718 +++++++++++++++++++++ external/bluez_bluetooth/inc/bluetooth/hci_lib.h | 24 external/bluez_bluetooth/inc/bluetooth/l2cap.h | 87 ++ external/bluez_bluetooth/inc/bluetooth/rfcomm.h | 47 + external/bluez_bluetooth/inc/bluetooth/sco.h | 32 sd/Library_sd.mk | 2 16 files changed, 983 insertions(+), 984 deletions(-)
New commits: commit 80b419153732e8b49c560e88b174785db4adb556 Author: Khaled Hosny <[email protected]> Date: Mon Nov 4 18:46:49 2013 +0200 fdo#70393: move bluez_bluetooth to a subdir of external Change-Id: Ia1c5eb2e6c5193256b61ec878abdb648632e1f47 Reviewed-on: https://gerrit.libreoffice.org/6570 Reviewed-by: David Tardon <[email protected]> Tested-by: David Tardon <[email protected]> diff --git a/Repository.mk b/Repository.mk index 96283b9..644fed5 100644 --- a/Repository.mk +++ b/Repository.mk @@ -566,7 +566,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ ) \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - bluez_bluetooth \ libreoffice \ pyuno \ pyuno_wrapper \ diff --git a/bluez_bluetooth/README b/external/bluez_bluetooth/README similarity index 100% rename from bluez_bluetooth/README rename to external/bluez_bluetooth/README diff --git a/bluez_bluetooth/inc/bluetooth/bluetooth.h b/external/bluez_bluetooth/inc/bluetooth/bluetooth.h similarity index 100% rename from bluez_bluetooth/inc/bluetooth/bluetooth.h rename to external/bluez_bluetooth/inc/bluetooth/bluetooth.h diff --git a/bluez_bluetooth/inc/bluetooth/hci.h b/external/bluez_bluetooth/inc/bluetooth/hci.h similarity index 100% rename from bluez_bluetooth/inc/bluetooth/hci.h rename to external/bluez_bluetooth/inc/bluetooth/hci.h diff --git a/bluez_bluetooth/inc/bluetooth/hci_lib.h b/external/bluez_bluetooth/inc/bluetooth/hci_lib.h similarity index 100% rename from bluez_bluetooth/inc/bluetooth/hci_lib.h rename to external/bluez_bluetooth/inc/bluetooth/hci_lib.h diff --git a/bluez_bluetooth/inc/bluetooth/l2cap.h b/external/bluez_bluetooth/inc/bluetooth/l2cap.h similarity index 100% rename from bluez_bluetooth/inc/bluetooth/l2cap.h rename to external/bluez_bluetooth/inc/bluetooth/l2cap.h diff --git a/bluez_bluetooth/inc/bluetooth/rfcomm.h b/external/bluez_bluetooth/inc/bluetooth/rfcomm.h similarity index 100% rename from bluez_bluetooth/inc/bluetooth/rfcomm.h rename to external/bluez_bluetooth/inc/bluetooth/rfcomm.h diff --git a/bluez_bluetooth/inc/bluetooth/sco.h b/external/bluez_bluetooth/inc/bluetooth/sco.h similarity index 100% rename from bluez_bluetooth/inc/bluetooth/sco.h rename to external/bluez_bluetooth/inc/bluetooth/sco.h diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index be29e38..249cb4e 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -46,7 +46,7 @@ $(eval $(call gb_Library_set_include,sd,\ ifneq ($(SYSTEM_BLUEZ),YES) $(eval $(call gb_Library_add_cxxflags,sd,\ - -I$(SRCDIR)/bluez_bluetooth/inc \ + -I$(SRCDIR)/external/bluez_bluetooth/inc \ )) endif _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
