-rw-r--r-- | Makefile.test | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.test b/Makefile.test index a7ceed4..b917c32 100644 --- a/Makefile.test +++ b/Makefile.test | |||
@@ -7,33 +7,33 @@ export QMAKESPECSDIR=$(OPIEDIR)/mkspecs | |||
7 | 7 | ||
8 | configs += $(TOPDIR)/core/applets/restartapplet2/config.in $(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)/core/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/config.in $(TOPDIR)/noncore/todayplugins/config.in $(TOPDIR)/config.in | 8 | configs += $(TOPDIR)/core/applets/restartapplet2/config.in $(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)/core/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/config.in $(TOPDIR)/noncore/todayplugins/config.in $(TOPDIR)/config.in |
9 | 9 | ||
10 | # $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs) | 10 | # $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs) |
11 | # in order to have a full set of config.in files. | 11 | # in order to have a full set of config.in files. |
12 | # .depends depends on $(TOPDIR)/.config | 12 | # .depends depends on $(TOPDIR)/.config |
13 | # everything else depends on .depends, to ensure the dependencies are | 13 | # everything else depends on .depends, to ensure the dependencies are |
14 | # intact. | 14 | # intact. |
15 | # | 15 | # |
16 | # NOTE: The order in which things happen in this makefile is | 16 | # NOTE: The order in which things happen in this makefile is |
17 | # -critical-. Do not rearrange this! | 17 | # -critical-. Do not rearrange this! |
18 | 18 | ||
19 | all : $(TOPDIR)/.config | 19 | all : $(TOPDIR)/.config |
20 | 20 | ||
21 | $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs | 21 | $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs |
22 | 22 | ||
23 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends | 23 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs |
24 | 24 | ||
25 | clean-configs : $(TOPDIR)/.depends.cfgs | 25 | clean-configs : $(TOPDIR)/.depends.cfgs |
26 | @echo "Wiping generated config.in files..." | 26 | @echo "Wiping generated config.in files..." |
27 | @-rm -f $(configs) | 27 | @-rm -f $(configs) |
28 | 28 | ||
29 | -include $(TOPDIR)/.depends.cfgs | 29 | -include $(TOPDIR)/.depends.cfgs |
30 | 30 | ||
31 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) | 31 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) |
32 | 32 | ||
33 | $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs) | 33 | $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs) |
34 | $(call descend,scripts/kconfig,conf) | 34 | $(call descend,scripts/kconfig,conf) |
35 | @if [ ! -e $@ ]; then \ | 35 | @if [ ! -e $@ ]; then \ |
36 | cp $(TOPDIR)/def-configs/opie $@; \ | 36 | cp $(TOPDIR)/def-configs/opie $@; \ |
37 | fi; | 37 | fi; |
38 | @$(MAKE) -C scripts/kconfig conf; | 38 | @$(MAKE) -C scripts/kconfig conf; |
39 | ./scripts/kconfig/conf -s ./config.in | 39 | ./scripts/kconfig/conf -s ./config.in |
@@ -65,31 +65,33 @@ randconfig : | |||
65 | 65 | ||
66 | allyesconfig : | 66 | allyesconfig : |
67 | $(call descend,scripts/kconfig,conf) | 67 | $(call descend,scripts/kconfig,conf) |
68 | ./scripts/kconfig/conf -y ./config.in | 68 | ./scripts/kconfig/conf -y ./config.in |
69 | 69 | ||
70 | allnoconfig : | 70 | allnoconfig : |
71 | $(call descend,scripts/kconfig,conf) | 71 | $(call descend,scripts/kconfig,conf) |
72 | ./scripts/kconfig/conf -n ./config.in | 72 | ./scripts/kconfig/conf -n ./config.in |
73 | 73 | ||
74 | defconfig : | 74 | defconfig : |
75 | $(call descend,scripts/kconfig,conf) | 75 | $(call descend,scripts/kconfig,conf) |
76 | ./scripts/kconfig/conf -d ./config.in | 76 | ./scripts/kconfig/conf -d ./config.in |
77 | 77 | ||
78 | 78 | ||
79 | export | 79 | export |
80 | 80 | ||
81 | ifneq ($(filter-out config menuconfig xconfig randconfig allyesconfig allnoconfig defconfig,$(MAKECMDGOALS)),) | ||
81 | -include $(TOPDIR)/.config | 82 | -include $(TOPDIR)/.config |
82 | -include $(TOPDIR)/..config.cmd | 83 | -include $(TOPDIR)/..config.cmd |
83 | -include $(TOPDIR)/.depends | 84 | -include $(TOPDIR)/.depends |
85 | endif | ||
84 | 86 | ||
85 | export QMAKESPEC=$(QMAKESPECSDIR)/qws/$(patsubst "%",%,$(CONFIG_SPECFILE)) | 87 | export QMAKESPEC=$(QMAKESPECSDIR)/qws/$(patsubst "%",%,$(CONFIG_SPECFILE)) |
86 | 88 | ||
87 | all clean: $(subdir-y) | 89 | all clean: $(subdir-y) |
88 | 90 | ||
89 | $(subdir-y) : $(if $(CONFIG_LIBQPE),$(TOPDIR)/stamp-headers) \ | 91 | $(subdir-y) : $(if $(CONFIG_LIBQPE),$(TOPDIR)/stamp-headers) \ |
90 | $(if $(CONFIG_LIBQPE-X11),$(TOPDIR)/stamp-headers-x11) \ | 92 | $(if $(CONFIG_LIBQPE-X11),$(TOPDIR)/stamp-headers-x11) \ |
91 | $(TOPDIR)/library/custom.h | 93 | $(TOPDIR)/library/custom.h |
92 | 94 | ||
93 | clean : $(TOPDIR)/.config | 95 | clean : $(TOPDIR)/.config |
94 | 96 | ||
95 | include $(TOPDIR)/Rules.make | 97 | include $(TOPDIR)/Rules.make |