author | kergoth <kergoth> | 2002-01-31 18:35:48 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-01-31 18:35:48 (UTC) |
commit | 2802e5a2b474101a50bf95e707061ca5542876fd (patch) (unidiff) | |
tree | a1015514ef9e48df091903cccf0d3174e272f663 | |
parent | 48a922e687e82dc8ebe2bc3cb17dcaa8dcae62bd (diff) | |
download | opie-2802e5a2b474101a50bf95e707061ca5542876fd.zip opie-2802e5a2b474101a50bf95e707061ca5542876fd.tar.gz opie-2802e5a2b474101a50bf95e707061ca5542876fd.tar.bz2 |
*** empty log message ***
-rwxr-xr-x | configure | 19 | ||||
-rw-r--r-- | core/applets/clipboardapplet/Makefile.in | 8 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/Makefile.in | 14 | ||||
-rw-r--r-- | core/launcher/launcher.pro | 2 | ||||
-rw-r--r-- | core/launcher/launcherview.cpp | 27 | ||||
-rw-r--r-- | core/multimedia/opieplayer/Makefile.in | 64 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libflash/Makefile.in | 9 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmad/Makefile.in | 11 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmpeg3/Makefile.in | 13 | ||||
-rw-r--r-- | core/multimedia/opieplayer/wavplugin/Makefile.in | 13 | ||||
-rw-r--r-- | core/pim/datebook/Makefile.in | 119 | ||||
-rw-r--r-- | docs/start.doc | 51 | ||||
-rw-r--r-- | library/Makefile.in | 125 | ||||
-rw-r--r-- | library/global.cpp | 2 | ||||
-rw-r--r-- | library/library.pro | 10 | ||||
-rw-r--r-- | noncore/games/chess/Makefile.in | 16 | ||||
-rw-r--r-- | noncore/games/go/Makefile.in | 15 |
17 files changed, 159 insertions, 359 deletions
@@ -5,7 +5,7 @@ | |||
5 | # Copyright 1999-2000 Trolltech AS. All rights reserved. | 5 | # Copyright 1999-2000 Trolltech AS. All rights reserved. |
6 | # | 6 | # |
7 | 7 | ||
8 | PLATFORM=linux-generic-g++ | 8 | PLATFORM=generic |
9 | SHARING=shared | 9 | SHARING=shared |
10 | DEBUG= | 10 | DEBUG= |
11 | QCONFIGARG= | 11 | QCONFIGARG= |
@@ -29,12 +29,9 @@ then | |||
29 | fi | 29 | fi |
30 | rm .test.qpe. | 30 | rm .test.qpe. |
31 | 31 | ||
32 | mkdir -p include/qpe | 32 | VERSION_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; ) | 33 | VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.\([0-9]\)\.[0-9]*.*".*/\1/p' <library/version.h) |
34 | 34 | VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.[0-9]*\.\([0-9]*\).*".*/\1/p' <library/version.h) | |
35 | VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\.[0-9]*\.[0-9]*.*".*/\1/p' <include/qpe/version.h) | ||
36 | VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.\([0-9]\)\.[0-9]*.*".*/\1/p' <include/qpe/version.h) | ||
37 | VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.[0-9]*\.\([0-9]*\).*".*/\1/p' <include/qpe/version.h) | ||
38 | 35 | ||
39 | TOMAKE= | 36 | TOMAKE= |
40 | 37 | ||
@@ -117,6 +114,14 @@ EOF | |||
117 | exit 0; | 114 | exit 0; |
118 | fi | 115 | fi |
119 | 116 | ||
117 | if [ -f library/custom-$PLATFORM.h ] | ||
118 | then | ||
119 | rm -f library/custom.h | ||
120 | ln -s custom-$PLATFORM.h library/custom.h | ||
121 | fi | ||
122 | |||
123 | mkdir -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 | ||
121 | echo Creating makefiles... | 126 | echo Creating makefiles... |
122 | 127 | ||
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 | |||
@@ -6,7 +6,7 @@ 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) |
@@ -65,8 +65,10 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) | |||
65 | 65 | ||
66 | moc: $(SRCMOC) | 66 | moc: $(SRCMOC) |
67 | 67 | ||
68 | tmake: | 68 | tmake: Makefile.in |
69 | tmake clipboardapplet.pro | 69 | |
70 | Makefile.in: clipboardapplet.pro | ||
71 | tmake clipboardapplet.pro -o Makefile.in | ||
70 | 72 | ||
71 | clean: | 73 | clean: |
72 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) | 74 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) |
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 | |||
@@ -99,8 +99,10 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) | |||
99 | 99 | ||
100 | moc: $(SRCMOC) | 100 | moc: $(SRCMOC) |
101 | 101 | ||
102 | tmake: | 102 | tmake: Makefile.in |
103 | tmake embeddedkonsole.pro | 103 | |
104 | Makefile.in: embeddedkonsole.pro | ||
105 | tmake embeddedkonsole.pro -o Makefile.in | ||
104 | 106 | ||
105 | clean: | 107 | clean: |
106 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) | 108 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) |
@@ -183,14 +185,9 @@ session.o: session.cpp \ | |||
183 | 185 | ||
184 | keytrans.o: keytrans.cpp \ | 186 | keytrans.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 | ||
189 | konsole.o: konsole.cpp \ | 190 | konsole.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 \ |
@@ -212,8 +209,7 @@ main.o: main.cpp \ | |||
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 | ||
218 | MyPty.o: MyPty.cpp \ | 214 | MyPty.o: MyPty.cpp \ |
219 | MyPty.h | 215 | MyPty.h |
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 | |||
@@ -6,6 +6,7 @@ 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 \ |
@@ -46,6 +47,7 @@ HEADERS = background.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 \ |
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 | |||
@@ -212,10 +212,8 @@ public: | |||
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: |
@@ -362,6 +360,8 @@ void LauncherIconView::hideOrShowItems(bool resort) | |||
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; |
@@ -371,28 +371,35 @@ void LauncherIconView::hideOrShowItems(bool resort) | |||
371 | } | 371 | } |
372 | if ( resort ) | 372 | if ( resort ) |
373 | sort(); | 373 | sort(); |
374 | setAutoArrange( oldAutoArrange ); | ||
374 | } | 375 | } |
375 | 376 | ||
376 | bool LauncherIconView::removeLink(const QString& linkfile) | 377 | bool LauncherIconView::removeLink(const QString& linkfile) |
377 | { | 378 | { |
378 | LauncherItem* item = (LauncherItem*)firstItem(); | 379 | LauncherItem* item = (LauncherItem*)firstItem(); |
380 | AppLnk* l; | ||
381 | bool did = FALSE; | ||
382 | DocLnk dl(linkfile); | ||
379 | while (item) { | 383 | while (item) { |
380 | if ( item->appLnk()->linkFile() == linkfile ) { | 384 | l = item->appLnk(); |
385 | if ( l->linkFileKnown() && l->linkFile() == linkfile || l->file() == linkfile | ||
386 | || dl.isValid() && dl.file() == l->file() ) { | ||
381 | delete item; | 387 | delete item; |
382 | return TRUE; | 388 | did = TRUE; |
383 | } | 389 | } |
384 | item = (LauncherItem*)item->nextItem(); | 390 | item = (LauncherItem*)item->nextItem(); |
385 | } | 391 | } |
386 | QListIterator<AppLnk> it(hidden); | 392 | QListIterator<AppLnk> it(hidden); |
387 | AppLnk* l; | ||
388 | while ((l=it.current())) { | 393 | while ((l=it.current())) { |
389 | ++it; | 394 | ++it; |
390 | if ( l->linkFile() == linkfile ) { | 395 | if ( l->linkFileKnown() && l->linkFile() == linkfile |
396 | || l->file() == linkfile | ||
397 | || dl.isValid() && dl.file() == l->file() ) { | ||
391 | hidden.removeRef(l); | 398 | hidden.removeRef(l); |
392 | return TRUE; | 399 | did = TRUE; |
393 | } | 400 | } |
394 | } | 401 | } |
395 | return FALSE; | 402 | return did; |
396 | } | 403 | } |
397 | 404 | ||
398 | LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl ) | 405 | LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl ) |
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 | |||
@@ -100,8 +100,10 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) | |||
100 | 100 | ||
101 | moc: $(SRCMOC) | 101 | moc: $(SRCMOC) |
102 | 102 | ||
103 | tmake: | 103 | tmake: Makefile.in |
104 | tmake mpegplayer.pro | 104 | |
105 | Makefile.in: mpegplayer.pro | ||
106 | tmake mpegplayer.pro -o Makefile.in | ||
105 | 107 | ||
106 | clean: | 108 | clean: |
107 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) | 109 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) |
@@ -135,100 +137,57 @@ REQUIRES= | |||
135 | ####### Compile | 137 | ####### Compile |
136 | 138 | ||
137 | main.o: main.cpp \ | 139 | main.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 | ||
151 | loopcontrol.o: loopcontrol.cpp \ | 147 | loopcontrol.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 | ||
162 | playlistselection.o: playlistselection.cpp \ | 153 | playlistselection.o: playlistselection.cpp \ |
163 | $(OPIEDIR)/include/qpe/applnk.h \ | ||
164 | $(OPIEDIR)/include/qpe/resource.h \ | ||
165 | playlistselection.h | 154 | playlistselection.h |
166 | 155 | ||
167 | mediaplayerstate.o: mediaplayerstate.cpp \ | 156 | mediaplayerstate.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 | ||
179 | videowidget.o: videowidget.cpp \ | 162 | videowidget.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 | ||
187 | audiowidget.o: audiowidget.cpp \ | 166 | audiowidget.o: audiowidget.cpp \ |
188 | $(OPIEDIR)/include/qpe/resource.h \ | ||
189 | audiowidget.h \ | 167 | audiowidget.h \ |
190 | mediaplayerstate.h | 168 | mediaplayerstate.h |
191 | 169 | ||
192 | playlistwidget.o: playlistwidget.cpp \ | 170 | playlistwidget.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 | ||
204 | mediaplayer.o: mediaplayer.cpp \ | 175 | mediaplayer.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 | ||
220 | audiodevice.o: audiodevice.cpp \ | 183 | audiodevice.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 | ||
226 | moc_loopcontrol.o: moc_loopcontrol.cpp \ | 186 | moc_loopcontrol.o: moc_loopcontrol.cpp \ |
227 | loopcontrol.h | 187 | loopcontrol.h |
228 | 188 | ||
229 | moc_playlistselection.o: moc_playlistselection.cpp \ | 189 | moc_playlistselection.o: moc_playlistselection.cpp \ |
230 | playlistselection.h \ | 190 | playlistselection.h |
231 | $(OPIEDIR)/include/qpe/applnk.h | ||
232 | 191 | ||
233 | moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \ | 192 | moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \ |
234 | mediaplayerstate.h | 193 | mediaplayerstate.h |
@@ -240,15 +199,10 @@ moc_audiowidget.o: moc_audiowidget.cpp \ | |||
240 | audiowidget.h | 199 | audiowidget.h |
241 | 200 | ||
242 | moc_playlistwidget.o: moc_playlistwidget.cpp \ | 201 | moc_playlistwidget.o: moc_playlistwidget.cpp \ |
243 | playlistwidget.h \ | 202 | playlistwidget.h |
244 | $(OPIEDIR)/include/qpe/applnk.h | ||
245 | 203 | ||
246 | moc_mediaplayer.o: moc_mediaplayer.cpp \ | 204 | moc_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 | ||
253 | moc_audiodevice.o: moc_audiodevice.cpp \ | 207 | moc_audiodevice.o: moc_audiodevice.cpp \ |
254 | audiodevice.h | 208 | audiodevice.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 | |||
@@ -6,7 +6,7 @@ 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) |
@@ -145,15 +145,12 @@ REQUIRES= | |||
145 | 145 | ||
146 | libflashplugin.o: libflashplugin.cpp \ | 146 | libflashplugin.o: libflashplugin.cpp \ |
147 | libflashplugin.h \ | 147 | libflashplugin.h \ |
148 | flash.h \ | 148 | flash.h |
149 | ../mediaplayerplugininterface.h | ||
150 | 149 | ||
151 | libflashpluginimpl.o: libflashpluginimpl.cpp \ | 150 | libflashpluginimpl.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 | ||
158 | adpcm.o: adpcm.cc \ | 155 | adpcm.o: adpcm.cc \ |
159 | swf.h \ | 156 | swf.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 | |||
@@ -100,8 +100,10 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) | |||
100 | 100 | ||
101 | moc: $(SRCMOC) | 101 | moc: $(SRCMOC) |
102 | 102 | ||
103 | tmake: | 103 | tmake: Makefile.in |
104 | tmake libmad.pro | 104 | |
105 | Makefile.in: libmad.pro | ||
106 | tmake libmad.pro -o Makefile.in | ||
105 | 107 | ||
106 | clean: | 108 | clean: |
107 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) | 109 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) |
@@ -214,13 +216,10 @@ huffman.o: huffman.c \ | |||
214 | 216 | ||
215 | libmadplugin.o: libmadplugin.cpp \ | 217 | libmadplugin.o: libmadplugin.cpp \ |
216 | libmadplugin.h \ | 218 | libmadplugin.h \ |
217 | ../mediaplayerplugininterface.h \ | ||
218 | mad.h | 219 | mad.h |
219 | 220 | ||
220 | libmadpluginimpl.o: libmadpluginimpl.cpp \ | 221 | libmadpluginimpl.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 | |||
@@ -129,8 +129,10 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) | |||
129 | 129 | ||
130 | moc: $(SRCMOC) | 130 | moc: $(SRCMOC) |
131 | 131 | ||
132 | tmake: | 132 | tmake: Makefile.in |
133 | tmake libmpeg3.pro | 133 | |
134 | Makefile.in: libmpeg3.pro | ||
135 | tmake libmpeg3.pro -o Makefile.in | ||
134 | 136 | ||
135 | clean: | 137 | clean: |
136 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) | 138 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) |
@@ -176,8 +178,7 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \ | |||
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 | ||
182 | libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \ | 183 | libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \ |
183 | libmpeg3plugin.h \ | 184 | libmpeg3plugin.h \ |
@@ -193,9 +194,7 @@ libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \ | |||
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 | ||
200 | bitstream.o: bitstream.c \ | 199 | bitstream.o: bitstream.c \ |
201 | mpeg3private.h \ | 200 | mpeg3private.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 | |||
@@ -65,8 +65,10 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) | |||
65 | 65 | ||
66 | moc: $(SRCMOC) | 66 | moc: $(SRCMOC) |
67 | 67 | ||
68 | tmake: | 68 | tmake: Makefile.in |
69 | tmake wavplugin.pro | 69 | |
70 | Makefile.in: wavplugin.pro | ||
71 | tmake wavplugin.pro -o Makefile.in | ||
70 | 72 | ||
71 | clean: | 73 | clean: |
72 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) | 74 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) |
@@ -100,13 +102,10 @@ REQUIRES= | |||
100 | ####### Compile | 102 | ####### Compile |
101 | 103 | ||
102 | wavplugin.o: wavplugin.cpp \ | 104 | wavplugin.o: wavplugin.cpp \ |
103 | wavplugin.h \ | 105 | wavplugin.h |
104 | ../mediaplayerplugininterface.h | ||
105 | 106 | ||
106 | wavpluginimpl.o: wavpluginimpl.cpp \ | 107 | wavpluginimpl.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 | |||
@@ -124,8 +124,10 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) | |||
124 | 124 | ||
125 | moc: $(SRCMOC) | 125 | moc: $(SRCMOC) |
126 | 126 | ||
127 | tmake: | 127 | tmake: Makefile.in |
128 | tmake datebook.pro | 128 | |
129 | Makefile.in: datebook.pro | ||
130 | tmake datebook.pro -o Makefile.in | ||
129 | 131 | ||
130 | clean: | 132 | clean: |
131 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) | 133 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) |
@@ -159,99 +161,40 @@ REQUIRES= | |||
159 | ####### Compile | 161 | ####### Compile |
160 | 162 | ||
161 | main.o: main.cpp \ | 163 | main.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 | ||
170 | datebookday.o: datebookday.cpp \ | 166 | datebookday.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 | ||
184 | datebook.o: datebook.cpp \ | 171 | datebook.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 | ||
212 | dateentryimpl.o: dateentryimpl.cpp \ | 180 | dateentryimpl.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 | ||
228 | datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \ | 186 | datebookdayheaderimpl.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 | ||
238 | datebooksettings.o: datebooksettings.cpp \ | 190 | datebooksettings.o: datebooksettings.cpp \ |
239 | datebooksettings.h \ | 191 | datebooksettings.h \ |
240 | datebooksettingsbase.h \ | 192 | datebooksettingsbase.h |
241 | $(OPIEDIR)/include/qpe/qpeapplication.h | ||
242 | 193 | ||
243 | datebookweek.o: datebookweek.cpp \ | 194 | datebookweek.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 | ||
256 | datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \ | 199 | datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \ |
257 | datebookweekheaderimpl.h \ | 200 | datebookweekheaderimpl.h \ |
@@ -259,14 +202,7 @@ datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \ | |||
259 | 202 | ||
260 | repeatentry.o: repeatentry.cpp \ | 203 | repeatentry.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 | ||
271 | dateentry.h: dateentry.ui | 207 | dateentry.h: dateentry.ui |
272 | $(UIC) dateentry.ui -o $(INTERFACE_DECL_PATH)/dateentry.h | 208 | $(UIC) dateentry.ui -o $(INTERFACE_DECL_PATH)/dateentry.h |
@@ -309,38 +245,21 @@ datebookweekheader.o: datebookweekheader.cpp | |||
309 | repeatentrybase.o: repeatentrybase.cpp | 245 | repeatentrybase.o: repeatentrybase.cpp |
310 | 246 | ||
311 | moc_datebookday.o: moc_datebookday.cpp \ | 247 | moc_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 | ||
318 | moc_datebook.o: moc_datebook.cpp \ | 250 | moc_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 | ||
326 | moc_dateentryimpl.o: moc_dateentryimpl.cpp \ | 253 | moc_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 | ||
334 | moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \ | 257 | moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \ |
335 | datebookdayheaderimpl.h \ | 258 | datebookdayheaderimpl.h \ |
336 | datebookdayheader.h | 259 | datebookdayheader.h |
337 | 260 | ||
338 | moc_datebookweek.o: moc_datebookweek.cpp \ | 261 | moc_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 | ||
345 | moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \ | 264 | moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \ |
346 | datebookweekheaderimpl.h \ | 265 | datebookweekheaderimpl.h \ |
@@ -348,11 +267,7 @@ moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \ | |||
348 | 267 | ||
349 | moc_repeatentry.o: moc_repeatentry.cpp \ | 268 | moc_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 | ||
357 | moc_dateentry.o: moc_dateentry.cpp \ | 272 | moc_dateentry.o: moc_dateentry.cpp \ |
358 | dateentry.h | 273 | dateentry.h |
diff --git a/docs/start.doc b/docs/start.doc index 01b6ab1..53a4e36 100644 --- a/docs/start.doc +++ b/docs/start.doc | |||
@@ -58,18 +58,18 @@ To compile the example program for running on the Linux desktop: | |||
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 | ||
@@ -89,9 +89,9 @@ To compile the example program for running on the Linux desktop: | |||
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 | ||
@@ -135,24 +135,39 @@ on the desktop, the process is similar: | |||
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> |
diff --git a/library/Makefile.in b/library/Makefile.in index b74b818..b8fc1f6 100644 --- a/library/Makefile.in +++ b/library/Makefile.in | |||
@@ -31,12 +31,12 @@ HEADERS = calendar.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 \ |
@@ -78,12 +78,7 @@ HEADERS = calendar.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 \ |
@@ -91,7 +86,6 @@ SOURCES = calendar.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 \ |
@@ -139,12 +133,7 @@ SOURCES = calendar.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 \ |
@@ -152,7 +141,6 @@ OBJECTS = calendar.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 \ |
@@ -201,35 +189,26 @@ OBJECTS = calendar.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 |
214 | INTERFACES = passwordbase_p.ui \ | 196 | INTERFACES = 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 |
219 | UICDECLS = passwordbase_p.h \ | 200 | UICDECLS = 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 |
224 | UICIMPLS = passwordbase_p.cpp \ | 204 | UICIMPLS = 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 \ |
@@ -247,23 +226,19 @@ SRCMOC = moc_menubutton.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 \ |
@@ -281,10 +256,7 @@ OBJMOC = moc_menubutton.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 |
@@ -319,8 +291,10 @@ $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) | |||
319 | 291 | ||
320 | moc: $(SRCMOC) | 292 | moc: $(SRCMOC) |
321 | 293 | ||
322 | tmake: | 294 | tmake: Makefile.in |
323 | tmake library.pro | 295 | |
296 | Makefile.in: library.pro | ||
297 | tmake library.pro -o Makefile.in | ||
324 | 298 | ||
325 | clean: | 299 | clean: |
326 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) | 300 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) |
@@ -381,11 +355,6 @@ networkinterface.o: networkinterface.cpp \ | |||
381 | network.h \ | 355 | network.h \ |
382 | config.h | 356 | config.h |
383 | 357 | ||
384 | proxies.o: proxies.cpp \ | ||
385 | proxies.h \ | ||
386 | config.h \ | ||
387 | proxiesbase_p.h | ||
388 | |||
389 | filemanager.o: filemanager.cpp \ | 358 | filemanager.o: filemanager.cpp \ |
390 | filemanager.h \ | 359 | filemanager.h \ |
391 | applnk.h | 360 | applnk.h |
@@ -410,6 +379,7 @@ fileselector.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 \ |
@@ -534,8 +504,7 @@ fontdatabase.o: fontdatabase.cpp \ | |||
534 | fontdatabase.h | 504 | fontdatabase.h |
535 | 505 | ||
536 | power.o: power.cpp \ | 506 | power.o: power.cpp \ |
537 | power.h \ | 507 | power.h |
538 | custom.h | ||
539 | 508 | ||
540 | storage.o: storage.cpp | 509 | storage.o: storage.cpp |
541 | 510 | ||
@@ -633,37 +602,12 @@ lnkproperties.o: lnkproperties.cpp \ | |||
633 | lnkpropertiesbase_p.h \ | 602 | lnkpropertiesbase_p.h \ |
634 | ir.h | 603 | ir.h |
635 | 604 | ||
636 | quuid.o: quuid.cpp \ | ||
637 | quuid.h | ||
638 | |||
639 | qlibrary.o: qlibrary.cpp \ | ||
640 | qlibrary_p.h \ | ||
641 | qlibrary.h | ||
642 | |||
643 | qlibrary_unix.o: qlibrary_unix.cpp \ | ||
644 | qlibrary_p.h \ | ||
645 | qlibrary.h | ||
646 | |||
647 | qprocess.o: qprocess.cpp \ | ||
648 | qprocess.h | ||
649 | |||
650 | qprocess_unix.o: qprocess_unix.cpp \ | ||
651 | qprocess_unix.moc \ | ||
652 | qprocess.h \ | ||
653 | qcleanuphandler_p.h | ||
654 | |||
655 | passwordbase_p.h: passwordbase_p.ui | 605 | passwordbase_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 | ||
658 | passwordbase_p.cpp: passwordbase_p.ui | 608 | passwordbase_p.cpp: passwordbase_p.ui |
659 | $(UIC) passwordbase_p.ui -i passwordbase_p.h -o passwordbase_p.cpp | 609 | $(UIC) passwordbase_p.ui -i passwordbase_p.h -o passwordbase_p.cpp |
660 | 610 | ||
661 | proxiesbase_p.h: proxiesbase_p.ui | ||
662 | $(UIC) proxiesbase_p.ui -o $(INTERFACE_DECL_PATH)/proxiesbase_p.h | ||
663 | |||
664 | proxiesbase_p.cpp: proxiesbase_p.ui | ||
665 | $(UIC) proxiesbase_p.ui -i proxiesbase_p.h -o proxiesbase_p.cpp | ||
666 | |||
667 | categoryeditbase_p.h: categoryeditbase_p.ui | 611 | categoryeditbase_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 | ||
@@ -684,8 +628,6 @@ lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui | |||
684 | 628 | ||
685 | passwordbase_p.o: passwordbase_p.cpp | 629 | passwordbase_p.o: passwordbase_p.cpp |
686 | 630 | ||
687 | proxiesbase_p.o: proxiesbase_p.cpp | ||
688 | |||
689 | categoryeditbase_p.o: categoryeditbase_p.cpp | 631 | categoryeditbase_p.o: categoryeditbase_p.cpp |
690 | 632 | ||
691 | findwidgetbase_p.o: findwidgetbase_p.cpp | 633 | findwidgetbase_p.o: findwidgetbase_p.cpp |
@@ -695,10 +637,6 @@ lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp | |||
695 | moc_menubutton.o: moc_menubutton.cpp \ | 637 | moc_menubutton.o: moc_menubutton.cpp \ |
696 | menubutton.h | 638 | menubutton.h |
697 | 639 | ||
698 | moc_proxies.o: moc_proxies.cpp \ | ||
699 | proxies.h \ | ||
700 | config.h | ||
701 | |||
702 | moc_datebookmonth.o: moc_datebookmonth.cpp \ | 640 | moc_datebookmonth.o: moc_datebookmonth.cpp \ |
703 | datebookmonth.h \ | 641 | datebookmonth.h \ |
704 | calendar.h \ | 642 | calendar.h \ |
@@ -709,6 +647,9 @@ moc_fileselector.o: moc_fileselector.cpp \ | |||
709 | filemanager.h \ | 647 | filemanager.h \ |
710 | applnk.h | 648 | applnk.h |
711 | 649 | ||
650 | moc_fileselector_p.o: moc_fileselector_p.cpp \ | ||
651 | fileselector_p.h | ||
652 | |||
712 | moc_imageedit.o: moc_imageedit.cpp \ | 653 | moc_imageedit.o: moc_imageedit.cpp \ |
713 | imageedit.h | 654 | imageedit.h |
714 | 655 | ||
@@ -766,20 +707,13 @@ moc_finddialog.o: moc_finddialog.cpp \ | |||
766 | moc_lnkproperties.o: moc_lnkproperties.cpp \ | 707 | moc_lnkproperties.o: moc_lnkproperties.cpp \ |
767 | lnkproperties.h | 708 | lnkproperties.h |
768 | 709 | ||
769 | moc_qlibrary_p.o: moc_qlibrary_p.cpp \ | ||
770 | qlibrary_p.h \ | ||
771 | qlibrary.h | ||
772 | |||
773 | moc_qprocess.o: moc_qprocess.cpp \ | ||
774 | qprocess.h | ||
775 | |||
776 | moc_passwordbase_p.o: global.moc \ | 710 | moc_passwordbase_p.o: global.moc \ |
777 | global.cpp | 711 | global.cpp |
778 | 712 | ||
779 | moc_proxiesbase_p.o: network.moc \ | 713 | moc_categoryeditbase_p.o: network.moc \ |
780 | network.cpp | 714 | network.cpp |
781 | 715 | ||
782 | moc_categoryeditbase_p.o: password.moc \ | 716 | moc_findwidgetbase_p.o: password.moc \ |
783 | password.cpp \ | 717 | password.cpp \ |
784 | password.h \ | 718 | password.h \ |
785 | config.h \ | 719 | config.h \ |
@@ -787,29 +721,22 @@ moc_categoryeditbase_p.o: password.moc \ | |||
787 | backend/contact.h \ | 721 | backend/contact.h \ |
788 | passwordbase_p.h | 722 | passwordbase_p.h |
789 | 723 | ||
790 | moc_findwidgetbase_p.o: process_unix.moc \ | 724 | moc_lnkpropertiesbase_p.o: process_unix.moc \ |
791 | process_unix.cpp \ | 725 | process_unix.cpp \ |
792 | process.h | 726 | process.h |
793 | 727 | ||
794 | moc_lnkpropertiesbase_p.o: timestring.moc \ | ||
795 | timestring.cpp \ | ||
796 | timestring.h \ | ||
797 | qpeapplication.h \ | ||
798 | qpedecoration_qws.h \ | ||
799 | config.h | ||
800 | |||
801 | moc_menubutton.cpp: menubutton.h | 728 | moc_menubutton.cpp: menubutton.h |
802 | $(MOC) menubutton.h -o moc_menubutton.cpp | 729 | $(MOC) menubutton.h -o moc_menubutton.cpp |
803 | 730 | ||
804 | moc_proxies.cpp: proxies.h | ||
805 | $(MOC) proxies.h -o moc_proxies.cpp | ||
806 | |||
807 | moc_datebookmonth.cpp: datebookmonth.h | 731 | moc_datebookmonth.cpp: datebookmonth.h |
808 | $(MOC) datebookmonth.h -o moc_datebookmonth.cpp | 732 | $(MOC) datebookmonth.h -o moc_datebookmonth.cpp |
809 | 733 | ||
810 | moc_fileselector.cpp: fileselector.h | 734 | moc_fileselector.cpp: fileselector.h |
811 | $(MOC) fileselector.h -o moc_fileselector.cpp | 735 | $(MOC) fileselector.h -o moc_fileselector.cpp |
812 | 736 | ||
737 | moc_fileselector_p.cpp: fileselector_p.h | ||
738 | $(MOC) fileselector_p.h -o moc_fileselector_p.cpp | ||
739 | |||
813 | moc_imageedit.cpp: imageedit.h | 740 | moc_imageedit.cpp: imageedit.h |
814 | $(MOC) imageedit.h -o moc_imageedit.cpp | 741 | $(MOC) imageedit.h -o moc_imageedit.cpp |
815 | 742 | ||
@@ -861,12 +788,6 @@ moc_finddialog.cpp: finddialog.h | |||
861 | moc_lnkproperties.cpp: lnkproperties.h | 788 | moc_lnkproperties.cpp: lnkproperties.h |
862 | $(MOC) lnkproperties.h -o moc_lnkproperties.cpp | 789 | $(MOC) lnkproperties.h -o moc_lnkproperties.cpp |
863 | 790 | ||
864 | moc_qlibrary_p.cpp: qlibrary_p.h | ||
865 | $(MOC) qlibrary_p.h -o moc_qlibrary_p.cpp | ||
866 | |||
867 | moc_qprocess.cpp: qprocess.h | ||
868 | $(MOC) qprocess.h -o moc_qprocess.cpp | ||
869 | |||
870 | global.moc: global.cpp | 791 | global.moc: global.cpp |
871 | $(MOC) global.cpp -o global.moc | 792 | $(MOC) global.cpp -o global.moc |
872 | 793 | ||
@@ -882,15 +803,9 @@ process_unix.moc: process_unix.cpp | |||
882 | timestring.moc: timestring.cpp | 803 | timestring.moc: timestring.cpp |
883 | $(MOC) timestring.cpp -o timestring.moc | 804 | $(MOC) timestring.cpp -o timestring.moc |
884 | 805 | ||
885 | qprocess_unix.moc: qprocess_unix.cpp | ||
886 | $(MOC) qprocess_unix.cpp -o qprocess_unix.moc | ||
887 | |||
888 | moc_passwordbase_p.cpp: passwordbase_p.h | 806 | moc_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 | ||
891 | moc_proxiesbase_p.cpp: proxiesbase_p.h | ||
892 | $(MOC) proxiesbase_p.h -o moc_proxiesbase_p.cpp | ||
893 | |||
894 | moc_categoryeditbase_p.cpp: categoryeditbase_p.h | 809 | moc_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 | ||
diff --git a/library/global.cpp b/library/global.cpp index e5fc2b3..fd7579a 100644 --- a/library/global.cpp +++ b/library/global.cpp | |||
@@ -505,7 +505,7 @@ void Global::invoke(const QString &c) | |||
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] ); |
diff --git a/library/library.pro b/library/library.pro index 058d216..e71e5a0 100644 --- a/library/library.pro +++ b/library/library.pro | |||
@@ -8,12 +8,12 @@ HEADERS = calendar.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 \ |
@@ -64,7 +64,6 @@ SOURCES = calendar.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 \ |
@@ -115,14 +114,13 @@ SOURCES = calendar.cpp \ | |||
115 | lnkproperties.cpp | 114 | lnkproperties.cpp |
116 | 115 | ||
117 | # Qt 3 compatibility | 116 | # Qt 3 compatibility |
118 | qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h qprocess.h | 117 | qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h |
119 | qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \ | 118 | qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp |
120 | qprocess_unix.cpp | ||
121 | 119 | ||
122 | INCLUDEPATH += $(OPIEDIR)/include backend | 120 | INCLUDEPATH += $(OPIEDIR)/include backend |
123 | LIBS += -ldl -lcrypt -lm | 121 | LIBS += -ldl -lcrypt -lm |
124 | 122 | ||
125 | INTERFACES = passwordbase_p.ui proxiesbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui | 123 | INTERFACES = 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) |
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 | |||
@@ -3,10 +3,10 @@ | |||
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) |
@@ -67,8 +67,10 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) | |||
67 | 67 | ||
68 | moc: $(SRCMOC) | 68 | moc: $(SRCMOC) |
69 | 69 | ||
70 | tmake: | 70 | tmake: Makefile.in |
71 | tmake chess.pro | 71 | |
72 | Makefile.in: chess.pro | ||
73 | tmake chess.pro -o Makefile.in | ||
72 | 74 | ||
73 | clean: | 75 | clean: |
74 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) | 76 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) |
@@ -102,12 +104,10 @@ REQUIRES= | |||
102 | ####### Compile | 104 | ####### Compile |
103 | 105 | ||
104 | chess.o: chess.cpp \ | 106 | chess.o: chess.cpp \ |
105 | $(QPEDIR)/include/qpe/config.h \ | ||
106 | $(QPEDIR)/include/qpe/resource.h \ | ||
107 | chess.h | 107 | chess.h |
108 | 108 | ||
109 | main.o: main.cpp \ | 109 | main.o: main.cpp \ |
110 | mainwindow.h | 110 | chess.h |
111 | 111 | ||
112 | mainwindow.h: mainwindow.ui | 112 | mainwindow.h: mainwindow.ui |
113 | $(UIC) mainwindow.ui -o $(INTERFACE_DECL_PATH)/mainwindow.h | 113 | $(UIC) mainwindow.ui -o $(INTERFACE_DECL_PATH)/mainwindow.h |
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 | |||
@@ -75,8 +75,10 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) | |||
75 | 75 | ||
76 | moc: $(SRCMOC) | 76 | moc: $(SRCMOC) |
77 | 77 | ||
78 | tmake: | 78 | tmake: Makefile.in |
79 | tmake go.pro | 79 | |
80 | Makefile.in: go.pro | ||
81 | tmake go.pro -o Makefile.in | ||
80 | 82 | ||
81 | clean: | 83 | clean: |
82 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) | 84 | -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) |
@@ -133,18 +135,13 @@ gowidget.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 | ||
142 | main.o: main.cpp \ | 140 | main.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 | ||
149 | moc_gowidget.o: moc_gowidget.cpp \ | 146 | moc_gowidget.o: moc_gowidget.cpp \ |
150 | gowidget.h \ | 147 | gowidget.h \ |