author | kergoth <kergoth> | 2003-01-16 17:46:43 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-01-16 17:46:43 (UTC) |
commit | dd3c6e3c2312899ba723a41c18d5af2ad68e6367 (patch) (unidiff) | |
tree | cb59ef24421d259cea37ee76f516d4dfe6824f32 | |
parent | 77da94fec78c4ee143412df4348d747d61c1a2fe (diff) | |
download | opie-dd3c6e3c2312899ba723a41c18d5af2ad68e6367.zip opie-dd3c6e3c2312899ba723a41c18d5af2ad68e6367.tar.gz opie-dd3c6e3c2312899ba723a41c18d5af2ad68e6367.tar.bz2 |
Remove prerequisite .depends.cfgs for clean-configs, no longer necessary
-rw-r--r-- | Makefile.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.test b/Makefile.test index b8f9525..346ed6a 100644 --- a/Makefile.test +++ b/Makefile.test | |||
@@ -1,92 +1,92 @@ | |||
1 | #!/usr/bin/make -f | 1 | #!/usr/bin/make -f |
2 | export OPIEDIR:=$(shell pwd) | 2 | export OPIEDIR:=$(shell pwd) |
3 | export TOPDIR:=$(OPIEDIR) | 3 | export TOPDIR:=$(OPIEDIR) |
4 | export QMAKE:=$(OPIEDIR)/qmake/qmake | 4 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
5 | 5 | ||
6 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs | 6 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
7 | 7 | ||
8 | noconfig_targets := xconfig menuconfig config oldconfig randconfig \ | 8 | noconfig_targets := xconfig menuconfig config oldconfig randconfig \ |
9 | defconfig allyesconfig allnoconfig allmodconfig | 9 | defconfig allyesconfig allnoconfig allmodconfig |
10 | 10 | ||
11 | configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/ofileselector/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/libsql/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/unsupported/opiemail/ifaces/config.in $(TOPDIR)/noncore/unsupported/config.in $(TOPDIR)/noncore/todayplugins/config.in | 11 | configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/ofileselector/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/libsql/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/unsupported/opiemail/ifaces/config.in $(TOPDIR)/noncore/unsupported/config.in $(TOPDIR)/noncore/todayplugins/config.in |
12 | 12 | ||
13 | # $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs) | 13 | # $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs) |
14 | # in order to have a full set of config.in files. | 14 | # in order to have a full set of config.in files. |
15 | # .depends depends on $(TOPDIR)/.config | 15 | # .depends depends on $(TOPDIR)/.config |
16 | # everything else depends on .depends, to ensure the dependencies are | 16 | # everything else depends on .depends, to ensure the dependencies are |
17 | # intact. | 17 | # intact. |
18 | # | 18 | # |
19 | # NOTE: The order in which things happen in this makefile is | 19 | # NOTE: The order in which things happen in this makefile is |
20 | # -critical-. Do not rearrange this! | 20 | # -critical-. Do not rearrange this! |
21 | 21 | ||
22 | all : $(TOPDIR)/.config | 22 | all : $(TOPDIR)/.config |
23 | 23 | ||
24 | $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs | 24 | $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs |
25 | 25 | ||
26 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs | 26 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs |
27 | 27 | ||
28 | clean-configs : $(TOPDIR)/.depends.cfgs | 28 | clean-configs : |
29 | @echo "Wiping generated config.in files..." | 29 | @echo "Wiping generated config.in files..." |
30 | @-rm -f $(configs) | 30 | @-rm -f $(configs) |
31 | 31 | ||
32 | -include $(TOPDIR)/.depends.cfgs | 32 | -include $(TOPDIR)/.depends.cfgs |
33 | 33 | ||
34 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) | 34 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) |
35 | 35 | ||
36 | $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs) | 36 | $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs) |
37 | $(call descend,scripts/kconfig,conf) | 37 | $(call descend,scripts/kconfig,conf) |
38 | @if [ ! -e $@ ]; then \ | 38 | @if [ ! -e $@ ]; then \ |
39 | cp $(TOPDIR)/def-configs/opie $@; \ | 39 | cp $(TOPDIR)/def-configs/opie $@; \ |
40 | fi; | 40 | fi; |
41 | @$(MAKE) -C scripts/kconfig conf; | 41 | @$(MAKE) -C scripts/kconfig conf; |
42 | ./scripts/kconfig/conf -s ./config.in | 42 | ./scripts/kconfig/conf -s ./config.in |
43 | 43 | ||
44 | # config rules must have the $(configs) var defined | 44 | # config rules must have the $(configs) var defined |
45 | # at the time that they run. we must ensure that .depends.cfgs | 45 | # at the time that they run. we must ensure that .depends.cfgs |
46 | # is built and included by the time we reach this point. | 46 | # is built and included by the time we reach this point. |
47 | 47 | ||
48 | xconfig : | 48 | xconfig : |
49 | $(call descend,scripts/kconfig,qconf) | 49 | $(call descend,scripts/kconfig,qconf) |
50 | LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \ | 50 | LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \ |
51 | ./scripts/kconfig/qconf ./config.in | 51 | ./scripts/kconfig/qconf ./config.in |
52 | 52 | ||
53 | menuconfig : scripts/lxdialog/lxdialog | 53 | menuconfig : scripts/lxdialog/lxdialog |
54 | $(call descend,scripts/kconfig,mconf) | 54 | $(call descend,scripts/kconfig,mconf) |
55 | ./scripts/kconfig/mconf ./config.in | 55 | ./scripts/kconfig/mconf ./config.in |
56 | 56 | ||
57 | config : | 57 | config : |
58 | $(call descend,scripts/kconfig,conf) | 58 | $(call descend,scripts/kconfig,conf) |
59 | ./scripts/kconfig/conf ./config.in | 59 | ./scripts/kconfig/conf ./config.in |
60 | 60 | ||
61 | oldconfig : | 61 | oldconfig : |
62 | $(call descend,scripts/kconfig,conf) | 62 | $(call descend,scripts/kconfig,conf) |
63 | ./scripts/kconfig/conf -o ./config.in | 63 | ./scripts/kconfig/conf -o ./config.in |
64 | 64 | ||
65 | randconfig : | 65 | randconfig : |
66 | $(call descend,scripts/kconfig,conf) | 66 | $(call descend,scripts/kconfig,conf) |
67 | ./scripts/kconfig/conf -r ./config.in | 67 | ./scripts/kconfig/conf -r ./config.in |
68 | 68 | ||
69 | allyesconfig : | 69 | allyesconfig : |
70 | $(call descend,scripts/kconfig,conf) | 70 | $(call descend,scripts/kconfig,conf) |
71 | ./scripts/kconfig/conf -y ./config.in | 71 | ./scripts/kconfig/conf -y ./config.in |
72 | 72 | ||
73 | allnoconfig : | 73 | allnoconfig : |
74 | $(call descend,scripts/kconfig,conf) | 74 | $(call descend,scripts/kconfig,conf) |
75 | ./scripts/kconfig/conf -n ./config.in | 75 | ./scripts/kconfig/conf -n ./config.in |
76 | 76 | ||
77 | defconfig : | 77 | defconfig : |
78 | $(call descend,scripts/kconfig,conf) | 78 | $(call descend,scripts/kconfig,conf) |
79 | ./scripts/kconfig/conf -d ./config.in | 79 | ./scripts/kconfig/conf -d ./config.in |
80 | 80 | ||
81 | 81 | ||
82 | export | 82 | export |
83 | 83 | ||
84 | ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) | 84 | ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) |
85 | 85 | ||
86 | export include-config := 1 | 86 | export include-config := 1 |
87 | 87 | ||
88 | -include $(TOPDIR)/.config | 88 | -include $(TOPDIR)/.config |
89 | -include $(TOPDIR)/.depends | 89 | -include $(TOPDIR)/.depends |
90 | 90 | ||
91 | endif | 91 | endif |
92 | 92 | ||