1 files changed, 6 insertions, 0 deletions

diff --git a/Makefile.test b/Makefile.test
index 74c6587..392ea37 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -12,71 +12,77 @@ export QMAKESPEC=$(QMAKESPECSDIR)/qws/linux-generic-g++
 # intact.
 #
 # NOTE: The order in which things happen in this makefile is
         # -critical-. Do not rearrange this!
  
 all : $(TOPDIR)/.config
 
 $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs
 
 all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends
 
 clean-configs : $(TOPDIR)/.depends.cfgs
         @echo "Wiping generated config.in files..."
         @-rm -f $(configs)
 
 -include $(TOPDIR)/.depends.cfgs
 
 all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs)
 
 $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
         $(call descend,scripts/kconfig,conf)
         @if [ ! -e $@ ]; then \
                 cp $(TOPDIR)/def-configs/opie $@; \
         fi;
         @$(MAKE) -C scripts/kconfig conf;
         ./scripts/kconfig/conf -s ./config.in
 
 # config rules must have the $(configs) var defined
 # at the time that they run. we must ensure that .depends.cfgs
 # is built and included by the time we reach this point.
         
 xconfig :
         $(call descend,scripts/kconfig,qconf)
         ./scripts/kconfig/qconf ./config.in
 
 menuconfig : scripts/lxdialog/lxdialog
         $(call descend,scripts/kconfig,mconf)
         ./scripts/kconfig/mconf ./config.in
 
 config :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf ./config.in
  
 oldconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -o ./config.in
  
 randconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -r ./config.in
  
 allyesconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -y ./config.in
  
 allnoconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -n ./config.in
  
 defconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -d ./config.in
 
 
+ifeq ($(if $(filter clean%,$(MAKECMDGOALS)),clean,notclean),notclean)
 -include $(TOPDIR)/.config
+endif
+ifeq ($(shell if [ -e $(TOPDIR)/..config.cmd ]; then echo exists; fi),exists)
 -include $(TOPDIR)/..config.cmd
+endif
+ifeq ($(if $(filter clean%,$(MAKECMDGOALS)),clean,notclean),notclean)
 -include $(TOPDIR)/.depends
+endif
 
 all : $(subdir-y)
         
 include $(TOPDIR)/Rules.make