summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-11-06 21:30:25 (UTC)
committer kergoth <kergoth>2002-11-06 21:30:25 (UTC)
commit7a0e2678368c1cbb036085aaa594801e93e0b1c1 (patch) (unidiff)
treeb55f28b29decdee69a51233a85144d388c9aeda3
parent1305bd1b6b9495783a1c189a206e4cc2b3d8d1c4 (diff)
downloadopie-7a0e2678368c1cbb036085aaa594801e93e0b1c1.zip
opie-7a0e2678368c1cbb036085aaa594801e93e0b1c1.tar.gz
opie-7a0e2678368c1cbb036085aaa594801e93e0b1c1.tar.bz2
Slight variable correction, to ensure clean target continues to work
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.test5
1 files changed, 1 insertions, 4 deletions
diff --git a/Makefile.test b/Makefile.test
index daa6d35..11fec40 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -1,108 +1,105 @@
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 mrproper distclean \
11 help tags TAGS sgmldocs psdocs pdfdocs htmldocs \
12 checkconfig checkhelp checkincludes
13 10
14configs += $(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 11configs += $(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
15 12
16# $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs) 13# $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs)
17# in order to have a full set of config.in files. 14# in order to have a full set of config.in files.
18# .depends depends on $(TOPDIR)/.config 15# .depends depends on $(TOPDIR)/.config
19# everything else depends on .depends, to ensure the dependencies are 16# everything else depends on .depends, to ensure the dependencies are
20# intact. 17# intact.
21# 18#
22# NOTE: The order in which things happen in this makefile is 19# NOTE: The order in which things happen in this makefile is
23 # -critical-. Do not rearrange this! 20 # -critical-. Do not rearrange this!
24 21
25all : $(TOPDIR)/.config 22all : $(TOPDIR)/.config
26 23
27$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs 24$(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs
28 25
29all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs 26all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs
30 27
31clean-configs : $(TOPDIR)/.depends.cfgs 28clean-configs : $(TOPDIR)/.depends.cfgs
32 @echo "Wiping generated config.in files..." 29 @echo "Wiping generated config.in files..."
33 @-rm -f $(configs) 30 @-rm -f $(configs)
34 31
35-include $(TOPDIR)/.depends.cfgs 32-include $(TOPDIR)/.depends.cfgs
36 33
37all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) 34all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs)
38 35
39$(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs) 36$(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
40 $(call descend,scripts/kconfig,conf) 37 $(call descend,scripts/kconfig,conf)
41 @if [ ! -e $@ ]; then \ 38 @if [ ! -e $@ ]; then \
42 cp $(TOPDIR)/def-configs/opie $@; \ 39 cp $(TOPDIR)/def-configs/opie $@; \
43 fi; 40 fi;
44 @$(MAKE) -C scripts/kconfig conf; 41 @$(MAKE) -C scripts/kconfig conf;
45 ./scripts/kconfig/conf -s ./config.in 42 ./scripts/kconfig/conf -s ./config.in
46 43
47# config rules must have the $(configs) var defined 44# config rules must have the $(configs) var defined
48# 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
49# is built and included by the time we reach this point. 46# is built and included by the time we reach this point.
50 47
51xconfig : 48xconfig :
52 $(call descend,scripts/kconfig,qconf) 49 $(call descend,scripts/kconfig,qconf)
53 LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \ 50 LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \
54 ./scripts/kconfig/qconf ./config.in 51 ./scripts/kconfig/qconf ./config.in
55 52
56menuconfig : scripts/lxdialog/lxdialog 53menuconfig : scripts/lxdialog/lxdialog
57 $(call descend,scripts/kconfig,mconf) 54 $(call descend,scripts/kconfig,mconf)
58 ./scripts/kconfig/mconf ./config.in 55 ./scripts/kconfig/mconf ./config.in
59 56
60config : 57config :
61 $(call descend,scripts/kconfig,conf) 58 $(call descend,scripts/kconfig,conf)
62 ./scripts/kconfig/conf ./config.in 59 ./scripts/kconfig/conf ./config.in
63 60
64oldconfig : 61oldconfig :
65 $(call descend,scripts/kconfig,conf) 62 $(call descend,scripts/kconfig,conf)
66 ./scripts/kconfig/conf -o ./config.in 63 ./scripts/kconfig/conf -o ./config.in
67 64
68randconfig : 65randconfig :
69 $(call descend,scripts/kconfig,conf) 66 $(call descend,scripts/kconfig,conf)
70 ./scripts/kconfig/conf -r ./config.in 67 ./scripts/kconfig/conf -r ./config.in
71 68
72allyesconfig : 69allyesconfig :
73 $(call descend,scripts/kconfig,conf) 70 $(call descend,scripts/kconfig,conf)
74 ./scripts/kconfig/conf -y ./config.in 71 ./scripts/kconfig/conf -y ./config.in
75 72
76allnoconfig : 73allnoconfig :
77 $(call descend,scripts/kconfig,conf) 74 $(call descend,scripts/kconfig,conf)
78 ./scripts/kconfig/conf -n ./config.in 75 ./scripts/kconfig/conf -n ./config.in
79 76
80defconfig : 77defconfig :
81 $(call descend,scripts/kconfig,conf) 78 $(call descend,scripts/kconfig,conf)
82 ./scripts/kconfig/conf -d ./config.in 79 ./scripts/kconfig/conf -d ./config.in
83 80
84 81
85export 82export
86 83
87ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) 84ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
88 85
89export include-config := 1 86export include-config := 1
90 87
91-include $(TOPDIR)/.config 88-include $(TOPDIR)/.config
92-include $(TOPDIR)/.depends 89-include $(TOPDIR)/.depends
93 90
94endif 91endif
95 92
96-include $(TOPDIR)/..config.cmd 93-include $(TOPDIR)/..config.cmd
97 94
98export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) 95export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
99 96
100all clean: $(subdir-y) 97all clean: $(subdir-y)
101 98
102$(subdir-y) : $(if $(CONFIG_LIBQPE),$(TOPDIR)/stamp-headers) \ 99$(subdir-y) : $(if $(CONFIG_LIBQPE),$(TOPDIR)/stamp-headers) \
103 $(if $(CONFIG_LIBQPE-X11),$(TOPDIR)/stamp-headers-x11) \ 100 $(if $(CONFIG_LIBQPE-X11),$(TOPDIR)/stamp-headers-x11) \
104 $(TOPDIR)/library/custom.h 101 $(TOPDIR)/library/custom.h
105 102
106clean : $(TOPDIR)/.config 103clean : $(TOPDIR)/.config
107 104
108include $(TOPDIR)/Rules.make 105include $(TOPDIR)/Rules.make