author | drw <drw> | 2004-04-22 20:45:26 (UTC) |
---|---|---|
committer | drw <drw> | 2004-04-22 20:45:26 (UTC) |
commit | 42977c57028a94735aaf9870097e1269815c6229 (patch) (unidiff) | |
tree | 9bc14ae88173421808144f5fed3dde7a31d2945d | |
parent | 47d4d04c8b593d9d26c262add5b16d9ce3868866 (diff) | |
download | opie-42977c57028a94735aaf9870097e1269815c6229.zip opie-42977c57028a94735aaf9870097e1269815c6229.tar.gz opie-42977c57028a94735aaf9870097e1269815c6229.tar.bz2 |
Added libsword dependancy for dagger
-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
@@ -92,24 +92,28 @@ endif | |||
92 | ifeq ($(CONFIG_LIBXINE_DEP),y) | 92 | ifeq ($(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) >> $@ |
95 | endif | 95 | endif |
96 | ifeq ($(CONFIG_LIBIPK_DEP),y) | 96 | ifeq ($(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) >> $@ |
99 | endif | 99 | endif |
100 | ifeq ($(CONFIG_LIBSDK_DEP),y) | 100 | ifeq ($(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) >> $@ |
103 | endif | 103 | endif |
104 | ifeq ($(CONFIG_LIBSWORD_DEP),y) | ||
105 | echo LIBSWORD_LIB_DIR = $(CONFIG_LIBSWORD_LIB_DIR) >> $@ | ||
106 | echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_DIR) >> $@ | ||
107 | endif | ||
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 |
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 |