| -rw-r--r-- | Rules.make | 4 | ||||
| -rw-r--r-- | dependencies.in | 15 | ||||
| -rw-r--r-- | noncore/apps/dagger/config.in | 2 |
3 files changed, 19 insertions, 2 deletions
@@ -96,16 +96,20 @@ endif ifeq ($(CONFIG_LIBIPK_DEP),y) echo LIBIPK_LIB_DIR = $(CONFIG_LIBIPK_LIB_DIR) >> $@ 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" \ "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends diff --git a/dependencies.in b/dependencies.in index 19220f9..7672ba7 100644 --- a/dependencies.in +++ b/dependencies.in @@ -42,17 +42,17 @@ string "LIBXINE library dir" depends LIBXINE_DEP 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 config LIBIPK_INC_DIR string "libipkg include dir" @@ -64,8 +64,21 @@ 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 |