summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-11-06 20:35:42 (UTC)
committer kergoth <kergoth>2002-11-06 20:35:42 (UTC)
commit0fc8aff3c45012e0a45027e13272a7461885081a (patch) (unidiff)
tree4c862d43d1cd0ef6de88cec6476c5de88bf6d860
parent0b11a3d71510993c97910d7efa5e328b93b5b8f2 (diff)
downloadopie-0fc8aff3c45012e0a45027e13272a7461885081a.zip
opie-0fc8aff3c45012e0a45027e13272a7461885081a.tar.gz
opie-0fc8aff3c45012e0a45027e13272a7461885081a.tar.bz2
Only include if not a config target, as the implicit rules causes the user to jump through hoops (right holger? :)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.test4
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
@@ -1,95 +1,97 @@
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
8configs += $(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 8configs += $(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
19all : $(TOPDIR)/.config 19all : $(TOPDIR)/.config
20 20
21$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs 21$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs
22 22
23all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends 23all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs
24 24
25clean-configs : $(TOPDIR)/.depends.cfgs 25clean-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
31all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) 31all 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
40 40
41# config rules must have the $(configs) var defined 41# config rules must have the $(configs) var defined
42# at the time that they run. we must ensure that .depends.cfgs 42# at the time that they run. we must ensure that .depends.cfgs
43# is built and included by the time we reach this point. 43# is built and included by the time we reach this point.
44 44
45xconfig : 45xconfig :
46 $(call descend,scripts/kconfig,qconf) 46 $(call descend,scripts/kconfig,qconf)
47 LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \ 47 LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \
48 ./scripts/kconfig/qconf ./config.in 48 ./scripts/kconfig/qconf ./config.in
49 49
50menuconfig : scripts/lxdialog/lxdialog 50menuconfig : scripts/lxdialog/lxdialog
51 $(call descend,scripts/kconfig,mconf) 51 $(call descend,scripts/kconfig,mconf)
52 ./scripts/kconfig/mconf ./config.in 52 ./scripts/kconfig/mconf ./config.in
53 53
54config : 54config :
55 $(call descend,scripts/kconfig,conf) 55 $(call descend,scripts/kconfig,conf)
56 ./scripts/kconfig/conf ./config.in 56 ./scripts/kconfig/conf ./config.in
57 57
58oldconfig : 58oldconfig :
59 $(call descend,scripts/kconfig,conf) 59 $(call descend,scripts/kconfig,conf)
60 ./scripts/kconfig/conf -o ./config.in 60 ./scripts/kconfig/conf -o ./config.in
61 61
62randconfig : 62randconfig :
63 $(call descend,scripts/kconfig,conf) 63 $(call descend,scripts/kconfig,conf)
64 ./scripts/kconfig/conf -r ./config.in 64 ./scripts/kconfig/conf -r ./config.in
65 65
66allyesconfig : 66allyesconfig :
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
70allnoconfig : 70allnoconfig :
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
74defconfig : 74defconfig :
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
79export 79export
80 80
81ifneq ($(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
85endif
84 86
85export QMAKESPEC=$(QMAKESPECSDIR)/qws/$(patsubst "%",%,$(CONFIG_SPECFILE)) 87export QMAKESPEC=$(QMAKESPECSDIR)/qws/$(patsubst "%",%,$(CONFIG_SPECFILE))
86 88
87all clean: $(subdir-y) 89all 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
93clean : $(TOPDIR)/.config 95clean : $(TOPDIR)/.config
94 96
95include $(TOPDIR)/Rules.make 97include $(TOPDIR)/Rules.make