add obexftp dependency to build system. patch courtesy Dmitriy Korovkin - thanks

3 files changed, 18 insertions, 0 deletions

diff --git a/README b/README
index e142382..89a9892 100644
--- a/README
+++ b/README
@@ -55,52 +55,55 @@ Then do the following in the opie source tree:
 
 make clean
 make menuconfig
 
 Now you can move through the menu and select or deselect anything..
 Exit and save the configuration and enter "make" to build everything selected.
 
 Have fun!
 
 2. Required Libraries
 =====================
 
 For a successful Opie build, you need to install the following libraries and headers:
 
 * libsdl >= 1.2.0
   http://www.libsdl.org/download-1.2.php
 
 * libxine >= 1.0
   http://prdownloads.sourceforge.net/xine/
 
 * libpcap >= 0.7.2
   http://www.tcpdump.org/release/
 
 * libetpan >= 0.34
   http://prdownloads.sourceforge.net/libetpan/
 
 * libsqlite >= 3.0.0
   http://www.sqlite.org/download.html
 
 * libipk >= 138
   ftp://handhelds.org/linux/packages/ipkg
 
+* libobexftp >= 0.19
+  http://triq.net/obexftp.html
+
 3. Required Programs
 ====================
 
 For a successful usage of Opie, you should install the following programs:
 
 * obexftpd
 * obextool
 
 4. Supported Devices
 ====================
 
 Sharp Zaurus SL-5x00, SL-B500, SL-C7x0, SL-C8x0, SL-C1000, SL-C3000, SL-C3100, SL-6000
 
 HP iPAQ 36xx, 37xx, 38xx, 39xx, 54xx, 55xx
 
 SIEMENS SIMpad CL4, SL4, SLC, T-SinusPAD
 
 MasterIA Beagle, Tradesquare.NL Tuxpad 1
 
 GMate Yopy 3x00
diff --git a/Rules.make b/Rules.make
index 9eeb9f9..a21404f 100644
--- a/Rules.make
+++ b/Rules.make
@@ -102,64 +102,68 @@ ifeq ($(CONFIG_LIBPCAP_DEP),y)
 endif
 ifeq ($(CONFIG_LIBSQLITE_DEP),y)
 	echo LIBSQLITE_LIB_DIR = $(CONFIG_LIBSQLITE_LIB_DIR) >> $@
 	echo LIBSQLITE_INC_DIR = $(CONFIG_LIBSQLITE_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBXINE_DEP),y)
 	echo LIBXINE_LIB_DIR = $(CONFIG_LIBXINE_LIB_DIR) >> $@
 	echo LIBXINE_INC_DIR = $(CONFIG_LIBXINE_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBBLUEZ_DEP),y)
 	echo LIBBLUEZ_LIB_DIR = $(CONFIG_LIBBLUEZ_LIB_DIR) >> $@
 	echo LIBBLUEZ_INC_DIR = $(CONFIG_LIBBLUEZ_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBIPK_DEP),y)
 	echo LIBIPK_LIB_DIR = $(CONFIG_LIBIPK_LIB_DIR) >> $@
 	echo LIBIPK_INC_DIR = $(CONFIG_LIBIPK_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBSDK_DEP),y)
 	echo LIBSDL_LIB_DIR = $(CONFIG_LIBSDL_LIB_DIR) >> $@
 	echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBSWORD_DEP),y)
 	echo LIBSWORD_LIB_DIR = $(CONFIG_LIBSWORD_LIB_DIR) >> $@
 	echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBFREETYPE2_DEP),y)
 	echo LIBFREETYPE2_INC_DIR = $(CONFIG_LIBFREETYPE2_INC_DIR) >> $@
 endif
 ifeq ($(CONFIG_LIBFLITE_DEP),y)
 	echo LIBFLITE_LIB_DIR = $(CONFIG_LIBFLITE_LIB_DIR) >> $@
 	echo LIBFLITE_INC_DIR = $(CONFIG_LIBFLITE_INC_DIR) >> $@
 endif
+ifeq ($(CONFIG_LIBOBEXFTP_DEP),y)
+	echo LIBOBEXFTP_INC_DIR = $(CONFIG_LIBOBEXFTP_INC_DIR) >> $@
+	echo LIBOBEXFTP_LIB_DIR = $(CONFIG_LIBOBEXFTP_LIB_DIR) >> $@
+endif
 $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
 	@echo Generating dependency information...
 # add to subdir-y, and add descend rules
 	@cat $(TOPDIR)/packages | grep -v '^#' | \
 		awk '{print \
 			".PHONY : " $$2 "\n" \
 			"subdir-$$(" $$1 ") += " $$2 "\n\n"; \
 			print $$2 " : " $$2 "/Makefile\n\t+$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends
 	cat $(TOPDIR)/packages | grep -v '^#' | \
 		perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \
 			>> $(TOPDIR)/.depends
 # interpackage dependency generation
 	@cat $(TOPDIR)/packages | \
 		$(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
 
 $(TOPDIR)/.depends.cfgs:
 # config.in interdependencies
 	@echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
 	@cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@
 	@-rm -f dirs
 
 $(QTDIR)/stamp-headers :
 	@-rm -f $(QTDIR)/stamp-headers*
 	( cd $(QTDIR)/include; \
 		$(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \
 		qcopchannel_qws.h qwindowsystem_qws.h \
 		qfontmanager_qws.h qwsdefaultdecoration_qws.h))
 	touch $@
 
 $(QTDIR)/stamp-headers-x11 :
 	@-rm -f $(QTDIR)/stamp-headers*
 	cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h)
diff --git a/dependencies.in b/dependencies.in
index 2a3d34a..8d6fdbe 100644
--- a/dependencies.in
+++ b/dependencies.in
@@ -85,32 +85,43 @@
   config LIBBLUEZ_DEP
     boolean "Have bluez library"
     default "n"
 
   config LIBBLUEZ_LIB_DIR
     string "libbluez library dir"
     depends LIBBLUEZ_DEP
 
   config LIBBLUEZ_INC_DIR
     string "libbluez include dir"
     depends LIBBLUEZ_DEP
 
   config LIBFREETYPE2_DEP
     boolean "Have freetype2"
     default "n"
 
   config LIBFREETYPE2_INC_DIR
     string "freetype2 include dir"
     depends LIBFREETYPE2_DEP
  
   config LIBFLITE_DEP
     boolean "Have flite library"
     default "n"
 
   config LIBFLITE_INC_DIR
     string "libflite include dir"
     depends LIBFLITE_DEP
 
   config LIBFLITE_LIB_DIR
     string "libflite library dir"
     depends LIBFLITE_DEP
 
+  config LIBOBEXFTP_DEP
+    boolean "Have OBEX FTP library"
+    default "n"
+
+  config LIBOBEXFTP_INC_DIR
+    string "OBEXFTP include dir"
+    depends LIBOBEXFTP_DEP
+
+  config LIBOBEXFTP_LIB_DIR
+    string "OBEXFTP library dir"
+    depends LIBOBEXFTP_DEP