author | mickeyl <mickeyl> | 2006-03-27 13:35:50 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2006-03-27 13:35:50 (UTC) |
commit | 8d8474e48d134c6ee64311d47f22753adcd63d10 (patch) (unidiff) | |
tree | 4570e65acbc517e664124fedf1fc1577fd8964cf | |
parent | 8cd6aceae9ddf16a7f6ed3a10d361f927fd164e1 (diff) | |
download | opie-8d8474e48d134c6ee64311d47f22753adcd63d10.zip opie-8d8474e48d134c6ee64311d47f22753adcd63d10.tar.gz opie-8d8474e48d134c6ee64311d47f22753adcd63d10.tar.bz2 |
add obexftp dependency to build system. patch courtesy Dmitriy Korovkin - thanks
-rw-r--r-- | README | 3 | ||||
-rw-r--r-- | Rules.make | 4 | ||||
-rw-r--r-- | dependencies.in | 11 |
3 files changed, 18 insertions, 0 deletions
@@ -81,12 +81,15 @@ For a successful Opie build, you need to install the following libraries and hea | |||
81 | * libsqlite >= 3.0.0 | 81 | * libsqlite >= 3.0.0 |
82 | http://www.sqlite.org/download.html | 82 | http://www.sqlite.org/download.html |
83 | 83 | ||
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 | |||
87 | 3. Required Programs | 90 | 3. Required Programs |
88 | ==================== | 91 | ==================== |
89 | 92 | ||
90 | For a successful usage of Opie, you should install the following programs: | 93 | For a successful usage of Opie, you should install the following programs: |
91 | 94 | ||
92 | * obexftpd | 95 | * obexftpd |
@@ -128,12 +128,16 @@ ifeq ($(CONFIG_LIBFREETYPE2_DEP),y) | |||
128 | echo LIBFREETYPE2_INC_DIR = $(CONFIG_LIBFREETYPE2_INC_DIR) >> $@ | 128 | echo LIBFREETYPE2_INC_DIR = $(CONFIG_LIBFREETYPE2_INC_DIR) >> $@ |
129 | endif | 129 | endif |
130 | ifeq ($(CONFIG_LIBFLITE_DEP),y) | 130 | 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) >> $@ |
133 | endif | 133 | endif |
134 | ifeq ($(CONFIG_LIBOBEXFTP_DEP),y) | ||
135 | echo LIBOBEXFTP_INC_DIR = $(CONFIG_LIBOBEXFTP_INC_DIR) >> $@ | ||
136 | echo LIBOBEXFTP_LIB_DIR = $(CONFIG_LIBOBEXFTP_LIB_DIR) >> $@ | ||
137 | endif | ||
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 |
137 | @cat $(TOPDIR)/packages | grep -v '^#' | \ | 141 | @cat $(TOPDIR)/packages | grep -v '^#' | \ |
138 | awk '{print \ | 142 | awk '{print \ |
139 | ".PHONY : " $$2 "\n" \ | 143 | ".PHONY : " $$2 "\n" \ |
diff --git a/dependencies.in b/dependencies.in index 2a3d34a..8d6fdbe 100644 --- a/dependencies.in +++ b/dependencies.in | |||
@@ -111,6 +111,17 @@ | |||
111 | depends LIBFLITE_DEP | 111 | depends LIBFLITE_DEP |
112 | 112 | ||
113 | config LIBFLITE_LIB_DIR | 113 | config LIBFLITE_LIB_DIR |
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 | ||