From 8e8ffc20d1699ba678d380f25e08424492f7d8ab Mon Sep 17 00:00:00 2001 From: kergoth Date: Tue, 05 Nov 2002 20:23:45 +0000 Subject: Use stampfile to ensure header symlinks are in place --- diff --git a/Makefile.test b/Makefile.test index 122e555..6753ee1 100644 --- a/Makefile.test +++ b/Makefile.test @@ -86,5 +86,8 @@ ifeq ($(if $(filter clean%,$(MAKECMDGOALS)),clean,notclean),notclean) 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 @@ -24,9 +24,29 @@ $(TOPDIR)/.depends.cfgs: @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 -- cgit v0.9.0.2