author | kergoth <kergoth> | 2003-04-24 21:13:13 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-24 21:13:13 (UTC) |
commit | 94ac3f6f306e91e154805cf5c51d73967852c2cb (patch) (unidiff) | |
tree | 9d418dbe6fc45359871f873b3174fc52890ffc59 | |
parent | f7ed0f1e02fa05b330d94b2a4928f3e249edb98f (diff) | |
download | opie-94ac3f6f306e91e154805cf5c51d73967852c2cb.zip opie-94ac3f6f306e91e154805cf5c51d73967852c2cb.tar.gz opie-94ac3f6f306e91e154805cf5c51d73967852c2cb.tar.bz2 |
Add OPIE_VERSION to subst
-rw-r--r-- | Rules.make | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -63,84 +63,85 @@ $(OPIEDIR)/stamp-headers : | |||
63 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) | 63 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) |
64 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) | 64 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) |
65 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) | 65 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) |
66 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) | 66 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) |
67 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) | 67 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) |
68 | ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) | 68 | ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) |
69 | #( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) | 69 | #( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) |
70 | ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) | 70 | ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) |
71 | #( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) | 71 | #( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) |
72 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) | 72 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) |
73 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ | 73 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ |
74 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) | 74 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) |
75 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h | 75 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h |
76 | touch $@ | 76 | touch $@ |
77 | 77 | ||
78 | $(OPIEDIR)/stamp-headers-x11 : | 78 | $(OPIEDIR)/stamp-headers-x11 : |
79 | @-rm -f $(OPIEDIR)/stamp-headers* | 79 | @-rm -f $(OPIEDIR)/stamp-headers* |
80 | mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ | 80 | mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ |
81 | $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private | 81 | $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private |
82 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) | 82 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) |
83 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) | 83 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) |
84 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) | 84 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) |
85 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) | 85 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) |
86 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) | 86 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) |
87 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) | 87 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) |
88 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ | 88 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ |
89 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) | 89 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) |
90 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h | 90 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h |
91 | ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) | 91 | ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) |
92 | touch $@ | 92 | touch $@ |
93 | 93 | ||
94 | $(TOPDIR)/library/custom.h : $(TOPDIR)/.config | 94 | $(TOPDIR)/library/custom.h : $(TOPDIR)/.config |
95 | @-rm -f $@ | 95 | @-rm -f $@ |
96 | @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ | 96 | @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ |
97 | ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@) | 97 | ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@) |
98 | @touch $@ | 98 | @touch $@ |
99 | 99 | ||
100 | $(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 : | 100 | $(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 : |
101 | $(call descend,$(shell dirname $@),$(shell basename $@)) | 101 | $(call descend,$(shell dirname $@),$(shell basename $@)) |
102 | 102 | ||
103 | $(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default | 103 | $(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default |
104 | 104 | ||
105 | $(TOPDIR)/mkspecs/default : | 105 | $(TOPDIR)/mkspecs/default : |
106 | ln -sf linux-g++ $@ | 106 | ln -sf linux-g++ $@ |
107 | 107 | ||
108 | $(TOPDIR)/scripts/subst : FORCE | 108 | $(TOPDIR)/scripts/subst : FORCE |
109 | @( \ | 109 | @( \ |
110 | echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \ | 110 | echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \ |
111 | echo 's,\$$OPIE_VERSION,$(OPIE_VERSION),g'; \ | ||
111 | echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \ | 112 | echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \ |
112 | echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \ | 113 | echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \ |
113 | echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \ | 114 | echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \ |
114 | echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \ | 115 | echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \ |
115 | ) > $@ || ( rm -f $@; exit 1 ) | 116 | ) > $@ || ( rm -f $@; exit 1 ) |
116 | 117 | ||
117 | $(TOPDIR)/scripts/filesubst : FORCE | 118 | $(TOPDIR)/scripts/filesubst : FORCE |
118 | @( \ | 119 | @( \ |
119 | echo 's,\$$OPIEDIR,$(prefix),g'; \ | 120 | echo 's,\$$OPIEDIR,$(prefix),g'; \ |
120 | echo 's,$(OPIEDIR),$(prefix),g'; \ | 121 | echo 's,$(OPIEDIR),$(prefix),g'; \ |
121 | echo 's,\$$QTDIR,$(prefix),g'; \ | 122 | echo 's,\$$QTDIR,$(prefix),g'; \ |
122 | echo 's,$(QTDIR),$(prefix),g'; \ | 123 | echo 's,$(QTDIR),$(prefix),g'; \ |
123 | echo 's,^root/,/,g'; \ | 124 | echo 's,^root/,/,g'; \ |
124 | echo 's,^etc/,$(prefix)/etc/,g'; \ | 125 | echo 's,^etc/,$(prefix)/etc/,g'; \ |
125 | echo 's,^lib/,$(prefix)/lib/,g'; \ | 126 | echo 's,^lib/,$(prefix)/lib/,g'; \ |
126 | echo 's,^bin/,$(prefix)/bin/,g'; \ | 127 | echo 's,^bin/,$(prefix)/bin/,g'; \ |
127 | echo 's,^pics/,$(prefix)/pics/,g'; \ | 128 | echo 's,^pics/,$(prefix)/pics/,g'; \ |
128 | echo 's,^sounds/,$(prefix)/sounds/,g'; \ | 129 | echo 's,^sounds/,$(prefix)/sounds/,g'; \ |
129 | echo 's,^plugins/,$(prefix)/plugins/,g'; \ | 130 | echo 's,^plugins/,$(prefix)/plugins/,g'; \ |
130 | echo 's,^apps/,$(prefix)/apps/,g'; \ | 131 | echo 's,^apps/,$(prefix)/apps/,g'; \ |
131 | ) > $@ || ( rm -f $@; exit 1 ) | 132 | ) > $@ || ( rm -f $@; exit 1 ) |
132 | 133 | ||
133 | ## general rules ## | 134 | ## general rules ## |
134 | 135 | ||
135 | define descend | 136 | define descend |
136 | $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) | 137 | $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) |
137 | endef | 138 | endef |
138 | 139 | ||
139 | define makefilegen | 140 | define makefilegen |
140 | cd $(if $(1),$(shell dirname $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(shell basename $(1))) `cat $(OPIEDIR)/packages | grep " \`echo $(1)|sed -e 's,/Makefile$$,,'\`" | \ | 141 | cd $(if $(1),$(shell dirname $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(shell basename $(1))) `cat $(OPIEDIR)/packages | grep " \`echo $(1)|sed -e 's,/Makefile$$,,'\`" | \ |
141 | head -1 | awk '{print $$3}'` | 142 | head -1 | awk '{print $$3}'` |
142 | endef | 143 | endef |
143 | 144 | ||
144 | define makecfg | 145 | define makecfg |
145 | $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR) | 146 | $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR) |
146 | endef | 147 | endef |