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 /Rules.make | |
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 | 14 |
1 files changed, 9 insertions, 5 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 |
@@ -211,41 +215,41 @@ menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf | |||
211 | 215 | ||
212 | xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in | 216 | xconfig: $(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 | ||
216 | gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in | 220 | gconfig: $(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 | ||
220 | config: $(TOPDIR)/scripts/kconfig/conf ./config.in | 224 | config: $(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 | ||
224 | oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in | 228 | oldconfig: $(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 | ||
228 | randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in | 232 | randconfig: $(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 | ||
232 | allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in | 236 | allyesconfig: $(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 | ||
236 | allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in | 240 | allnoconfig: $(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 | ||
240 | defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in | 244 | defconfig: $(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'; \ |