summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xconfigure19
-rw-r--r--core/applets/clipboardapplet/Makefile.in8
-rw-r--r--core/apps/embeddedkonsole/Makefile.in14
-rw-r--r--core/launcher/launcher.pro2
-rw-r--r--core/launcher/launcherview.cpp27
-rw-r--r--core/multimedia/opieplayer/Makefile.in64
-rw-r--r--core/multimedia/opieplayer/libflash/Makefile.in9
-rw-r--r--core/multimedia/opieplayer/libmad/Makefile.in11
-rw-r--r--core/multimedia/opieplayer/libmpeg3/Makefile.in13
-rw-r--r--core/multimedia/opieplayer/wavplugin/Makefile.in13
-rw-r--r--core/pim/datebook/Makefile.in119
-rw-r--r--docs/start.doc51
-rw-r--r--library/Makefile.in125
-rw-r--r--library/global.cpp2
-rw-r--r--library/library.pro10
-rw-r--r--noncore/games/chess/Makefile.in16
-rw-r--r--noncore/games/go/Makefile.in15
17 files changed, 159 insertions, 359 deletions
diff --git a/configure b/configure
index 7824e36..3b474c6 100755
--- a/configure
+++ b/configure
@@ -6,5 +6,5 @@
6# 6#
7 7
8PLATFORM=linux-generic-g++ 8PLATFORM=generic
9SHARING=shared 9SHARING=shared
10DEBUG= 10DEBUG=
@@ -30,10 +30,7 @@ fi
30rm .test.qpe. 30rm .test.qpe.
31 31
32mkdir -p include/qpe 32VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\.[0-9]*\.[0-9]*.*".*/\1/p' <library/version.h)
33( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; ) 33VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.\([0-9]\)\.[0-9]*.*".*/\1/p' <library/version.h)
34 34VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.[0-9]*\.\([0-9]*\).*".*/\1/p' <library/version.h)
35VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\.[0-9]*\.[0-9]*.*".*/\1/p' <include/qpe/version.h)
36VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.\([0-9]\)\.[0-9]*.*".*/\1/p' <include/qpe/version.h)
37VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.[0-9]*\.\([0-9]*\).*".*/\1/p' <include/qpe/version.h)
38 35
39TOMAKE= 36TOMAKE=
@@ -118,4 +115,12 @@ EOF
118fi 115fi
119 116
117if [ -f library/custom-$PLATFORM.h ]
118then
119 rm -f library/custom.h
120 ln -s custom-$PLATFORM.h library/custom.h
121fi
122
123mkdir -p include/qpe
124( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; )
120 125
121echo Creating makefiles... 126echo Creating makefiles...
diff --git a/core/applets/clipboardapplet/Makefile.in b/core/applets/clipboardapplet/Makefile.in
index 2ddeb42..c42404e 100644
--- a/core/applets/clipboardapplet/Makefile.in
+++ b/core/applets/clipboardapplet/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) 8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
@@ -66,6 +66,8 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
66moc: $(SRCMOC) 66moc: $(SRCMOC)
67 67
68tmake: 68tmake: Makefile.in
69 tmake clipboardapplet.pro 69
70Makefile.in: clipboardapplet.pro
71 tmake clipboardapplet.pro -o Makefile.in
70 72
71clean: 73clean:
diff --git a/core/apps/embeddedkonsole/Makefile.in b/core/apps/embeddedkonsole/Makefile.in
index 8a69557..0da49d7 100644
--- a/core/apps/embeddedkonsole/Makefile.in
+++ b/core/apps/embeddedkonsole/Makefile.in
@@ -100,6 +100,8 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
100moc: $(SRCMOC) 100moc: $(SRCMOC)
101 101
102tmake: 102tmake: Makefile.in
103 tmake embeddedkonsole.pro 103
104Makefile.in: embeddedkonsole.pro
105 tmake embeddedkonsole.pro -o Makefile.in
104 106
105clean: 107clean:
@@ -184,12 +186,7 @@ session.o: session.cpp \
184keytrans.o: keytrans.cpp \ 186keytrans.o: keytrans.cpp \
185 keytrans.h \ 187 keytrans.h \
186 $(OPIEDIR)/include/qpe/qpeapplication.h \
187 default.keytab.h 188 default.keytab.h
188 189
189konsole.o: konsole.cpp \ 190konsole.o: konsole.cpp \
190 $(OPIEDIR)/include/qpe/resource.h \
191 $(OPIEDIR)/include/qpe/qpetoolbar.h \
192 $(OPIEDIR)/include/qpe/qpemenubar.h \
193 $(OPIEDIR)/include/qpe/config.h \
194 konsole.h \ 191 konsole.h \
195 MyPty.h \ 192 MyPty.h \
@@ -213,6 +210,5 @@ main.o: main.cpp \
213 TEmulation.h \ 210 TEmulation.h \
214 keytrans.h \ 211 keytrans.h \
215 session.h \ 212 session.h
216 $(OPIEDIR)/include/qpe/qpeapplication.h
217 213
218MyPty.o: MyPty.cpp \ 214MyPty.o: MyPty.cpp \
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro
index 0078faf..32cb95f 100644
--- a/core/launcher/launcher.pro
+++ b/core/launcher/launcher.pro
@@ -7,4 +7,5 @@ DESTDIR = $(OPIEDIR)/bin
7 HEADERS = background.h \ 7 HEADERS = background.h \
8 desktop.h \ 8 desktop.h \
9 qprocess.h \
9 info.h \ 10 info.h \
10 appicons.h \ 11 appicons.h \
@@ -47,4 +48,5 @@ HEADERS = background.h \
47 SOURCES = background.cpp \ 48 SOURCES = background.cpp \
48 desktop.cpp \ 49 desktop.cpp \
50 qprocess.cpp qprocess_unix.cpp \
49 info.cpp \ 51 info.cpp \
50 appicons.cpp \ 52 appicons.cpp \
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index ed39720..e8741a2 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -213,8 +213,6 @@ public:
213 return a->name().compare(b->name()); 213 return a->name().compare(b->name());
214 case Date: { 214 case Date: {
215 QFileInfo fa(a->linkFile()); 215 QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file());
216 if ( !fa.exists() ) fa.setFile(a->file()); 216 QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file());
217 QFileInfo fb(b->linkFile());
218 if ( !fb.exists() ) fb.setFile(b->file());
219 return fa.lastModified().secsTo(fb.lastModified()); 217 return fa.lastModified().secsTo(fb.lastModified());
220 } 218 }
@@ -363,4 +361,6 @@ void LauncherIconView::hideOrShowItems(bool resort)
363 item = (LauncherItem*)item->nextItem(); 361 item = (LauncherItem*)item->nextItem();
364 } 362 }
363 bool oldAutoArrange = autoArrange();
364 setAutoArrange( FALSE );
365 clear(); 365 clear();
366 QListIterator<AppLnk> it(links); 366 QListIterator<AppLnk> it(links);
@@ -372,4 +372,5 @@ void LauncherIconView::hideOrShowItems(bool resort)
372 if ( resort ) 372 if ( resort )
373 sort(); 373 sort();
374 setAutoArrange( oldAutoArrange );
374} 375}
375 376
@@ -377,21 +378,27 @@ bool LauncherIconView::removeLink(const QString& linkfile)
377{ 378{
378 LauncherItem* item = (LauncherItem*)firstItem(); 379 LauncherItem* item = (LauncherItem*)firstItem();
380 AppLnk* l;
381 bool did = FALSE;
382 DocLnk dl(linkfile);
379 while (item) { 383 while (item) {
380 if ( item->appLnk()->linkFile() == linkfile ) { 384 l = item->appLnk();
385 if ( l->linkFileKnown() && l->linkFile() == linkfile || l->file() == linkfile
386 || dl.isValid() && dl.file() == l->file() ) {
381 delete item; 387 delete item;
382 return TRUE; 388 did = TRUE;
383 } 389 }
384 item = (LauncherItem*)item->nextItem(); 390 item = (LauncherItem*)item->nextItem();
385 } 391 }
386 QListIterator<AppLnk> it(hidden); 392 QListIterator<AppLnk> it(hidden);
387 AppLnk* l;
388 while ((l=it.current())) { 393 while ((l=it.current())) {
389 ++it; 394 ++it;
390 if ( l->linkFile() == linkfile ) { 395 if ( l->linkFileKnown() && l->linkFile() == linkfile
396 || l->file() == linkfile
397 || dl.isValid() && dl.file() == l->file() ) {
391 hidden.removeRef(l); 398 hidden.removeRef(l);
392 return TRUE; 399 did = TRUE;
393 } 400 }
394 } 401 }
395 return FALSE; 402 return did;
396} 403}
397 404
diff --git a/core/multimedia/opieplayer/Makefile.in b/core/multimedia/opieplayer/Makefile.in
index 6e007ec..3e1f9fc 100644
--- a/core/multimedia/opieplayer/Makefile.in
+++ b/core/multimedia/opieplayer/Makefile.in
@@ -101,6 +101,8 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
101moc: $(SRCMOC) 101moc: $(SRCMOC)
102 102
103tmake: 103tmake: Makefile.in
104 tmake mpegplayer.pro 104
105Makefile.in: mpegplayer.pro
106 tmake mpegplayer.pro -o Makefile.in
105 107
106clean: 108clean:
@@ -136,40 +138,21 @@ REQUIRES=
136 138
137main.o: main.cpp \ 139main.o: main.cpp \
138 $(OPIEDIR)/include/qpe/qpeapplication.h \
139 mediaplayerstate.h \ 140 mediaplayerstate.h \
140 playlistwidget.h \ 141 playlistwidget.h \
141 $(OPIEDIR)/include/qpe/applnk.h \
142 audiowidget.h \ 142 audiowidget.h \
143 videowidget.h \ 143 videowidget.h \
144 loopcontrol.h \ 144 loopcontrol.h \
145 mediaplayer.h \ 145 mediaplayer.h
146 $(OPIEDIR)/include/qpe/qlibrary.h \
147 $(OPIEDIR)/include/qpe/qcom.h \
148 $(OPIEDIR)/include/qpe/quuid.h \
149 mediaplayerplugininterface.h
150 146
151loopcontrol.o: loopcontrol.cpp \ 147loopcontrol.o: loopcontrol.cpp \
152 $(OPIEDIR)/include/qpe/qpeapplication.h \
153 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
154 loopcontrol.h \ 148 loopcontrol.h \
155 videowidget.h \ 149 videowidget.h \
156 audiodevice.h \ 150 audiodevice.h \
157 mediaplayerplugininterface.h \
158 $(OPIEDIR)/include/qpe/qcom.h \
159 $(OPIEDIR)/include/qpe/quuid.h \
160 mediaplayerstate.h 151 mediaplayerstate.h
161 152
162playlistselection.o: playlistselection.cpp \ 153playlistselection.o: playlistselection.cpp \
163 $(OPIEDIR)/include/qpe/applnk.h \
164 $(OPIEDIR)/include/qpe/resource.h \
165 playlistselection.h 154 playlistselection.h
166 155
167mediaplayerstate.o: mediaplayerstate.cpp \ 156mediaplayerstate.o: mediaplayerstate.cpp \
168 $(OPIEDIR)/include/qpe/qpeapplication.h \
169 $(OPIEDIR)/include/qpe/qlibrary.h \
170 $(OPIEDIR)/include/qpe/qcom.h \
171 $(OPIEDIR)/include/qpe/quuid.h \
172 $(OPIEDIR)/include/qpe/config.h \
173 mediaplayerplugininterface.h \
174 mediaplayerstate.h \ 157 mediaplayerstate.h \
175 libmad/libmadpluginimpl.h \ 158 libmad/libmadpluginimpl.h \
@@ -178,24 +161,12 @@ mediaplayerstate.o: mediaplayerstate.cpp \
178 161
179videowidget.o: videowidget.cpp \ 162videowidget.o: videowidget.cpp \
180 $(OPIEDIR)/include/qpe/resource.h \
181 videowidget.h \ 163 videowidget.h \
182 mediaplayerplugininterface.h \
183 $(OPIEDIR)/include/qpe/qcom.h \
184 $(OPIEDIR)/include/qpe/quuid.h \
185 mediaplayerstate.h 164 mediaplayerstate.h
186 165
187audiowidget.o: audiowidget.cpp \ 166audiowidget.o: audiowidget.cpp \
188 $(OPIEDIR)/include/qpe/resource.h \
189 audiowidget.h \ 167 audiowidget.h \
190 mediaplayerstate.h 168 mediaplayerstate.h
191 169
192playlistwidget.o: playlistwidget.cpp \ 170playlistwidget.o: playlistwidget.cpp \
193 $(OPIEDIR)/include/qpe/qpemenubar.h \
194 $(OPIEDIR)/include/qpe/qpetoolbar.h \
195 $(OPIEDIR)/include/qpe/fileselector.h \
196 $(OPIEDIR)/include/qpe/applnk.h \
197 $(OPIEDIR)/include/qpe/config.h \
198 $(OPIEDIR)/include/qpe/global.h \
199 $(OPIEDIR)/include/qpe/resource.h \
200 playlistselection.h \ 171 playlistselection.h \
201 playlistwidget.h \ 172 playlistwidget.h \
@@ -203,14 +174,6 @@ playlistwidget.o: playlistwidget.cpp \
203 174
204mediaplayer.o: mediaplayer.cpp \ 175mediaplayer.o: mediaplayer.cpp \
205 $(OPIEDIR)/include/qpe/qpeapplication.h \
206 $(OPIEDIR)/include/qpe/qlibrary.h \
207 $(OPIEDIR)/include/qpe/qcom.h \
208 $(OPIEDIR)/include/qpe/quuid.h \
209 $(OPIEDIR)/include/qpe/resource.h \
210 $(OPIEDIR)/include/qpe/config.h \
211 mediaplayer.h \ 176 mediaplayer.h \
212 mediaplayerplugininterface.h \
213 playlistwidget.h \ 177 playlistwidget.h \
214 $(OPIEDIR)/include/qpe/applnk.h \
215 audiowidget.h \ 178 audiowidget.h \
216 loopcontrol.h \ 179 loopcontrol.h \
@@ -219,8 +182,5 @@ mediaplayer.o: mediaplayer.cpp \
219 182
220audiodevice.o: audiodevice.cpp \ 183audiodevice.o: audiodevice.cpp \
221 $(OPIEDIR)/include/qpe/qpeapplication.h \ 184 audiodevice.h
222 $(OPIEDIR)/include/qpe/config.h \
223 audiodevice.h \
224 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
225 185
226moc_loopcontrol.o: moc_loopcontrol.cpp \ 186moc_loopcontrol.o: moc_loopcontrol.cpp \
@@ -228,6 +188,5 @@ moc_loopcontrol.o: moc_loopcontrol.cpp \
228 188
229moc_playlistselection.o: moc_playlistselection.cpp \ 189moc_playlistselection.o: moc_playlistselection.cpp \
230 playlistselection.h \ 190 playlistselection.h
231 $(OPIEDIR)/include/qpe/applnk.h
232 191
233moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \ 192moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \
@@ -241,13 +200,8 @@ moc_audiowidget.o: moc_audiowidget.cpp \
241 200
242moc_playlistwidget.o: moc_playlistwidget.cpp \ 201moc_playlistwidget.o: moc_playlistwidget.cpp \
243 playlistwidget.h \ 202 playlistwidget.h
244 $(OPIEDIR)/include/qpe/applnk.h
245 203
246moc_mediaplayer.o: moc_mediaplayer.cpp \ 204moc_mediaplayer.o: moc_mediaplayer.cpp \
247 mediaplayer.h \ 205 mediaplayer.h
248 $(OPIEDIR)/include/qpe/qlibrary.h \
249 $(OPIEDIR)/include/qpe/qcom.h \
250 $(OPIEDIR)/include/qpe/quuid.h \
251 mediaplayerplugininterface.h
252 206
253moc_audiodevice.o: moc_audiodevice.cpp \ 207moc_audiodevice.o: moc_audiodevice.cpp \
diff --git a/core/multimedia/opieplayer/libflash/Makefile.in b/core/multimedia/opieplayer/libflash/Makefile.in
index 52c8557..0947454 100644
--- a/core/multimedia/opieplayer/libflash/Makefile.in
+++ b/core/multimedia/opieplayer/libflash/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) 8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include -I..
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
@@ -146,13 +146,10 @@ REQUIRES=
146libflashplugin.o: libflashplugin.cpp \ 146libflashplugin.o: libflashplugin.cpp \
147 libflashplugin.h \ 147 libflashplugin.h \
148 flash.h \ 148 flash.h
149 ../mediaplayerplugininterface.h
150 149
151libflashpluginimpl.o: libflashpluginimpl.cpp \ 150libflashpluginimpl.o: libflashpluginimpl.cpp \
152 libflashplugin.h \ 151 libflashplugin.h \
153 flash.h \ 152 flash.h \
154 ../mediaplayerplugininterface.h \ 153 libflashpluginimpl.h
155 libflashpluginimpl.h \
156 ../mediaplayerplugininterface.h
157 154
158adpcm.o: adpcm.cc \ 155adpcm.o: adpcm.cc \
diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in
index 19ded26..d2e1cda 100644
--- a/core/multimedia/opieplayer/libmad/Makefile.in
+++ b/core/multimedia/opieplayer/libmad/Makefile.in
@@ -101,6 +101,8 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
101moc: $(SRCMOC) 101moc: $(SRCMOC)
102 102
103tmake: 103tmake: Makefile.in
104 tmake libmad.pro 104
105Makefile.in: libmad.pro
106 tmake libmad.pro -o Makefile.in
105 107
106clean: 108clean:
@@ -215,12 +217,9 @@ huffman.o: huffman.c \
215libmadplugin.o: libmadplugin.cpp \ 217libmadplugin.o: libmadplugin.cpp \
216 libmadplugin.h \ 218 libmadplugin.h \
217 ../mediaplayerplugininterface.h \
218 mad.h 219 mad.h
219 220
220libmadpluginimpl.o: libmadpluginimpl.cpp \ 221libmadpluginimpl.o: libmadpluginimpl.cpp \
221 libmadplugin.h \ 222 libmadplugin.h \
222 ../mediaplayerplugininterface.h \ 223 libmadpluginimpl.h
223 libmadpluginimpl.h \
224 ../mediaplayerplugininterface.h
225 224
226 225
diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in
index 9881815..4ccdb8c 100644
--- a/core/multimedia/opieplayer/libmpeg3/Makefile.in
+++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in
@@ -130,6 +130,8 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
130moc: $(SRCMOC) 130moc: $(SRCMOC)
131 131
132tmake: 132tmake: Makefile.in
133 tmake libmpeg3.pro 133
134Makefile.in: libmpeg3.pro
135 tmake libmpeg3.pro -o Makefile.in
134 136
135clean: 137clean:
@@ -177,6 +179,5 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \
177 mpeg3vtrack.h \ 179 mpeg3vtrack.h \
178 video/mpeg3video.h \ 180 video/mpeg3video.h \
179 mpeg3protos.h \ 181 mpeg3protos.h
180 ../mediaplayerplugininterface.h
181 182
182libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \ 183libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
@@ -194,7 +195,5 @@ libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
194 video/mpeg3video.h \ 195 video/mpeg3video.h \
195 mpeg3protos.h \ 196 mpeg3protos.h \
196 ../mediaplayerplugininterface.h \ 197 libmpeg3pluginimpl.h
197 libmpeg3pluginimpl.h \
198 ../mediaplayerplugininterface.h
199 198
200bitstream.o: bitstream.c \ 199bitstream.o: bitstream.c \
diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in
index e9fec6c..560534e 100644
--- a/core/multimedia/opieplayer/wavplugin/Makefile.in
+++ b/core/multimedia/opieplayer/wavplugin/Makefile.in
@@ -66,6 +66,8 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
66moc: $(SRCMOC) 66moc: $(SRCMOC)
67 67
68tmake: 68tmake: Makefile.in
69 tmake wavplugin.pro 69
70Makefile.in: wavplugin.pro
71 tmake wavplugin.pro -o Makefile.in
70 72
71clean: 73clean:
@@ -101,12 +103,9 @@ REQUIRES=
101 103
102wavplugin.o: wavplugin.cpp \ 104wavplugin.o: wavplugin.cpp \
103 wavplugin.h \ 105 wavplugin.h
104 ../mediaplayerplugininterface.h
105 106
106wavpluginimpl.o: wavpluginimpl.cpp \ 107wavpluginimpl.o: wavpluginimpl.cpp \
107 wavplugin.h \ 108 wavplugin.h \
108 ../mediaplayerplugininterface.h \ 109 wavpluginimpl.h
109 wavpluginimpl.h \
110 ../mediaplayerplugininterface.h
111 110
112 111
diff --git a/core/pim/datebook/Makefile.in b/core/pim/datebook/Makefile.in
index 0c3282e..cc31efe 100644
--- a/core/pim/datebook/Makefile.in
+++ b/core/pim/datebook/Makefile.in
@@ -125,6 +125,8 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
125moc: $(SRCMOC) 125moc: $(SRCMOC)
126 126
127tmake: 127tmake: Makefile.in
128 tmake datebook.pro 128
129Makefile.in: datebook.pro
130 tmake datebook.pro -o Makefile.in
129 131
130clean: 132clean:
@@ -160,33 +162,13 @@ REQUIRES=
160 162
161main.o: main.cpp \ 163main.o: main.cpp \
162 datebook.h \ 164 datebook.h
163 $(OPIEDIR)/include/qpe/datebookdb.h \
164 $(OPIEDIR)/include/qpe/event.h \
165 $(OPIEDIR)/include/qpe/palmtoprecord.h \
166 $(OPIEDIR)/include/qpe/timeconversion.h \
167 $(OPIEDIR)/include/qpe/qpcglobal.h \
168 $(OPIEDIR)/include/qpe/qpeapplication.h
169 165
170datebookday.o: datebookday.cpp \ 166datebookday.o: datebookday.cpp \
171 datebookday.h \ 167 datebookday.h \
172 $(OPIEDIR)/include/qpe/event.h \
173 $(OPIEDIR)/include/qpe/palmtoprecord.h \
174 $(OPIEDIR)/include/qpe/timeconversion.h \
175 $(OPIEDIR)/include/qpe/qpcglobal.h \
176 datebookdayheaderimpl.h \ 168 datebookdayheaderimpl.h \
177 datebookdayheader.h \ 169 datebookdayheader.h
178 $(OPIEDIR)/include/qpe/datebookdb.h \
179 $(OPIEDIR)/include/qpe/resource.h \
180 $(OPIEDIR)/include/qpe/qpeapplication.h \
181 $(OPIEDIR)/include/qpe/timestring.h \
182 $(OPIEDIR)/include/qpe/qpedebug.h
183 170
184datebook.o: datebook.cpp \ 171datebook.o: datebook.cpp \
185 datebook.h \ 172 datebook.h \
186 $(OPIEDIR)/include/qpe/datebookdb.h \
187 $(OPIEDIR)/include/qpe/event.h \
188 $(OPIEDIR)/include/qpe/palmtoprecord.h \
189 $(OPIEDIR)/include/qpe/timeconversion.h \
190 $(OPIEDIR)/include/qpe/qpcglobal.h \
191 datebookday.h \ 173 datebookday.h \
192 datebooksettings.h \ 174 datebooksettings.h \
@@ -194,63 +176,24 @@ datebook.o: datebook.cpp \
194 datebookweek.h \ 176 datebookweek.h \
195 dateentryimpl.h \ 177 dateentryimpl.h \
196 dateentry.h \ 178 dateentry.h
197 $(OPIEDIR)/include/qpe/datebookmonth.h \
198 $(OPIEDIR)/include/qpe/qpeapplication.h \
199 $(OPIEDIR)/include/qpe/config.h \
200 $(OPIEDIR)/include/qpe/qpedebug.h \
201 $(OPIEDIR)/include/qpe/finddialog.h \
202 $(OPIEDIR)/include/qpe/ir.h \
203 $(OPIEDIR)/include/qpe/qpemenubar.h \
204 $(OPIEDIR)/include/qpe/qpemessagebox.h \
205 $(OPIEDIR)/include/qpe/resource.h \
206 $(OPIEDIR)/include/qpe/sound.h \
207 $(OPIEDIR)/include/qpe/timestring.h \
208 $(OPIEDIR)/include/qpe/qpetoolbar.h \
209 $(OPIEDIR)/include/qpe/tzselect.h \
210 $(OPIEDIR)/include/qpe/xmlreader.h
211 179
212dateentryimpl.o: dateentryimpl.cpp \ 180dateentryimpl.o: dateentryimpl.cpp \
213 dateentryimpl.h \ 181 dateentryimpl.h \
214 dateentry.h \ 182 dateentry.h \
215 $(OPIEDIR)/include/qpe/event.h \
216 $(OPIEDIR)/include/qpe/palmtoprecord.h \
217 $(OPIEDIR)/include/qpe/timeconversion.h \
218 $(OPIEDIR)/include/qpe/qpcglobal.h \
219 repeatentry.h \ 183 repeatentry.h \
220 repeatentrybase.h \ 184 repeatentrybase.h
221 $(OPIEDIR)/include/qpe/qpeapplication.h \
222 $(OPIEDIR)/include/qpe/categoryselect.h \
223 $(OPIEDIR)/include/qpe/datebookmonth.h \
224 $(OPIEDIR)/include/qpe/global.h \
225 $(OPIEDIR)/include/qpe/timestring.h \
226 $(OPIEDIR)/include/qpe/tzselect.h
227 185
228datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \ 186datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \
229 datebookdayheaderimpl.h \ 187 datebookdayheaderimpl.h \
230 datebookdayheader.h \ 188 datebookdayheader.h
231 $(OPIEDIR)/include/qpe/datebookmonth.h \
232 $(OPIEDIR)/include/qpe/event.h \
233 $(OPIEDIR)/include/qpe/palmtoprecord.h \
234 $(OPIEDIR)/include/qpe/timeconversion.h \
235 $(OPIEDIR)/include/qpe/qpcglobal.h \
236 $(OPIEDIR)/include/qpe/timestring.h
237 189
238datebooksettings.o: datebooksettings.cpp \ 190datebooksettings.o: datebooksettings.cpp \
239 datebooksettings.h \ 191 datebooksettings.h \
240 datebooksettingsbase.h \ 192 datebooksettingsbase.h
241 $(OPIEDIR)/include/qpe/qpeapplication.h
242 193
243datebookweek.o: datebookweek.cpp \ 194datebookweek.o: datebookweek.cpp \
244 datebookweek.h \ 195 datebookweek.h \
245 $(OPIEDIR)/include/qpe/event.h \
246 $(OPIEDIR)/include/qpe/palmtoprecord.h \
247 $(OPIEDIR)/include/qpe/timeconversion.h \
248 $(OPIEDIR)/include/qpe/qpcglobal.h \
249 datebookweekheaderimpl.h \ 196 datebookweekheaderimpl.h \
250 datebookweekheader.h \ 197 datebookweekheader.h
251 $(OPIEDIR)/include/qpe/calendar.h \
252 $(OPIEDIR)/include/qpe/datebookdb.h \
253 $(OPIEDIR)/include/qpe/qpeapplication.h \
254 $(OPIEDIR)/include/qpe/timestring.h
255 198
256datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \ 199datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \
@@ -260,12 +203,5 @@ datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \
260repeatentry.o: repeatentry.cpp \ 203repeatentry.o: repeatentry.cpp \
261 repeatentry.h \ 204 repeatentry.h \
262 repeatentrybase.h \ 205 repeatentrybase.h
263 $(OPIEDIR)/include/qpe/event.h \
264 $(OPIEDIR)/include/qpe/palmtoprecord.h \
265 $(OPIEDIR)/include/qpe/timeconversion.h \
266 $(OPIEDIR)/include/qpe/qpcglobal.h \
267 $(OPIEDIR)/include/qpe/datebookmonth.h \
268 $(OPIEDIR)/include/qpe/qpeapplication.h \
269 $(OPIEDIR)/include/qpe/timestring.h
270 206
271dateentry.h: dateentry.ui 207dateentry.h: dateentry.ui
@@ -310,25 +246,12 @@ repeatentrybase.o: repeatentrybase.cpp
310 246
311moc_datebookday.o: moc_datebookday.cpp \ 247moc_datebookday.o: moc_datebookday.cpp \
312 datebookday.h \ 248 datebookday.h
313 $(OPIEDIR)/include/qpe/event.h \
314 $(OPIEDIR)/include/qpe/palmtoprecord.h \
315 $(OPIEDIR)/include/qpe/timeconversion.h \
316 $(OPIEDIR)/include/qpe/qpcglobal.h
317 249
318moc_datebook.o: moc_datebook.cpp \ 250moc_datebook.o: moc_datebook.cpp \
319 datebook.h \ 251 datebook.h
320 $(OPIEDIR)/include/qpe/datebookdb.h \
321 $(OPIEDIR)/include/qpe/event.h \
322 $(OPIEDIR)/include/qpe/palmtoprecord.h \
323 $(OPIEDIR)/include/qpe/timeconversion.h \
324 $(OPIEDIR)/include/qpe/qpcglobal.h
325 252
326moc_dateentryimpl.o: moc_dateentryimpl.cpp \ 253moc_dateentryimpl.o: moc_dateentryimpl.cpp \
327 dateentryimpl.h \ 254 dateentryimpl.h \
328 dateentry.h \ 255 dateentry.h
329 $(OPIEDIR)/include/qpe/event.h \
330 $(OPIEDIR)/include/qpe/palmtoprecord.h \
331 $(OPIEDIR)/include/qpe/timeconversion.h \
332 $(OPIEDIR)/include/qpe/qpcglobal.h
333 256
334moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \ 257moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \
@@ -337,9 +260,5 @@ moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \
337 260
338moc_datebookweek.o: moc_datebookweek.cpp \ 261moc_datebookweek.o: moc_datebookweek.cpp \
339 datebookweek.h \ 262 datebookweek.h
340 $(OPIEDIR)/include/qpe/event.h \
341 $(OPIEDIR)/include/qpe/palmtoprecord.h \
342 $(OPIEDIR)/include/qpe/timeconversion.h \
343 $(OPIEDIR)/include/qpe/qpcglobal.h
344 263
345moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \ 264moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \
@@ -349,9 +268,5 @@ moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \
349moc_repeatentry.o: moc_repeatentry.cpp \ 268moc_repeatentry.o: moc_repeatentry.cpp \
350 repeatentry.h \ 269 repeatentry.h \
351 repeatentrybase.h \ 270 repeatentrybase.h
352 $(OPIEDIR)/include/qpe/event.h \
353 $(OPIEDIR)/include/qpe/palmtoprecord.h \
354 $(OPIEDIR)/include/qpe/timeconversion.h \
355 $(OPIEDIR)/include/qpe/qpcglobal.h
356 271
357moc_dateentry.o: moc_dateentry.cpp \ 272moc_dateentry.o: moc_dateentry.cpp \
diff --git a/docs/start.doc b/docs/start.doc
index 01b6ab1..53a4e36 100644
--- a/docs/start.doc
+++ b/docs/start.doc
@@ -59,9 +59,9 @@ To compile the example program for running on the Linux desktop:
59 <p> 59 <p>
60<pre> 60<pre>
61 export OPIEDIR=/opt/Qtopia 61 export QPEDIR=/opt/Qtopia
62 export QTDIR=/opt/Qtopia 62 export QTDIR=/opt/Qtopia
63 export PATH=$QTDIR/bin:$PATH 63 export PATH=$QTDIR/bin:$PATH
64 export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++ 64 export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++
65 export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH 65 export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
66</pre> 66</pre>
67 67
@@ -70,5 +70,5 @@ To compile the example program for running on the Linux desktop:
70<pre> 70<pre>
71 cd somewhere 71 cd somewhere
72 cp -r $OPIEDIR/example . 72 cp -r $QPEDIR/example .
73 cd example 73 cd example
74</pre> 74</pre>
@@ -90,7 +90,7 @@ To compile the example program for running on the Linux desktop:
90<pre> 90<pre>
91 su # root privileges required to install 91 su # root privileges required to install
92 cp example.desktop $OPIEDIR/apps/Applications 92 cp example.desktop $QPEDIR/apps/Applications
93 cp Example.png $OPIEDIR/pics 93 cp Example.png $QPEDIR/pics
94 cp example $OPIEDIR/bin 94 cp example $QPEDIR/bin
95 exit # no need to be root anymore 95 exit # no need to be root anymore
96</pre> 96</pre>
@@ -136,22 +136,37 @@ on the desktop, the process is similar:
136 <p> 136 <p>
137<pre> 137<pre>
138 export OPIEDIR=/opt/Qtopia/sharp 138 export QPEDIR=/opt/Qtopia/sharp
139 export QTDIR=/opt/Qtopia/sharp 139 export QTDIR=/opt/Qtopia/sharp
140 export PATH=$QTDIR/bin:/usr/local/arm/bin:$PATH 140 export PATH=$QTDIR/bin:/usr/local/arm/bin:$PATH
141 export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++ 141 export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++
142</pre> 142</pre>
143 143
144 <li> Build and install exactly the same as you did for the desktop 144 <li> Rebuild the makefile ($TMAKEPATH has changed) above:
145 (note that the generated Makefile is different):
146<pre> 145<pre>
147 make clean 146 make clean
148 tmake -o Makefile example.pro 147 tmake -o Makefile example.pro
149 ... <i>etc.</i>
150</pre> 148</pre>
151 149
152 <li> To install it on a device, build an ipk package file (you should be root 150 <li> Build it:
153 to do this, since then it will strip the executable for you):
154<pre> 151<pre>
152 make
153</pre>
154
155 <li> Install it (note that this is now going into the /opt/Qtopia/sharp/ directory):
156<pre>
157 su # root privileges required to install
158 cp example.desktop $QPEDIR/apps/Applications
159 cp Example.png $QPEDIR/pics
160 cp example $QPEDIR/bin
161 exit # no need to be root anymore
162</pre>
163
164</pre>
165
166 <li> To install it on a device, build an ipk package file:
167<pre>
168 su # root privileges required to strip the executable
155 mkipks example.control 169 mkipks example.control
170 exit # no need to be root anymore
156</pre> 171</pre>
157 172
diff --git a/library/Makefile.in b/library/Makefile.in
index b74b818..b8fc1f6 100644
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -32,5 +32,4 @@ HEADERS = calendar.h \
32 network.h \ 32 network.h \
33 networkinterface.h \ 33 networkinterface.h \
34 proxies.h \
35 filemanager.h \ 34 filemanager.h \
36 fontmanager.h \ 35 fontmanager.h \
@@ -38,4 +37,5 @@ HEADERS = calendar.h \
38 datebookmonth.h \ 37 datebookmonth.h \
39 fileselector.h \ 38 fileselector.h \
39 fileselector_p.h \
40 imageedit.h \ 40 imageedit.h \
41 qcopenvelope_qws.h \ 41 qcopenvelope_qws.h \
@@ -79,10 +79,5 @@ HEADERS = calendar.h \
79 findwidget_p.h \ 79 findwidget_p.h \
80 finddialog.h \ 80 finddialog.h \
81 lnkproperties.h \ 81 lnkproperties.h
82 quuid.h \
83 qcom.h \
84 qlibrary.h \
85 qlibrary_p.h \
86 qprocess.h
87 SOURCES =calendar.cpp \ 82 SOURCES =calendar.cpp \
88 global.cpp \ 83 global.cpp \
@@ -92,5 +87,4 @@ SOURCES = calendar.cpp \
92 network.cpp \ 87 network.cpp \
93 networkinterface.cpp \ 88 networkinterface.cpp \
94 proxies.cpp \
95 filemanager.cpp \ 89 filemanager.cpp \
96 fontmanager.cpp \ 90 fontmanager.cpp \
@@ -140,10 +134,5 @@ SOURCES = calendar.cpp \
140 findwidget_p.cpp \ 134 findwidget_p.cpp \
141 finddialog.cpp \ 135 finddialog.cpp \
142 lnkproperties.cpp \ 136 lnkproperties.cpp
143 quuid.cpp \
144 qlibrary.cpp \
145 qlibrary_unix.cpp \
146 qprocess.cpp \
147 qprocess_unix.cpp
148 OBJECTS =calendar.o \ 137 OBJECTS =calendar.o \
149 global.o \ 138 global.o \
@@ -153,5 +142,4 @@ OBJECTS = calendar.o \
153 network.o \ 142 network.o \
154 networkinterface.o \ 143 networkinterface.o \
155 proxies.o \
156 filemanager.o \ 144 filemanager.o \
157 fontmanager.o \ 145 fontmanager.o \
@@ -202,33 +190,24 @@ OBJECTS = calendar.o \
202 finddialog.o \ 190 finddialog.o \
203 lnkproperties.o \ 191 lnkproperties.o \
204 quuid.o \
205 qlibrary.o \
206 qlibrary_unix.o \
207 qprocess.o \
208 qprocess_unix.o \
209 passwordbase_p.o \ 192 passwordbase_p.o \
210 proxiesbase_p.o \
211 categoryeditbase_p.o \ 193 categoryeditbase_p.o \
212 findwidgetbase_p.o \ 194 findwidgetbase_p.o \
213 lnkpropertiesbase_p.o 195 lnkpropertiesbase_p.o
214INTERFACES = passwordbase_p.ui \ 196INTERFACES = passwordbase_p.ui \
215 proxiesbase_p.ui \
216 categoryeditbase_p.ui \ 197 categoryeditbase_p.ui \
217 findwidgetbase_p.ui \ 198 findwidgetbase_p.ui \
218 lnkpropertiesbase_p.ui 199 lnkpropertiesbase_p.ui
219UICDECLS = passwordbase_p.h \ 200UICDECLS = passwordbase_p.h \
220 proxiesbase_p.h \
221 categoryeditbase_p.h \ 201 categoryeditbase_p.h \
222 findwidgetbase_p.h \ 202 findwidgetbase_p.h \
223 lnkpropertiesbase_p.h 203 lnkpropertiesbase_p.h
224UICIMPLS = passwordbase_p.cpp \ 204UICIMPLS = passwordbase_p.cpp \
225 proxiesbase_p.cpp \
226 categoryeditbase_p.cpp \ 205 categoryeditbase_p.cpp \
227 findwidgetbase_p.cpp \ 206 findwidgetbase_p.cpp \
228 lnkpropertiesbase_p.cpp 207 lnkpropertiesbase_p.cpp
229 SRCMOC =moc_menubutton.cpp \ 208 SRCMOC =moc_menubutton.cpp \
230 moc_proxies.cpp \
231 moc_datebookmonth.cpp \ 209 moc_datebookmonth.cpp \
232 moc_fileselector.cpp \ 210 moc_fileselector.cpp \
211 moc_fileselector_p.cpp \
233 moc_imageedit.cpp \ 212 moc_imageedit.cpp \
234 moc_qpedecoration_qws.cpp \ 213 moc_qpedecoration_qws.cpp \
@@ -248,6 +227,4 @@ SRCMOC = moc_menubutton.cpp \
248 moc_finddialog.cpp \ 227 moc_finddialog.cpp \
249 moc_lnkproperties.cpp \ 228 moc_lnkproperties.cpp \
250 moc_qlibrary_p.cpp \
251 moc_qprocess.cpp \
252 global.moc \ 229 global.moc \
253 network.moc \ 230 network.moc \
@@ -255,14 +232,12 @@ SRCMOC = moc_menubutton.cpp \
255 process_unix.moc \ 232 process_unix.moc \
256 timestring.moc \ 233 timestring.moc \
257 qprocess_unix.moc \
258 moc_passwordbase_p.cpp \ 234 moc_passwordbase_p.cpp \
259 moc_proxiesbase_p.cpp \
260 moc_categoryeditbase_p.cpp \ 235 moc_categoryeditbase_p.cpp \
261 moc_findwidgetbase_p.cpp \ 236 moc_findwidgetbase_p.cpp \
262 moc_lnkpropertiesbase_p.cpp 237 moc_lnkpropertiesbase_p.cpp
263 OBJMOC =moc_menubutton.o \ 238 OBJMOC =moc_menubutton.o \
264 moc_proxies.o \
265 moc_datebookmonth.o \ 239 moc_datebookmonth.o \
266 moc_fileselector.o \ 240 moc_fileselector.o \
241 moc_fileselector_p.o \
267 moc_imageedit.o \ 242 moc_imageedit.o \
268 moc_qpedecoration_qws.o \ 243 moc_qpedecoration_qws.o \
@@ -282,8 +257,5 @@ OBJMOC = moc_menubutton.o \
282 moc_finddialog.o \ 257 moc_finddialog.o \
283 moc_lnkproperties.o \ 258 moc_lnkproperties.o \
284 moc_qlibrary_p.o \
285 moc_qprocess.o \
286 moc_passwordbase_p.o \ 259 moc_passwordbase_p.o \
287 moc_proxiesbase_p.o \
288 moc_categoryeditbase_p.o \ 260 moc_categoryeditbase_p.o \
289 moc_findwidgetbase_p.o \ 261 moc_findwidgetbase_p.o \
@@ -320,6 +292,8 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
320moc: $(SRCMOC) 292moc: $(SRCMOC)
321 293
322tmake: 294tmake: Makefile.in
323 tmake library.pro 295
296Makefile.in: library.pro
297 tmake library.pro -o Makefile.in
324 298
325clean: 299clean:
@@ -382,9 +356,4 @@ networkinterface.o: networkinterface.cpp \
382 config.h 356 config.h
383 357
384proxies.o: proxies.cpp \
385 proxies.h \
386 config.h \
387 proxiesbase_p.h
388
389filemanager.o: filemanager.cpp \ 358filemanager.o: filemanager.cpp \
390 filemanager.h \ 359 filemanager.h \
@@ -411,4 +380,5 @@ fileselector.o: fileselector.cpp \
411 filemanager.h \ 380 filemanager.h \
412 applnk.h \ 381 applnk.h \
382 fileselector_p.h \
413 global.h \ 383 global.h \
414 resource.h \ 384 resource.h \
@@ -535,6 +505,5 @@ fontdatabase.o: fontdatabase.cpp \
535 505
536power.o: power.cpp \ 506power.o: power.cpp \
537 power.h \ 507 power.h
538 custom.h
539 508
540storage.o: storage.cpp 509storage.o: storage.cpp
@@ -634,23 +603,4 @@ lnkproperties.o: lnkproperties.cpp \
634 ir.h 603 ir.h
635 604
636quuid.o: quuid.cpp \
637 quuid.h
638
639qlibrary.o: qlibrary.cpp \
640 qlibrary_p.h \
641 qlibrary.h
642
643qlibrary_unix.o: qlibrary_unix.cpp \
644 qlibrary_p.h \
645 qlibrary.h
646
647qprocess.o: qprocess.cpp \
648 qprocess.h
649
650qprocess_unix.o: qprocess_unix.cpp \
651 qprocess_unix.moc \
652 qprocess.h \
653 qcleanuphandler_p.h
654
655passwordbase_p.h: passwordbase_p.ui 605passwordbase_p.h: passwordbase_p.ui
656 $(UIC) passwordbase_p.ui -o $(INTERFACE_DECL_PATH)/passwordbase_p.h 606 $(UIC) passwordbase_p.ui -o $(INTERFACE_DECL_PATH)/passwordbase_p.h
@@ -659,10 +609,4 @@ passwordbase_p.cpp: passwordbase_p.ui
659 $(UIC) passwordbase_p.ui -i passwordbase_p.h -o passwordbase_p.cpp 609 $(UIC) passwordbase_p.ui -i passwordbase_p.h -o passwordbase_p.cpp
660 610
661proxiesbase_p.h: proxiesbase_p.ui
662 $(UIC) proxiesbase_p.ui -o $(INTERFACE_DECL_PATH)/proxiesbase_p.h
663
664proxiesbase_p.cpp: proxiesbase_p.ui
665 $(UIC) proxiesbase_p.ui -i proxiesbase_p.h -o proxiesbase_p.cpp
666
667categoryeditbase_p.h: categoryeditbase_p.ui 611categoryeditbase_p.h: categoryeditbase_p.ui
668 $(UIC) categoryeditbase_p.ui -o $(INTERFACE_DECL_PATH)/categoryeditbase_p.h 612 $(UIC) categoryeditbase_p.ui -o $(INTERFACE_DECL_PATH)/categoryeditbase_p.h
@@ -685,6 +629,4 @@ lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui
685passwordbase_p.o: passwordbase_p.cpp 629passwordbase_p.o: passwordbase_p.cpp
686 630
687proxiesbase_p.o: proxiesbase_p.cpp
688
689categoryeditbase_p.o: categoryeditbase_p.cpp 631categoryeditbase_p.o: categoryeditbase_p.cpp
690 632
@@ -696,8 +638,4 @@ moc_menubutton.o: moc_menubutton.cpp \
696 menubutton.h 638 menubutton.h
697 639
698moc_proxies.o: moc_proxies.cpp \
699 proxies.h \
700 config.h
701
702moc_datebookmonth.o: moc_datebookmonth.cpp \ 640moc_datebookmonth.o: moc_datebookmonth.cpp \
703 datebookmonth.h \ 641 datebookmonth.h \
@@ -710,4 +648,7 @@ moc_fileselector.o: moc_fileselector.cpp \
710 applnk.h 648 applnk.h
711 649
650moc_fileselector_p.o: moc_fileselector_p.cpp \
651 fileselector_p.h
652
712moc_imageedit.o: moc_imageedit.cpp \ 653moc_imageedit.o: moc_imageedit.cpp \
713 imageedit.h 654 imageedit.h
@@ -767,18 +708,11 @@ moc_lnkproperties.o: moc_lnkproperties.cpp \
767 lnkproperties.h 708 lnkproperties.h
768 709
769moc_qlibrary_p.o: moc_qlibrary_p.cpp \
770 qlibrary_p.h \
771 qlibrary.h
772
773moc_qprocess.o: moc_qprocess.cpp \
774 qprocess.h
775
776moc_passwordbase_p.o: global.moc \ 710moc_passwordbase_p.o: global.moc \
777 global.cpp 711 global.cpp
778 712
779moc_proxiesbase_p.o: network.moc \ 713moc_categoryeditbase_p.o: network.moc \
780 network.cpp 714 network.cpp
781 715
782moc_categoryeditbase_p.o: password.moc \ 716moc_findwidgetbase_p.o: password.moc \
783 password.cpp \ 717 password.cpp \
784 password.h \ 718 password.h \
@@ -788,21 +722,11 @@ moc_categoryeditbase_p.o: password.moc \
788 passwordbase_p.h 722 passwordbase_p.h
789 723
790moc_findwidgetbase_p.o: process_unix.moc \ 724moc_lnkpropertiesbase_p.o: process_unix.moc \
791 process_unix.cpp \ 725 process_unix.cpp \
792 process.h 726 process.h
793 727
794moc_lnkpropertiesbase_p.o: timestring.moc \
795 timestring.cpp \
796 timestring.h \
797 qpeapplication.h \
798 qpedecoration_qws.h \
799 config.h
800
801moc_menubutton.cpp: menubutton.h 728moc_menubutton.cpp: menubutton.h
802 $(MOC) menubutton.h -o moc_menubutton.cpp 729 $(MOC) menubutton.h -o moc_menubutton.cpp
803 730
804moc_proxies.cpp: proxies.h
805 $(MOC) proxies.h -o moc_proxies.cpp
806
807moc_datebookmonth.cpp: datebookmonth.h 731moc_datebookmonth.cpp: datebookmonth.h
808 $(MOC) datebookmonth.h -o moc_datebookmonth.cpp 732 $(MOC) datebookmonth.h -o moc_datebookmonth.cpp
@@ -811,4 +735,7 @@ moc_fileselector.cpp: fileselector.h
811 $(MOC) fileselector.h -o moc_fileselector.cpp 735 $(MOC) fileselector.h -o moc_fileselector.cpp
812 736
737moc_fileselector_p.cpp: fileselector_p.h
738 $(MOC) fileselector_p.h -o moc_fileselector_p.cpp
739
813moc_imageedit.cpp: imageedit.h 740moc_imageedit.cpp: imageedit.h
814 $(MOC) imageedit.h -o moc_imageedit.cpp 741 $(MOC) imageedit.h -o moc_imageedit.cpp
@@ -862,10 +789,4 @@ moc_lnkproperties.cpp: lnkproperties.h
862 $(MOC) lnkproperties.h -o moc_lnkproperties.cpp 789 $(MOC) lnkproperties.h -o moc_lnkproperties.cpp
863 790
864moc_qlibrary_p.cpp: qlibrary_p.h
865 $(MOC) qlibrary_p.h -o moc_qlibrary_p.cpp
866
867moc_qprocess.cpp: qprocess.h
868 $(MOC) qprocess.h -o moc_qprocess.cpp
869
870global.moc: global.cpp 791global.moc: global.cpp
871 $(MOC) global.cpp -o global.moc 792 $(MOC) global.cpp -o global.moc
@@ -883,13 +804,7 @@ timestring.moc: timestring.cpp
883 $(MOC) timestring.cpp -o timestring.moc 804 $(MOC) timestring.cpp -o timestring.moc
884 805
885qprocess_unix.moc: qprocess_unix.cpp
886 $(MOC) qprocess_unix.cpp -o qprocess_unix.moc
887
888moc_passwordbase_p.cpp: passwordbase_p.h 806moc_passwordbase_p.cpp: passwordbase_p.h
889 $(MOC) passwordbase_p.h -o moc_passwordbase_p.cpp 807 $(MOC) passwordbase_p.h -o moc_passwordbase_p.cpp
890 808
891moc_proxiesbase_p.cpp: proxiesbase_p.h
892 $(MOC) proxiesbase_p.h -o moc_proxiesbase_p.cpp
893
894moc_categoryeditbase_p.cpp: categoryeditbase_p.h 809moc_categoryeditbase_p.cpp: categoryeditbase_p.h
895 $(MOC) categoryeditbase_p.h -o moc_categoryeditbase_p.cpp 810 $(MOC) categoryeditbase_p.h -o moc_categoryeditbase_p.cpp
diff --git a/library/global.cpp b/library/global.cpp
index e5fc2b3..fd7579a 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -506,5 +506,5 @@ void Global::invoke(const QString &c)
506 ::execv( qpeDir()+"/bin/"+args[0], (char * const *)args ); 506 ::execv( qpeDir()+"/bin/"+args[0], (char * const *)args );
507 ::execvp( args[0], (char * const *)args ); 507 ::execvp( args[0], (char * const *)args );
508 exit( -1 ); 508 _exit( -1 );
509 } 509 }
510 } 510 }
diff --git a/library/library.pro b/library/library.pro
index 058d216..e71e5a0 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -9,5 +9,4 @@ HEADERS = calendar.h \
9 network.h \ 9 network.h \
10 networkinterface.h \ 10 networkinterface.h \
11 proxies.h \
12 filemanager.h \ 11 filemanager.h \
13 fontmanager.h \ 12 fontmanager.h \
@@ -15,4 +14,5 @@ HEADERS = calendar.h \
15 datebookmonth.h \ 14 datebookmonth.h \
16 fileselector.h \ 15 fileselector.h \
16 fileselector_p.h \
17 imageedit.h \ 17 imageedit.h \
18 qcopenvelope_qws.h \ 18 qcopenvelope_qws.h \
@@ -65,5 +65,4 @@ SOURCES = calendar.cpp \
65 network.cpp \ 65 network.cpp \
66 networkinterface.cpp \ 66 networkinterface.cpp \
67 proxies.cpp \
68 filemanager.cpp \ 67 filemanager.cpp \
69 fontmanager.cpp \ 68 fontmanager.cpp \
@@ -116,12 +115,11 @@ SOURCES = calendar.cpp \
116 115
117# Qt 3 compatibility 116# Qt 3 compatibility
118qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h qprocess.h 117qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h
119qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \ 118qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp
120 qprocess_unix.cpp
121 119
122INCLUDEPATH += $(OPIEDIR)/include backend 120INCLUDEPATH += $(OPIEDIR)/include backend
123 LIBS += -ldl -lcrypt -lm 121 LIBS += -ldl -lcrypt -lm
124 122
125INTERFACES = passwordbase_p.ui proxiesbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui 123INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
126 124
127 TARGET = qpe 125 TARGET = qpe
diff --git a/noncore/games/chess/Makefile.in b/noncore/games/chess/Makefile.in
index 7354d76..a1f2cd7 100644
--- a/noncore/games/chess/Makefile.in
+++ b/noncore/games/chess/Makefile.in
@@ -4,8 +4,8 @@
4 4
5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT) 5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DQCONFIG=\"qpe\" 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) -DQCONFIG=\"qpe\" 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
@@ -68,6 +68,8 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
68moc: $(SRCMOC) 68moc: $(SRCMOC)
69 69
70tmake: 70tmake: Makefile.in
71 tmake chess.pro 71
72Makefile.in: chess.pro
73 tmake chess.pro -o Makefile.in
72 74
73clean: 75clean:
@@ -103,10 +105,8 @@ REQUIRES=
103 105
104chess.o: chess.cpp \ 106chess.o: chess.cpp \
105 $(QPEDIR)/include/qpe/config.h \
106 $(QPEDIR)/include/qpe/resource.h \
107 chess.h 107 chess.h
108 108
109main.o: main.cpp \ 109main.o: main.cpp \
110 mainwindow.h 110 chess.h
111 111
112mainwindow.h: mainwindow.ui 112mainwindow.h: mainwindow.ui
diff --git a/noncore/games/go/Makefile.in b/noncore/games/go/Makefile.in
index 985eff0..0395dff 100644
--- a/noncore/games/go/Makefile.in
+++ b/noncore/games/go/Makefile.in
@@ -76,6 +76,8 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
76moc: $(SRCMOC) 76moc: $(SRCMOC)
77 77
78tmake: 78tmake: Makefile.in
79 tmake go.pro 79
80Makefile.in: go.pro
81 tmake go.pro -o Makefile.in
80 82
81clean: 83clean:
@@ -134,9 +136,5 @@ gowidget.o: gowidget.cpp \
134 amigo.h \ 136 amigo.h \
135 go.h \ 137 go.h \
136 goplayutils.h \ 138 goplayutils.h
137 $(OPIEDIR)/include/qpe/config.h \
138 $(OPIEDIR)/include/qpe/resource.h \
139 $(OPIEDIR)/include/qpe/qpetoolbar.h \
140 $(OPIEDIR)/include/qpe/qpemenubar.h
141 139
142main.o: main.cpp \ 140main.o: main.cpp \
@@ -144,6 +142,5 @@ main.o: main.cpp \
144 amigo.h \ 142 amigo.h \
145 go.h \ 143 go.h \
146 goplayutils.h \ 144 goplayutils.h
147 $(OPIEDIR)/include/qpe/qpeapplication.h
148 145
149moc_gowidget.o: moc_gowidget.cpp \ 146moc_gowidget.o: moc_gowidget.cpp \