2 files changed, 40 insertions, 18 deletions

diff --git a/Makefile.test b/Makefile.test
index 3311cde..b30b85d 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -1,62 +1,82 @@
 #!/usr/bin/make -f
 export OPIEDIR:=$(shell pwd)
 export TOPDIR:=$(OPIEDIR)
 
 export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
 export QMAKESPEC=$(QMAKESPECSDIR)/qws/linux-generic-g++
 
-all :
+# $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs)
+# in order to have a full set of config.in files.
+# .depends depends on $(TOPDIR)/.config
+# everything else depends on .depends, to ensure the dependencies are
+# 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
         @echo "Wiping generated config.in files..."
         @-rm -f $(configs)
 
--include $(TOPDIR)/.config
--include $(TOPDIR)/..config.cmd
--include $(TOPDIR)/.depends
+-include $(TOPDIR)/.depends.cfgs
 
-all : $(TOPDIR)/.depends $(configs) $(subdir-y)
+all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs)
 
-./.config: $(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
 
-xconfig: $(configs)
+# 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: $(configs) scripts/lxdialog/lxdialog
+menuconfig : scripts/lxdialog/lxdialog
         $(call descend,scripts/kconfig,mconf)
         ./scripts/kconfig/mconf ./config.in
 
-config: $(configs)
+config :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf ./config.in
  
-oldconfig: $(configs)
+oldconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -o ./config.in
  
-randconfig: $(configs)
+randconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -r ./config.in
  
-allyesconfig: $(configs)
+allyesconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -y ./config.in
  
-allnoconfig: $(configs)
+allnoconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -n ./config.in
  
-defconfig: $(configs)
+defconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -d ./config.in
 
 
-include $(TOPDIR)/Rules.make
+-include $(TOPDIR)/.config
+-include $(TOPDIR)/..config.cmd
+-include $(TOPDIR)/.depends
 
+all : $(subdir-y)
+        
+include $(TOPDIR)/Rules.make
diff --git a/Rules.make b/Rules.make
index 74e74fd..5943b93 100644
--- a/Rules.make
+++ b/Rules.make
@@ -1,35 +1,37 @@
 ## targets ##
 
 $(configs) :
         $(call makecfg,$@)
 
-$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;)
+$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config
         @echo Generating dependency information...
 # add to subdir-y, and add descend rules
         @cat $(TOPDIR)/packages | \
                 awk '/^#/ { next }; {print \
                         ".PHONY : " $$2 "\n" \
                         "subdir-$$(" $$1 ") += " $$2 "\n\n" \
                         $$2 "/Makefile : " $$2 "/" $$3 " $$(TOPDIR)/qmake/qmake\n\t" \
                         "$$(call makefilegen,$$@)\n\n" \
                         $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@)\n"}'\
                         > $(TOPDIR)/.depends
 # interpackage dependency generation
         @cat $(TOPDIR)/packages | \
                 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
+
+$(TOPDIR)/.depends.cfgs:
 # generation of config.in files, and config.in interdependencies
         @find $(TOPDIR)/ -name config.in | ( for cfg in `cat`; do dir=`dirname $$cfg`; name=`basename $$dir`; if [ ! -e $$dir/$$name.pro ]; then echo $$dir; fi; done; ) > dirs
-        @echo "configs += `echo \`cat dirs | sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g' -e's,$$,/config.in,g'\``" >> .depends
-        @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $(TOPDIR)/.depends
+        @echo "configs += `echo \`cat dirs | sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g' -e's,$$,/config.in,g'\``" >> $@
+        @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@
         @-rm -f dirs
 
 $(TOPDIR)/qmake/qmake :
         $(call descend,$(TOPDIR)/qmake)
 
 $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/conf scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/mconf scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/qconf scripts/kconfig/qconf :
         $(call descend,$(shell dirname $@),$(shell basename $@))
 
 ## general rules ##
 
 define descend
         $(MAKE) -C $(1) $(2)