make obexftp work with static linking, fix ipv6 dependency

package/Config.in

@@ -443,6 +443,7 @@ source "package/libnl/Config.in"
 source "package/libogg/Config.in"
 source "package/libol/Config.in"
 source "package/opencdk/Config.in"  # libopencdk
+source "package/obexftp/Config.in.lib"
 source "package/openobex/Config.in"
 source "package/libosip2/Config.in"
 source "package/libowfat/Config.in"

package/Makefile

@@ -286,7 +286,7 @@ package-$(ADK_PACKAGE_NFS_KERNEL_NFSD) += nfs-utils
 package-$(ADK_PACKAGE_NMAP) += nmap
 package-$(ADK_PACKAGE_NTPCLIENT) += ntpclient
 package-$(ADK_PACKAGE_NSS) += nss
-package-$(ADK_PACKAGE_OBEXFTP) += obexftp
+package-$(ADK_COMPILE_OBEXFTP) += obexftp
 package-$(ADK_PACKAGE_OLSRD) += olsrd
 package-$(ADK_COMPILE_OPENCDK) += opencdk
 package-$(ADK_PACKAGE_OPENCT) += openct

package/libpthread/Makefile

@@ -18,9 +18,13 @@ PKG_DESCR:=		POSIX threading library
 PKG_SECTION:=		libs
 NO_DISTFILES:=		1
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBPTHREAD,libpthread,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBPTHREAD,libpthread,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 do-install:
 	${INSTALL_DIR} ${IDIR_LIBPTHREAD}/lib

package/obexftp/Config.in

@@ -1,7 +1,13 @@
+config ADK_COMPILE_OBEXFTP
+	tristate
+	default n
+	depends on ADK_PACKAGE_OBEXFTP
+
 config ADK_PACKAGE_OBEXFTP
 	prompt "obexftp........................... obexftp applications"
 	tristate
 	default n
+	select ADK_COMPILE_OBEXFTP
 	select ADK_PACKAGE_LIBICONV
 	select ADK_PACKAGE_OPENOBEX
 	help

package/obexftp/Config.in.lib

@@ -0,0 +1,10 @@
+config ADK_PACKAGE_LIBOBEXFTP
+	prompt "libobexftp........................ obexftp libraries"
+	tristate
+	default n
+	select ADK_COMPILE_OBEXFTP
+	select ADK_PACKAGE_LIBICONV
+	select ADK_PACKAGE_OPENOBEX
+	help
+	  http://openobex.triq.net/
+

package/obexftp/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		obexftp
 PKG_VERSION:=		0.23
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		f20762061b68bc921e80be4aebc349eb
 PKG_DESCR:=		bluetooth ftp application
 PKG_SECTION:=		bluetooth
@@ -13,11 +13,18 @@ PKG_DEPENDS:=		openobex libiconv
 PKG_URL:=		http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=openobex/}
 
+PKG_DESCR_LIB:=		obexftp library
+PKG_SECTION_LIB:=	libs
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,OBEXFTP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBOBEXFTP,libobexftp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_LIB},${PKG_SECTION_LIB},${PKG_OPTS}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		OPENOBEX_CFLAGS="-I${STAGING_DIR}/usr/include" \
@@ -30,8 +37,9 @@ CONFIGURE_ARGS+=	--disable-perl \
 INSTALL_STYLE:=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_OBEXFTP}/usr/bin ${IDIR_OBEXFTP}/usr/lib
+	${INSTALL_DIR} ${IDIR_OBEXFTP}/usr/bin 
 	${CP} ${WRKINST}/usr/bin/* ${IDIR_OBEXFTP}/usr/bin/
-	${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_OBEXFTP}/usr/lib/
+	${INSTALL_DIR} ${IDIR_LIBOBEXFTP}/usr/lib
+	${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_LIBOBEXFTP}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/openobex/Config.in

@@ -2,8 +2,9 @@ config ADK_PACKAGE_OPENOBEX
 	prompt "openobex.......................... openobex library"
 	tristate
 	default n
+	# openobex does not work without ipv6
+	select ADK_IPV6	
 	select ADK_PACKAGE_BLUEZ
 	help
-	  Free open source implementation of the Object Exchange (OBEX) protocol.  
-
+	  Open source implementation of the Object Exchange (OBEX) protocol.  
 	  http://openobex.triq.net/

package/openobex/Makefile

@@ -12,9 +12,13 @@ PKG_SECTION:=		bluetooth
 PKG_URL:=		http://dev.zuckschwerdt.org/openobex/wiki/WikiStart
 PKG_SITES:=		${MASTER_SITE_KERNEL:=bluetooth/}
 
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS:=		libonly
+endif
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,OPENOBEX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENOBEX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_STYLE:=	gnu
 BUILD_STYLE:=		auto