| -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
@@ -101,6 +101,10 @@ 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 @@ -220,23 +224,23 @@ gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so 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 diff --git a/dependencies.in b/dependencies.in index 19220f9..7672ba7 100644 --- a/dependencies.in +++ b/dependencies.in @@ -47,7 +47,7 @@ depends LIBXINE_DEP config LIBIPK_DEP - boolean "Have libipkg v109 or greater" + boolean "Have libipkg >= 0.99.109" default "n" config LIBIPK_LIB_DIR @@ -61,7 +61,7 @@ config LIBSDL_DEP boolean "Have libsdl12 and sdlimage" default "n" - + config LIBSDL_LIB_DIR string "LIBSDL library dir" depends LIBSDL_DEP @@ -69,3 +69,16 @@ 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 |