summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-11-05 20:23:45 (UTC)
committer kergoth <kergoth>2002-11-05 20:23:45 (UTC)
commit8e8ffc20d1699ba678d380f25e08424492f7d8ab (patch) (unidiff)
tree7a9241f6706a35e8885614d5f0f509622b1eabe4
parent8eda06d13cf3eacf986cf1ab32c884c64ee972ae (diff)
downloadopie-8e8ffc20d1699ba678d380f25e08424492f7d8ab.zip
opie-8e8ffc20d1699ba678d380f25e08424492f7d8ab.tar.gz
opie-8e8ffc20d1699ba678d380f25e08424492f7d8ab.tar.bz2
Use stampfile to ensure header symlinks are in place
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.test5
-rw-r--r--Rules.make20
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
@@ -83,8 +83,11 @@ ifeq ($(shell if [ -e $(TOPDIR)/..config.cmd ]; then echo exists; fi),exists)
83endif 83endif
84ifeq ($(if $(filter clean%,$(MAKECMDGOALS)),clean,notclean),notclean) 84ifeq ($(if $(filter clean%,$(MAKECMDGOALS)),clean,notclean),notclean)
85-include $(TOPDIR)/.depends 85-include $(TOPDIR)/.depends
86endif 86endif
87 87
88all : $(subdir-y) 88all : $(subdir-y)
89 89
90$(subdir-y) : $(TOPDIR)/stamp-headers
91
92
90include $(TOPDIR)/Rules.make 93include $(TOPDIR)/Rules.make
diff --git a/Rules.make b/Rules.make
index 1342b49..c079acf 100644
--- a/Rules.make
+++ b/Rules.make
@@ -21,15 +21,35 @@ $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)
21$(TOPDIR)/.depends.cfgs: 21$(TOPDIR)/.depends.cfgs:
22# config.in interdependencies 22# config.in interdependencies
23 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs 23 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
24 @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 ) >> $@ 24 @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 ) >> $@
25 @-rm -f dirs 25 @-rm -f dirs
26 26
27$(TOPDIR)/stamp-headers :
28 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
29 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
30 ( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; )
31 ( cd include/qtopia && rm -f *.h; ln -s ../../library/*.h .; )
32 ( cd include/qtopia/private && rm -f *.h; ln -s ../../../library/backend/*.h .; )
33 ( cd include/opie && rm -f *.h; ln -s ../../libopie/*.h .; rm -f *_p.h; )
34 ( cd include/opie && ln -s ../../libsql/*.h .; )
35 ( cd include/opie && ln -s ../../libopie/pim/*.h .; )
36 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
37 ln -s ../../libopie/$$generatedHeader $$generatedHeader; done )
38 touch $@
39
40
41
27$(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 : 42$(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 :
28 $(call descend,$(shell dirname $@),$(shell basename $@)) 43 $(call descend,$(shell dirname $@),$(shell basename $@))
29 44
45$(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default
46
47$(TOPDIR)/mkspecs/default :
48 ln -sf linux-g++ $@
49
30## general rules ## 50## general rules ##
31 51
32define descend 52define descend
33 $(MAKE) -C $(1) $(2) 53 $(MAKE) -C $(1) $(2)
34endef 54endef
35 55