summaryrefslogtreecommitdiff
authordrw <drw>2004-04-22 20:45:26 (UTC)
committer drw <drw>2004-04-22 20:45:26 (UTC)
commit42977c57028a94735aaf9870097e1269815c6229 (patch) (unidiff)
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
@@ -103,2 +103,6 @@ ifeq ($(CONFIG_LIBSDK_DEP),y)
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
@@ -222,3 +226,3 @@ config: $(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
@@ -226,3 +230,3 @@ oldconfig: $(TOPDIR)/scripts/kconfig/conf ./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
@@ -230,3 +234,3 @@ randconfig: $(TOPDIR)/scripts/kconfig/conf ./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
@@ -234,3 +238,3 @@ allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./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
@@ -238,3 +242,3 @@ allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./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
diff --git a/dependencies.in b/dependencies.in
index 19220f9..7672ba7 100644
--- a/dependencies.in
+++ b/dependencies.in
@@ -49,3 +49,3 @@
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"
@@ -63,3 +63,3 @@
63 default "n" 63 default "n"
64 64
65 config LIBSDL_LIB_DIR 65 config LIBSDL_LIB_DIR
@@ -71 +71,14 @@
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
@@ -3,2 +3,2 @@
3 default "n" 3 default "n"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBSWORD_DEP