summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make2
1 files changed, 1 insertions, 1 deletions
diff --git a/Rules.make b/Rules.make
index 5cdbb00..82c71e1 100644
--- a/Rules.make
+++ b/Rules.make
@@ -19,65 +19,65 @@ else
19 echo CONFIG += qt3 >> $@ 19 echo CONFIG += qt3 >> $@
20endif 20endif
21ifneq ($(CONFIG_QUICK_LAUNCH),) 21ifneq ($(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 \} >> $@
26else 26else
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
32ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) 32ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y)
33 echo CONFIG += no-override >> $@ 33 echo CONFIG += no-override >> $@
34endif 34endif
35ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) 35ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y)
36 echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ 36 echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@
37endif 37endif
38ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y) 38ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y)
39 echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@ 39 echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@
40endif 40endif
41ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y) 41ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y)
42 echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@ 42 echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@
43endif 43endif
44ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y) 44ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y)
45 echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@ 45 echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@
46endif 46endif
47ifeq ($(CONFIG_OPIE_HIGH_RES_SMALL_PHY),y) 47ifeq ($(CONFIG_OPIE_HIGH_RES_SMALL_PHY),y)
48 echo DEFINES += OPIE_HIGH_RES_SMALL_PHY >> $@ 48 echo DEFINES += OPIE_HIGH_RES_SMALL_PHY >> $@
49endif 49endif
50ifeq ($(CONFIG_OPIE_NEW_ALLOC),y) 50ifeq ($(CONFIG_OPIE_NEW_ALLOC),y)
51 echo DEFINES += OPIE_NEW_ALLOC >> $@ 51 echo DEFINES += OPIE_NEW_MALLOC >> $@
52endif 52endif
53ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y) 53ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y)
54 echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@ 54 echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@
55endif 55endif
56 echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@ 56 echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@
57$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages 57$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
58 @echo Generating dependency information... 58 @echo Generating dependency information...
59# add to subdir-y, and add descend rules 59# add to subdir-y, and add descend rules
60 @cat $(TOPDIR)/packages | grep -v '^#' | \ 60 @cat $(TOPDIR)/packages | grep -v '^#' | \
61 awk '{print \ 61 awk '{print \
62 ".PHONY : " $$2 "\n" \ 62 ".PHONY : " $$2 "\n" \
63 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ 63 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \
64 print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends 64 print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends
65 cat $(TOPDIR)/packages | grep -v '^#' | \ 65 cat $(TOPDIR)/packages | grep -v '^#' | \
66 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"; }' \ 66 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"; }' \
67 >> $(TOPDIR)/.depends 67 >> $(TOPDIR)/.depends
68# interpackage dependency generation 68# interpackage dependency generation
69 @cat $(TOPDIR)/packages | \ 69 @cat $(TOPDIR)/packages | \
70 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends 70 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
71 71
72$(TOPDIR)/.depends.cfgs: 72$(TOPDIR)/.depends.cfgs:
73# config.in interdependencies 73# config.in interdependencies
74 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs 74 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
75 @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@ 75 @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@
76 @-rm -f dirs 76 @-rm -f dirs
77 77
78$(QTDIR)/stamp-headers : 78$(QTDIR)/stamp-headers :
79 @-rm -f $(QTDIR)/stamp-headers* 79 @-rm -f $(QTDIR)/stamp-headers*
80 ( cd $(QTDIR)/include; \ 80 ( cd $(QTDIR)/include; \
81 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ 81 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \
82 qcopchannel_qws.h qwindowsystem_qws.h \ 82 qcopchannel_qws.h qwindowsystem_qws.h \
83 qfontmanager_qws.h qwsdefaultdecoration_qws.h)) 83 qfontmanager_qws.h qwsdefaultdecoration_qws.h))