author | zecke <zecke> | 2003-12-09 20:12:42 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-12-09 20:12:42 (UTC) |
commit | 31ba7b6bf273889f9486bb2df44d9a8a5381f579 (patch) (unidiff) | |
tree | ffab05c16eb5c3e8e404a2f72f79170c80a70ffc /Rules.make | |
parent | a22a4b5cbec7a12ae247c3e5edf8c51eb121ba49 (diff) | |
download | opie-31ba7b6bf273889f9486bb2df44d9a8a5381f579.zip opie-31ba7b6bf273889f9486bb2df44d9a8a5381f579.tar.gz opie-31ba7b6bf273889f9486bb2df44d9a8a5381f579.tar.bz2 |
small typo.. it is OPIE_NEW_MALLOC not _ALLOC
-rw-r--r-- | Rules.make | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -27,49 +27,49 @@ 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) | 32 | ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) |
33 | echo CONFIG += no-override >> $@ | 33 | echo CONFIG += no-override >> $@ |
34 | endif | 34 | endif |
35 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) | 35 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) |
36 | echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ | 36 | echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ |
37 | endif | 37 | endif |
38 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y) | 38 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y) |
39 | echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@ | 39 | echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@ |
40 | endif | 40 | endif |
41 | ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y) | 41 | ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y) |
42 | echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@ | 42 | echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@ |
43 | endif | 43 | endif |
44 | ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y) | 44 | ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y) |
45 | echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@ | 45 | echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@ |
46 | endif | 46 | endif |
47 | ifeq ($(CONFIG_OPIE_HIGH_RES_SMALL_PHY),y) | 47 | ifeq ($(CONFIG_OPIE_HIGH_RES_SMALL_PHY),y) |
48 | echo DEFINES += OPIE_HIGH_RES_SMALL_PHY >> $@ | 48 | echo DEFINES += OPIE_HIGH_RES_SMALL_PHY >> $@ |
49 | endif | 49 | endif |
50 | ifeq ($(CONFIG_OPIE_NEW_ALLOC),y) | 50 | ifeq ($(CONFIG_OPIE_NEW_ALLOC),y) |
51 | echo DEFINES += OPIE_NEW_ALLOC >> $@ | 51 | echo DEFINES += OPIE_NEW_MALLOC >> $@ |
52 | endif | 52 | endif |
53 | ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y) | 53 | ifeq ($(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 >> $@ |
55 | endif | 55 | endif |
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 ) >> $@ |