author | mickeyl <mickeyl> | 2004-05-14 15:47:06 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-05-14 15:47:06 (UTC) |
commit | 3378aa3bfa5fc0e9e664ae5d3800107c790dfc5a (patch) (unidiff) | |
tree | 1d7ce18cc0e543d8c07d08ec3b63734fe73f61a4 /Rules.make | |
parent | a9c907c218d106727ad3879a125c77ae7900635f (diff) | |
download | opie-3378aa3bfa5fc0e9e664ae5d3800107c790dfc5a.zip opie-3378aa3bfa5fc0e9e664ae5d3800107c790dfc5a.tar.gz opie-3378aa3bfa5fc0e9e664ae5d3800107c790dfc5a.tar.bz2 |
CLEANUP: Don't include header files via relative paths
Note: Remember to rm stamp-headers
-rw-r--r-- | Rules.make | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -144,64 +144,66 @@ $(OPIEDIR)/stamp-headers : | |||
144 | mkdir -p $(TOPDIR)/include/qpe \ | 144 | mkdir -p $(TOPDIR)/include/qpe \ |
145 | $(TOPDIR)/include/qtopia \ | 145 | $(TOPDIR)/include/qtopia \ |
146 | $(TOPDIR)/include/opie \ | 146 | $(TOPDIR)/include/opie \ |
147 | $(TOPDIR)/include/opie2 \ | 147 | $(TOPDIR)/include/opie2 \ |
148 | $(TOPDIR)/include/qtopia/private \ | 148 | $(TOPDIR)/include/qtopia/private \ |
149 | $(TOPDIR)/include/sl | 149 | $(TOPDIR)/include/sl |
150 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) | 150 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) |
151 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) | 151 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) |
152 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) | 152 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) |
153 | ifeq ($(CONFIG_LIBOPIE),y) | 153 | ifeq ($(CONFIG_LIBOPIE),y) |
154 | # libopie1 | 154 | # libopie1 |
155 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) | 155 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) |
156 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) | 156 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) |
157 | ( cd include/opie && ln -sf ../../libopie/big-screen/*.h .; ) | 157 | ( cd include/opie && ln -sf ../../libopie/big-screen/*.h .; ) |
158 | endif | 158 | endif |
159 | # libopie2 | 159 | # libopie2 |
160 | ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) | 160 | ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) |
161 | ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; ) | 161 | ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; ) |
162 | ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; ) | 162 | ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; ) |
163 | ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) | 163 | ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) |
164 | ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) | 164 | ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) |
165 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) | 165 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) |
166 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; ) | 166 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; ) |
167 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/backends/*.h .; ) | 167 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/backends/*.h .; ) |
168 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; ) | 168 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; ) |
169 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) | 169 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) |
170 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; ) | 170 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; ) |
171 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; ) | 171 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; ) |
172 | # auxilliary libraries | 172 | # auxilliary libraries |
173 | ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; ) | 173 | ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; ) |
174 | ( cd include/sl && ln -sf ../../libslcompat/*.h .; ) | 174 | ( cd include/sl && ln -sf ../../libslcompat/*.h .; ) |
175 | ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; ) | 175 | ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; ) |
176 | ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; ) | ||
177 | ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; ) | ||
176 | # all | 178 | # all |
177 | ifeq ($(CONFIG_LIBOPIE),y) | 179 | ifeq ($(CONFIG_LIBOPIE),y) |
178 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ | 180 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ |
179 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) | 181 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) |
180 | endif | 182 | endif |
181 | ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ | 183 | ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ |
182 | ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done ) | 184 | ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done ) |
183 | ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ | 185 | ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ |
184 | ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done ) | 186 | ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done ) |
185 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h | 187 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h |
186 | touch $@ | 188 | touch $@ |
187 | 189 | ||
188 | $(OPIEDIR)/stamp-headers-x11 : | 190 | $(OPIEDIR)/stamp-headers-x11 : |
189 | @-rm -f $(OPIEDIR)/stamp-headers* | 191 | @-rm -f $(OPIEDIR)/stamp-headers* |
190 | mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ | 192 | mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ |
191 | $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private | 193 | $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private |
192 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) | 194 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) |
193 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) | 195 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) |
194 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) | 196 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) |
195 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) | 197 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) |
196 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) | 198 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) |
197 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) | 199 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) |
198 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ | 200 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ |
199 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) | 201 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) |
200 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h | 202 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h |
201 | ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) | 203 | ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) |
202 | touch $@ | 204 | touch $@ |
203 | 205 | ||
204 | $(TOPDIR)/library/custom.h : $(TOPDIR)/.config | 206 | $(TOPDIR)/library/custom.h : $(TOPDIR)/.config |
205 | @-rm -f $@ | 207 | @-rm -f $@ |
206 | @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ | 208 | @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ |
207 | ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@) | 209 | ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@) |