summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.test50
-rw-r--r--Rules.make8
2 files changed, 40 insertions, 18 deletions
diff --git a/Makefile.test b/Makefile.test
index 3311cde..b30b85d 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -5,19 +5,30 @@ export TOPDIR:=$(OPIEDIR)
5export QMAKESPECSDIR=$(OPIEDIR)/mkspecs 5export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
6export QMAKESPEC=$(QMAKESPECSDIR)/qws/linux-generic-g++ 6export QMAKESPEC=$(QMAKESPECSDIR)/qws/linux-generic-g++
7 7
8all : 8# $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs)
9# in order to have a full set of config.in files.
10# .depends depends on $(TOPDIR)/.config
11# everything else depends on .depends, to ensure the dependencies are
12# intact.
13#
14# NOTE: The order in which things happen in this makefile is
15 # -critical-. Do not rearrange this!
16
17all : $(TOPDIR)/.config
18
19$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs
20
21all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends
9 22
10clean-configs : $(TOPDIR)/.depends 23clean-configs : $(TOPDIR)/.depends
11 @echo "Wiping generated config.in files..." 24 @echo "Wiping generated config.in files..."
12 @-rm -f $(configs) 25 @-rm -f $(configs)
13 26
14-include $(TOPDIR)/.config 27-include $(TOPDIR)/.depends.cfgs
15-include $(TOPDIR)/..config.cmd
16-include $(TOPDIR)/.depends
17 28
18all : $(TOPDIR)/.depends $(configs) $(subdir-y) 29all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs)
19 30
20./.config: $(configs) 31$(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
21 $(call descend,scripts/kconfig,conf) 32 $(call descend,scripts/kconfig,conf)
22 @if [ ! -e $@ ]; then \ 33 @if [ ! -e $@ ]; then \
23 cp $(TOPDIR)/def-configs/opie $@; \ 34 cp $(TOPDIR)/def-configs/opie $@; \
@@ -25,38 +36,47 @@ all : $(TOPDIR)/.depends $(configs) $(subdir-y)
25 @$(MAKE) -C scripts/kconfig conf; 36 @$(MAKE) -C scripts/kconfig conf;
26 ./scripts/kconfig/conf -s ./config.in 37 ./scripts/kconfig/conf -s ./config.in
27 38
28xconfig: $(configs) 39# config rules must have the $(configs) var defined
40# at the time that they run. we must ensure that .depends.cfgs
41# is built and included by the time we reach this point.
42
43xconfig :
29 $(call descend,scripts/kconfig,qconf) 44 $(call descend,scripts/kconfig,qconf)
30 ./scripts/kconfig/qconf ./config.in 45 ./scripts/kconfig/qconf ./config.in
31 46
32menuconfig: $(configs) scripts/lxdialog/lxdialog 47menuconfig : scripts/lxdialog/lxdialog
33 $(call descend,scripts/kconfig,mconf) 48 $(call descend,scripts/kconfig,mconf)
34 ./scripts/kconfig/mconf ./config.in 49 ./scripts/kconfig/mconf ./config.in
35 50
36config: $(configs) 51config :
37 $(call descend,scripts/kconfig,conf) 52 $(call descend,scripts/kconfig,conf)
38 ./scripts/kconfig/conf ./config.in 53 ./scripts/kconfig/conf ./config.in
39 54
40oldconfig: $(configs) 55oldconfig :
41 $(call descend,scripts/kconfig,conf) 56 $(call descend,scripts/kconfig,conf)
42 ./scripts/kconfig/conf -o ./config.in 57 ./scripts/kconfig/conf -o ./config.in
43 58
44randconfig: $(configs) 59randconfig :
45 $(call descend,scripts/kconfig,conf) 60 $(call descend,scripts/kconfig,conf)
46 ./scripts/kconfig/conf -r ./config.in 61 ./scripts/kconfig/conf -r ./config.in
47 62
48allyesconfig: $(configs) 63allyesconfig :
49 $(call descend,scripts/kconfig,conf) 64 $(call descend,scripts/kconfig,conf)
50 ./scripts/kconfig/conf -y ./config.in 65 ./scripts/kconfig/conf -y ./config.in
51 66
52allnoconfig: $(configs) 67allnoconfig :
53 $(call descend,scripts/kconfig,conf) 68 $(call descend,scripts/kconfig,conf)
54 ./scripts/kconfig/conf -n ./config.in 69 ./scripts/kconfig/conf -n ./config.in
55 70
56defconfig: $(configs) 71defconfig :
57 $(call descend,scripts/kconfig,conf) 72 $(call descend,scripts/kconfig,conf)
58 ./scripts/kconfig/conf -d ./config.in 73 ./scripts/kconfig/conf -d ./config.in
59 74
60 75
61include $(TOPDIR)/Rules.make 76-include $(TOPDIR)/.config
77-include $(TOPDIR)/..config.cmd
78-include $(TOPDIR)/.depends
62 79
80all : $(subdir-y)
81
82include $(TOPDIR)/Rules.make
diff --git a/Rules.make b/Rules.make
index 74e74fd..5943b93 100644
--- a/Rules.make
+++ b/Rules.make
@@ -3,7 +3,7 @@
3$(configs) : 3$(configs) :
4 $(call makecfg,$@) 4 $(call makecfg,$@)
5 5
6$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) 6$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config
7 @echo Generating dependency information... 7 @echo Generating dependency information...
8# add to subdir-y, and add descend rules 8# add to subdir-y, and add descend rules
9 @cat $(TOPDIR)/packages | \ 9 @cat $(TOPDIR)/packages | \
@@ -17,10 +17,12 @@ $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)
17# interpackage dependency generation 17# interpackage dependency generation
18 @cat $(TOPDIR)/packages | \ 18 @cat $(TOPDIR)/packages | \
19 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends 19 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
20
21$(TOPDIR)/.depends.cfgs:
20# generation of config.in files, and config.in interdependencies 22# generation of config.in files, and config.in interdependencies
21 @find $(TOPDIR)/ -name config.in | ( for cfg in `cat`; do dir=`dirname $$cfg`; name=`basename $$dir`; if [ ! -e $$dir/$$name.pro ]; then echo $$dir; fi; done; ) > dirs 23 @find $(TOPDIR)/ -name config.in | ( for cfg in `cat`; do dir=`dirname $$cfg`; name=`basename $$dir`; if [ ! -e $$dir/$$name.pro ]; then echo $$dir; fi; done; ) > dirs
22 @echo "configs += `echo \`cat dirs | sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g' -e's,$$,/config.in,g'\``" >> .depends 24 @echo "configs += `echo \`cat dirs | sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g' -e's,$$,/config.in,g'\``" >> $@
23 @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 ) >> $(TOPDIR)/.depends 25 @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 ) >> $@
24 @-rm -f dirs 26 @-rm -f dirs
25 27
26$(TOPDIR)/qmake/qmake : 28$(TOPDIR)/qmake/qmake :