author | zecke <zecke> | 2003-10-04 08:59:51 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-10-04 08:59:51 (UTC) |
commit | dc9510f788212a6be063349461540e4bea690f51 (patch) (unidiff) | |
tree | b8728fdc12c1580287f16f3828180beac5d55c13 /Rules.make | |
parent | 23f729eb7487ad189591c3b0c9af9d3afecd3b91 (diff) | |
download | opie-dc9510f788212a6be063349461540e4bea690f51.zip opie-dc9510f788212a6be063349461540e4bea690f51.tar.gz opie-dc9510f788212a6be063349461540e4bea690f51.tar.bz2 |
Allow Opie beeing build with a Plain version of Qt without weak symbols
-rw-r--r-- | Rules.make | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -16,32 +16,35 @@ endif | |||
16 | ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 | 16 | ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 |
17 | echo CONFIG -= qt3 >> $@ | 17 | echo CONFIG -= qt3 >> $@ |
18 | else | 18 | else |
19 | echo CONFIG += qt3 >> $@ | 19 | echo CONFIG += qt3 >> $@ |
20 | endif | 20 | endif |
21 | ifeq ($(CONFIG_QUICK_LAUNCH),) | 21 | ifeq ($(CONFIG_QUICK_LAUNCH),) |
22 | echo contains\( CONFIG, quick-app \) \{ >> $@ | 22 | echo contains\( CONFIG, quick-app \) \{ >> $@ |
23 | echo CONFIG -= quick-app >> $@ | 23 | echo CONFIG -= quick-app >> $@ |
24 | echo CONFIG += quick-app-lib >> $@ | 24 | echo CONFIG += quick-app-lib >> $@ |
25 | echo \} >> $@ | 25 | echo \} >> $@ |
26 | else | 26 | else |
27 | echo contains\( CONFIG, quick-app \) \{ >> $@ | 27 | echo contains\( CONFIG, quick-app \) \{ >> $@ |
28 | echo CONFIG -= quick-app >> $@ | 28 | echo CONFIG -= quick-app >> $@ |
29 | echo CONFIG += quick-app-bin >> $@ | 29 | echo CONFIG += quick-app-bin >> $@ |
30 | echo \} >> $@ | 30 | echo \} >> $@ |
31 | endif | 31 | endif |
32 | ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) | ||
33 | echo CONFIG += no-override >> $@ | ||
34 | endif | ||
32 | 35 | ||
33 | $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages | 36 | $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages |
34 | @echo Generating dependency information... | 37 | @echo Generating dependency information... |
35 | # add to subdir-y, and add descend rules | 38 | # add to subdir-y, and add descend rules |
36 | @cat $(TOPDIR)/packages | grep -v '^#' | \ | 39 | @cat $(TOPDIR)/packages | grep -v '^#' | \ |
37 | awk '{print \ | 40 | awk '{print \ |
38 | ".PHONY : " $$2 "\n" \ | 41 | ".PHONY : " $$2 "\n" \ |
39 | "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ | 42 | "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ |
40 | print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends | 43 | print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends |
41 | cat $(TOPDIR)/packages | grep -v '^#' | \ | 44 | cat $(TOPDIR)/packages | grep -v '^#' | \ |
42 | 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"; }' \ | 45 | 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"; }' \ |
43 | >> $(TOPDIR)/.depends | 46 | >> $(TOPDIR)/.depends |
44 | # interpackage dependency generation | 47 | # interpackage dependency generation |
45 | @cat $(TOPDIR)/packages | \ | 48 | @cat $(TOPDIR)/packages | \ |
46 | $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends | 49 | $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends |
47 | 50 | ||