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/sqlite/Makefile | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'package/sqlite')

diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile
index 06800ca1c..5eaa4b32b 100644
--- a/package/sqlite/Makefile
+++ b/package/sqlite/Makefile
@@ -12,17 +12,23 @@ PKG_SECTION:=		db
 PKG_BUILDDEP:=		ncurses readline
 PKG_URL:=		http://www.sqlite.org/
 PKG_SITES:=		http://www.sqlite.org/2013/
+PKG_LIBNAME:=		libsqlite
+PKG_OPTS:=		dev
 
 DISTFILES:=		sqlite-autoconf-3080002.tar.gz
 WRKDIST=		${WRKDIR}/sqlite-autoconf-3080002
 
-PKG_SUBPKGS:=		SQLITE_CLI LIBSQLITE LIBSQLITE_DEV
+PKG_SUBPKGS:=		SQLITE_CLI LIBSQLITE
 PKGSD_LIBSQLITE:=	sqlite library
+PKGSC_LIBSQLITE:=	libs
+
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+=		libmix
+endif
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBSQLITE,libsqlite,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSQLITE},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBSQLITE_DEV,libsqlite-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSQLITE},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBSQLITE,libsqlite,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSQLITE},${PKGSC_LIBSQLITE},${PKG_OPTS}))
 $(eval $(call PKG_template,SQLITE_CLI,sqlite-cli,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
@@ -44,13 +50,4 @@ sqlite-cli-install:
 	${INSTALL_DIR} ${IDIR_SQLITE_CLI}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/sqlite3 ${IDIR_SQLITE_CLI}/usr/bin
 
-libsqlite-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBSQLITE_DEV}/usr/lib/pkgconfig
-	${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
-		${IDIR_LIBSQLITE_DEV}/usr/lib/pkgconfig
-	${INSTALL_DIR} ${IDIR_LIBSQLITE_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* \
-		${IDIR_LIBSQLITE_DEV}/usr/include
-	
-
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3