author | kergoth <kergoth> | 2002-11-05 21:21:19 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-05 21:21:19 (UTC) |
commit | 29d8b412c02963b58482a9e58e23becb8f18fa0d (patch) (unidiff) | |
tree | e050191ff73849c05492ba419334af480cb64fd4 /Makefile.test | |
parent | c9d9315e03afba63853a10dec16a6a9dea3a5c4e (diff) | |
download | opie-29d8b412c02963b58482a9e58e23becb8f18fa0d.zip opie-29d8b412c02963b58482a9e58e23becb8f18fa0d.tar.gz opie-29d8b412c02963b58482a9e58e23becb8f18fa0d.tar.bz2 |
Obey our new specfile config parameter
-rw-r--r-- | Makefile.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.test b/Makefile.test index 6753ee1..61d8a56 100644 --- a/Makefile.test +++ b/Makefile.test | |||
@@ -1,30 +1,29 @@ | |||
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 | 4 | ||
5 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs | 5 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
6 | export QMAKESPEC=$(QMAKESPECSDIR)/qws/linux-generic-g++ | ||
7 | 6 | ||
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)/x11/ipc/server/config.in $(TOPDIR)/x11/ipc/config.in $(TOPDIR)/x11/config.in $(TOPDIR)/config.in | 7 | 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)/x11/ipc/server/config.in $(TOPDIR)/x11/ipc/config.in $(TOPDIR)/x11/config.in $(TOPDIR)/config.in |
9 | 8 | ||
10 | # $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs) | 9 | # $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs) |
11 | # in order to have a full set of config.in files. | 10 | # in order to have a full set of config.in files. |
12 | # .depends depends on $(TOPDIR)/.config | 11 | # .depends depends on $(TOPDIR)/.config |
13 | # everything else depends on .depends, to ensure the dependencies are | 12 | # everything else depends on .depends, to ensure the dependencies are |
14 | # intact. | 13 | # intact. |
15 | # | 14 | # |
16 | # NOTE: The order in which things happen in this makefile is | 15 | # NOTE: The order in which things happen in this makefile is |
17 | # -critical-. Do not rearrange this! | 16 | # -critical-. Do not rearrange this! |
18 | 17 | ||
19 | all : $(TOPDIR)/.config | 18 | all : $(TOPDIR)/.config |
20 | 19 | ||
21 | $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs | 20 | $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs |
22 | 21 | ||
23 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends | 22 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends |
24 | 23 | ||
25 | clean-configs : $(TOPDIR)/.depends.cfgs | 24 | clean-configs : $(TOPDIR)/.depends.cfgs |
26 | @echo "Wiping generated config.in files..." | 25 | @echo "Wiping generated config.in files..." |
27 | @-rm -f $(configs) | 26 | @-rm -f $(configs) |
28 | 27 | ||
29 | -include $(TOPDIR)/.depends.cfgs | 28 | -include $(TOPDIR)/.depends.cfgs |
30 | 29 | ||
@@ -64,30 +63,31 @@ randconfig : | |||
64 | 63 | ||
65 | allyesconfig : | 64 | allyesconfig : |
66 | $(call descend,scripts/kconfig,conf) | 65 | $(call descend,scripts/kconfig,conf) |
67 | ./scripts/kconfig/conf -y ./config.in | 66 | ./scripts/kconfig/conf -y ./config.in |
68 | 67 | ||
69 | allnoconfig : | 68 | allnoconfig : |
70 | $(call descend,scripts/kconfig,conf) | 69 | $(call descend,scripts/kconfig,conf) |
71 | ./scripts/kconfig/conf -n ./config.in | 70 | ./scripts/kconfig/conf -n ./config.in |
72 | 71 | ||
73 | defconfig : | 72 | defconfig : |
74 | $(call descend,scripts/kconfig,conf) | 73 | $(call descend,scripts/kconfig,conf) |
75 | ./scripts/kconfig/conf -d ./config.in | 74 | ./scripts/kconfig/conf -d ./config.in |
76 | 75 | ||
77 | 76 | ||
78 | ifeq ($(if $(filter clean%,$(MAKECMDGOALS)),clean,notclean),notclean) | 77 | ifeq ($(if $(filter clean%,$(MAKECMDGOALS)),clean,notclean),notclean) |
79 | -include $(TOPDIR)/.config | 78 | -include $(TOPDIR)/.config |
80 | endif | 79 | endif |
81 | ifeq ($(shell if [ -e $(TOPDIR)/..config.cmd ]; then echo exists; fi),exists) | 80 | ifeq ($(shell if [ -e $(TOPDIR)/..config.cmd ]; then echo exists; fi),exists) |
82 | -include $(TOPDIR)/..config.cmd | 81 | -include $(TOPDIR)/..config.cmd |
83 | endif | 82 | endif |
84 | ifeq ($(if $(filter clean%,$(MAKECMDGOALS)),clean,notclean),notclean) | 83 | ifeq ($(if $(filter clean%,$(MAKECMDGOALS)),clean,notclean),notclean) |
85 | -include $(TOPDIR)/.depends | 84 | -include $(TOPDIR)/.depends |
86 | endif | 85 | endif |
87 | 86 | ||
87 | export QMAKESPEC=$(QMAKESPECSDIR)/qws/$(CONFIG_SPECFILE) | ||
88 | |||
88 | all : $(subdir-y) | 89 | all : $(subdir-y) |
89 | 90 | ||
90 | $(subdir-y) : $(TOPDIR)/stamp-headers | 91 | $(subdir-y) : $(TOPDIR)/stamp-headers |
91 | 92 | ||
92 | |||
93 | include $(TOPDIR)/Rules.make | 93 | include $(TOPDIR)/Rules.make |