diff options
| -rw-r--r-- | bluez_bluetooth/Module_bluez_bluetooth.mk | 7 | ||||
| -rw-r--r-- | bluez_bluetooth/Package_inc.mk | 19 | ||||
| -rw-r--r-- | sd/Library_sd.mk | 5 |
3 files changed, 2 insertions, 29 deletions
diff --git a/bluez_bluetooth/Module_bluez_bluetooth.mk b/bluez_bluetooth/Module_bluez_bluetooth.mk index afca1a06d210..65d350c3219f 100644 --- a/bluez_bluetooth/Module_bluez_bluetooth.mk +++ b/bluez_bluetooth/Module_bluez_bluetooth.mk @@ -10,9 +10,4 @@ $(eval $(call gb_Module_Module,bluez_bluetooth)) - -$(eval $(call gb_Module_add_targets,bluez_bluetooth,\ - Package_inc \ -)) - -# vim: set noet sw=4 ts=4:
\ No newline at end of file +# vim: set noet sw=4 ts=4: diff --git a/bluez_bluetooth/Package_inc.mk b/bluez_bluetooth/Package_inc.mk deleted file mode 100644 index 29ee255c21a7..000000000000 --- a/bluez_bluetooth/Package_inc.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,bluez_bluetooth_inc,$(SRCDIR)/bluez_bluetooth/inc)) - -$(eval $(call gb_Package_add_file,bluez_bluetooth_inc,inc/bluetooth/bluetooth.h,bluetooth/bluetooth.h)) -$(eval $(call gb_Package_add_file,bluez_bluetooth_inc,inc/bluetooth/hci.h,bluetooth/hci.h)) -$(eval $(call gb_Package_add_file,bluez_bluetooth_inc,inc/bluetooth/hci_lib.h,bluetooth/hci_lib.h)) -$(eval $(call gb_Package_add_file,bluez_bluetooth_inc,inc/bluetooth/l2cap.h,bluetooth/l2cap.h)) -$(eval $(call gb_Package_add_file,bluez_bluetooth_inc,inc/bluetooth/rfcomm.h,bluetooth/rfcomm.h)) -$(eval $(call gb_Package_add_file,bluez_bluetooth_inc,inc/bluetooth/sco.h,bluetooth/sco.h)) - -# vim: set noet sw=4 ts=4: diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index c18535345d91..55fb129ec698 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -32,12 +32,9 @@ $(eval $(call gb_Library_add_sdi_headers,sd,\ sd/sdi/sdslots \ )) -$(eval $(call gb_Library_use_packages,sd,\ - bluez_bluetooth_inc \ -)) - $(eval $(call gb_Library_set_include,sd,\ $$(INCLUDE) \ + -I$(SRCDIR)/bluez_bluetooth/inc \ -I$(SRCDIR)/sd/inc \ -I$(SRCDIR)/sd/source/ui/inc \ -I$(SRCDIR)/sd/source/ui/slidesorter/inc \ |