summaryrefslogtreecommitdiff
path: root/package/obexftp
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-11-22 18:39:48 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2009-11-22 18:39:48 +0100
commit4088c6eaebb868c4533c83a3d7880b9fab31d45e (patch)
tree55a79694e55cafd70798d729e9f151850c5f3fab /package/obexftp
parentd0cc7e39caa254a2fb234a7f737e020dcf3b2b21 (diff)
make obexftp work with static linking, fix ipv6 dependency
Diffstat (limited to 'package/obexftp')
-rw-r--r--package/obexftp/Config.in6
-rw-r--r--package/obexftp/Config.in.lib10
-rw-r--r--package/obexftp/Makefile14
3 files changed, 27 insertions, 3 deletions
diff --git a/package/obexftp/Config.in b/package/obexftp/Config.in
index 97a5f86be..d9e457852 100644
--- a/package/obexftp/Config.in
+++ b/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
diff --git a/package/obexftp/Config.in.lib b/package/obexftp/Config.in.lib
new file mode 100644
index 000000000..8b822f2a4
--- /dev/null
+++ b/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/
+
diff --git a/package/obexftp/Makefile b/package/obexftp/Makefile
index c3fd175bf..27cc64cf7 100644
--- a/package/obexftp/Makefile
+++ b/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