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
@@ -17,13 +17,13 @@ configs += $(TOPDIR)/core/applets/restartapplet2/config.in $(TOPDIR)/core/applet
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
@@ -75,15 +75,17 @@ 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
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) \