From 56e554d65183edf7bcbab7ff04f0d13fa5a4a403 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 13 Mar 2011 22:07:11 +0100
Subject: add a lot of new devel subpackages and fix native builds of packages

---
 package/dbus/Makefile | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

(limited to 'package/dbus')

diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index 2a400abad..fb4f05b67 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -14,13 +14,18 @@ PKG_BUILDDEP:=		expat
 PKG_URL:=		http://dbus.freedesktop.org/
 PKG_SITES:=		http://dbus.freedesktop.org/releases/dbus/
 
+PKG_SUBPKGS:=		DBUS DBUS_DEV
+PKGSC_DBUS_DEV:=	devel
+PKGSD_DBUS_DEV:=	DBUS headers
+
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
 endif
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DBUS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,DBUS_DEV,dbus-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBUS_DEV},${PKGSC_DBUS_DEV},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--disable-tests \
 			--disable-abstract-sockets \
@@ -34,16 +39,26 @@ CONFIGURE_ARGS+=	--disable-tests \
 CONFIGURE_ENV+=		ac_cv_have_abstract_sockets=no
 
 pre-install:
-	${INSTALL_DIR} $(STAGING_TARGET_DIR)/usr/include/dbus-1.0/dbus
+	${INSTALL_DIR} $(STAGING_DIR)/usr/include/dbus-1.0/dbus
 	$(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \
-		$(STAGING_TARGET_DIR)/usr/include/dbus-1.0/dbus/
+		$(STAGING_DIR)/usr/include/dbus-1.0/dbus
 
-post-install:
+dbus-install:
 	${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/lib \
 		${IDIR_DBUS}/usr/bin
-	${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc/
-	${CP} ${WRKINST}/usr/lib/libdbus-1.so* ${IDIR_DBUS}/usr/lib/
-	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin/
-	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-launch ${IDIR_DBUS}/usr/bin/
+	${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc
+	${CP} ${WRKINST}/usr/lib/libdbus-1.so* ${IDIR_DBUS}/usr/lib
+	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-launch ${IDIR_DBUS}/usr/bin
+
+dbus-dev-install:
+	${INSTALL_DIR} ${IDIR_DBUS_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_DBUS_DEV}/usr/include
+	${INSTALL_DIR} $(IDIR_DBUS_DEV)/usr/include/dbus-1.0/dbus
+	$(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \
+		$(IDIR_DBUS_DEV)/usr/include/dbus-1.0/dbus
+	${INSTALL_DIR} ${IDIR_DBUS_DEV}/usr/lib/pkgconfig
+	${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
+		${IDIR_DBUS_DEV}/usr/lib/pkgconfig
 
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3