summaryrefslogtreecommitdiff
path: root/core
Unidiff
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-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
10 files changed, 75 insertions, 205 deletions
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
@@ -3,13 +3,13 @@
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
@@ -62,14 +62,16 @@ all: $(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
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
@@ -96,14 +96,16 @@ all: $(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
@@ -180,20 +182,15 @@ session.o: session.cpp \
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 \
@@ -209,14 +206,13 @@ main.o: main.cpp \
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 \
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
@@ -3,12 +3,13 @@ TEMPLATE = app
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 \
@@ -43,12 +44,13 @@ HEADERS = background.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 \
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
@@ -209,16 +209,14 @@ public:
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;
@@ -359,43 +357,52 @@ void LauncherIconView::hideOrShowItems(bool resort)
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 );
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
@@ -97,14 +97,16 @@ all: $(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
@@ -132,126 +134,78 @@ REQUIRES=
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
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
@@ -3,13 +3,13 @@
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
@@ -142,21 +142,18 @@ REQUIRES=
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 \
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
@@ -97,14 +97,16 @@ all: $(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
@@ -211,16 +213,13 @@ layer3.o: layer3.c \
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
@@ -126,14 +126,16 @@ all: $(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
@@ -173,14 +175,13 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \
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 \
@@ -190,15 +191,13 @@ libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
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 \
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
@@ -62,14 +62,16 @@ all: $(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
@@ -97,16 +99,13 @@ REQUIRES=
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
@@ -121,14 +121,16 @@ all: $(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
@@ -156,120 +158,54 @@ REQUIRES=
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
@@ -306,56 +242,35 @@ datebooksettingsbase.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