summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-01-31 18:35:48 (UTC)
committer kergoth <kergoth>2002-01-31 18:35:48 (UTC)
commit2802e5a2b474101a50bf95e707061ca5542876fd (patch) (unidiff)
treea1015514ef9e48df091903cccf0d3174e272f663
parent48a922e687e82dc8ebe2bc3cb17dcaa8dcae62bd (diff)
downloadopie-2802e5a2b474101a50bf95e707061ca5542876fd.zip
opie-2802e5a2b474101a50bf95e707061ca5542876fd.tar.gz
opie-2802e5a2b474101a50bf95e707061ca5542876fd.tar.bz2
*** empty log message ***
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
@@ -1,16 +1,16 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# Configures to build the Qtopia Environment 3# Configures to build the Qtopia Environment
4# 4#
5# Copyright 1999-2000 Trolltech AS. All rights reserved. 5# Copyright 1999-2000 Trolltech AS. All rights reserved.
6# 6#
7 7
8PLATFORM=linux-generic-g++ 8PLATFORM=generic
9SHARING=shared 9SHARING=shared
10DEBUG= 10DEBUG=
11QCONFIGARG= 11QCONFIGARG=
12 12
13touch .test.qpe. 13touch .test.qpe.
14if [ '!' -f ${OPIEDIR}/.test.qpe. ]; 14if [ '!' -f ${OPIEDIR}/.test.qpe. ];
15then 15then
16 rm .test.qpe. 16 rm .test.qpe.
@@ -24,22 +24,19 @@ then
24 echo ' correctly. If you have set $OPIEDIR in your .profile or .login, you ' 24 echo ' correctly. If you have set $OPIEDIR in your .profile or .login, you '
25 echo ' will need to log out and log in again to make the setting effective.' 25 echo ' will need to log out and log in again to make the setting effective.'
26 echo 26 echo
27 echo 27 echo
28 exit 1 28 exit 1
29fi 29fi
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=
40 37
41if grep -q 'VERSION_STR.*"3' $QTDIR/include/qglobal.h 38if grep -q 'VERSION_STR.*"3' $QTDIR/include/qglobal.h
42then 39then
43 QT3=yes 40 QT3=yes
44else 41else
45 QT3=no 42 QT3=no
@@ -112,16 +109,24 @@ each option:
112 109
113 -qt3 ............... Configure for use with Qt 3.x 110 -qt3 ............... Configure for use with Qt 3.x
114 111
115 -platform target ... The platform you are building on ($PLATFORM) 112 -platform target ... The platform you are building on ($PLATFORM)
116EOF 113EOF
117 exit 0; 114 exit 0;
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...
122 127
123sed -e 's/^\(VERSION.*= \).*/\1'$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT/ <library/library.pro >library/library.pro-v 128sed -e 's/^\(VERSION.*= \).*/\1'$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT/ <library/library.pro >library/library.pro-v
124mv library/library.pro-v library/library.pro 129mv library/library.pro-v library/library.pro
125 130
126if [ "$QT3" = yes ] 131if [ "$QT3" = yes ]
127then 132then
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
@@ -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$(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)
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/applets/ 17DESTDIR = ../../plugins/applets/
@@ -60,18 +60,20 @@ OBJMOC = moc_clipboard.o
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: 68tmake: Makefile.in
69 tmake clipboardapplet.pro 69
70Makefile.in: clipboardapplet.pro
71 tmake clipboardapplet.pro -o Makefile.in
70 72
71clean: 73clean:
72 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 74 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
73 -rm -f *~ core 75 -rm -f *~ core
74 -rm -f allmoc.cpp 76 -rm -f allmoc.cpp
75 77
76####### Extension Modules 78####### Extension Modules
77 79
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
@@ -94,18 +94,20 @@ 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: 102tmake: Makefile.in
103 tmake embeddedkonsole.pro 103
104Makefile.in: embeddedkonsole.pro
105 tmake embeddedkonsole.pro -o Makefile.in
104 106
105clean: 107clean:
106 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 108 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
107 -rm -f *~ core 109 -rm -f *~ core
108 -rm -f allmoc.cpp 110 -rm -f allmoc.cpp
109 111
110####### Extension Modules 112####### Extension Modules
111 113
@@ -178,24 +180,19 @@ session.o: session.cpp \
178 TEmuVt102.h \ 180 TEmuVt102.h \
179 TEScreen.h \ 181 TEScreen.h \
180 TEHistory.h \ 182 TEHistory.h \
181 TEmulation.h \ 183 TEmulation.h \
182 keytrans.h 184 keytrans.h
183 185
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 \
196 TEWidget.h \ 193 TEWidget.h \
197 TECommon.h \ 194 TECommon.h \
198 TEmuVt102.h \ 195 TEmuVt102.h \
199 TEScreen.h \ 196 TEScreen.h \
200 TEHistory.h \ 197 TEHistory.h \
201 TEmulation.h \ 198 TEmulation.h \
@@ -207,18 +204,17 @@ main.o: main.cpp \
207 MyPty.h \ 204 MyPty.h \
208 TEWidget.h \ 205 TEWidget.h \
209 TECommon.h \ 206 TECommon.h \
210 TEmuVt102.h \ 207 TEmuVt102.h \
211 TEScreen.h \ 208 TEScreen.h \
212 TEHistory.h \ 209 TEHistory.h \
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 \
219 MyPty.h 215 MyPty.h
220 216
221moc_TEWidget.o: moc_TEWidget.cpp \ 217moc_TEWidget.o: moc_TEWidget.cpp \
222 TEWidget.h \ 218 TEWidget.h \
223 TECommon.h 219 TECommon.h
224 220
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
@@ -1,16 +1,17 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 2
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 4
5 DESTDIR = $(OPIEDIR)/bin 5 DESTDIR = $(OPIEDIR)/bin
6 6
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 \
11 taskbar.h \ 12 taskbar.h \
12 sidething.h \ 13 sidething.h \
13 mrulist.h \ 14 mrulist.h \
14 stabmon.h \ 15 stabmon.h \
15 inputmethods.h \ 16 inputmethods.h \
16 systray.h \ 17 systray.h \
@@ -41,16 +42,17 @@ HEADERS = background.h \
41 $(OPIEDIR)/rsync/util.h \ 42 $(OPIEDIR)/rsync/util.h \
42 $(OPIEDIR)/rsync/whole.h \ 43 $(OPIEDIR)/rsync/whole.h \
43 $(OPIEDIR)/rsync/config_rsync.h \ 44 $(OPIEDIR)/rsync/config_rsync.h \
44 $(OPIEDIR)/rsync/qrsync.h 45 $(OPIEDIR)/rsync/qrsync.h
45 # quicklauncher.h \ 46 # quicklauncher.h \
46 47
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 \
51 taskbar.cpp \ 53 taskbar.cpp \
52 sidething.cpp \ 54 sidething.cpp \
53 mrulist.cpp \ 55 mrulist.cpp \
54 stabmon.cpp \ 56 stabmon.cpp \
55 inputmethods.cpp \ 57 inputmethods.cpp \
56 systray.cpp \ 58 systray.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
@@ -207,20 +207,18 @@ public:
207 } 207 }
208 208
209 int compare(const AppLnk* a, const AppLnk* b) 209 int compare(const AppLnk* a, const AppLnk* b)
210 { 210 {
211 switch (sortmeth) { 211 switch (sortmeth) {
212 case Name: 212 case Name:
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 }
221 case Type: 219 case Type:
222 return a->type().compare(b->type()); 220 return a->type().compare(b->type());
223 } 221 }
224 return 0; 222 return 0;
225 } 223 }
226 224
@@ -357,47 +355,56 @@ void LauncherIconView::hideOrShowItems(bool resort)
357 QList<AppLnk> links=hidden; 355 QList<AppLnk> links=hidden;
358 hidden.clear(); 356 hidden.clear();
359 hidden.setAutoDelete(TRUE); 357 hidden.setAutoDelete(TRUE);
360 LauncherItem* item = (LauncherItem*)firstItem(); 358 LauncherItem* item = (LauncherItem*)firstItem();
361 while (item) { 359 while (item) {
362 links.append(item->takeAppLnk()); 360 links.append(item->takeAppLnk());
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);
367 AppLnk* l; 367 AppLnk* l;
368 while ((l=it.current())) { 368 while ((l=it.current())) {
369 addItem(l,FALSE); 369 addItem(l,FALSE);
370 ++it; 370 ++it;
371 } 371 }
372 if ( resort ) 372 if ( resort )
373 sort(); 373 sort();
374 setAutoArrange( oldAutoArrange );
374} 375}
375 376
376bool LauncherIconView::removeLink(const QString& linkfile) 377bool 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
398LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl ) 405LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl )
399 : QVBox( parent, name, fl ) 406 : QVBox( parent, name, fl )
400{ 407{
401 icons = new LauncherIconView( this ); 408 icons = new LauncherIconView( this );
402 setFocusProxy(icons); 409 setFocusProxy(icons);
403 QPEApplication::setStylusOperation( icons->viewport(), QPEApplication::RightOnHold ); 410 QPEApplication::setStylusOperation( icons->viewport(), QPEApplication::RightOnHold );
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
@@ -95,18 +95,20 @@ 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: 103tmake: Makefile.in
104 tmake mpegplayer.pro 104
105Makefile.in: mpegplayer.pro
106 tmake mpegplayer.pro -o Makefile.in
105 107
106clean: 108clean:
107 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 109 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
108 -rm -f *~ core 110 -rm -f *~ core
109 -rm -f allmoc.cpp 111 -rm -f allmoc.cpp
110 112
111####### Extension Modules 113####### Extension Modules
112 114
@@ -130,130 +132,82 @@ REQUIRES=
130 132
131###### Combined headers 133###### Combined headers
132 134
133 135
134 136
135####### Compile 137####### Compile
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 \
176 libmpeg3/libmpeg3pluginimpl.h \ 159 libmpeg3/libmpeg3pluginimpl.h \
177 wavplugin/wavpluginimpl.h 160 wavplugin/wavpluginimpl.h
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 \
202 mediaplayerstate.h 173 mediaplayerstate.h
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 \
217 audiodevice.h \ 180 audiodevice.h \
218 mediaplayerstate.h 181 mediaplayerstate.h
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 \
227 loopcontrol.h 187 loopcontrol.h
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 \
234 mediaplayerstate.h 193 mediaplayerstate.h
235 194
236moc_videowidget.o: moc_videowidget.cpp \ 195moc_videowidget.o: moc_videowidget.cpp \
237 videowidget.h 196 videowidget.h
238 197
239moc_audiowidget.o: moc_audiowidget.cpp \ 198moc_audiowidget.o: moc_audiowidget.cpp \
240 audiowidget.h 199 audiowidget.h
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 \
254 audiodevice.h 208 audiodevice.h
255 209
256moc_loopcontrol.cpp: loopcontrol.h 210moc_loopcontrol.cpp: loopcontrol.h
257 $(MOC) loopcontrol.h -o moc_loopcontrol.cpp 211 $(MOC) loopcontrol.h -o moc_loopcontrol.cpp
258 212
259moc_playlistselection.cpp: playlistselection.h 213moc_playlistselection.cpp: playlistselection.h
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
@@ -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$(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)
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/codecs/ 17DESTDIR = ../../plugins/codecs/
@@ -140,25 +140,22 @@ REQUIRES=
140###### Combined headers 140###### Combined headers
141 141
142 142
143 143
144####### Compile 144####### Compile
145 145
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 \
159 swf.h \ 156 swf.h \
160 flash.h \ 157 flash.h \
161 matrix.h \ 158 matrix.h \
162 cxform.h \ 159 cxform.h \
163 rect.h \ 160 rect.h \
164 jpeglib.h \ 161 jpeglib.h \
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
@@ -95,18 +95,20 @@ 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: 103tmake: Makefile.in
104 tmake libmad.pro 104
105Makefile.in: libmad.pro
106 tmake libmad.pro -o Makefile.in
105 107
106clean: 108clean:
107 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 109 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
108 -rm -f *~ core 110 -rm -f *~ core
109 -rm -f allmoc.cpp 111 -rm -f allmoc.cpp
110 112
111####### Extension Modules 113####### Extension Modules
112 114
@@ -209,18 +211,15 @@ layer3.o: layer3.c \
209 imdct_s.dat 211 imdct_s.dat
210 212
211huffman.o: huffman.c \ 213huffman.o: huffman.c \
212 libmad_global.h \ 214 libmad_global.h \
213 huffman.h 215 huffman.h
214 216
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
@@ -124,18 +124,20 @@ 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: 132tmake: Makefile.in
133 tmake libmpeg3.pro 133
134Makefile.in: libmpeg3.pro
135 tmake libmpeg3.pro -o Makefile.in
134 136
135clean: 137clean:
136 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 138 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
137 -rm -f *~ core 139 -rm -f *~ core
138 -rm -f allmoc.cpp 140 -rm -f allmoc.cpp
139 141
140####### Extension Modules 142####### Extension Modules
141 143
@@ -171,36 +173,33 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \
171 mpeg3demux.h \ 173 mpeg3demux.h \
172 mpeg3title.h \ 174 mpeg3title.h \
173 mpeg3io.h \ 175 mpeg3io.h \
174 mpeg3css.h \ 176 mpeg3css.h \
175 mpeg3private.inc \ 177 mpeg3private.inc \
176 audio/mpeg3audio.h \ 178 audio/mpeg3audio.h \
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 \
183 libmpeg3plugin.h \ 184 libmpeg3plugin.h \
184 libmpeg3.h \ 185 libmpeg3.h \
185 mpeg3private.h \ 186 mpeg3private.h \
186 mpeg3atrack.h \ 187 mpeg3atrack.h \
187 mpeg3demux.h \ 188 mpeg3demux.h \
188 mpeg3title.h \ 189 mpeg3title.h \
189 mpeg3io.h \ 190 mpeg3io.h \
190 mpeg3css.h \ 191 mpeg3css.h \
191 mpeg3private.inc \ 192 mpeg3private.inc \
192 audio/mpeg3audio.h \ 193 audio/mpeg3audio.h \
193 mpeg3vtrack.h \ 194 mpeg3vtrack.h \
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 \
201 mpeg3private.h \ 200 mpeg3private.h \
202 mpeg3atrack.h \ 201 mpeg3atrack.h \
203 mpeg3demux.h \ 202 mpeg3demux.h \
204 mpeg3title.h \ 203 mpeg3title.h \
205 mpeg3io.h \ 204 mpeg3io.h \
206 mpeg3css.h \ 205 mpeg3css.h \
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
@@ -60,18 +60,20 @@ 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: 68tmake: Makefile.in
69 tmake wavplugin.pro 69
70Makefile.in: wavplugin.pro
71 tmake wavplugin.pro -o Makefile.in
70 72
71clean: 73clean:
72 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 74 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
73 -rm -f *~ core 75 -rm -f *~ core
74 -rm -f allmoc.cpp 76 -rm -f allmoc.cpp
75 77
76####### Extension Modules 78####### Extension Modules
77 79
@@ -95,18 +97,15 @@ REQUIRES=
95 97
96###### Combined headers 98###### Combined headers
97 99
98 100
99 101
100####### Compile 102####### Compile
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
@@ -119,18 +119,20 @@ 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: 127tmake: Makefile.in
128 tmake datebook.pro 128
129Makefile.in: datebook.pro
130 tmake datebook.pro -o Makefile.in
129 131
130clean: 132clean:
131 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 133 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
132 -rm -f *~ core 134 -rm -f *~ core
133 -rm -f allmoc.cpp 135 -rm -f allmoc.cpp
134 136
135####### Extension Modules 137####### Extension Modules
136 138
@@ -154,124 +156,58 @@ REQUIRES=
154 156
155###### Combined headers 157###### Combined headers
156 158
157 159
158 160
159####### Compile 161####### Compile
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 \
193 datebooksettingsbase.h \ 175 datebooksettingsbase.h \
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 \
257 datebookweekheaderimpl.h \ 200 datebookweekheaderimpl.h \
258 datebookweekheader.h 201 datebookweekheader.h
259 202
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
272 $(UIC) dateentry.ui -o $(INTERFACE_DECL_PATH)/dateentry.h 208 $(UIC) dateentry.ui -o $(INTERFACE_DECL_PATH)/dateentry.h
273 209
274dateentry.cpp: dateentry.ui 210dateentry.cpp: dateentry.ui
275 $(UIC) dateentry.ui -i dateentry.h -o dateentry.cpp 211 $(UIC) dateentry.ui -i dateentry.h -o dateentry.cpp
276 212
277datebookdayheader.h: datebookdayheader.ui 213datebookdayheader.h: datebookdayheader.ui
@@ -304,60 +240,39 @@ datebookdayheader.o: datebookdayheader.cpp
304 240
305datebooksettingsbase.o: datebooksettingsbase.cpp 241datebooksettingsbase.o: datebooksettingsbase.cpp
306 242
307datebookweekheader.o: datebookweekheader.cpp 243datebookweekheader.o: datebookweekheader.cpp
308 244
309repeatentrybase.o: repeatentrybase.cpp 245repeatentrybase.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 \
335 datebookdayheaderimpl.h \ 258 datebookdayheaderimpl.h \
336 datebookdayheader.h 259 datebookdayheader.h
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 \
346 datebookweekheaderimpl.h \ 265 datebookweekheaderimpl.h \
347 datebookweekheader.h 266 datebookweekheader.h
348 267
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 \
358 dateentry.h 273 dateentry.h
359 274
360moc_datebookdayheader.o: moc_datebookdayheader.cpp \ 275moc_datebookdayheader.o: moc_datebookdayheader.cpp \
361 datebookdayheader.h 276 datebookdayheader.h
362 277
363moc_datebooksettingsbase.o: moc_datebooksettingsbase.cpp \ 278moc_datebooksettingsbase.o: moc_datebooksettingsbase.cpp \
diff --git a/docs/start.doc b/docs/start.doc
index 01b6ab1..53a4e36 100644
--- a/docs/start.doc
+++ b/docs/start.doc
@@ -53,28 +53,28 @@ To compile the example program for running on the Linux desktop:
53 53
54<ol> 54<ol>
55 <li> 55 <li>
56 <p> 56 <p>
57 Check the environment is correct: 57 Check the environment is correct:
58 58
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
68 <li> Take a copy of the example: 68 <li> Take a copy of the example:
69 69
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>
75 75
76 <li> Generate a Makefile: 76 <li> Generate a Makefile:
77 77
78<pre> 78<pre>
79 tmake -o Makefile example.pro 79 tmake -o Makefile example.pro
80</pre> 80</pre>
@@ -84,19 +84,19 @@ To compile the example program for running on the Linux desktop:
84<pre> 84<pre>
85 make 85 make
86</pre> 86</pre>
87 87
88 <li> Install it: 88 <li> Install it:
89 89
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>
97 97
98 <li> To run it, first run the Qt Virtual Framebuffer: 98 <li> To run it, first run the Qt Virtual Framebuffer:
99 99
100<pre> 100<pre>
101 qvfb &amp; 101 qvfb &amp;
102</pre> 102</pre>
@@ -130,34 +130,49 @@ on the desktop, the process is similar:
130 130
131<ol> 131<ol>
132 <li> 132 <li>
133 <p> 133 <p>
134 Check the environment is correctly set for the SHARP SL5000: 134 Check the environment is correctly set for the SHARP SL5000:
135 135
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
158<p> 173<p>
159 The resulting <tt>example-1.0.0.ipk</tt> can be installed on the 174 The resulting <tt>example-1.0.0.ipk</tt> can be installed on the
160SL5000 by using <i>Qtopia Desktop</i>. 175SL5000 by using <i>Qtopia Desktop</i>.
161</p> 176</p>
162 177
163</ol> 178</ol>
diff --git a/library/Makefile.in b/library/Makefile.in
index b74b818..b8fc1f6 100644
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -26,22 +26,22 @@ TARGET1 = lib$(TARGET).so.$(VER_MAJ)
26 HEADERS =calendar.h \ 26 HEADERS =calendar.h \
27 global.h \ 27 global.h \
28 resource.h \ 28 resource.h \
29 xmlreader.h \ 29 xmlreader.h \
30 mimetype.h \ 30 mimetype.h \
31 menubutton.h \ 31 menubutton.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 \
37 qdawg.h \ 36 qdawg.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 \
42 qpedecoration_qws.h \ 42 qpedecoration_qws.h \
43 qpeapplication.h \ 43 qpeapplication.h \
44 qpestyle.h \ 44 qpestyle.h \
45 qpedialog.h \ 45 qpedialog.h \
46 lightstyle.h \ 46 lightstyle.h \
47 config.h \ 47 config.h \
@@ -73,30 +73,24 @@ 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 \
86 qprocess.h
87 SOURCES =calendar.cpp \ 82 SOURCES =calendar.cpp \
88 global.cpp \ 83 global.cpp \
89 xmlreader.cpp \ 84 xmlreader.cpp \
90 mimetype.cpp \ 85 mimetype.cpp \
91 menubutton.cpp \ 86 menubutton.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 \
97 qdawg.cpp \ 91 qdawg.cpp \
98 datebookmonth.cpp \ 92 datebookmonth.cpp \
99 fileselector.cpp \ 93 fileselector.cpp \
100 imageedit.cpp \ 94 imageedit.cpp \
101 resource.cpp \ 95 resource.cpp \
102 qpedecoration_qws.cpp \ 96 qpedecoration_qws.cpp \
@@ -134,30 +128,24 @@ SOURCES = calendar.cpp \
134 categoryedit_p.cpp \ 128 categoryedit_p.cpp \
135 categoryselect.cpp \ 129 categoryselect.cpp \
136 categorywidget.cpp \ 130 categorywidget.cpp \
137 ir.cpp \ 131 ir.cpp \
138 backend/vcc_yacc.cpp \ 132 backend/vcc_yacc.cpp \
139 backend/vobject.cpp \ 133 backend/vobject.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 \
150 xmlreader.o \ 139 xmlreader.o \
151 mimetype.o \ 140 mimetype.o \
152 menubutton.o \ 141 menubutton.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 \
158 qdawg.o \ 146 qdawg.o \
159 datebookmonth.o \ 147 datebookmonth.o \
160 fileselector.o \ 148 fileselector.o \
161 imageedit.o \ 149 imageedit.o \
162 resource.o \ 150 resource.o \
163 qpedecoration_qws.o \ 151 qpedecoration_qws.o \
@@ -196,45 +184,36 @@ OBJECTS = calendar.o \
196 categoryselect.o \ 184 categoryselect.o \
197 categorywidget.o \ 185 categorywidget.o \
198 ir.o \ 186 ir.o \
199 backend/vcc_yacc.o \ 187 backend/vcc_yacc.o \
200 backend/vobject.o \ 188 backend/vobject.o \
201 findwidget_p.o \ 189 findwidget_p.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 \
235 moc_qpeapplication.cpp \ 214 moc_qpeapplication.cpp \
236 moc_qpedialog.cpp \ 215 moc_qpedialog.cpp \
237 moc_tzselect.cpp \ 216 moc_tzselect.cpp \
238 moc_process.cpp \ 217 moc_process.cpp \
239 moc_storage.cpp \ 218 moc_storage.cpp \
240 moc_qpemenubar.cpp \ 219 moc_qpemenubar.cpp \
@@ -242,33 +221,29 @@ SRCMOC = moc_menubutton.cpp \
242 backend/moc_categories.cpp \ 221 backend/moc_categories.cpp \
243 moc_categorymenu.cpp \ 222 moc_categorymenu.cpp \
244 moc_categoryedit_p.cpp \ 223 moc_categoryedit_p.cpp \
245 moc_categoryselect.cpp \ 224 moc_categoryselect.cpp \
246 moc_ir.cpp \ 225 moc_ir.cpp \
247 moc_findwidget_p.cpp \ 226 moc_findwidget_p.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 \
254 password.moc \ 231 password.moc \
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 \
269 moc_qpeapplication.o \ 244 moc_qpeapplication.o \
270 moc_qpedialog.o \ 245 moc_qpedialog.o \
271 moc_tzselect.o \ 246 moc_tzselect.o \
272 moc_process.o \ 247 moc_process.o \
273 moc_storage.o \ 248 moc_storage.o \
274 moc_qpemenubar.o \ 249 moc_qpemenubar.o \
@@ -276,20 +251,17 @@ OBJMOC = moc_menubutton.o \
276 backend/moc_categories.o \ 251 backend/moc_categories.o \
277 moc_categorymenu.o \ 252 moc_categorymenu.o \
278 moc_categoryedit_p.o \ 253 moc_categoryedit_p.o \
279 moc_categoryselect.o \ 254 moc_categoryselect.o \
280 moc_ir.o \ 255 moc_ir.o \
281 moc_findwidget_p.o \ 256 moc_findwidget_p.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 \
290 moc_lnkpropertiesbase_p.o 262 moc_lnkpropertiesbase_p.o
291 263
292 264
293####### Implicit rules 265####### Implicit rules
294 266
295.SUFFIXES: .cpp .cxx .cc .C .c 267.SUFFIXES: .cpp .cxx .cc .C .c
@@ -314,18 +286,20 @@ OBJMOC = moc_menubutton.o \
314 286
315all: $(DESTDIR)$(SYSCONF_LINK_TARGET) 287all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
316 288
317$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 289$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
318 $(SYSCONF_LINK_LIB) 290 $(SYSCONF_LINK_LIB)
319 291
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:
326 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 300 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
327 -rm -f *~ core 301 -rm -f *~ core
328 -rm -f allmoc.cpp 302 -rm -f allmoc.cpp
329 303
330####### Extension Modules 304####### Extension Modules
331 305
@@ -376,21 +350,16 @@ menubutton.o: menubutton.cpp \
376network.o: network.cpp \ 350network.o: network.cpp \
377 network.moc 351 network.moc
378 352
379networkinterface.o: networkinterface.cpp \ 353networkinterface.o: networkinterface.cpp \
380 networkinterface.h \ 354 networkinterface.h \
381 network.h \ 355 network.h \
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 \
391 applnk.h 360 applnk.h
392 361
393fontmanager.o: fontmanager.cpp \ 362fontmanager.o: fontmanager.cpp \
394 fontmanager.h 363 fontmanager.h
395 364
396qdawg.o: qdawg.cpp \ 365qdawg.o: qdawg.cpp \
@@ -405,16 +374,17 @@ datebookmonth.o: datebookmonth.cpp \
405 resource.h \ 374 resource.h \
406 qpeapplication.h \ 375 qpeapplication.h \
407 qpedecoration_qws.h 376 qpedecoration_qws.h
408 377
409fileselector.o: fileselector.cpp \ 378fileselector.o: fileselector.cpp \
410 fileselector.h \ 379 fileselector.h \
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 \
415 config.h \ 385 config.h \
416 storage.h \ 386 storage.h \
417 qpemenubar.h \ 387 qpemenubar.h \
418 lnkproperties.h \ 388 lnkproperties.h \
419 qpeapplication.h \ 389 qpeapplication.h \
420 qpedecoration_qws.h \ 390 qpedecoration_qws.h \
@@ -529,18 +499,17 @@ timestring.o: timestring.cpp \
529fontdatabase.o: fontdatabase.cpp \ 499fontdatabase.o: fontdatabase.cpp \
530 qpeapplication.h \ 500 qpeapplication.h \
531 qpedecoration_qws.h \ 501 qpedecoration_qws.h \
532 timestring.h \ 502 timestring.h \
533 fontfactoryinterface.h \ 503 fontfactoryinterface.h \
534 fontdatabase.h 504 fontdatabase.h
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
541 510
542qpemessagebox.o: qpemessagebox.cpp \ 511qpemessagebox.o: qpemessagebox.cpp \
543 qpemessagebox.h 512 qpemessagebox.h
544 513
545backend/timeconversion.o: backend/timeconversion.cpp \ 514backend/timeconversion.o: backend/timeconversion.cpp \
546 backend/timeconversion.h 515 backend/timeconversion.h
@@ -628,47 +597,22 @@ finddialog.o: finddialog.cpp \
628 findwidget_p.h \ 597 findwidget_p.h \
629 findwidgetbase_p.h 598 findwidgetbase_p.h
630 599
631lnkproperties.o: lnkproperties.cpp \ 600lnkproperties.o: lnkproperties.cpp \
632 lnkproperties.h \ 601 lnkproperties.h \
633 lnkpropertiesbase_p.h \ 602 lnkpropertiesbase_p.h \
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
657 607
658passwordbase_p.cpp: passwordbase_p.ui 608passwordbase_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
669 613
670categoryeditbase_p.cpp: categoryeditbase_p.ui 614categoryeditbase_p.cpp: categoryeditbase_p.ui
671 $(UIC) categoryeditbase_p.ui -i categoryeditbase_p.h -o categoryeditbase_p.cpp 615 $(UIC) categoryeditbase_p.ui -i categoryeditbase_p.h -o categoryeditbase_p.cpp
672 616
673findwidgetbase_p.h: findwidgetbase_p.ui 617findwidgetbase_p.h: findwidgetbase_p.ui
674 $(UIC) findwidgetbase_p.ui -o $(INTERFACE_DECL_PATH)/findwidgetbase_p.h 618 $(UIC) findwidgetbase_p.ui -o $(INTERFACE_DECL_PATH)/findwidgetbase_p.h
@@ -679,41 +623,38 @@ findwidgetbase_p.cpp: findwidgetbase_p.ui
679lnkpropertiesbase_p.h: lnkpropertiesbase_p.ui 623lnkpropertiesbase_p.h: lnkpropertiesbase_p.ui
680 $(UIC) lnkpropertiesbase_p.ui -o $(INTERFACE_DECL_PATH)/lnkpropertiesbase_p.h 624 $(UIC) lnkpropertiesbase_p.ui -o $(INTERFACE_DECL_PATH)/lnkpropertiesbase_p.h
681 625
682lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui 626lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui
683 $(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp 627 $(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp
684 628
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
691findwidgetbase_p.o: findwidgetbase_p.cpp 633findwidgetbase_p.o: findwidgetbase_p.cpp
692 634
693lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp 635lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp
694 636
695moc_menubutton.o: moc_menubutton.cpp \ 637moc_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 \
704 calendar.h \ 642 calendar.h \
705 timestring.h 643 timestring.h
706 644
707moc_fileselector.o: moc_fileselector.cpp \ 645moc_fileselector.o: moc_fileselector.cpp \
708 fileselector.h \ 646 fileselector.h \
709 filemanager.h \ 647 filemanager.h \
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
714 655
715moc_qpedecoration_qws.o: moc_qpedecoration_qws.cpp \ 656moc_qpedecoration_qws.o: moc_qpedecoration_qws.cpp \
716 qpedecoration_qws.h 657 qpedecoration_qws.h
717 658
718moc_qpeapplication.o: moc_qpeapplication.cpp \ 659moc_qpeapplication.o: moc_qpeapplication.cpp \
719 qpeapplication.h \ 660 qpeapplication.h \
@@ -761,60 +702,46 @@ moc_findwidget_p.o: moc_findwidget_p.cpp \
761 findwidgetbase_p.h 702 findwidgetbase_p.h
762 703
763moc_finddialog.o: moc_finddialog.cpp \ 704moc_finddialog.o: moc_finddialog.cpp \
764 finddialog.h 705 finddialog.h
765 706
766moc_lnkproperties.o: moc_lnkproperties.cpp \ 707moc_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 \
785 config.h \ 719 config.h \
786 global.h \ 720 global.h \
787 backend/contact.h \ 721 backend/contact.h \
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
809 733
810moc_fileselector.cpp: fileselector.h 734moc_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
815 742
816moc_qpedecoration_qws.cpp: qpedecoration_qws.h 743moc_qpedecoration_qws.cpp: qpedecoration_qws.h
817 $(MOC) qpedecoration_qws.h -o moc_qpedecoration_qws.cpp 744 $(MOC) qpedecoration_qws.h -o moc_qpedecoration_qws.cpp
818 745
819moc_qpeapplication.cpp: qpeapplication.h 746moc_qpeapplication.cpp: qpeapplication.h
820 $(MOC) qpeapplication.h -o moc_qpeapplication.cpp 747 $(MOC) qpeapplication.h -o moc_qpeapplication.cpp
@@ -856,46 +783,34 @@ moc_findwidget_p.cpp: findwidget_p.h
856 $(MOC) findwidget_p.h -o moc_findwidget_p.cpp 783 $(MOC) findwidget_p.h -o moc_findwidget_p.cpp
857 784
858moc_finddialog.cpp: finddialog.h 785moc_finddialog.cpp: finddialog.h
859 $(MOC) finddialog.h -o moc_finddialog.cpp 786 $(MOC) finddialog.h -o moc_finddialog.cpp
860 787
861moc_lnkproperties.cpp: lnkproperties.h 788moc_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
872 793
873network.moc: network.cpp 794network.moc: network.cpp
874 $(MOC) network.cpp -o network.moc 795 $(MOC) network.cpp -o network.moc
875 796
876password.moc: password.cpp 797password.moc: password.cpp
877 $(MOC) password.cpp -o password.moc 798 $(MOC) password.cpp -o password.moc
878 799
879process_unix.moc: process_unix.cpp 800process_unix.moc: process_unix.cpp
880 $(MOC) process_unix.cpp -o process_unix.moc 801 $(MOC) process_unix.cpp -o process_unix.moc
881 802
882timestring.moc: timestring.cpp 803timestring.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
896 811
897moc_findwidgetbase_p.cpp: findwidgetbase_p.h 812moc_findwidgetbase_p.cpp: findwidgetbase_p.h
898 $(MOC) findwidgetbase_p.h -o moc_findwidgetbase_p.cpp 813 $(MOC) findwidgetbase_p.h -o moc_findwidgetbase_p.cpp
899 814
900moc_lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.h 815moc_lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.h
901 $(MOC) lnkpropertiesbase_p.h -o moc_lnkpropertiesbase_p.cpp 816 $(MOC) lnkpropertiesbase_p.h -o moc_lnkpropertiesbase_p.cpp
diff --git a/library/global.cpp b/library/global.cpp
index e5fc2b3..fd7579a 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -500,17 +500,17 @@ void Global::invoke(const QString &c)
500 { 500 {
501 if ( !::vfork() ) { 501 if ( !::vfork() ) {
502 for ( int fd = 3; fd < 100; fd++ ) 502 for ( int fd = 3; fd < 100; fd++ )
503 ::close( fd ); 503 ::close( fd );
504 ::setpgid( ::getpid(), ::getppid() ); 504 ::setpgid( ::getpid(), ::getppid() );
505 // Try bindir first, so that foo/bar works too 505 // Try bindir first, so that foo/bar works too
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 }
511 StartingAppList::add( list[0] ); 511 StartingAppList::add( list[0] );
512#endif //QT_NO_QWS_MULTIPROCESS 512#endif //QT_NO_QWS_MULTIPROCESS
513} 513}
514 514
515/*! 515/*!
516 Executes application identfied by \a c, passing \a document. 516 Executes application identfied by \a c, passing \a document.
diff --git a/library/library.pro b/library/library.pro
index 058d216..e71e5a0 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -3,22 +3,22 @@ CONFIG += qt warn_on release
3 HEADERS= calendar.h \ 3 HEADERS= calendar.h \
4 global.h \ 4 global.h \
5 resource.h \ 5 resource.h \
6 xmlreader.h \ 6 xmlreader.h \
7 mimetype.h \ 7 mimetype.h \
8 menubutton.h \ 8 menubutton.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 \
14 qdawg.h \ 13 qdawg.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 \
19 qpedecoration_qws.h \ 19 qpedecoration_qws.h \
20 qpeapplication.h \ 20 qpeapplication.h \
21 qpestyle.h \ 21 qpestyle.h \
22 qpedialog.h \ 22 qpedialog.h \
23 lightstyle.h \ 23 lightstyle.h \
24 config.h \ 24 config.h \
@@ -59,17 +59,16 @@ HEADERS = calendar.h \
59 59
60 SOURCES= calendar.cpp \ 60 SOURCES= calendar.cpp \
61 global.cpp \ 61 global.cpp \
62 xmlreader.cpp \ 62 xmlreader.cpp \
63 mimetype.cpp \ 63 mimetype.cpp \
64 menubutton.cpp \ 64 menubutton.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 \
70 qdawg.cpp \ 69 qdawg.cpp \
71 datebookmonth.cpp \ 70 datebookmonth.cpp \
72 fileselector.cpp \ 71 fileselector.cpp \
73 imageedit.cpp \ 72 imageedit.cpp \
74 resource.cpp \ 73 resource.cpp \
75 qpedecoration_qws.cpp \ 74 qpedecoration_qws.cpp \
@@ -110,23 +109,22 @@ SOURCES = calendar.cpp \
110 ir.cpp \ 109 ir.cpp \
111 backend/vcc_yacc.cpp \ 110 backend/vcc_yacc.cpp \
112 backend/vobject.cpp \ 111 backend/vobject.cpp \
113 findwidget_p.cpp \ 112 findwidget_p.cpp \
114 finddialog.cpp \ 113 finddialog.cpp \
115 lnkproperties.cpp 114 lnkproperties.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
128 DESTDIR = $(QTDIR)/lib$(PROJMAK) 126 DESTDIR = $(QTDIR)/lib$(PROJMAK)
129# This is set by configure$(OPIEDIR). 127# This is set by configure$(OPIEDIR).
130 VERSION = 1.5.0 128 VERSION = 1.5.0
131 129
132TRANSLATIONS = ../i18n/de/libqpe.ts 130TRANSLATIONS = ../i18n/de/libqpe.ts
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
@@ -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) -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)
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/
@@ -62,18 +62,20 @@ OBJMOC = moc_chess.o \
62 62
63all: $(DESTDIR)$(TARGET) 63all: $(DESTDIR)$(TARGET)
64 64
65$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 65$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
66 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 66 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
67 67
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:
74 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 76 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
75 -rm -f *~ core 77 -rm -f *~ core
76 -rm -f allmoc.cpp 78 -rm -f allmoc.cpp
77 79
78####### Extension Modules 80####### Extension Modules
79 81
@@ -97,22 +99,20 @@ REQUIRES=
97 99
98###### Combined headers 100###### Combined headers
99 101
100 102
101 103
102####### Compile 104####### Compile
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
113 $(UIC) mainwindow.ui -o $(INTERFACE_DECL_PATH)/mainwindow.h 113 $(UIC) mainwindow.ui -o $(INTERFACE_DECL_PATH)/mainwindow.h
114 114
115mainwindow.cpp: mainwindow.ui 115mainwindow.cpp: mainwindow.ui
116 $(UIC) mainwindow.ui -i mainwindow.h -o mainwindow.cpp 116 $(UIC) mainwindow.ui -i mainwindow.h -o mainwindow.cpp
117 117
118mainwindow.o: mainwindow.cpp \ 118mainwindow.o: mainwindow.cpp \
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
@@ -70,18 +70,20 @@ 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: 78tmake: Makefile.in
79 tmake go.pro 79
80Makefile.in: go.pro
81 tmake go.pro -o Makefile.in
80 82
81clean: 83clean:
82 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 84 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
83 -rm -f *~ core 85 -rm -f *~ core
84 -rm -f allmoc.cpp 86 -rm -f allmoc.cpp
85 87
86####### Extension Modules 88####### Extension Modules
87 89
@@ -128,28 +130,23 @@ killable.o: killable.c \
128 go.h \ 130 go.h \
129 goplayutils.h \ 131 goplayutils.h \
130 amigo.h 132 amigo.h
131 133
132gowidget.o: gowidget.cpp \ 134gowidget.o: gowidget.cpp \
133 gowidget.h \ 135 gowidget.h \
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 \
143 gowidget.h \ 141 gowidget.h \
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 \
150 gowidget.h \ 147 gowidget.h \
151 amigo.h \ 148 amigo.h \
152 go.h \ 149 go.h \
153 goplayutils.h 150 goplayutils.h
154 151
155moc_gowidget.cpp: gowidget.h 152moc_gowidget.cpp: gowidget.h