summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Rules.make1
1 files changed, 0 insertions, 1 deletions
diff --git a/Rules.make b/Rules.make
index f68fa3b..c940a05 100644
--- a/Rules.make
+++ b/Rules.make
@@ -124,97 +124,96 @@ $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)
124# add to subdir-y, and add descend rules 124# add to subdir-y, and add descend rules
125 @cat $(TOPDIR)/packages | grep -v '^#' | \ 125 @cat $(TOPDIR)/packages | grep -v '^#' | \
126 awk '{print \ 126 awk '{print \
127 ".PHONY : " $$2 "\n" \ 127 ".PHONY : " $$2 "\n" \
128 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ 128 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \
129 print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends 129 print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends
130 cat $(TOPDIR)/packages | grep -v '^#' | \ 130 cat $(TOPDIR)/packages | grep -v '^#' | \
131 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \ 131 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \
132 >> $(TOPDIR)/.depends 132 >> $(TOPDIR)/.depends
133# interpackage dependency generation 133# interpackage dependency generation
134 @cat $(TOPDIR)/packages | \ 134 @cat $(TOPDIR)/packages | \
135 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends 135 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
136 136
137$(TOPDIR)/.depends.cfgs: 137$(TOPDIR)/.depends.cfgs:
138# config.in interdependencies 138# config.in interdependencies
139 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs 139 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
140 @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 ) >> $@ 140 @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 ) >> $@
141 @-rm -f dirs 141 @-rm -f dirs
142 142
143$(QTDIR)/stamp-headers : 143$(QTDIR)/stamp-headers :
144 @-rm -f $(QTDIR)/stamp-headers* 144 @-rm -f $(QTDIR)/stamp-headers*
145 ( cd $(QTDIR)/include; \ 145 ( cd $(QTDIR)/include; \
146 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ 146 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \
147 qcopchannel_qws.h qwindowsystem_qws.h \ 147 qcopchannel_qws.h qwindowsystem_qws.h \
148 qfontmanager_qws.h qwsdefaultdecoration_qws.h)) 148 qfontmanager_qws.h qwsdefaultdecoration_qws.h))
149 touch $@ 149 touch $@
150 150
151$(QTDIR)/stamp-headers-x11 : 151$(QTDIR)/stamp-headers-x11 :
152 @-rm -f $(QTDIR)/stamp-headers* 152 @-rm -f $(QTDIR)/stamp-headers*
153 cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h) 153 cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h)
154 touch $@ 154 touch $@
155 155
156$(OPIEDIR)/stamp-headers : 156$(OPIEDIR)/stamp-headers :
157 @-rm -f $(OPIEDIR)/stamp-headers* 157 @-rm -f $(OPIEDIR)/stamp-headers*
158 mkdir -p $(TOPDIR)/include/qpe \ 158 mkdir -p $(TOPDIR)/include/qpe \
159 $(TOPDIR)/include/qtopia \ 159 $(TOPDIR)/include/qtopia \
160 $(TOPDIR)/include/opie \ 160 $(TOPDIR)/include/opie \
161 $(TOPDIR)/include/opie2 \ 161 $(TOPDIR)/include/opie2 \
162 $(TOPDIR)/include/opie2/private \ 162 $(TOPDIR)/include/opie2/private \
163 $(TOPDIR)/include/qtopia/private \ 163 $(TOPDIR)/include/qtopia/private \
164 $(TOPDIR)/include/sl 164 $(TOPDIR)/include/sl
165 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 165 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
166 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 166 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
167 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 167 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
168ifeq ($(CONFIG_LIBOPIE),y) 168ifeq ($(CONFIG_LIBOPIE),y)
169 # libopie1 169 # libopie1
170 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) 170 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
171 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) 171 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
172 ( cd include/opie && ln -sf ../../libopie/big-screen/*.h .; )
173endif 172endif
174 # libopie2 173 # libopie2
175 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) 174 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; )
176 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; ) 175 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; )
177 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; ) 176 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; )
178 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) 177 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; )
179 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) 178 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; )
180 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) 179 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; )
181 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; ) 180 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; )
182 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/backend/*.h .; ) 181 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/backend/*.h .; )
183 ( cd include/opie2/private && ln -sf ../../../libopie2/opiepim/private/*.h .; ) 182 ( cd include/opie2/private && ln -sf ../../../libopie2/opiepim/private/*.h .; )
184 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; ) 183 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; )
185 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) 184 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; )
186 ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; ) 185 ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; )
187 ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; ) 186 ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; )
188 ( cd include/opie2 && ln -sf ../../libopie2/opiesecurity/*.h .; ) 187 ( cd include/opie2 && ln -sf ../../libopie2/opiesecurity/*.h .; )
189 # auxilliary libraries 188 # auxilliary libraries
190 ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; ) 189 ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; )
191 ( cd include/sl && ln -sf ../../libslcompat/*.h .; ) 190 ( cd include/sl && ln -sf ../../libslcompat/*.h .; )
192 ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; ) 191 ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; )
193 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; ) 192 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; )
194 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; ) 193 ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; )
195 # all 194 # all
196ifeq ($(CONFIG_LIBOPIE),y) 195ifeq ($(CONFIG_LIBOPIE),y)
197 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 196 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
198 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 197 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
199endif 198endif
200 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 199 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
201 ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done ) 200 ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done )
202 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 201 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
203 ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done ) 202 ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done )
204 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 203 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
205 touch $@ 204 touch $@
206 205
207$(OPIEDIR)/stamp-headers-x11 : 206$(OPIEDIR)/stamp-headers-x11 :
208 @-rm -f $(OPIEDIR)/stamp-headers* 207 @-rm -f $(OPIEDIR)/stamp-headers*
209 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ 208 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
210 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private 209 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
211 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 210 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
212 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 211 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
213 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 212 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
214 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) 213 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
215 ( cd include/opie && ln -sf ../../libsql/*.h .; ) 214 ( cd include/opie && ln -sf ../../libsql/*.h .; )
216 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) 215 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
217 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 216 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
218 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 217 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
219 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 218 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
220 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) 219 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; )