author | kergoth <kergoth> | 2002-11-06 20:35:42 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-06 20:35:42 (UTC) |
commit | 0fc8aff3c45012e0a45027e13272a7461885081a (patch) (unidiff) | |
tree | 4c862d43d1cd0ef6de88cec6476c5de88bf6d860 | |
parent | 0b11a3d71510993c97910d7efa5e328b93b5b8f2 (diff) | |
download | opie-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? :)
-rw-r--r-- | Makefile.test | 4 |
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 | |||
@@ -15,17 +15,17 @@ configs += $(TOPDIR)/core/applets/restartapplet2/config.in $(TOPDIR)/core/applet | |||
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 | ||
19 | all : $(TOPDIR)/.config | 19 | all : $(TOPDIR)/.config |
20 | 20 | ||
21 | $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs | 21 | $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs |
22 | 22 | ||
23 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends | 23 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs |
24 | 24 | ||
25 | clean-configs : $(TOPDIR)/.depends.cfgs | 25 | clean-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 | ||
31 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) | 31 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) |
@@ -73,19 +73,21 @@ allnoconfig : | |||
73 | 73 | ||
74 | defconfig : | 74 | 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 | ||
79 | export | 79 | export |
80 | 80 | ||
81 | ifneq ($(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 |
85 | endif | ||
84 | 86 | ||
85 | export QMAKESPEC=$(QMAKESPECSDIR)/qws/$(patsubst "%",%,$(CONFIG_SPECFILE)) | 87 | export QMAKESPEC=$(QMAKESPECSDIR)/qws/$(patsubst "%",%,$(CONFIG_SPECFILE)) |
86 | 88 | ||
87 | all clean: $(subdir-y) | 89 | all 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 |