From d279b5d1fe744cac44da7cd1b51f9ba6a2cc4647 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 22 Oct 2013 19:29:20 +0200
Subject: fix libmix packages, while checking all packages make some style
cleanup
---
package/bluez/Makefile | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
(limited to 'package/bluez')
diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index 092cd03ac..d8a0b540f 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -5,20 +5,32 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= bluez
PKG_VERSION:= 4.101
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= fb42cb7038c380eb0e2fa208987c96ad
-PKG_DESCR:= bluetooth libraries and applications
+PKG_DESCR:= bluetooth applications
PKG_SECTION:= bluetooth
-PKG_DEPENDS:= kmod-bt libusb glib dbus
-PKG_BUILDDEP:= libusb dbus glib libusb-compat
+PKG_DEPENDS:= kmod-bt libbluetooth
PKG_URL:= http://www.bluez.org/
PKG_SITES:= http://mirror.anl.gov/pub/linux/bluetooth/
+PKG_LIBNAME:= libbluetooth
+PKG_OPTS:= dev
+
+PKG_SUBPKGS:= BLUEZ LIBBLUETOOTH
+PKGSC_LIBBLUETOOTH:= libs
+PKGSD_LIBBLUETOOTH:= bluetooth libraries
+PKGSS_LIBBLUETOOTH:= glib libusb dbus libusb-compat
+PKGSB_LIBBLUETOOTH:= glib libusb dbus libusb-compat
PKG_ARCH_DEPENDS:= !avr32
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+= libmix
+endif
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBBLUETOOTH,libbluetooth,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBBLUETOOTH},${PKGSD_LIBBLUETOOTH},${PKGSC_LIBBLUETOOTH},${PKG_OPTS}))
ifeq ($(ADK_STATIC),y)
XAKE_FLAGS+= CCLD="$(TARGET_CC) -all-static -pthread"
@@ -37,10 +49,6 @@ CONFIGURE_ARGS+= --enable-tools \
--disable-cups
bluez-install:
-ifneq ($(ADK_STATIC),y)
- ${INSTALL_DIR} ${IDIR_BLUEZ}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libbluetooth.so* ${IDIR_BLUEZ}/usr/lib
-endif
${INSTALL_DIR} $(IDIR_BLUEZ)/etc/dbus-1/system.d
${INSTALL_DIR} ${IDIR_BLUEZ}/usr/bin
${CP} ${WRKINST}/usr/bin/* ${IDIR_BLUEZ}/usr/bin
@@ -52,4 +60,8 @@ endif
$(INSTALL_DATA) ./files/bluetooth.conf \
$(IDIR_BLUEZ)/etc/dbus-1/system.d
+libbluetooth-install:
+ ${INSTALL_DIR} ${IDIR_LIBBLUETOOTH}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libbluetooth.so* ${IDIR_LIBBLUETOOTH}/usr/lib
+
include ${TOPDIR}/mk/pkg-bottom.mk
--
cgit v1.2.3