summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2006-03-27 13:35:50 (UTC)
committer mickeyl <mickeyl>2006-03-27 13:35:50 (UTC)
commit8d8474e48d134c6ee64311d47f22753adcd63d10 (patch) (unidiff)
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
@@ -84,6 +84,9 @@ For a successful Opie build, you need to install the following libraries and hea
84* libipk >= 138 84* libipk >= 138
85 ftp://handhelds.org/linux/packages/ipkg 85 ftp://handhelds.org/linux/packages/ipkg
86 86
87* libobexftp >= 0.19
88 http://triq.net/obexftp.html
89
873. Required Programs 903. Required Programs
88==================== 91====================
89 92
diff --git a/Rules.make b/Rules.make
index 9eeb9f9..a21404f 100644
--- a/Rules.make
+++ b/Rules.make
@@ -131,6 +131,10 @@ ifeq ($(CONFIG_LIBFLITE_DEP),y)
131 echo LIBFLITE_LIB_DIR = $(CONFIG_LIBFLITE_LIB_DIR) >> $@ 131 echo LIBFLITE_LIB_DIR = $(CONFIG_LIBFLITE_LIB_DIR) >> $@
132 echo LIBFLITE_INC_DIR = $(CONFIG_LIBFLITE_INC_DIR) >> $@ 132 echo LIBFLITE_INC_DIR = $(CONFIG_LIBFLITE_INC_DIR) >> $@
133endif 133endif
134ifeq ($(CONFIG_LIBOBEXFTP_DEP),y)
135 echo LIBOBEXFTP_INC_DIR = $(CONFIG_LIBOBEXFTP_INC_DIR) >> $@
136 echo LIBOBEXFTP_LIB_DIR = $(CONFIG_LIBOBEXFTP_LIB_DIR) >> $@
137endif
134$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages 138$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
135 @echo Generating dependency information... 139 @echo Generating dependency information...
136# add to subdir-y, and add descend rules 140# add to subdir-y, and add descend rules
diff --git a/dependencies.in b/dependencies.in
index 2a3d34a..8d6fdbe 100644
--- a/dependencies.in
+++ b/dependencies.in
@@ -114,3 +114,14 @@
114 string "libflite library dir" 114 string "libflite library dir"
115 depends LIBFLITE_DEP 115 depends LIBFLITE_DEP
116 116
117 config LIBOBEXFTP_DEP
118 boolean "Have OBEX FTP library"
119 default "n"
120
121 config LIBOBEXFTP_INC_DIR
122 string "OBEXFTP include dir"
123 depends LIBOBEXFTP_DEP
124
125 config LIBOBEXFTP_LIB_DIR
126 string "OBEXFTP library dir"
127 depends LIBOBEXFTP_DEP