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
@@ -92,24 +92,28 @@ endif
92ifeq ($(CONFIG_LIBXINE_DEP),y) 92ifeq ($(CONFIG_LIBXINE_DEP),y)
93 echo LIBXINE_LIB_DIR = $(CONFIG_LIBXINE_LIB_DIR) >> $@ 93 echo LIBXINE_LIB_DIR = $(CONFIG_LIBXINE_LIB_DIR) >> $@
94 echo LIBXINE_INC_DIR = $(CONFIG_LIBXINE_INC_DIR) >> $@ 94 echo LIBXINE_INC_DIR = $(CONFIG_LIBXINE_INC_DIR) >> $@
95endif 95endif
96ifeq ($(CONFIG_LIBIPK_DEP),y) 96ifeq ($(CONFIG_LIBIPK_DEP),y)
97 echo LIBIPK_LIB_DIR = $(CONFIG_LIBIPK_LIB_DIR) >> $@ 97 echo LIBIPK_LIB_DIR = $(CONFIG_LIBIPK_LIB_DIR) >> $@
98 echo LIBIPK_INC_DIR = $(CONFIG_LIBIPK_INC_DIR) >> $@ 98 echo LIBIPK_INC_DIR = $(CONFIG_LIBIPK_INC_DIR) >> $@
99endif 99endif
100ifeq ($(CONFIG_LIBSDK_DEP),y) 100ifeq ($(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
107 @cat $(TOPDIR)/packages | grep -v '^#' | \ 111 @cat $(TOPDIR)/packages | grep -v '^#' | \
108 awk '{print \ 112 awk '{print \
109 ".PHONY : " $$2 "\n" \ 113 ".PHONY : " $$2 "\n" \
110 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ 114 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \
111 print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends 115 print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends
112 cat $(TOPDIR)/packages | grep -v '^#' | \ 116 cat $(TOPDIR)/packages | grep -v '^#' | \
113 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \ 117 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \
114 >> $(TOPDIR)/.depends 118 >> $(TOPDIR)/.depends
115# interpackage dependency generation 119# interpackage dependency generation
@@ -211,41 +215,41 @@ menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf
211 215
212xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in 216xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
213 $(TOPDIR)/scripts/kconfig/qconf ./config.in 217 $(TOPDIR)/scripts/kconfig/qconf ./config.in
214 @touch .config.stamp 218 @touch .config.stamp
215 219
216gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in 220gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
217 $(TOPDIR)/scripts/kconfig/gconf ./config.in 221 $(TOPDIR)/scripts/kconfig/gconf ./config.in
218 @touch .config.stamp 222 @touch .config.stamp
219 223
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
243 247
244$(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default 248$(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default
245 249
246$(TOPDIR)/mkspecs/default : 250$(TOPDIR)/mkspecs/default :
247 ln -sf linux-g++ $@ 251 ln -sf linux-g++ $@
248 252
249$(TOPDIR)/scripts/subst : force 253$(TOPDIR)/scripts/subst : force
250 @( \ 254 @( \
251 echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \ 255 echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \
diff --git a/dependencies.in b/dependencies.in
index 19220f9..7672ba7 100644
--- a/dependencies.in
+++ b/dependencies.in
@@ -38,34 +38,47 @@
38 boolean "Have libxine 1.0 beta11" 38 boolean "Have libxine 1.0 beta11"
39 default "n" 39 default "n"
40 40
41 config LIBXINE_LIB_DIR 41 config LIBXINE_LIB_DIR
42 string "LIBXINE library dir" 42 string "LIBXINE library dir"
43 depends LIBXINE_DEP 43 depends LIBXINE_DEP
44 44
45 config LIBXINE_INC_DIR 45 config LIBXINE_INC_DIR
46 string "LIBXINE include dir" 46 string "LIBXINE include dir"
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
54 string "libipkg library dir" 54 string "libipkg library dir"
55 depends LIBIPK_DEP 55 depends LIBIPK_DEP
56 56
57 config LIBIPK_INC_DIR 57 config LIBIPK_INC_DIR
58 string "libipkg include dir" 58 string "libipkg include dir"
59 depends LIBIPK_DEP 59 depends LIBIPK_DEP
60 60
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
68 68
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