summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make14
-rw-r--r--dependencies.in17
-rw-r--r--noncore/apps/dagger/config.in2
3 files changed, 25 insertions, 8 deletions
diff --git a/Rules.make b/Rules.make
index 42e4cfe..e86f662 100644
--- a/Rules.make
+++ b/Rules.make
@@ -101,6 +101,10 @@ ifeq ($(CONFIG_LIBSDK_DEP),y)
101 echo LIBSDL_LIB_DIR = $(CONFIG_LIBSDL_LIB_DIR) >> $@ 101 echo LIBSDL_LIB_DIR = $(CONFIG_LIBSDL_LIB_DIR) >> $@
102 echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@ 102 echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@
103endif 103endif
104ifeq ($(CONFIG_LIBSWORD_DEP),y)
105 echo LIBSWORD_LIB_DIR = $(CONFIG_LIBSWORD_LIB_DIR) >> $@
106 echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_DIR) >> $@
107endif
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...
106# add to subdir-y, and add descend rules 110# add to subdir-y, and add descend rules
@@ -220,23 +224,23 @@ gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so
220config: $(TOPDIR)/scripts/kconfig/conf ./config.in 224config: $(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
224oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 228oldconfig: $(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
228randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 232randconfig: $(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
232allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 236allyesconfig: $(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
236allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 240allnoconfig: $(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
240defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in 244defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
241 $(TOPDIR)/scripts/kconfig/conf -d ./config.in 245 $(TOPDIR)/scripts/kconfig/conf -d ./config.in
242 @touch .config.stamp 246 @touch .config.stamp
diff --git a/dependencies.in b/dependencies.in
index 19220f9..7672ba7 100644
--- a/dependencies.in
+++ b/dependencies.in
@@ -47,7 +47,7 @@
47 depends LIBXINE_DEP 47 depends LIBXINE_DEP
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
53 config LIBIPK_LIB_DIR 53 config LIBIPK_LIB_DIR
@@ -61,7 +61,7 @@
61 config LIBSDL_DEP 61 config LIBSDL_DEP
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"
67 depends LIBSDL_DEP 67 depends LIBSDL_DEP
@@ -69,3 +69,16 @@
69 config LIBSDL_INC_DIR 69 config LIBSDL_INC_DIR
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
@@ -1,4 +1,4 @@
1 config DAGGER 1 config DAGGER
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