summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2006-03-27 13:35:50 (UTC)
committer mickeyl <mickeyl>2006-03-27 13:35:50 (UTC)
commit8d8474e48d134c6ee64311d47f22753adcd63d10 (patch) (side-by-side diff)
tree4570e65acbc517e664124fedf1fc1577fd8964cf
parent8cd6aceae9ddf16a7f6ed3a10d361f927fd164e1 (diff)
downloadopie-8d8474e48d134c6ee64311d47f22753adcd63d10.zip
opie-8d8474e48d134c6ee64311d47f22753adcd63d10.tar.gz
opie-8d8474e48d134c6ee64311d47f22753adcd63d10.tar.bz2
add obexftp dependency to build system. patch courtesy Dmitriy Korovkin - thanks
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--README3
-rw-r--r--Rules.make4
-rw-r--r--dependencies.in11
3 files changed, 18 insertions, 0 deletions
diff --git a/README b/README
index e142382..89a9892 100644
--- a/README
+++ b/README
@@ -75,24 +75,27 @@ For a successful Opie build, you need to install the following libraries and hea
* 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
diff --git a/Rules.make b/Rules.make
index 9eeb9f9..a21404f 100644
--- a/Rules.make
+++ b/Rules.make
@@ -122,24 +122,28 @@ ifeq ($(CONFIG_LIBSDK_DEP),y)
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
diff --git a/dependencies.in b/dependencies.in
index 2a3d34a..8d6fdbe 100644
--- a/dependencies.in
+++ b/dependencies.in
@@ -105,12 +105,23 @@
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