summaryrefslogtreecommitdiff
authordrw <drw>2004-04-22 20:45:26 (UTC)
committer drw <drw>2004-04-22 20:45:26 (UTC)
commit42977c57028a94735aaf9870097e1269815c6229 (patch) (side-by-side diff)
tree9bc14ae88173421808144f5fed3dde7a31d2945d
parent47d4d04c8b593d9d26c262add5b16d9ce3868866 (diff)
downloadopie-42977c57028a94735aaf9870097e1269815c6229.zip
opie-42977c57028a94735aaf9870097e1269815c6229.tar.gz
opie-42977c57028a94735aaf9870097e1269815c6229.tar.bz2
Added libsword dependancy for dagger
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
@@ -98,12 +98,16 @@ ifeq ($(CONFIG_LIBIPK_DEP),y)
echo LIBIPK_INC_DIR = $(CONFIG_LIBIPK_INC_DIR) >> $@
endif
ifeq ($(CONFIG_LIBSDK_DEP),y)
echo LIBSDL_LIB_DIR = $(CONFIG_LIBSDL_LIB_DIR) >> $@
echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@
endif
+ifeq ($(CONFIG_LIBSWORD_DEP),y)
+ echo LIBSWORD_LIB_DIR = $(CONFIG_LIBSWORD_LIB_DIR) >> $@
+ echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_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" \
@@ -217,29 +221,29 @@ gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so
$(TOPDIR)/scripts/kconfig/gconf ./config.in
@touch .config.stamp
config: $(TOPDIR)/scripts/kconfig/conf ./config.in
$(TOPDIR)/scripts/kconfig/conf ./config.in
@touch .config.stamp
-
+
oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
$(TOPDIR)/scripts/kconfig/conf -o ./config.in
@touch .config.stamp
-
+
randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
$(TOPDIR)/scripts/kconfig/conf -r ./config.in
@touch .config.stamp
-
+
allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
$(TOPDIR)/scripts/kconfig/conf -y ./config.in
@touch .config.stamp
-
+
allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
$(TOPDIR)/scripts/kconfig/conf -n ./config.in
@touch .config.stamp
-
+
defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
$(TOPDIR)/scripts/kconfig/conf -d ./config.in
@touch .config.stamp
$(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default
diff --git a/dependencies.in b/dependencies.in
index 19220f9..7672ba7 100644
--- a/dependencies.in
+++ b/dependencies.in
@@ -44,13 +44,13 @@
config LIBXINE_INC_DIR
string "LIBXINE include dir"
depends LIBXINE_DEP
config LIBIPK_DEP
- boolean "Have libipkg v109 or greater"
+ boolean "Have libipkg >= 0.99.109"
default "n"
config LIBIPK_LIB_DIR
string "libipkg library dir"
depends LIBIPK_DEP
@@ -58,14 +58,27 @@
string "libipkg include dir"
depends LIBIPK_DEP
config LIBSDL_DEP
boolean "Have libsdl12 and sdlimage"
default "n"
-
+
config LIBSDL_LIB_DIR
string "LIBSDL library dir"
depends LIBSDL_DEP
config LIBSDL_INC_DIR
string "LIBSDL include dir"
depends LIBSDL_DEP
+
+ config LIBSWORD_DEP
+ boolean "Have libsword > = 1.5.0"
+ default "n"
+
+ config LIBSWORD_LIB_DIR
+ string "libsword library dir"
+ depends LIBSWORD_DEP
+
+ config LIBSWORD_INC_DIR
+ string "libsword include dir"
+ depends LIBSWORD_DEP
+
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 @@
config DAGGER
boolean "opie-dagger (Bible study/reader application - requires libsword)"
default "n"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBSWORD_DEP