Use stampfile to ensure header symlinks are in place

2 files changed, 24 insertions, 1 deletions

diff --git a/Makefile.test b/Makefile.test
index 122e555..6753ee1 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -77,14 +77,17 @@ defconfig :
 
 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)
-        
+
+$(subdir-y) : $(TOPDIR)/stamp-headers
+
+
 include $(TOPDIR)/Rules.make
diff --git a/Rules.make b/Rules.make
index 1342b49..c079acf 100644
--- a/Rules.make
+++ b/Rules.make
@@ -15,27 +15,47 @@ $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)
                         $$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:
 # config.in interdependencies
         @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
         @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)/stamp-headers :
+        mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
+                $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
+        ( cd include/qpe &&  rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; )
+        ( cd include/qtopia && rm -f *.h; ln -s ../../library/*.h .; )
+        ( cd include/qtopia/private && rm -f *.h; ln -s ../../../library/backend/*.h .; )
+        ( cd include/opie &&  rm -f *.h; ln -s ../../libopie/*.h .; rm -f *_p.h; )
+        ( cd include/opie &&  ln -s ../../libsql/*.h .; )
+        ( cd include/opie &&  ln -s ../../libopie/pim/*.h .; )
+        ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
+        ln -s ../../libopie/$$generatedHeader $$generatedHeader; done )
+        touch $@
+        
+        
+
 $(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 $(TOPDIR)/qmake/qmake :
         $(call descend,$(shell dirname $@),$(shell basename $@))
 
+$(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default
+
+$(TOPDIR)/mkspecs/default :
+        ln -sf linux-g++ $@
+
 ## general rules ##
 
 define descend
         $(MAKE) -C $(1) $(2)
 endef
 
 define makefilegen
         cd $(shell dirname $(1)); $(TOPDIR)/qmake/qmake $(3) -o $(shell basename $(1)) `echo $(1)|sed -e 's,/Makefile$$,,g' -e 's,.*/,,g'`.pro
 endef
 
 define makecfg
         $(TOPDIR)/scripts/makecfg.pl $1