From cc72091faa47f540c40b711505ec9ecae3a88e92 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 18 Jul 2011 13:29:37 +0200
Subject: add header subpackages

---
 package/lvm/Makefile  | 12 ++++++++++--
 package/popt/Makefile | 14 +++++++++++---
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index 7863fe58e..981aa21b6 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		lvm
 PKG_VERSION:=		2.02.80
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		816f4cee75674e3a21fd40f1961279f2
 PKG_DESCR:=		logical volume management
 PKG_SECTION:=		fs
@@ -13,11 +13,13 @@ PKG_DEPENDS:=		libdevmapper libncurses
 PKG_URL:=		http://sourceware.org/lvm2/
 PKG_SITES:=		ftp://sources.redhat.com/pub/lvm2/
 
-PKG_SUBPKGS:=		LVM DEVICE_MAPPER LIBDEVMAPPER
+PKG_SUBPKGS:=		LVM DEVICE_MAPPER LIBDEVMAPPER LIBDEVMAPPER_DEV
 PKGSD_DEVICE_MAPPER:=	device-mapper utility
 PKGSS_DEVICE_MAPPER:=	libdevmapper
 PKGSD_LIBDEVMAPPER:=	device-mapper library
 PKGSC_LIBDEVMAPPER:=	libs
+PKGSD_LIBDEVMAPPER_DEV:=device-mapper headers
+PKGSC_LIBDEVMAPPER_DEV:=devel
 
 DISTFILES:=		LVM2.${PKG_VERSION}.tgz
 WRKDIST=		${WRKDIR}/LVM2.${PKG_VERSION}
@@ -27,6 +29,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_DEVICE_MAPPER},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBDEVMAPPER,libdevmapper,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBDEVMAPPER},${PKGSC_LIBDEVMAPPER}))
+$(eval $(call PKG_template,LIBDEVMAPPER_DEV,libdevmapper-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBDEVMAPPER_DEV},${PKGSC_LIBDEVMAPPER_DEV}))
 
 CONFIGURE_ARGS+=	--with-user="" --with-group="" \
 			--with-optimisation="" \
@@ -41,6 +44,11 @@ libdevmapper-install:
 	${CP} ${WRKINST}/usr/lib/libdevmapper.so* \
 		${IDIR_LIBDEVMAPPER}/usr/lib
 
+libdevmapper-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBDEVMAPPER_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* \
+		${IDIR_LIBDEVMAPPER_DEV}/usr/include
+
 device-mapper-install:
 	${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/dmsetup \
diff --git a/package/popt/Makefile b/package/popt/Makefile
index 2c355dbfb..aead00fe5 100644
--- a/package/popt/Makefile
+++ b/package/popt/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		popt
 PKG_VERSION:=		1.16
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		3743beefa3dd6247a73f8f7a32c14c33
 PKG_DESCR:=		a command line option parsing library
 PKG_SECTION:=		libs
@@ -14,7 +14,8 @@ PKG_BUILDDEP:=		libiconv
 PKG_URL:=		http://rpm5.org/
 PKG_SITES:=		http://rpm5.org/files/popt/
 
-PKG_SUBPKGS:=		LIBPOPT
+PKG_SUBPKGS:=		LIBPOPT LIBPOPT_DEV
+PKGSC_LIBPOPT_DEV:=	devel
 
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
@@ -23,9 +24,16 @@ endif
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBPOPT,libpopt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBPOPT_DEV,libpopt-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBPOPT_DEV},${PKG_OPTS}))
+
+TARGET_LDFAGS+=		-liconv
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBPOPT}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libpopt.so* ${IDIR_LIBPOPT}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libpopt.so* ${IDIR_LIBPOPT}/usr/lib
+
+libpopt-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBPOPT_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBPOPT_DEV}/usr/include
 
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3