summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-01-16 17:48:23 (UTC)
committer kergoth <kergoth>2003-01-16 17:48:23 (UTC)
commit0eec393ef2dd8b43db96c86e80e307f73a771fae (patch) (unidiff)
treea70ceced4095ecca577dc4c693fa8f6042f78cdb
parentdd3c6e3c2312899ba723a41c18d5af2ad68e6367 (diff)
downloadopie-0eec393ef2dd8b43db96c86e80e307f73a771fae.zip
opie-0eec393ef2dd8b43db96c86e80e307f73a771fae.tar.gz
opie-0eec393ef2dd8b43db96c86e80e307f73a771fae.tar.bz2
Add clean-configs to noconfig_targets.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.test3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.test b/Makefile.test
index 346ed6a..3fe7867 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -1,105 +1,106 @@
1#!/usr/bin/make -f 1#!/usr/bin/make -f
2export OPIEDIR:=$(shell pwd) 2export OPIEDIR:=$(shell pwd)
3export TOPDIR:=$(OPIEDIR) 3export TOPDIR:=$(OPIEDIR)
4export QMAKE:=$(OPIEDIR)/qmake/qmake 4export QMAKE:=$(OPIEDIR)/qmake/qmake
5 5
6export QMAKESPECSDIR=$(OPIEDIR)/mkspecs 6export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
7 7
8noconfig_targets := xconfig menuconfig config oldconfig randconfig \ 8noconfig_targets := xconfig menuconfig config oldconfig randconfig \
9 defconfig allyesconfig allnoconfig allmodconfig 9 defconfig allyesconfig allnoconfig allmodconfig \
10 clean-configs clean
10 11
11configs += $(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 12configs += $(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 13
13# $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs) 14# $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs)
14# in order to have a full set of config.in files. 15# in order to have a full set of config.in files.
15# .depends depends on $(TOPDIR)/.config 16# .depends depends on $(TOPDIR)/.config
16# everything else depends on .depends, to ensure the dependencies are 17# everything else depends on .depends, to ensure the dependencies are
17# intact. 18# intact.
18# 19#
19# NOTE: The order in which things happen in this makefile is 20# NOTE: The order in which things happen in this makefile is
20 # -critical-. Do not rearrange this! 21 # -critical-. Do not rearrange this!
21 22
22all : $(TOPDIR)/.config 23all : $(TOPDIR)/.config
23 24
24$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs 25$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs
25 26
26all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs 27all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs
27 28
28clean-configs : 29clean-configs :
29 @echo "Wiping generated config.in files..." 30 @echo "Wiping generated config.in files..."
30 @-rm -f $(configs) 31 @-rm -f $(configs)
31 32
32-include $(TOPDIR)/.depends.cfgs 33-include $(TOPDIR)/.depends.cfgs
33 34
34all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) 35all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs)
35 36
36$(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs) 37$(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
37 $(call descend,scripts/kconfig,conf) 38 $(call descend,scripts/kconfig,conf)
38 @if [ ! -e $@ ]; then \ 39 @if [ ! -e $@ ]; then \
39 cp $(TOPDIR)/def-configs/opie $@; \ 40 cp $(TOPDIR)/def-configs/opie $@; \
40 fi; 41 fi;
41 @$(MAKE) -C scripts/kconfig conf; 42 @$(MAKE) -C scripts/kconfig conf;
42 ./scripts/kconfig/conf -s ./config.in 43 ./scripts/kconfig/conf -s ./config.in
43 44
44# config rules must have the $(configs) var defined 45# config rules must have the $(configs) var defined
45# at the time that they run. we must ensure that .depends.cfgs 46# at the time that they run. we must ensure that .depends.cfgs
46# is built and included by the time we reach this point. 47# is built and included by the time we reach this point.
47 48
48xconfig : 49xconfig :
49 $(call descend,scripts/kconfig,qconf) 50 $(call descend,scripts/kconfig,qconf)
50 LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \ 51 LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \
51 ./scripts/kconfig/qconf ./config.in 52 ./scripts/kconfig/qconf ./config.in
52 53
53menuconfig : scripts/lxdialog/lxdialog 54menuconfig : scripts/lxdialog/lxdialog
54 $(call descend,scripts/kconfig,mconf) 55 $(call descend,scripts/kconfig,mconf)
55 ./scripts/kconfig/mconf ./config.in 56 ./scripts/kconfig/mconf ./config.in
56 57
57config : 58config :
58 $(call descend,scripts/kconfig,conf) 59 $(call descend,scripts/kconfig,conf)
59 ./scripts/kconfig/conf ./config.in 60 ./scripts/kconfig/conf ./config.in
60 61
61oldconfig : 62oldconfig :
62 $(call descend,scripts/kconfig,conf) 63 $(call descend,scripts/kconfig,conf)
63 ./scripts/kconfig/conf -o ./config.in 64 ./scripts/kconfig/conf -o ./config.in
64 65
65randconfig : 66randconfig :
66 $(call descend,scripts/kconfig,conf) 67 $(call descend,scripts/kconfig,conf)
67 ./scripts/kconfig/conf -r ./config.in 68 ./scripts/kconfig/conf -r ./config.in
68 69
69allyesconfig : 70allyesconfig :
70 $(call descend,scripts/kconfig,conf) 71 $(call descend,scripts/kconfig,conf)
71 ./scripts/kconfig/conf -y ./config.in 72 ./scripts/kconfig/conf -y ./config.in
72 73
73allnoconfig : 74allnoconfig :
74 $(call descend,scripts/kconfig,conf) 75 $(call descend,scripts/kconfig,conf)
75 ./scripts/kconfig/conf -n ./config.in 76 ./scripts/kconfig/conf -n ./config.in
76 77
77defconfig : 78defconfig :
78 $(call descend,scripts/kconfig,conf) 79 $(call descend,scripts/kconfig,conf)
79 ./scripts/kconfig/conf -d ./config.in 80 ./scripts/kconfig/conf -d ./config.in
80 81
81 82
82export 83export
83 84
84ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) 85ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
85 86
86export include-config := 1 87export include-config := 1
87 88
88-include $(TOPDIR)/.config 89-include $(TOPDIR)/.config
89-include $(TOPDIR)/.depends 90-include $(TOPDIR)/.depends
90 91
91endif 92endif
92 93
93-include $(TOPDIR)/..config.cmd 94-include $(TOPDIR)/..config.cmd
94 95
95SUBDIRS = $(subdir-y) 96SUBDIRS = $(subdir-y)
96 97
97export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) 98export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
98 99
99ifdef CONFIG_OPTIMIZATIONS 100ifdef CONFIG_OPTIMIZATIONS
100export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) 101export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
101export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) 102export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
102endif 103endif
103 104
104all clean lupdate lrelease install ipk: $(SUBDIRS) 105all clean lupdate lrelease install ipk: $(SUBDIRS)
105 106