summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-02-01 22:24:34 (UTC)
committer kergoth <kergoth>2002-02-01 22:24:34 (UTC)
commit5a3c8bf8c1033882685f3a6d897c6fa5229403e3 (patch) (unidiff)
tree48303354ea88e165f5a263208c9ecd8ba503dfe4
parent190a0111ccd874923bf88dac938531a18f52e698 (diff)
downloadopie-5a3c8bf8c1033882685f3a6d897c6fa5229403e3.zip
opie-5a3c8bf8c1033882685f3a6d897c6fa5229403e3.tar.gz
opie-5a3c8bf8c1033882685f3a6d897c6fa5229403e3.tar.bz2
Making opie compile again.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/embeddedkonsole/Makefile.in16
-rw-r--r--core/launcher/Makefile.in47
-rw-r--r--core/multimedia/opieplayer/Makefile.in64
-rw-r--r--core/multimedia/opieplayer/libmad/Makefile.in6
-rw-r--r--core/multimedia/opieplayer/libmpeg3/Makefile.in6
-rw-r--r--core/multimedia/opieplayer/wavplugin/Makefile.in6
-rw-r--r--core/pim/datebook/Makefile.in119
-rw-r--r--freetype/Makefile.in10
-rw-r--r--library/Makefile.in40
-rw-r--r--noncore/apps/tableviewer/Makefile.in24
-rw-r--r--noncore/games/chess/Makefile.in13
-rw-r--r--noncore/games/go/Makefile.in15
-rw-r--r--quickexec/Makefile.in6
-rw-r--r--rsync/Makefile.in391
14 files changed, 274 insertions, 489 deletions
diff --git a/core/apps/embeddedkonsole/Makefile.in b/core/apps/embeddedkonsole/Makefile.in
index 0da49d7..1c24ded 100644
--- a/core/apps/embeddedkonsole/Makefile.in
+++ b/core/apps/embeddedkonsole/Makefile.in
@@ -94,20 +94,18 @@ OBJMOC = moc_TEWidget.o \
94 94
95all: $(DESTDIR)$(TARGET) 95all: $(DESTDIR)$(TARGET)
96 96
97$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 97$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
98 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 98 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
99 99
100moc: $(SRCMOC) 100moc: $(SRCMOC)
101 101
102tmake: Makefile.in 102tmake:
103 103 tmake embeddedkonsole.pro
104Makefile.in: embeddedkonsole.pro
105 tmake embeddedkonsole.pro -o Makefile.in
106 104
107clean: 105clean:
108 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 106 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
109 -rm -f *~ core 107 -rm -f *~ core
110 -rm -f allmoc.cpp 108 -rm -f allmoc.cpp
111 109
112####### Extension Modules 110####### Extension Modules
113 111
@@ -180,41 +178,48 @@ session.o: session.cpp \
180 TEmuVt102.h \ 178 TEmuVt102.h \
181 TEScreen.h \ 179 TEScreen.h \
182 TEHistory.h \ 180 TEHistory.h \
183 TEmulation.h \ 181 TEmulation.h \
184 keytrans.h 182 keytrans.h
185 183
186keytrans.o: keytrans.cpp \ 184keytrans.o: keytrans.cpp \
187 keytrans.h \ 185 keytrans.h \
186 $(OPIEDIR)/include/qpe/qpeapplication.h \
188 default.keytab.h 187 default.keytab.h
189 188
190konsole.o: konsole.cpp \ 189konsole.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 \
191 konsole.h \ 194 konsole.h \
192 MyPty.h \ 195 MyPty.h \
193 TEWidget.h \ 196 TEWidget.h \
194 TECommon.h \ 197 TECommon.h \
195 TEmuVt102.h \ 198 TEmuVt102.h \
196 TEScreen.h \ 199 TEScreen.h \
197 TEHistory.h \ 200 TEHistory.h \
198 TEmulation.h \ 201 TEmulation.h \
199 keytrans.h \ 202 keytrans.h \
200 session.h 203 session.h
201 204
202main.o: main.cpp \ 205main.o: main.cpp \
203 konsole.h \ 206 konsole.h \
207 $(OPIEDIR)/include/qpe/qpetoolbar.h \
204 MyPty.h \ 208 MyPty.h \
205 TEWidget.h \ 209 TEWidget.h \
206 TECommon.h \ 210 TECommon.h \
207 TEmuVt102.h \ 211 TEmuVt102.h \
208 TEScreen.h \ 212 TEScreen.h \
209 TEHistory.h \ 213 TEHistory.h \
210 TEmulation.h \ 214 TEmulation.h \
211 keytrans.h \ 215 keytrans.h \
212 session.h 216 session.h \
217 $(OPIEDIR)/include/qpe/qpeapplication.h
213 218
214MyPty.o: MyPty.cpp \ 219MyPty.o: MyPty.cpp \
215 MyPty.h 220 MyPty.h
216 221
217moc_TEWidget.o: moc_TEWidget.cpp \ 222moc_TEWidget.o: moc_TEWidget.cpp \
218 TEWidget.h \ 223 TEWidget.h \
219 TECommon.h 224 TECommon.h
220 225
@@ -243,16 +248,17 @@ moc_session.o: moc_session.cpp \
243 TEmuVt102.h \ 248 TEmuVt102.h \
244 TEScreen.h \ 249 TEScreen.h \
245 TEHistory.h \ 250 TEHistory.h \
246 TEmulation.h \ 251 TEmulation.h \
247 keytrans.h 252 keytrans.h
248 253
249moc_konsole.o: moc_konsole.cpp \ 254moc_konsole.o: moc_konsole.cpp \
250 konsole.h \ 255 konsole.h \
256 $(OPIEDIR)/include/qpe/qpetoolbar.h \
251 MyPty.h \ 257 MyPty.h \
252 TEWidget.h \ 258 TEWidget.h \
253 TECommon.h \ 259 TECommon.h \
254 TEmuVt102.h \ 260 TEmuVt102.h \
255 TEScreen.h \ 261 TEScreen.h \
256 TEHistory.h \ 262 TEHistory.h \
257 TEmulation.h \ 263 TEmulation.h \
258 keytrans.h \ 264 keytrans.h \
diff --git a/core/launcher/Makefile.in b/core/launcher/Makefile.in
index 5e2dbe5..91a5a9b 100644
--- a/core/launcher/Makefile.in
+++ b/core/launcher/Makefile.in
@@ -20,16 +20,17 @@ VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= qpe 21 TARGET= qpe
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =background.h \ 26 HEADERS =background.h \
27 desktop.h \ 27 desktop.h \
28 qprocess.h \
28 info.h \ 29 info.h \
29 appicons.h \ 30 appicons.h \
30 taskbar.h \ 31 taskbar.h \
31 sidething.h \ 32 sidething.h \
32 mrulist.h \ 33 mrulist.h \
33 stabmon.h \ 34 stabmon.h \
34 inputmethods.h \ 35 inputmethods.h \
35 systray.h \ 36 systray.h \
@@ -58,16 +59,18 @@ HEADERS = background.h \
58 $(OPIEDIR)/rsync/trace.h \ 59 $(OPIEDIR)/rsync/trace.h \
59 $(OPIEDIR)/rsync/types.h \ 60 $(OPIEDIR)/rsync/types.h \
60 $(OPIEDIR)/rsync/util.h \ 61 $(OPIEDIR)/rsync/util.h \
61 $(OPIEDIR)/rsync/whole.h \ 62 $(OPIEDIR)/rsync/whole.h \
62 $(OPIEDIR)/rsync/config_rsync.h \ 63 $(OPIEDIR)/rsync/config_rsync.h \
63 $(OPIEDIR)/rsync/qrsync.h 64 $(OPIEDIR)/rsync/qrsync.h
64 SOURCES =background.cpp \ 65 SOURCES =background.cpp \
65 desktop.cpp \ 66 desktop.cpp \
67 qprocess.cpp \
68 qprocess_unix.cpp \
66 info.cpp \ 69 info.cpp \
67 appicons.cpp \ 70 appicons.cpp \
68 taskbar.cpp \ 71 taskbar.cpp \
69 sidething.cpp \ 72 sidething.cpp \
70 mrulist.cpp \ 73 mrulist.cpp \
71 stabmon.cpp \ 74 stabmon.cpp \
72 inputmethods.cpp \ 75 inputmethods.cpp \
73 systray.cpp \ 76 systray.cpp \
@@ -105,16 +108,18 @@ SOURCES = background.cpp \
105 $(OPIEDIR)/rsync/trace.c \ 108 $(OPIEDIR)/rsync/trace.c \
106 $(OPIEDIR)/rsync/tube.c \ 109 $(OPIEDIR)/rsync/tube.c \
107 $(OPIEDIR)/rsync/util.c \ 110 $(OPIEDIR)/rsync/util.c \
108 $(OPIEDIR)/rsync/version.c \ 111 $(OPIEDIR)/rsync/version.c \
109 $(OPIEDIR)/rsync/whole.c \ 112 $(OPIEDIR)/rsync/whole.c \
110 $(OPIEDIR)/rsync/qrsync.cpp 113 $(OPIEDIR)/rsync/qrsync.cpp
111 OBJECTS =background.o \ 114 OBJECTS =background.o \
112 desktop.o \ 115 desktop.o \
116 qprocess.o \
117 qprocess_unix.o \
113 info.o \ 118 info.o \
114 appicons.o \ 119 appicons.o \
115 taskbar.o \ 120 taskbar.o \
116 sidething.o \ 121 sidething.o \
117 mrulist.o \ 122 mrulist.o \
118 stabmon.o \ 123 stabmon.o \
119 inputmethods.o \ 124 inputmethods.o \
120 systray.o \ 125 systray.o \
@@ -160,36 +165,39 @@ OBJECTS = background.o \
160INTERFACES = shutdown.ui \ 165INTERFACES = shutdown.ui \
161 syncdialog.ui 166 syncdialog.ui
162UICDECLS = shutdown.h \ 167UICDECLS = shutdown.h \
163 syncdialog.h 168 syncdialog.h
164UICIMPLS = shutdown.cpp \ 169UICIMPLS = shutdown.cpp \
165 syncdialog.cpp 170 syncdialog.cpp
166 SRCMOC =moc_background.cpp \ 171 SRCMOC =moc_background.cpp \
167 moc_desktop.cpp \ 172 moc_desktop.cpp \
173 moc_qprocess.cpp \
168 moc_info.cpp \ 174 moc_info.cpp \
169 moc_appicons.cpp \ 175 moc_appicons.cpp \
170 moc_taskbar.cpp \ 176 moc_taskbar.cpp \
171 moc_sidething.cpp \ 177 moc_sidething.cpp \
172 moc_inputmethods.cpp \ 178 moc_inputmethods.cpp \
173 moc_systray.cpp \ 179 moc_systray.cpp \
174 moc_shutdownimpl.cpp \ 180 moc_shutdownimpl.cpp \
175 moc_launcher.cpp \ 181 moc_launcher.cpp \
176 moc_launcherview.cpp \ 182 moc_launcherview.cpp \
177 ../calibrate/moc_calibrate.cpp \ 183 ../calibrate/moc_calibrate.cpp \
178 moc_startmenu.cpp \ 184 moc_startmenu.cpp \
179 moc_transferserver.cpp \ 185 moc_transferserver.cpp \
180 moc_qcopbridge.cpp \ 186 moc_qcopbridge.cpp \
181 moc_packageslave.cpp \ 187 moc_packageslave.cpp \
182 moc_irserver.cpp \ 188 moc_irserver.cpp \
189 qprocess_unix.moc \
183 appicons.moc \ 190 appicons.moc \
184 moc_shutdown.cpp \ 191 moc_shutdown.cpp \
185 moc_syncdialog.cpp 192 moc_syncdialog.cpp
186 OBJMOC =moc_background.o \ 193 OBJMOC =moc_background.o \
187 moc_desktop.o \ 194 moc_desktop.o \
195 moc_qprocess.o \
188 moc_info.o \ 196 moc_info.o \
189 moc_appicons.o \ 197 moc_appicons.o \
190 moc_taskbar.o \ 198 moc_taskbar.o \
191 moc_sidething.o \ 199 moc_sidething.o \
192 moc_inputmethods.o \ 200 moc_inputmethods.o \
193 moc_systray.o \ 201 moc_systray.o \
194 moc_shutdownimpl.o \ 202 moc_shutdownimpl.o \
195 moc_launcher.o \ 203 moc_launcher.o \
@@ -285,27 +293,34 @@ desktop.o: desktop.cpp \
285 launcher.h \ 293 launcher.h \
286 launcherview.h \ 294 launcherview.h \
287 $(OPIEDIR)/include/qpe/storage.h \ 295 $(OPIEDIR)/include/qpe/storage.h \
288 mrulist.h \ 296 mrulist.h \
289 $(OPIEDIR)/include/qpe/applnk.h \ 297 $(OPIEDIR)/include/qpe/applnk.h \
290 qcopbridge.h \ 298 qcopbridge.h \
291 startmenu.h \ 299 startmenu.h \
292 taskbar.h \ 300 taskbar.h \
293 $(OPIEDIR)/include/qpe/custom.h \
294 transferserver.h \ 301 transferserver.h \
295 irserver.h \ 302 irserver.h \
296 packageslave.h \ 303 packageslave.h \
297 $(OPIEDIR)/include/qpe/mimetype.h \ 304 $(OPIEDIR)/include/qpe/mimetype.h \
298 $(OPIEDIR)/include/qpe/password.h \ 305 $(OPIEDIR)/include/qpe/password.h \
299 $(OPIEDIR)/include/qpe/config.h \ 306 $(OPIEDIR)/include/qpe/config.h \
300 $(OPIEDIR)/include/qpe/power.h \ 307 $(OPIEDIR)/include/qpe/power.h \
301 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ 308 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
302 $(OPIEDIR)/include/qpe/global.h 309 $(OPIEDIR)/include/qpe/global.h
303 310
311qprocess.o: qprocess.cpp \
312 qprocess.h
313
314qprocess_unix.o: qprocess_unix.cpp \
315 qprocess_unix.moc \
316 qprocess.h \
317 qcleanuphandler_p.h
318
304info.o: info.cpp \ 319info.o: info.cpp \
305 info.h \ 320 info.h \
306 background.h \ 321 background.h \
307 desktop.h \ 322 desktop.h \
308 shutdownimpl.h \ 323 shutdownimpl.h \
309 shutdown.h \ 324 shutdown.h \
310 $(OPIEDIR)/include/qpe/qpeapplication.h \ 325 $(OPIEDIR)/include/qpe/qpeapplication.h \
311 $(OPIEDIR)/include/qpe/resource.h \ 326 $(OPIEDIR)/include/qpe/resource.h \
@@ -326,17 +341,16 @@ taskbar.o: taskbar.cpp \
326 $(OPIEDIR)/include/qpe/applnk.h \ 341 $(OPIEDIR)/include/qpe/applnk.h \
327 systray.h \ 342 systray.h \
328 $(OPIEDIR)/include/qpe/taskbarappletinterface.h \ 343 $(OPIEDIR)/include/qpe/taskbarappletinterface.h \
329 $(OPIEDIR)/calibrate/calibrate.h \ 344 $(OPIEDIR)/calibrate/calibrate.h \
330 wait.h \ 345 wait.h \
331 $(OPIEDIR)/include/qpe/resource.h \ 346 $(OPIEDIR)/include/qpe/resource.h \
332 appicons.h \ 347 appicons.h \
333 taskbar.h \ 348 taskbar.h \
334 $(OPIEDIR)/include/qpe/custom.h \
335 desktop.h \ 349 desktop.h \
336 shutdownimpl.h \ 350 shutdownimpl.h \
337 shutdown.h \ 351 shutdown.h \
338 $(OPIEDIR)/include/qpe/qpeapplication.h \ 352 $(OPIEDIR)/include/qpe/qpeapplication.h \
339 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ 353 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
340 $(OPIEDIR)/include/qpe/global.h \ 354 $(OPIEDIR)/include/qpe/global.h \
341 ../taskbar/apps.h \ 355 ../taskbar/apps.h \
342 ../addressbook/addressbook.h \ 356 ../addressbook/addressbook.h \
@@ -360,17 +374,19 @@ taskbar.o: taskbar.cpp \
360 $(OPIEDIR)/include/qpe/timestring.h \ 374 $(OPIEDIR)/include/qpe/timestring.h \
361 ../filebrowser/filebrowser.h \ 375 ../filebrowser/filebrowser.h \
362 ../solitaire/canvascardwindow.h \ 376 ../solitaire/canvascardwindow.h \
363 ../snake/interface.h \ 377 ../snake/interface.h \
364 ../parashoot/interface.h \ 378 ../parashoot/interface.h \
365 $(OPIEDIR)/include/qpe/sound.h \ 379 $(OPIEDIR)/include/qpe/sound.h \
366 ../mpegplayer/mediaplayer.h \ 380 ../mpegplayer/mediaplayer.h \
367 $(OPIEDIR)/include/qpe/qlibrary.h \ 381 $(OPIEDIR)/include/qpe/qlibrary.h \
382 $(OPIEDIR)/include/qpe/mediaplayerplugininterface.h \
368 ../embeddedkonsole/konsole.h \ 383 ../embeddedkonsole/konsole.h \
384 $(OPIEDIR)/include/qpe/qpetoolbar.h \
369 ../wordgame/wordgame.h \ 385 ../wordgame/wordgame.h \
370 $(OPIEDIR)/include/qpe/qdawg.h 386 $(OPIEDIR)/include/qpe/qdawg.h
371 387
372sidething.o: sidething.cpp \ 388sidething.o: sidething.cpp \
373 sidething.h \ 389 sidething.h \
374 startmenu.h \ 390 startmenu.h \
375 $(OPIEDIR)/include/qpe/resource.h 391 $(OPIEDIR)/include/qpe/resource.h
376 392
@@ -444,21 +460,21 @@ launcherview.o: launcherview.cpp \
444 $(OPIEDIR)/include/qpe/resource.h \ 460 $(OPIEDIR)/include/qpe/resource.h \
445 $(OPIEDIR)/include/qpe/qpetoolbar.h 461 $(OPIEDIR)/include/qpe/qpetoolbar.h
446 462
447$(OPIEDIR)/calibrate/calibrate.o: $(OPIEDIR)/calibrate/calibrate.cpp \ 463$(OPIEDIR)/calibrate/calibrate.o: $(OPIEDIR)/calibrate/calibrate.cpp \
448 $(OPIEDIR)/calibrate/calibrate.h \ 464 $(OPIEDIR)/calibrate/calibrate.h \
449 $(OPIEDIR)/include/qpe/resource.h 465 $(OPIEDIR)/include/qpe/resource.h
450 466
451transferserver.o: transferserver.cpp \ 467transferserver.o: transferserver.cpp \
452 $(OPIEDIR)/include/qpe/qprocess.h \
453 $(OPIEDIR)/include/qpe/process.h \ 468 $(OPIEDIR)/include/qpe/process.h \
454 $(OPIEDIR)/include/qpe/config.h \ 469 $(OPIEDIR)/include/qpe/config.h \
455 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ 470 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
456 transferserver.h 471 transferserver.h \
472 qprocess.h
457 473
458packageslave.o: packageslave.cpp \ 474packageslave.o: packageslave.cpp \
459 packageslave.h \ 475 packageslave.h \
460 $(OPIEDIR)/include/qpe/process.h \ 476 $(OPIEDIR)/include/qpe/process.h \
461 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h 477 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
462 478
463irserver.o: irserver.cpp \ 479irserver.o: irserver.cpp \
464 irserver.h \ 480 irserver.h \
@@ -487,17 +503,16 @@ startmenu.o: startmenu.cpp \
487 $(OPIEDIR)/include/qpe/resource.h 503 $(OPIEDIR)/include/qpe/resource.h
488 504
489main.o: main.cpp \ 505main.o: main.cpp \
490 desktop.h \ 506 desktop.h \
491 shutdownimpl.h \ 507 shutdownimpl.h \
492 shutdown.h \ 508 shutdown.h \
493 $(OPIEDIR)/include/qpe/qpeapplication.h \ 509 $(OPIEDIR)/include/qpe/qpeapplication.h \
494 taskbar.h \ 510 taskbar.h \
495 $(OPIEDIR)/include/qpe/custom.h \
496 stabmon.h \ 511 stabmon.h \
497 $(OPIEDIR)/include/qpe/network.h \ 512 $(OPIEDIR)/include/qpe/network.h \
498 $(OPIEDIR)/include/qpe/config.h \ 513 $(OPIEDIR)/include/qpe/config.h \
499 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ 514 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
500 $(OPIEDIR)/include/qpe/alarmserver.h \ 515 $(OPIEDIR)/include/qpe/alarmserver.h \
501 ../calibrate/calibrate.h \ 516 ../calibrate/calibrate.h \
502 ../login/qdmdialogimpl.h \ 517 ../login/qdmdialogimpl.h \
503 $(OPIEDIR)/include/qpe/global.h 518 $(OPIEDIR)/include/qpe/global.h
@@ -742,26 +757,28 @@ moc_background.o: moc_background.cpp \
742 background.h 757 background.h
743 758
744moc_desktop.o: moc_desktop.cpp \ 759moc_desktop.o: moc_desktop.cpp \
745 desktop.h \ 760 desktop.h \
746 shutdownimpl.h \ 761 shutdownimpl.h \
747 shutdown.h \ 762 shutdown.h \
748 $(OPIEDIR)/include/qpe/qpeapplication.h 763 $(OPIEDIR)/include/qpe/qpeapplication.h
749 764
765moc_qprocess.o: moc_qprocess.cpp \
766 qprocess.h
767
750moc_info.o: moc_info.cpp \ 768moc_info.o: moc_info.cpp \
751 info.h \ 769 info.h \
752 background.h 770 background.h
753 771
754moc_appicons.o: moc_appicons.cpp \ 772moc_appicons.o: moc_appicons.cpp \
755 appicons.h 773 appicons.h
756 774
757moc_taskbar.o: moc_taskbar.cpp \ 775moc_taskbar.o: moc_taskbar.cpp \
758 taskbar.h \ 776 taskbar.h
759 $(OPIEDIR)/include/qpe/custom.h
760 777
761moc_sidething.o: moc_sidething.cpp \ 778moc_sidething.o: moc_sidething.cpp \
762 sidething.h \ 779 sidething.h \
763 startmenu.h 780 startmenu.h
764 781
765moc_inputmethods.o: moc_inputmethods.cpp \ 782moc_inputmethods.o: moc_inputmethods.cpp \
766 inputmethods.h \ 783 inputmethods.h \
767 $(OPIEDIR)/include/qpe/inputmethodinterface.h \ 784 $(OPIEDIR)/include/qpe/inputmethodinterface.h \
@@ -800,30 +817,35 @@ moc_qcopbridge.o: moc_qcopbridge.cpp \
800 qcopbridge.h 817 qcopbridge.h
801 818
802moc_packageslave.o: moc_packageslave.cpp \ 819moc_packageslave.o: moc_packageslave.cpp \
803 packageslave.h 820 packageslave.h
804 821
805moc_irserver.o: moc_irserver.cpp \ 822moc_irserver.o: moc_irserver.cpp \
806 irserver.h 823 irserver.h
807 824
808moc_shutdown.o: appicons.moc \ 825moc_shutdown.o: qprocess_unix.moc \
826 qprocess_unix.cpp \
827 qprocess.h \
828 qcleanuphandler_p.h
829
830moc_syncdialog.o: appicons.moc \
809 appicons.cpp \ 831 appicons.cpp \
810 appicons.h \ 832 appicons.h \
811 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h 833 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
812 834
813moc_syncdialog.o: moc_shutdown.cpp \
814 shutdown.h
815
816moc_background.cpp: background.h 835moc_background.cpp: background.h
817 $(MOC) background.h -o moc_background.cpp 836 $(MOC) background.h -o moc_background.cpp
818 837
819moc_desktop.cpp: desktop.h 838moc_desktop.cpp: desktop.h
820 $(MOC) desktop.h -o moc_desktop.cpp 839 $(MOC) desktop.h -o moc_desktop.cpp
821 840
841moc_qprocess.cpp: qprocess.h
842 $(MOC) qprocess.h -o moc_qprocess.cpp
843
822moc_info.cpp: info.h 844moc_info.cpp: info.h
823 $(MOC) info.h -o moc_info.cpp 845 $(MOC) info.h -o moc_info.cpp
824 846
825moc_appicons.cpp: appicons.h 847moc_appicons.cpp: appicons.h
826 $(MOC) appicons.h -o moc_appicons.cpp 848 $(MOC) appicons.h -o moc_appicons.cpp
827 849
828moc_taskbar.cpp: taskbar.h 850moc_taskbar.cpp: taskbar.h
829 $(MOC) taskbar.h -o moc_taskbar.cpp 851 $(MOC) taskbar.h -o moc_taskbar.cpp
@@ -859,16 +881,19 @@ moc_qcopbridge.cpp: qcopbridge.h
859 $(MOC) qcopbridge.h -o moc_qcopbridge.cpp 881 $(MOC) qcopbridge.h -o moc_qcopbridge.cpp
860 882
861moc_packageslave.cpp: packageslave.h 883moc_packageslave.cpp: packageslave.h
862 $(MOC) packageslave.h -o moc_packageslave.cpp 884 $(MOC) packageslave.h -o moc_packageslave.cpp
863 885
864moc_irserver.cpp: irserver.h 886moc_irserver.cpp: irserver.h
865 $(MOC) irserver.h -o moc_irserver.cpp 887 $(MOC) irserver.h -o moc_irserver.cpp
866 888
889qprocess_unix.moc: qprocess_unix.cpp
890 $(MOC) qprocess_unix.cpp -o qprocess_unix.moc
891
867appicons.moc: appicons.cpp 892appicons.moc: appicons.cpp
868 $(MOC) appicons.cpp -o appicons.moc 893 $(MOC) appicons.cpp -o appicons.moc
869 894
870moc_shutdown.cpp: shutdown.h 895moc_shutdown.cpp: shutdown.h
871 $(MOC) shutdown.h -o moc_shutdown.cpp 896 $(MOC) shutdown.h -o moc_shutdown.cpp
872 897
873moc_syncdialog.cpp: syncdialog.h 898moc_syncdialog.cpp: syncdialog.h
874 $(MOC) syncdialog.h -o moc_syncdialog.cpp 899 $(MOC) syncdialog.h -o moc_syncdialog.cpp
diff --git a/core/multimedia/opieplayer/Makefile.in b/core/multimedia/opieplayer/Makefile.in
index 3e1f9fc..1b0307a 100644
--- a/core/multimedia/opieplayer/Makefile.in
+++ b/core/multimedia/opieplayer/Makefile.in
@@ -95,20 +95,18 @@ OBJMOC = moc_loopcontrol.o \
95 95
96all: $(DESTDIR)$(TARGET) 96all: $(DESTDIR)$(TARGET)
97 97
98$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 98$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
99 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 99 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
100 100
101moc: $(SRCMOC) 101moc: $(SRCMOC)
102 102
103tmake: Makefile.in 103tmake:
104 104 tmake mpegplayer.pro
105Makefile.in: mpegplayer.pro
106 tmake mpegplayer.pro -o Makefile.in
107 105
108clean: 106clean:
109 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 107 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
110 -rm -f *~ core 108 -rm -f *~ core
111 -rm -f allmoc.cpp 109 -rm -f allmoc.cpp
112 110
113####### Extension Modules 111####### Extension Modules
114 112
@@ -132,82 +130,130 @@ REQUIRES=
132 130
133###### Combined headers 131###### Combined headers
134 132
135 133
136 134
137####### Compile 135####### Compile
138 136
139main.o: main.cpp \ 137main.o: main.cpp \
138 $(OPIEDIR)/include/qpe/qpeapplication.h \
140 mediaplayerstate.h \ 139 mediaplayerstate.h \
141 playlistwidget.h \ 140 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 $(OPIEDIR)/include/qpe/mediaplayerplugininterface.h
146 150
147loopcontrol.o: loopcontrol.cpp \ 151loopcontrol.o: loopcontrol.cpp \
152 $(OPIEDIR)/include/qpe/qpeapplication.h \
153 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
148 loopcontrol.h \ 154 loopcontrol.h \
149 videowidget.h \ 155 videowidget.h \
150 audiodevice.h \ 156 audiodevice.h \
157 mediaplayerplugininterface.h \
158 $(OPIEDIR)/include/qpe/qcom.h \
159 $(OPIEDIR)/include/qpe/quuid.h \
151 mediaplayerstate.h 160 mediaplayerstate.h
152 161
153playlistselection.o: playlistselection.cpp \ 162playlistselection.o: playlistselection.cpp \
163 $(OPIEDIR)/include/qpe/applnk.h \
164 $(OPIEDIR)/include/qpe/resource.h \
154 playlistselection.h 165 playlistselection.h
155 166
156mediaplayerstate.o: mediaplayerstate.cpp \ 167mediaplayerstate.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/mediaplayerplugininterface.h \
173 $(OPIEDIR)/include/qpe/config.h \
157 mediaplayerstate.h \ 174 mediaplayerstate.h \
158 libmad/libmadpluginimpl.h \ 175 libmad/libmadpluginimpl.h \
159 libmpeg3/libmpeg3pluginimpl.h \ 176 libmpeg3/libmpeg3pluginimpl.h \
160 wavplugin/wavpluginimpl.h 177 wavplugin/wavpluginimpl.h
161 178
162videowidget.o: videowidget.cpp \ 179videowidget.o: videowidget.cpp \
180 $(OPIEDIR)/include/qpe/resource.h \
181 $(OPIEDIR)/include/qpe/mediaplayerplugininterface.h \
182 $(OPIEDIR)/include/qpe/qcom.h \
183 $(OPIEDIR)/include/qpe/quuid.h \
163 videowidget.h \ 184 videowidget.h \
164 mediaplayerstate.h 185 mediaplayerstate.h
165 186
166audiowidget.o: audiowidget.cpp \ 187audiowidget.o: audiowidget.cpp \
188 $(OPIEDIR)/include/qpe/resource.h \
167 audiowidget.h \ 189 audiowidget.h \
168 mediaplayerstate.h 190 mediaplayerstate.h
169 191
170playlistwidget.o: playlistwidget.cpp \ 192playlistwidget.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 \
171 playlistselection.h \ 200 playlistselection.h \
172 playlistwidget.h \ 201 playlistwidget.h \
173 mediaplayerstate.h 202 mediaplayerstate.h
174 203
175mediaplayer.o: mediaplayer.cpp \ 204mediaplayer.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 \
176 mediaplayer.h \ 211 mediaplayer.h \
212 $(OPIEDIR)/include/qpe/mediaplayerplugininterface.h \
177 playlistwidget.h \ 213 playlistwidget.h \
214 $(OPIEDIR)/include/qpe/applnk.h \
178 audiowidget.h \ 215 audiowidget.h \
179 loopcontrol.h \ 216 loopcontrol.h \
180 audiodevice.h \ 217 audiodevice.h \
181 mediaplayerstate.h 218 mediaplayerstate.h
182 219
183audiodevice.o: audiodevice.cpp \ 220audiodevice.o: audiodevice.cpp \
184 audiodevice.h 221 $(OPIEDIR)/include/qpe/qpeapplication.h \
222 $(OPIEDIR)/include/qpe/config.h \
223 audiodevice.h \
224 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
185 225
186moc_loopcontrol.o: moc_loopcontrol.cpp \ 226moc_loopcontrol.o: moc_loopcontrol.cpp \
187 loopcontrol.h 227 loopcontrol.h
188 228
189moc_playlistselection.o: moc_playlistselection.cpp \ 229moc_playlistselection.o: moc_playlistselection.cpp \
190 playlistselection.h 230 playlistselection.h \
231 $(OPIEDIR)/include/qpe/applnk.h
191 232
192moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \ 233moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \
193 mediaplayerstate.h 234 mediaplayerstate.h
194 235
195moc_videowidget.o: moc_videowidget.cpp \ 236moc_videowidget.o: moc_videowidget.cpp \
196 videowidget.h 237 videowidget.h
197 238
198moc_audiowidget.o: moc_audiowidget.cpp \ 239moc_audiowidget.o: moc_audiowidget.cpp \
199 audiowidget.h 240 audiowidget.h
200 241
201moc_playlistwidget.o: moc_playlistwidget.cpp \ 242moc_playlistwidget.o: moc_playlistwidget.cpp \
202 playlistwidget.h 243 playlistwidget.h \
244 $(OPIEDIR)/include/qpe/applnk.h
203 245
204moc_mediaplayer.o: moc_mediaplayer.cpp \ 246moc_mediaplayer.o: moc_mediaplayer.cpp \
205 mediaplayer.h 247 mediaplayer.h \
248 $(OPIEDIR)/include/qpe/qlibrary.h \
249 $(OPIEDIR)/include/qpe/qcom.h \
250 $(OPIEDIR)/include/qpe/quuid.h \
251 $(OPIEDIR)/include/qpe/mediaplayerplugininterface.h
206 252
207moc_audiodevice.o: moc_audiodevice.cpp \ 253moc_audiodevice.o: moc_audiodevice.cpp \
208 audiodevice.h 254 audiodevice.h
209 255
210moc_loopcontrol.cpp: loopcontrol.h 256moc_loopcontrol.cpp: loopcontrol.h
211 $(MOC) loopcontrol.h -o moc_loopcontrol.cpp 257 $(MOC) loopcontrol.h -o moc_loopcontrol.cpp
212 258
213moc_playlistselection.cpp: playlistselection.h 259moc_playlistselection.cpp: playlistselection.h
diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in
index d2e1cda..e9f74e7 100644
--- a/core/multimedia/opieplayer/libmad/Makefile.in
+++ b/core/multimedia/opieplayer/libmad/Makefile.in
@@ -95,20 +95,18 @@ OBJMOC =
95 95
96all: $(DESTDIR)$(SYSCONF_LINK_TARGET) 96all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
97 97
98$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 98$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
99 $(SYSCONF_LINK_LIB) 99 $(SYSCONF_LINK_LIB)
100 100
101moc: $(SRCMOC) 101moc: $(SRCMOC)
102 102
103tmake: Makefile.in 103tmake:
104 104 tmake libmad.pro
105Makefile.in: libmad.pro
106 tmake libmad.pro -o Makefile.in
107 105
108clean: 106clean:
109 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 107 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
110 -rm -f *~ core 108 -rm -f *~ core
111 -rm -f allmoc.cpp 109 -rm -f allmoc.cpp
112 110
113####### Extension Modules 111####### Extension Modules
114 112
diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in
index 4ccdb8c..154f85d 100644
--- a/core/multimedia/opieplayer/libmpeg3/Makefile.in
+++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in
@@ -124,20 +124,18 @@ OBJMOC =
124 124
125all: $(DESTDIR)$(SYSCONF_LINK_TARGET) 125all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
126 126
127$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 127$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
128 $(SYSCONF_LINK_LIB) 128 $(SYSCONF_LINK_LIB)
129 129
130moc: $(SRCMOC) 130moc: $(SRCMOC)
131 131
132tmake: Makefile.in 132tmake:
133 133 tmake libmpeg3.pro
134Makefile.in: libmpeg3.pro
135 tmake libmpeg3.pro -o Makefile.in
136 134
137clean: 135clean:
138 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 136 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
139 -rm -f *~ core 137 -rm -f *~ core
140 -rm -f allmoc.cpp 138 -rm -f allmoc.cpp
141 139
142####### Extension Modules 140####### Extension Modules
143 141
diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in
index 560534e..bcbe7f2 100644
--- a/core/multimedia/opieplayer/wavplugin/Makefile.in
+++ b/core/multimedia/opieplayer/wavplugin/Makefile.in
@@ -60,20 +60,18 @@ OBJMOC =
60 60
61all: $(DESTDIR)$(SYSCONF_LINK_TARGET) 61all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
62 62
63$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 63$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
64 $(SYSCONF_LINK_LIB) 64 $(SYSCONF_LINK_LIB)
65 65
66moc: $(SRCMOC) 66moc: $(SRCMOC)
67 67
68tmake: Makefile.in 68tmake:
69 69 tmake wavplugin.pro
70Makefile.in: wavplugin.pro
71 tmake wavplugin.pro -o Makefile.in
72 70
73clean: 71clean:
74 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 72 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
75 -rm -f *~ core 73 -rm -f *~ core
76 -rm -f allmoc.cpp 74 -rm -f allmoc.cpp
77 75
78####### Extension Modules 76####### Extension Modules
79 77
diff --git a/core/pim/datebook/Makefile.in b/core/pim/datebook/Makefile.in
index cc31efe..0c3282e 100644
--- a/core/pim/datebook/Makefile.in
+++ b/core/pim/datebook/Makefile.in
@@ -119,20 +119,18 @@ OBJMOC = moc_datebookday.o \
119 119
120all: $(DESTDIR)$(TARGET) 120all: $(DESTDIR)$(TARGET)
121 121
122$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 122$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
123 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 123 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
124 124
125moc: $(SRCMOC) 125moc: $(SRCMOC)
126 126
127tmake: Makefile.in 127tmake:
128 128 tmake datebook.pro
129Makefile.in: datebook.pro
130 tmake datebook.pro -o Makefile.in
131 129
132clean: 130clean:
133 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 131 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
134 -rm -f *~ core 132 -rm -f *~ core
135 -rm -f allmoc.cpp 133 -rm -f allmoc.cpp
136 134
137####### Extension Modules 135####### Extension Modules
138 136
@@ -156,58 +154,124 @@ REQUIRES=
156 154
157###### Combined headers 155###### Combined headers
158 156
159 157
160 158
161####### Compile 159####### Compile
162 160
163main.o: main.cpp \ 161main.o: main.cpp \
164 datebook.h 162 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
165 169
166datebookday.o: datebookday.cpp \ 170datebookday.o: datebookday.cpp \
167 datebookday.h \ 171 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 \
168 datebookdayheaderimpl.h \ 176 datebookdayheaderimpl.h \
169 datebookdayheader.h 177 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
170 183
171datebook.o: datebook.cpp \ 184datebook.o: datebook.cpp \
172 datebook.h \ 185 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 \
173 datebookday.h \ 191 datebookday.h \
174 datebooksettings.h \ 192 datebooksettings.h \
175 datebooksettingsbase.h \ 193 datebooksettingsbase.h \
176 datebookweek.h \ 194 datebookweek.h \
177 dateentryimpl.h \ 195 dateentryimpl.h \
178 dateentry.h 196 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
179 211
180dateentryimpl.o: dateentryimpl.cpp \ 212dateentryimpl.o: dateentryimpl.cpp \
181 dateentryimpl.h \ 213 dateentryimpl.h \
182 dateentry.h \ 214 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 \
183 repeatentry.h \ 219 repeatentry.h \
184 repeatentrybase.h 220 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
185 227
186datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \ 228datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \
187 datebookdayheaderimpl.h \ 229 datebookdayheaderimpl.h \
188 datebookdayheader.h 230 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
189 237
190datebooksettings.o: datebooksettings.cpp \ 238datebooksettings.o: datebooksettings.cpp \
191 datebooksettings.h \ 239 datebooksettings.h \
192 datebooksettingsbase.h 240 datebooksettingsbase.h \
241 $(OPIEDIR)/include/qpe/qpeapplication.h
193 242
194datebookweek.o: datebookweek.cpp \ 243datebookweek.o: datebookweek.cpp \
195 datebookweek.h \ 244 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 \
196 datebookweekheaderimpl.h \ 249 datebookweekheaderimpl.h \
197 datebookweekheader.h 250 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
198 255
199datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \ 256datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \
200 datebookweekheaderimpl.h \ 257 datebookweekheaderimpl.h \
201 datebookweekheader.h 258 datebookweekheader.h
202 259
203repeatentry.o: repeatentry.cpp \ 260repeatentry.o: repeatentry.cpp \
204 repeatentry.h \ 261 repeatentry.h \
205 repeatentrybase.h 262 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
206 270
207dateentry.h: dateentry.ui 271dateentry.h: dateentry.ui
208 $(UIC) dateentry.ui -o $(INTERFACE_DECL_PATH)/dateentry.h 272 $(UIC) dateentry.ui -o $(INTERFACE_DECL_PATH)/dateentry.h
209 273
210dateentry.cpp: dateentry.ui 274dateentry.cpp: dateentry.ui
211 $(UIC) dateentry.ui -i dateentry.h -o dateentry.cpp 275 $(UIC) dateentry.ui -i dateentry.h -o dateentry.cpp
212 276
213datebookdayheader.h: datebookdayheader.ui 277datebookdayheader.h: datebookdayheader.ui
@@ -240,39 +304,60 @@ datebookdayheader.o: datebookdayheader.cpp
240 304
241datebooksettingsbase.o: datebooksettingsbase.cpp 305datebooksettingsbase.o: datebooksettingsbase.cpp
242 306
243datebookweekheader.o: datebookweekheader.cpp 307datebookweekheader.o: datebookweekheader.cpp
244 308
245repeatentrybase.o: repeatentrybase.cpp 309repeatentrybase.o: repeatentrybase.cpp
246 310
247moc_datebookday.o: moc_datebookday.cpp \ 311moc_datebookday.o: moc_datebookday.cpp \
248 datebookday.h 312 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
249 317
250moc_datebook.o: moc_datebook.cpp \ 318moc_datebook.o: moc_datebook.cpp \
251 datebook.h 319 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
252 325
253moc_dateentryimpl.o: moc_dateentryimpl.cpp \ 326moc_dateentryimpl.o: moc_dateentryimpl.cpp \
254 dateentryimpl.h \ 327 dateentryimpl.h \
255 dateentry.h 328 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
256 333
257moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \ 334moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \
258 datebookdayheaderimpl.h \ 335 datebookdayheaderimpl.h \
259 datebookdayheader.h 336 datebookdayheader.h
260 337
261moc_datebookweek.o: moc_datebookweek.cpp \ 338moc_datebookweek.o: moc_datebookweek.cpp \
262 datebookweek.h 339 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
263 344
264moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \ 345moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \
265 datebookweekheaderimpl.h \ 346 datebookweekheaderimpl.h \
266 datebookweekheader.h 347 datebookweekheader.h
267 348
268moc_repeatentry.o: moc_repeatentry.cpp \ 349moc_repeatentry.o: moc_repeatentry.cpp \
269 repeatentry.h \ 350 repeatentry.h \
270 repeatentrybase.h 351 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
271 356
272moc_dateentry.o: moc_dateentry.cpp \ 357moc_dateentry.o: moc_dateentry.cpp \
273 dateentry.h 358 dateentry.h
274 359
275moc_datebookdayheader.o: moc_datebookdayheader.cpp \ 360moc_datebookdayheader.o: moc_datebookdayheader.cpp \
276 datebookdayheader.h 361 datebookdayheader.h
277 362
278moc_datebooksettingsbase.o: moc_datebooksettingsbase.cpp \ 363moc_datebooksettingsbase.o: moc_datebooksettingsbase.cpp \
diff --git a/freetype/Makefile.in b/freetype/Makefile.in
index ba4c829..cdc6fa4 100644
--- a/freetype/Makefile.in
+++ b/freetype/Makefile.in
@@ -1,17 +1,17 @@
1############################################################################# 1#############################################################################
2 2
3####### Compiler, tools and options 3####### Compiler, tools and options
4 4
5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT) 5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) 6 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../library 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 -lfreetype $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe -lfreetype $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
13 UIC =$(SYSCONF_UIC) 13 UIC =$(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = ../plugins/fontfactories/ 17DESTDIR = ../plugins/fontfactories/
@@ -19,18 +19,17 @@ VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= freetypefactory 21 TARGET= freetypefactory
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =fontfactoryttf_qws.h \ 26 HEADERS =fontfactoryttf_qws.h \
27 freetypefactoryimpl.h \ 27 freetypefactoryimpl.h
28 qfontdata_p.h
29 SOURCES =fontfactoryttf_qws.cpp \ 28 SOURCES =fontfactoryttf_qws.cpp \
30 freetypefactoryimpl.cpp 29 freetypefactoryimpl.cpp
31 OBJECTS =fontfactoryttf_qws.o \ 30 OBJECTS =fontfactoryttf_qws.o \
32 freetypefactoryimpl.o 31 freetypefactoryimpl.o
33INTERFACES = 32INTERFACES =
34UICDECLS = 33UICDECLS =
35UICIMPLS = 34UICIMPLS =
36 SRCMOC = 35 SRCMOC =
@@ -104,14 +103,11 @@ REQUIRES=
104 103
105fontfactoryttf_qws.o: fontfactoryttf_qws.cpp \ 104fontfactoryttf_qws.o: fontfactoryttf_qws.cpp \
106 fontfactoryttf_qws.h \ 105 fontfactoryttf_qws.h \
107 qfontdata_p.h 106 qfontdata_p.h
108 107
109freetypefactoryimpl.o: freetypefactoryimpl.cpp \ 108freetypefactoryimpl.o: freetypefactoryimpl.cpp \
110 fontfactoryttf_qws.h \ 109 fontfactoryttf_qws.h \
111 qfontdata_p.h \ 110 qfontdata_p.h \
112 freetypefactoryimpl.h \ 111 freetypefactoryimpl.h
113 ../library/fontfactoryinterface.h \
114 ../library/qcom.h \
115 ../library/quuid.h
116 112
117 113
diff --git a/library/Makefile.in b/library/Makefile.in
index b8fc1f6..dcea4b8 100644
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -73,17 +73,21 @@ HEADERS = calendar.h \
73 categorymenu.h \ 73 categorymenu.h \
74 categoryedit_p.h \ 74 categoryedit_p.h \
75 categoryselect.h \ 75 categoryselect.h \
76 categorywidget.h \ 76 categorywidget.h \
77 ir.h \ 77 ir.h \
78 backend/vobject_p.h \ 78 backend/vobject_p.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
82 SOURCES =calendar.cpp \ 86 SOURCES =calendar.cpp \
83 global.cpp \ 87 global.cpp \
84 xmlreader.cpp \ 88 xmlreader.cpp \
85 mimetype.cpp \ 89 mimetype.cpp \
86 menubutton.cpp \ 90 menubutton.cpp \
87 network.cpp \ 91 network.cpp \
88 networkinterface.cpp \ 92 networkinterface.cpp \
89 filemanager.cpp \ 93 filemanager.cpp \
@@ -128,17 +132,20 @@ SOURCES = calendar.cpp \
128 categoryedit_p.cpp \ 132 categoryedit_p.cpp \
129 categoryselect.cpp \ 133 categoryselect.cpp \
130 categorywidget.cpp \ 134 categorywidget.cpp \
131 ir.cpp \ 135 ir.cpp \
132 backend/vcc_yacc.cpp \ 136 backend/vcc_yacc.cpp \
133 backend/vobject.cpp \ 137 backend/vobject.cpp \
134 findwidget_p.cpp \ 138 findwidget_p.cpp \
135 finddialog.cpp \ 139 finddialog.cpp \
136 lnkproperties.cpp 140 lnkproperties.cpp \
141 quuid.cpp \
142 qlibrary.cpp \
143 qlibrary_unix.cpp
137 OBJECTS =calendar.o \ 144 OBJECTS =calendar.o \
138 global.o \ 145 global.o \
139 xmlreader.o \ 146 xmlreader.o \
140 mimetype.o \ 147 mimetype.o \
141 menubutton.o \ 148 menubutton.o \
142 network.o \ 149 network.o \
143 networkinterface.o \ 150 networkinterface.o \
144 filemanager.o \ 151 filemanager.o \
@@ -184,16 +191,19 @@ OBJECTS = calendar.o \
184 categoryselect.o \ 191 categoryselect.o \
185 categorywidget.o \ 192 categorywidget.o \
186 ir.o \ 193 ir.o \
187 backend/vcc_yacc.o \ 194 backend/vcc_yacc.o \
188 backend/vobject.o \ 195 backend/vobject.o \
189 findwidget_p.o \ 196 findwidget_p.o \
190 finddialog.o \ 197 finddialog.o \
191 lnkproperties.o \ 198 lnkproperties.o \
199 quuid.o \
200 qlibrary.o \
201 qlibrary_unix.o \
192 passwordbase_p.o \ 202 passwordbase_p.o \
193 categoryeditbase_p.o \ 203 categoryeditbase_p.o \
194 findwidgetbase_p.o \ 204 findwidgetbase_p.o \
195 lnkpropertiesbase_p.o 205 lnkpropertiesbase_p.o
196INTERFACES = passwordbase_p.ui \ 206INTERFACES = passwordbase_p.ui \
197 categoryeditbase_p.ui \ 207 categoryeditbase_p.ui \
198 findwidgetbase_p.ui \ 208 findwidgetbase_p.ui \
199 lnkpropertiesbase_p.ui 209 lnkpropertiesbase_p.ui
@@ -221,16 +231,17 @@ SRCMOC = moc_menubutton.cpp \
221 backend/moc_categories.cpp \ 231 backend/moc_categories.cpp \
222 moc_categorymenu.cpp \ 232 moc_categorymenu.cpp \
223 moc_categoryedit_p.cpp \ 233 moc_categoryedit_p.cpp \
224 moc_categoryselect.cpp \ 234 moc_categoryselect.cpp \
225 moc_ir.cpp \ 235 moc_ir.cpp \
226 moc_findwidget_p.cpp \ 236 moc_findwidget_p.cpp \
227 moc_finddialog.cpp \ 237 moc_finddialog.cpp \
228 moc_lnkproperties.cpp \ 238 moc_lnkproperties.cpp \
239 moc_qlibrary_p.cpp \
229 global.moc \ 240 global.moc \
230 network.moc \ 241 network.moc \
231 password.moc \ 242 password.moc \
232 process_unix.moc \ 243 process_unix.moc \
233 timestring.moc \ 244 timestring.moc \
234 moc_passwordbase_p.cpp \ 245 moc_passwordbase_p.cpp \
235 moc_categoryeditbase_p.cpp \ 246 moc_categoryeditbase_p.cpp \
236 moc_findwidgetbase_p.cpp \ 247 moc_findwidgetbase_p.cpp \
@@ -251,16 +262,17 @@ OBJMOC = moc_menubutton.o \
251 backend/moc_categories.o \ 262 backend/moc_categories.o \
252 moc_categorymenu.o \ 263 moc_categorymenu.o \
253 moc_categoryedit_p.o \ 264 moc_categoryedit_p.o \
254 moc_categoryselect.o \ 265 moc_categoryselect.o \
255 moc_ir.o \ 266 moc_ir.o \
256 moc_findwidget_p.o \ 267 moc_findwidget_p.o \
257 moc_finddialog.o \ 268 moc_finddialog.o \
258 moc_lnkproperties.o \ 269 moc_lnkproperties.o \
270 moc_qlibrary_p.o \
259 moc_passwordbase_p.o \ 271 moc_passwordbase_p.o \
260 moc_categoryeditbase_p.o \ 272 moc_categoryeditbase_p.o \
261 moc_findwidgetbase_p.o \ 273 moc_findwidgetbase_p.o \
262 moc_lnkpropertiesbase_p.o 274 moc_lnkpropertiesbase_p.o
263 275
264 276
265####### Implicit rules 277####### Implicit rules
266 278
@@ -286,20 +298,18 @@ OBJMOC = moc_menubutton.o \
286 298
287all: $(DESTDIR)$(SYSCONF_LINK_TARGET) 299all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
288 300
289$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 301$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
290 $(SYSCONF_LINK_LIB) 302 $(SYSCONF_LINK_LIB)
291 303
292moc: $(SRCMOC) 304moc: $(SRCMOC)
293 305
294tmake: Makefile.in 306tmake:
295 307 tmake library.pro
296Makefile.in: library.pro
297 tmake library.pro -o Makefile.in
298 308
299clean: 309clean:
300 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 310 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
301 -rm -f *~ core 311 -rm -f *~ core
302 -rm -f allmoc.cpp 312 -rm -f allmoc.cpp
303 313
304####### Extension Modules 314####### Extension Modules
305 315
@@ -597,16 +607,27 @@ finddialog.o: finddialog.cpp \
597 findwidget_p.h \ 607 findwidget_p.h \
598 findwidgetbase_p.h 608 findwidgetbase_p.h
599 609
600lnkproperties.o: lnkproperties.cpp \ 610lnkproperties.o: lnkproperties.cpp \
601 lnkproperties.h \ 611 lnkproperties.h \
602 lnkpropertiesbase_p.h \ 612 lnkpropertiesbase_p.h \
603 ir.h 613 ir.h
604 614
615quuid.o: quuid.cpp \
616 quuid.h
617
618qlibrary.o: qlibrary.cpp \
619 qlibrary_p.h \
620 qlibrary.h
621
622qlibrary_unix.o: qlibrary_unix.cpp \
623 qlibrary_p.h \
624 qlibrary.h
625
605passwordbase_p.h: passwordbase_p.ui 626passwordbase_p.h: passwordbase_p.ui
606 $(UIC) passwordbase_p.ui -o $(INTERFACE_DECL_PATH)/passwordbase_p.h 627 $(UIC) passwordbase_p.ui -o $(INTERFACE_DECL_PATH)/passwordbase_p.h
607 628
608passwordbase_p.cpp: passwordbase_p.ui 629passwordbase_p.cpp: passwordbase_p.ui
609 $(UIC) passwordbase_p.ui -i passwordbase_p.h -o passwordbase_p.cpp 630 $(UIC) passwordbase_p.ui -i passwordbase_p.h -o passwordbase_p.cpp
610 631
611categoryeditbase_p.h: categoryeditbase_p.ui 632categoryeditbase_p.h: categoryeditbase_p.ui
612 $(UIC) categoryeditbase_p.ui -o $(INTERFACE_DECL_PATH)/categoryeditbase_p.h 633 $(UIC) categoryeditbase_p.ui -o $(INTERFACE_DECL_PATH)/categoryeditbase_p.h
@@ -702,16 +723,20 @@ moc_findwidget_p.o: moc_findwidget_p.cpp \
702 findwidgetbase_p.h 723 findwidgetbase_p.h
703 724
704moc_finddialog.o: moc_finddialog.cpp \ 725moc_finddialog.o: moc_finddialog.cpp \
705 finddialog.h 726 finddialog.h
706 727
707moc_lnkproperties.o: moc_lnkproperties.cpp \ 728moc_lnkproperties.o: moc_lnkproperties.cpp \
708 lnkproperties.h 729 lnkproperties.h
709 730
731moc_qlibrary_p.o: moc_qlibrary_p.cpp \
732 qlibrary_p.h \
733 qlibrary.h
734
710moc_passwordbase_p.o: global.moc \ 735moc_passwordbase_p.o: global.moc \
711 global.cpp 736 global.cpp
712 737
713moc_categoryeditbase_p.o: network.moc \ 738moc_categoryeditbase_p.o: network.moc \
714 network.cpp 739 network.cpp
715 740
716moc_findwidgetbase_p.o: password.moc \ 741moc_findwidgetbase_p.o: password.moc \
717 password.cpp \ 742 password.cpp \
@@ -783,16 +808,19 @@ moc_findwidget_p.cpp: findwidget_p.h
783 $(MOC) findwidget_p.h -o moc_findwidget_p.cpp 808 $(MOC) findwidget_p.h -o moc_findwidget_p.cpp
784 809
785moc_finddialog.cpp: finddialog.h 810moc_finddialog.cpp: finddialog.h
786 $(MOC) finddialog.h -o moc_finddialog.cpp 811 $(MOC) finddialog.h -o moc_finddialog.cpp
787 812
788moc_lnkproperties.cpp: lnkproperties.h 813moc_lnkproperties.cpp: lnkproperties.h
789 $(MOC) lnkproperties.h -o moc_lnkproperties.cpp 814 $(MOC) lnkproperties.h -o moc_lnkproperties.cpp
790 815
816moc_qlibrary_p.cpp: qlibrary_p.h
817 $(MOC) qlibrary_p.h -o moc_qlibrary_p.cpp
818
791global.moc: global.cpp 819global.moc: global.cpp
792 $(MOC) global.cpp -o global.moc 820 $(MOC) global.cpp -o global.moc
793 821
794network.moc: network.cpp 822network.moc: network.cpp
795 $(MOC) network.cpp -o network.moc 823 $(MOC) network.cpp -o network.moc
796 824
797password.moc: password.cpp 825password.moc: password.cpp
798 $(MOC) password.cpp -o password.moc 826 $(MOC) password.cpp -o password.moc
diff --git a/noncore/apps/tableviewer/Makefile.in b/noncore/apps/tableviewer/Makefile.in
index 8c5dc26..e135d82 100644
--- a/noncore/apps/tableviewer/Makefile.in
+++ b/noncore/apps/tableviewer/Makefile.in
@@ -1,17 +1,17 @@
1############################################################################# 1#############################################################################
2 2
3####### Compiler, tools and options 3####### Compiler, tools and options
4 4
5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT) 5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 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) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I../library 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)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
13 UIC =$(SYSCONF_UIC) 13 UIC =$(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = ../bin/ 17DESTDIR = ../bin/
@@ -152,43 +152,31 @@ REQUIRES=
152###### Combined headers 152###### Combined headers
153 153
154 154
155 155
156####### Compile 156####### Compile
157 157
158main.o: main.cpp \ 158main.o: main.cpp \
159 tableviewer.h \ 159 tableviewer.h \
160 db/common.h \ 160 db/common.h
161 ../library/fileselector.h \
162 ../library/filemanager.h \
163 ../library/applnk.h \
164 ../library/qpeapplication.h \
165 ../library/qpedecoration_qws.h
166 161
167tableviewer.o: tableviewer.cpp \ 162tableviewer.o: tableviewer.cpp \
168 tableviewer.h \ 163 tableviewer.h \
169 db/common.h \ 164 db/common.h \
170 ../library/fileselector.h \
171 ../library/filemanager.h \
172 ../library/applnk.h \
173 ui/tvbrowseview.h \ 165 ui/tvbrowseview.h \
174 ui/tvfilterview.h \ 166 ui/tvfilterview.h \
175 ui/tvlistview.h \ 167 ui/tvlistview.h \
176 ui/tveditview.h \ 168 ui/tveditview.h \
177 ui/tvkeyedit.h \ 169 ui/tvkeyedit.h \
178 tvkeyedit_gen.h \ 170 tvkeyedit_gen.h \
179 db/datacache.h \ 171 db/datacache.h \
180 ../library/resource.h 172 /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/qpemenubar.h
181 173
182ui/commonwidgets.o: ui/commonwidgets.cpp \ 174ui/commonwidgets.o: ui/commonwidgets.cpp \
183 ../library/datebookmonth.h \
184 ../library/organizer.h \
185 ../library/xmlreader.h \
186 ../library/calendar.h \
187 ui/commonwidgets.h 175 ui/commonwidgets.h
188 176
189ui/tvbrowseview.o: ui/tvbrowseview.cpp \ 177ui/tvbrowseview.o: ui/tvbrowseview.cpp \
190 ui/tvbrowseview.h \ 178 ui/tvbrowseview.h \
191 ui/../db/common.h \ 179 ui/../db/common.h \
192 ui/browsekeyentry.h 180 ui/browsekeyentry.h
193 181
194ui/tvfilterview.o: ui/tvfilterview.cpp \ 182ui/tvfilterview.o: ui/tvfilterview.cpp \
@@ -232,17 +220,16 @@ db/xmlsource.o: db/xmlsource.cpp \
232 db/common.h 220 db/common.h
233 221
234db/csvsource.o: db/csvsource.cpp \ 222db/csvsource.o: db/csvsource.cpp \
235 db/csvsource.h \ 223 db/csvsource.h \
236 db/datacache.h \ 224 db/datacache.h \
237 db/common.h 225 db/common.h
238 226
239db/common.o: db/common.cpp \ 227db/common.o: db/common.cpp \
240 ../library/timestring.h \
241 db/common.h \ 228 db/common.h \
242 db/datacache.h 229 db/datacache.h
243 230
244ui/tvkeyedit_gen.h: ui/tvkeyedit_gen.ui 231ui/tvkeyedit_gen.h: ui/tvkeyedit_gen.ui
245 $(UIC) ui/tvkeyedit_gen.ui -o $(INTERFACE_DECL_PATH)/ui/tvkeyedit_gen.h 232 $(UIC) ui/tvkeyedit_gen.ui -o $(INTERFACE_DECL_PATH)/ui/tvkeyedit_gen.h
246 233
247tvkeyedit_gen.h: ui/tvkeyedit_gen.ui 234tvkeyedit_gen.h: ui/tvkeyedit_gen.ui
248 $(UIC) ui/tvkeyedit_gen.ui -o tvkeyedit_gen.h 235 $(UIC) ui/tvkeyedit_gen.ui -o tvkeyedit_gen.h
@@ -251,20 +238,17 @@ ui/tvkeyedit_gen.cpp: ui/tvkeyedit_gen.ui
251 $(UIC) ui/tvkeyedit_gen.ui -i tvkeyedit_gen.h -o ui/tvkeyedit_gen.cpp 238 $(UIC) ui/tvkeyedit_gen.ui -i tvkeyedit_gen.h -o ui/tvkeyedit_gen.cpp
252 239
253ui/tvkeyedit_gen.o: ui/tvkeyedit_gen.cpp \ 240ui/tvkeyedit_gen.o: ui/tvkeyedit_gen.cpp \
254 ui/tvkeyedit_gen.h \ 241 ui/tvkeyedit_gen.h \
255 ui/tvkeyedit_gen.ui 242 ui/tvkeyedit_gen.ui
256 243
257moc_tableviewer.o: moc_tableviewer.cpp \ 244moc_tableviewer.o: moc_tableviewer.cpp \
258 tableviewer.h \ 245 tableviewer.h \
259 db/common.h \ 246 db/common.h
260 ../library/fileselector.h \
261 ../library/filemanager.h \
262 ../library/applnk.h
263 247
264ui/moc_commonwidgets.o: ui/moc_commonwidgets.cpp \ 248ui/moc_commonwidgets.o: ui/moc_commonwidgets.cpp \
265 ui/commonwidgets.h 249 ui/commonwidgets.h
266 250
267ui/moc_tvbrowseview.o: ui/moc_tvbrowseview.cpp \ 251ui/moc_tvbrowseview.o: ui/moc_tvbrowseview.cpp \
268 ui/tvbrowseview.h \ 252 ui/tvbrowseview.h \
269 ui/../db/common.h 253 ui/../db/common.h
270 254
diff --git a/noncore/games/chess/Makefile.in b/noncore/games/chess/Makefile.in
index a1f2cd7..0987d58 100644
--- a/noncore/games/chess/Makefile.in
+++ b/noncore/games/chess/Makefile.in
@@ -99,33 +99,40 @@ REQUIRES=
99 99
100###### Combined headers 100###### Combined headers
101 101
102 102
103 103
104####### Compile 104####### Compile
105 105
106chess.o: chess.cpp \ 106chess.o: chess.cpp \
107 chess.h 107 /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/config.h \
108 /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/resource.h \
109 chess.h \
110 /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/process.h
108 111
109main.o: main.cpp \ 112main.o: main.cpp \
110 chess.h 113 /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/qpeapplication.h \
114 /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/qpetoolbar.h \
115 chess.h \
116 /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/process.h
111 117
112mainwindow.h: mainwindow.ui 118mainwindow.h: mainwindow.ui
113 $(UIC) mainwindow.ui -o $(INTERFACE_DECL_PATH)/mainwindow.h 119 $(UIC) mainwindow.ui -o $(INTERFACE_DECL_PATH)/mainwindow.h
114 120
115mainwindow.cpp: mainwindow.ui 121mainwindow.cpp: mainwindow.ui
116 $(UIC) mainwindow.ui -i mainwindow.h -o mainwindow.cpp 122 $(UIC) mainwindow.ui -i mainwindow.h -o mainwindow.cpp
117 123
118mainwindow.o: mainwindow.cpp \ 124mainwindow.o: mainwindow.cpp \
119 mainwindow.h \ 125 mainwindow.h \
120 mainwindow.ui 126 mainwindow.ui
121 127
122moc_chess.o: moc_chess.cpp \ 128moc_chess.o: moc_chess.cpp \
123 chess.h 129 chess.h \
130 /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/process.h
124 131
125moc_mainwindow.o: moc_mainwindow.cpp \ 132moc_mainwindow.o: moc_mainwindow.cpp \
126 mainwindow.h 133 mainwindow.h
127 134
128moc_chess.cpp: chess.h 135moc_chess.cpp: chess.h
129 $(MOC) chess.h -o moc_chess.cpp 136 $(MOC) chess.h -o moc_chess.cpp
130 137
131moc_mainwindow.cpp: mainwindow.h 138moc_mainwindow.cpp: mainwindow.h
diff --git a/noncore/games/go/Makefile.in b/noncore/games/go/Makefile.in
index 0395dff..985eff0 100644
--- a/noncore/games/go/Makefile.in
+++ b/noncore/games/go/Makefile.in
@@ -70,20 +70,18 @@ OBJMOC = moc_gowidget.o
70 70
71all: $(DESTDIR)$(TARGET) 71all: $(DESTDIR)$(TARGET)
72 72
73$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 73$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
74 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 74 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
75 75
76moc: $(SRCMOC) 76moc: $(SRCMOC)
77 77
78tmake: Makefile.in 78tmake:
79 79 tmake go.pro
80Makefile.in: go.pro
81 tmake go.pro -o Makefile.in
82 80
83clean: 81clean:
84 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 82 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
85 -rm -f *~ core 83 -rm -f *~ core
86 -rm -f allmoc.cpp 84 -rm -f allmoc.cpp
87 85
88####### Extension Modules 86####### Extension Modules
89 87
@@ -130,23 +128,28 @@ killable.o: killable.c \
130 go.h \ 128 go.h \
131 goplayutils.h \ 129 goplayutils.h \
132 amigo.h 130 amigo.h
133 131
134gowidget.o: gowidget.cpp \ 132gowidget.o: gowidget.cpp \
135 gowidget.h \ 133 gowidget.h \
136 amigo.h \ 134 amigo.h \
137 go.h \ 135 go.h \
138 goplayutils.h 136 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
139 141
140main.o: main.cpp \ 142main.o: main.cpp \
141 gowidget.h \ 143 gowidget.h \
142 amigo.h \ 144 amigo.h \
143 go.h \ 145 go.h \
144 goplayutils.h 146 goplayutils.h \
147 $(OPIEDIR)/include/qpe/qpeapplication.h
145 148
146moc_gowidget.o: moc_gowidget.cpp \ 149moc_gowidget.o: moc_gowidget.cpp \
147 gowidget.h \ 150 gowidget.h \
148 amigo.h \ 151 amigo.h \
149 go.h \ 152 go.h \
150 goplayutils.h 153 goplayutils.h
151 154
152moc_gowidget.cpp: gowidget.h 155moc_gowidget.cpp: gowidget.h
diff --git a/quickexec/Makefile.in b/quickexec/Makefile.in
index 514e6cc..d3ac9dc 100644
--- a/quickexec/Makefile.in
+++ b/quickexec/Makefile.in
@@ -57,18 +57,20 @@ OBJMOC =
57 57
58all: $(DESTDIR)$(TARGET) 58all: $(DESTDIR)$(TARGET)
59 59
60$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 60$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
61 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 61 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
62 62
63moc: $(SRCMOC) 63moc: $(SRCMOC)
64 64
65tmake: 65tmake: Makefile.in
66 tmake quickexec.pro 66
67Makefile.in: quickexec.pro
68 tmake quickexec.pro -o Makefile.in
67 69
68clean: 70clean:
69 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 71 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
70 -rm -f *~ core 72 -rm -f *~ core
71 -rm -f allmoc.cpp 73 -rm -f allmoc.cpp
72 74
73####### Extension Modules 75####### Extension Modules
74 76
diff --git a/rsync/Makefile.in b/rsync/Makefile.in
index 50e7b3d..e69de29 100644
--- a/rsync/Makefile.in
+++ b/rsync/Makefile.in
@@ -1,391 +0,0 @@
1#############################################################################
2
3####### Compiler, tools and options
4
5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9 INCPATH =-I.
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC)
13 UIC =$(SYSCONF_UIC)
14
15####### Target
16
17DESTDIR = $(QTDIR)/lib$(PROJMAK)/
18VER_MAJ = 1
19VER_MIN = 0
20VER_PATCH = 0
21 TARGET= rsync
22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23
24####### Files
25
26 HEADERS =buf.h \
27 checksum.h \
28 command.h \
29 emit.h \
30 fileutil.h \
31 job.h \
32 netint.h \
33 protocol.h \
34 prototab.h \
35 rsync.h \
36 search.h \
37 stream.h \
38 sumset.h \
39 trace.h \
40 types.h \
41 util.h \
42 whole.h \
43 config.h
44 SOURCES =base64.c \
45 buf.c \
46 checksum.c \
47 command.c \
48 delta.c \
49 emit.c \
50 fileutil.c \
51 hex.c \
52 job.c \
53 mdfour.c \
54 mksum.c \
55 msg.c \
56 netint.c \
57 patch.c \
58 prototab.c \
59 readsums.c \
60 scoop.c \
61 search.c \
62 stats.c \
63 stream.c \
64 sumset.c \
65 trace.c \
66 tube.c \
67 util.c \
68 version.c \
69 whole.c
70 OBJECTS =base64.o \
71 buf.o \
72 checksum.o \
73 command.o \
74 delta.o \
75 emit.o \
76 fileutil.o \
77 hex.o \
78 job.o \
79 mdfour.o \
80 mksum.o \
81 msg.o \
82 netint.o \
83 patch.o \
84 prototab.o \
85 readsums.o \
86 scoop.o \
87 search.o \
88 stats.o \
89 stream.o \
90 sumset.o \
91 trace.o \
92 tube.o \
93 util.o \
94 version.o \
95 whole.o
96INTERFACES =
97UICDECLS =
98UICIMPLS =
99 SRCMOC =
100 OBJMOC =
101
102
103####### Implicit rules
104
105.SUFFIXES: .cpp .cxx .cc .C .c
106
107.cpp.o:
108 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
109
110.cxx.o:
111 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
112
113.cc.o:
114 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
115
116.C.o:
117 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
118
119.c.o:
120 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
121
122####### Build rules
123
124
125all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
126
127$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
128 $(SYSCONF_LINK_LIB)
129
130moc: $(SRCMOC)
131
132tmake: Makefile.in
133
134Makefile.in: rsync.pro
135 tmake rsync.pro -o Makefile.in
136
137clean:
138 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
139 -rm -f *~ core
140 -rm -f allmoc.cpp
141
142####### Extension Modules
143
144listpromodules:
145 @echo
146
147listallmodules:
148 @echo
149
150listaddonpromodules:
151 @echo
152
153listaddonentmodules:
154 @echo
155
156
157REQUIRES=
158
159####### Sub-libraries
160
161
162###### Combined headers
163
164
165
166####### Compile
167
168base64.o: base64.c \
169 config.h \
170 config_linux.h \
171 rsync.h
172
173buf.o: buf.c \
174 config.h \
175 config_linux.h \
176 rsync.h \
177 trace.h \
178 buf.h \
179 util.h
180
181checksum.o: checksum.c \
182 config.h \
183 config_linux.h \
184 rsync.h \
185 checksum.h
186
187command.o: command.c \
188 config.h \
189 config_linux.h \
190 rsync.h \
191 command.h
192
193delta.o: delta.c \
194 config.h \
195 config_linux.h \
196 rsync.h \
197 emit.h \
198 stream.h \
199 util.h \
200 sumset.h \
201 job.h \
202 trace.h \
203 checksum.h \
204 search.h \
205 types.h
206
207emit.o: emit.c \
208 config.h \
209 config_linux.h \
210 rsync.h \
211 command.h \
212 protocol.h \
213 trace.h \
214 emit.h \
215 prototab.h \
216 netint.h \
217 sumset.h \
218 job.h
219
220fileutil.o: fileutil.c \
221 config.h \
222 config_linux.h \
223 rsync.h \
224 fileutil.h \
225 trace.h
226
227hex.o: hex.c \
228 config.h \
229 config_linux.h \
230 rsync.h
231
232job.o: job.c \
233 config.h \
234 config_linux.h \
235 rsync.h \
236 stream.h \
237 util.h \
238 sumset.h \
239 job.h \
240 trace.h
241
242mdfour.o: mdfour.c \
243 config.h \
244 config_linux.h \
245 rsync.h \
246 trace.h \
247 types.h
248
249mksum.o: mksum.c \
250 config.h \
251 config_linux.h \
252 rsync.h \
253 stream.h \
254 util.h \
255 sumset.h \
256 job.h \
257 protocol.h \
258 netint.h \
259 trace.h \
260 checksum.h
261
262msg.o: msg.c \
263 config.h \
264 config_linux.h \
265 rsync.h
266
267netint.o: netint.c \
268 config.h \
269 config_linux.h \
270 rsync.h \
271 job.h \
272 netint.h \
273 trace.h \
274 stream.h
275
276patch.o: patch.c \
277 config.h \
278 config_linux.h \
279 rsync.h \
280 util.h \
281 trace.h \
282 protocol.h \
283 netint.h \
284 command.h \
285 sumset.h \
286 prototab.h \
287 stream.h \
288 job.h
289
290prototab.o: prototab.c \
291 config.h \
292 config_linux.h \
293 rsync.h \
294 protocol.h \
295 command.h \
296 prototab.h
297
298readsums.o: readsums.c \
299 config.h \
300 config_linux.h \
301 rsync.h \
302 sumset.h \
303 job.h \
304 trace.h \
305 netint.h \
306 protocol.h \
307 util.h \
308 stream.h
309
310scoop.o: scoop.c \
311 config.h \
312 config_linux.h \
313 rsync.h \
314 job.h \
315 stream.h \
316 trace.h \
317 util.h
318
319search.o: search.c \
320 config.h \
321 config_linux.h \
322 rsync.h \
323 trace.h \
324 util.h \
325 sumset.h \
326 search.h \
327 checksum.h
328
329stats.o: stats.c \
330 config.h \
331 config_linux.h \
332 rsync.h \
333 trace.h
334
335stream.o: stream.c \
336 config.h \
337 config_linux.h \
338 rsync.h \
339 stream.h \
340 util.h \
341 trace.h
342
343sumset.o: sumset.c \
344 config.h \
345 config_linux.h \
346 rsync.h \
347 sumset.h \
348 util.h \
349 trace.h
350
351trace.o: trace.c \
352 config.h \
353 config_linux.h \
354 rsync.h \
355 util.h \
356 trace.h
357
358tube.o: tube.c \
359 config.h \
360 config_linux.h \
361 rsync.h \
362 trace.h \
363 util.h \
364 job.h \
365 stream.h
366
367util.o: util.c \
368 config.h \
369 config_linux.h \
370 util.h \
371 rsync.h \
372 trace.h
373
374version.o: version.c \
375 config.h \
376 config_linux.h \
377 rsync.h
378
379whole.o: whole.c \
380 config.h \
381 config_linux.h \
382 rsync.h \
383 trace.h \
384 fileutil.h \
385 sumset.h \
386 job.h \
387 buf.h \
388 whole.h \
389 util.h
390
391