author | kergoth <kergoth> | 2002-11-06 05:50:05 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-06 05:50:05 (UTC) |
commit | 915029461454cd28ee312948bbe7b4565d2173c0 (patch) (unidiff) | |
tree | b0d1413cc56432b00bba713a03bdea2b51e0dcf9 | |
parent | afc4a200ea476e4cb5baa52bac8e11c9efd398c2 (diff) | |
download | opie-915029461454cd28ee312948bbe7b4565d2173c0.zip opie-915029461454cd28ee312948bbe7b4565d2173c0.tar.gz opie-915029461454cd28ee312948bbe7b4565d2173c0.tar.bz2 |
pass qmake var down
-rw-r--r-- | Rules.make | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -26,42 +26,42 @@ $(TOPDIR)/.depends.cfgs: | |||
26 | 26 | ||
27 | $(TOPDIR)/stamp-headers : | 27 | $(TOPDIR)/stamp-headers : |
28 | mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ | 28 | mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ |
29 | $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private | 29 | $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private |
30 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) | 30 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) |
31 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) | 31 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) |
32 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) | 32 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) |
33 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) | 33 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) |
34 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) | 34 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) |
35 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) | 35 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) |
36 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ | 36 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ |
37 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) | 37 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) |
38 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h | ||
38 | touch $@ | 39 | touch $@ |
39 | 40 | ||
40 | $(TOPDIR)/library/custom.h : $(TOPDIR)/.config | 41 | $(TOPDIR)/library/custom.h : $(TOPDIR)/.config |
41 | @-rm -f $@ | 42 | @-rm -f $@ |
42 | $(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ | 43 | @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ |
43 | ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@,\ | 44 | ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@) |
44 | touch $@\ | 45 | @touch $@ |
45 | ) | ||
46 | 46 | ||
47 | $(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 : | 47 | $(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 : |
48 | $(call descend,$(shell dirname $@),$(shell basename $@)) | 48 | $(call descend,$(shell dirname $@),$(shell basename $@)) |
49 | 49 | ||
50 | $(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default | 50 | $(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default |
51 | 51 | ||
52 | $(TOPDIR)/mkspecs/default : | 52 | $(TOPDIR)/mkspecs/default : |
53 | ln -sf linux-g++ $@ | 53 | ln -sf linux-g++ $@ |
54 | 54 | ||
55 | ## general rules ## | 55 | ## general rules ## |
56 | 56 | ||
57 | define descend | 57 | define descend |
58 | $(MAKE) -C $(1) $(2) | 58 | $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) |
59 | endef | 59 | endef |
60 | 60 | ||
61 | define makefilegen | 61 | define makefilegen |
62 | cd $(shell dirname $(1)); $(TOPDIR)/qmake/qmake $(3) -o $(shell basename $(1)) `echo $(1)|sed -e 's,/Makefile$$,,g' -e 's,.*/,,g'`.pro | 62 | cd $(shell dirname $(1)); $(TOPDIR)/qmake/qmake $(3) -o $(shell basename $(1)) `echo $(1)|sed -e 's,/Makefile$$,,g' -e 's,.*/,,g'`.pro |
63 | endef | 63 | endef |
64 | 64 | ||
65 | define makecfg | 65 | define makecfg |
66 | $(TOPDIR)/scripts/makecfg.pl $1 | 66 | $(TOPDIR)/scripts/makecfg.pl $1 |
67 | endef | 67 | endef |