author | drw <drw> | 2004-04-22 20:45:26 (UTC) |
---|---|---|
committer | drw <drw> | 2004-04-22 20:45:26 (UTC) |
commit | 42977c57028a94735aaf9870097e1269815c6229 (patch) (unidiff) | |
tree | 9bc14ae88173421808144f5fed3dde7a31d2945d | |
parent | 47d4d04c8b593d9d26c262add5b16d9ce3868866 (diff) | |
download | opie-42977c57028a94735aaf9870097e1269815c6229.zip opie-42977c57028a94735aaf9870097e1269815c6229.tar.gz opie-42977c57028a94735aaf9870097e1269815c6229.tar.bz2 |
Added libsword dependancy for dagger
-rw-r--r-- | Rules.make | 14 | ||||
-rw-r--r-- | dependencies.in | 17 | ||||
-rw-r--r-- | noncore/apps/dagger/config.in | 2 |
3 files changed, 25 insertions, 8 deletions
@@ -102,4 +102,8 @@ ifeq ($(CONFIG_LIBSDK_DEP),y) | |||
102 | echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@ | 102 | echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@ |
103 | endif | 103 | endif |
104 | ifeq ($(CONFIG_LIBSWORD_DEP),y) | ||
105 | echo LIBSWORD_LIB_DIR = $(CONFIG_LIBSWORD_LIB_DIR) >> $@ | ||
106 | echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_DIR) >> $@ | ||
107 | endif | ||
104 | $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages | 108 | $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages |
105 | @echo Generating dependency information... | 109 | @echo Generating dependency information... |
@@ -221,21 +225,21 @@ config: $(TOPDIR)/scripts/kconfig/conf ./config.in | |||
221 | $(TOPDIR)/scripts/kconfig/conf ./config.in | 225 | $(TOPDIR)/scripts/kconfig/conf ./config.in |
222 | @touch .config.stamp | 226 | @touch .config.stamp |
223 | 227 | ||
224 | oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in | 228 | oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in |
225 | $(TOPDIR)/scripts/kconfig/conf -o ./config.in | 229 | $(TOPDIR)/scripts/kconfig/conf -o ./config.in |
226 | @touch .config.stamp | 230 | @touch .config.stamp |
227 | 231 | ||
228 | randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in | 232 | randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in |
229 | $(TOPDIR)/scripts/kconfig/conf -r ./config.in | 233 | $(TOPDIR)/scripts/kconfig/conf -r ./config.in |
230 | @touch .config.stamp | 234 | @touch .config.stamp |
231 | 235 | ||
232 | allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in | 236 | allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in |
233 | $(TOPDIR)/scripts/kconfig/conf -y ./config.in | 237 | $(TOPDIR)/scripts/kconfig/conf -y ./config.in |
234 | @touch .config.stamp | 238 | @touch .config.stamp |
235 | 239 | ||
236 | allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in | 240 | allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in |
237 | $(TOPDIR)/scripts/kconfig/conf -n ./config.in | 241 | $(TOPDIR)/scripts/kconfig/conf -n ./config.in |
238 | @touch .config.stamp | 242 | @touch .config.stamp |
239 | 243 | ||
240 | defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in | 244 | defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in |
241 | $(TOPDIR)/scripts/kconfig/conf -d ./config.in | 245 | $(TOPDIR)/scripts/kconfig/conf -d ./config.in |
diff --git a/dependencies.in b/dependencies.in index 19220f9..7672ba7 100644 --- a/dependencies.in +++ b/dependencies.in | |||
@@ -48,5 +48,5 @@ | |||
48 | 48 | ||
49 | config LIBIPK_DEP | 49 | config LIBIPK_DEP |
50 | boolean "Have libipkg v109 or greater" | 50 | boolean "Have libipkg >= 0.99.109" |
51 | default "n" | 51 | default "n" |
52 | 52 | ||
@@ -62,5 +62,5 @@ | |||
62 | boolean "Have libsdl12 and sdlimage" | 62 | boolean "Have libsdl12 and sdlimage" |
63 | default "n" | 63 | default "n" |
64 | 64 | ||
65 | config LIBSDL_LIB_DIR | 65 | config LIBSDL_LIB_DIR |
66 | string "LIBSDL library dir" | 66 | string "LIBSDL library dir" |
@@ -70,2 +70,15 @@ | |||
70 | string "LIBSDL include dir" | 70 | string "LIBSDL include dir" |
71 | depends LIBSDL_DEP | 71 | depends LIBSDL_DEP |
72 | |||
73 | config LIBSWORD_DEP | ||
74 | boolean "Have libsword > = 1.5.0" | ||
75 | default "n" | ||
76 | |||
77 | config LIBSWORD_LIB_DIR | ||
78 | string "libsword library dir" | ||
79 | depends LIBSWORD_DEP | ||
80 | |||
81 | config LIBSWORD_INC_DIR | ||
82 | string "libsword include dir" | ||
83 | depends LIBSWORD_DEP | ||
84 | |||
diff --git a/noncore/apps/dagger/config.in b/noncore/apps/dagger/config.in index eb2326b..6822865 100644 --- a/noncore/apps/dagger/config.in +++ b/noncore/apps/dagger/config.in | |||
@@ -2,3 +2,3 @@ | |||
2 | boolean "opie-dagger (Bible study/reader application - requires libsword)" | 2 | boolean "opie-dagger (Bible study/reader application - requires libsword)" |
3 | default "n" | 3 | default "n" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBSWORD_DEP |