Making opie compile again.

7 files changed, 210 insertions, 54 deletions

diff --git a/core/apps/embeddedkonsole/Makefile.in b/core/apps/embeddedkonsole/Makefile.in
index 0da49d7..1c24ded 100644
--- a/core/apps/embeddedkonsole/Makefile.in
+++ b/core/apps/embeddedkonsole/Makefile.in
@@ -94,20 +94,18 @@ OBJMOC	=	moc_TEWidget.o \
 
 all: $(DESTDIR)$(TARGET)
 
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 moc: $(SRCMOC)
 
-tmake: Makefile.in
-
-Makefile.in: embeddedkonsole.pro
-	tmake embeddedkonsole.pro -o Makefile.in
+tmake:
+	tmake embeddedkonsole.pro
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
@@ -180,41 +178,48 @@ session.o: session.cpp \
 		TEmuVt102.h \
 		TEScreen.h \
 		TEHistory.h \
 		TEmulation.h \
 		keytrans.h
 
 keytrans.o: keytrans.cpp \
 		keytrans.h \
+		$(OPIEDIR)/include/qpe/qpeapplication.h \
 		default.keytab.h
 
 konsole.o: konsole.cpp \
+		$(OPIEDIR)/include/qpe/resource.h \
+		$(OPIEDIR)/include/qpe/qpetoolbar.h \
+		$(OPIEDIR)/include/qpe/qpemenubar.h \
+		$(OPIEDIR)/include/qpe/config.h \
 		konsole.h \
 		MyPty.h \
 		TEWidget.h \
 		TECommon.h \
 		TEmuVt102.h \
 		TEScreen.h \
 		TEHistory.h \
 		TEmulation.h \
 		keytrans.h \
 		session.h
 
 main.o: main.cpp \
 		konsole.h \
+		$(OPIEDIR)/include/qpe/qpetoolbar.h \
 		MyPty.h \
 		TEWidget.h \
 		TECommon.h \
 		TEmuVt102.h \
 		TEScreen.h \
 		TEHistory.h \
 		TEmulation.h \
 		keytrans.h \
-		session.h
+		session.h \
+		$(OPIEDIR)/include/qpe/qpeapplication.h
 
 MyPty.o: MyPty.cpp \
 		MyPty.h
 
 moc_TEWidget.o: moc_TEWidget.cpp \
 		TEWidget.h \
 		TECommon.h
 
@@ -243,16 +248,17 @@ moc_session.o: moc_session.cpp \
 		TEmuVt102.h \
 		TEScreen.h \
 		TEHistory.h \
 		TEmulation.h \
 		keytrans.h
 
 moc_konsole.o: moc_konsole.cpp \
 		konsole.h \
+		$(OPIEDIR)/include/qpe/qpetoolbar.h \
 		MyPty.h \
 		TEWidget.h \
 		TECommon.h \
 		TEmuVt102.h \
 		TEScreen.h \
 		TEHistory.h \
 		TEmulation.h \
 		keytrans.h \
diff --git a/core/launcher/Makefile.in b/core/launcher/Makefile.in
index 5e2dbe5..91a5a9b 100644
--- a/core/launcher/Makefile.in
+++ b/core/launcher/Makefile.in
@@ -20,16 +20,17 @@ VER_MIN = 0
 VER_PATCH = 0
 TARGET	= qpe
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
 HEADERS =	background.h \
 		desktop.h \
+		qprocess.h \
 		info.h \
 		appicons.h \
 		taskbar.h \
 		sidething.h \
 		mrulist.h \
 		stabmon.h \
 		inputmethods.h \
 		systray.h \
@@ -58,16 +59,18 @@ HEADERS =	background.h \
 		$(OPIEDIR)/rsync/trace.h \
 		$(OPIEDIR)/rsync/types.h \
 		$(OPIEDIR)/rsync/util.h \
 		$(OPIEDIR)/rsync/whole.h \
 		$(OPIEDIR)/rsync/config_rsync.h \
 		$(OPIEDIR)/rsync/qrsync.h
 SOURCES =	background.cpp \
 		desktop.cpp \
+		qprocess.cpp \
+		qprocess_unix.cpp \
 		info.cpp \
 		appicons.cpp \
 		taskbar.cpp \
 		sidething.cpp \
 		mrulist.cpp \
 		stabmon.cpp \
 		inputmethods.cpp \
 		systray.cpp \
@@ -105,16 +108,18 @@ SOURCES =	background.cpp \
 		$(OPIEDIR)/rsync/trace.c \
 		$(OPIEDIR)/rsync/tube.c \
 		$(OPIEDIR)/rsync/util.c \
 		$(OPIEDIR)/rsync/version.c \
 		$(OPIEDIR)/rsync/whole.c \
 		$(OPIEDIR)/rsync/qrsync.cpp
 OBJECTS =	background.o \
 		desktop.o \
+		qprocess.o \
+		qprocess_unix.o \
 		info.o \
 		appicons.o \
 		taskbar.o \
 		sidething.o \
 		mrulist.o \
 		stabmon.o \
 		inputmethods.o \
 		systray.o \
@@ -160,36 +165,39 @@ OBJECTS =	background.o \
 INTERFACES =    shutdown.ui \
 		syncdialog.ui
 UICDECLS =      shutdown.h \
 		syncdialog.h
 UICIMPLS =      shutdown.cpp \
 		syncdialog.cpp
 SRCMOC	=	moc_background.cpp \
 		moc_desktop.cpp \
+		moc_qprocess.cpp \
 		moc_info.cpp \
 		moc_appicons.cpp \
 		moc_taskbar.cpp \
 		moc_sidething.cpp \
 		moc_inputmethods.cpp \
 		moc_systray.cpp \
 		moc_shutdownimpl.cpp \
 		moc_launcher.cpp \
 		moc_launcherview.cpp \
 		../calibrate/moc_calibrate.cpp \
 		moc_startmenu.cpp \
 		moc_transferserver.cpp \
 		moc_qcopbridge.cpp \
 		moc_packageslave.cpp \
 		moc_irserver.cpp \
+		qprocess_unix.moc \
 		appicons.moc \
 		moc_shutdown.cpp \
 		moc_syncdialog.cpp
 OBJMOC	=	moc_background.o \
 		moc_desktop.o \
+		moc_qprocess.o \
 		moc_info.o \
 		moc_appicons.o \
 		moc_taskbar.o \
 		moc_sidething.o \
 		moc_inputmethods.o \
 		moc_systray.o \
 		moc_shutdownimpl.o \
 		moc_launcher.o \
@@ -285,27 +293,34 @@ desktop.o: desktop.cpp \
 		launcher.h \
 		launcherview.h \
 		$(OPIEDIR)/include/qpe/storage.h \
 		mrulist.h \
 		$(OPIEDIR)/include/qpe/applnk.h \
 		qcopbridge.h \
 		startmenu.h \
 		taskbar.h \
-		$(OPIEDIR)/include/qpe/custom.h \
 		transferserver.h \
 		irserver.h \
 		packageslave.h \
 		$(OPIEDIR)/include/qpe/mimetype.h \
 		$(OPIEDIR)/include/qpe/password.h \
 		$(OPIEDIR)/include/qpe/config.h \
 		$(OPIEDIR)/include/qpe/power.h \
 		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
 		$(OPIEDIR)/include/qpe/global.h
 
+qprocess.o: qprocess.cpp \
+		qprocess.h
+
+qprocess_unix.o: qprocess_unix.cpp \
+		qprocess_unix.moc \
+		qprocess.h \
+		qcleanuphandler_p.h
+
 info.o: info.cpp \
 		info.h \
 		background.h \
 		desktop.h \
 		shutdownimpl.h \
 		shutdown.h \
 		$(OPIEDIR)/include/qpe/qpeapplication.h \
 		$(OPIEDIR)/include/qpe/resource.h \
@@ -326,17 +341,16 @@ taskbar.o: taskbar.cpp \
 		$(OPIEDIR)/include/qpe/applnk.h \
 		systray.h \
 		$(OPIEDIR)/include/qpe/taskbarappletinterface.h \
 		$(OPIEDIR)/calibrate/calibrate.h \
 		wait.h \
 		$(OPIEDIR)/include/qpe/resource.h \
 		appicons.h \
 		taskbar.h \
-		$(OPIEDIR)/include/qpe/custom.h \
 		desktop.h \
 		shutdownimpl.h \
 		shutdown.h \
 		$(OPIEDIR)/include/qpe/qpeapplication.h \
 		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
 		$(OPIEDIR)/include/qpe/global.h \
 		../taskbar/apps.h \
 		../addressbook/addressbook.h \
@@ -360,17 +374,19 @@ taskbar.o: taskbar.cpp \
 		$(OPIEDIR)/include/qpe/timestring.h \
 		../filebrowser/filebrowser.h \
 		../solitaire/canvascardwindow.h \
 		../snake/interface.h \
 		../parashoot/interface.h \
 		$(OPIEDIR)/include/qpe/sound.h \
 		../mpegplayer/mediaplayer.h \
 		$(OPIEDIR)/include/qpe/qlibrary.h \
+		$(OPIEDIR)/include/qpe/mediaplayerplugininterface.h \
 		../embeddedkonsole/konsole.h \
+		$(OPIEDIR)/include/qpe/qpetoolbar.h \
 		../wordgame/wordgame.h \
 		$(OPIEDIR)/include/qpe/qdawg.h
 
 sidething.o: sidething.cpp \
 		sidething.h \
 		startmenu.h \
 		$(OPIEDIR)/include/qpe/resource.h
 
@@ -444,21 +460,21 @@ launcherview.o: launcherview.cpp \
 		$(OPIEDIR)/include/qpe/resource.h \
 		$(OPIEDIR)/include/qpe/qpetoolbar.h
 
 $(OPIEDIR)/calibrate/calibrate.o: $(OPIEDIR)/calibrate/calibrate.cpp \
 		$(OPIEDIR)/calibrate/calibrate.h \
 		$(OPIEDIR)/include/qpe/resource.h
 
 transferserver.o: transferserver.cpp \
-		$(OPIEDIR)/include/qpe/qprocess.h \
 		$(OPIEDIR)/include/qpe/process.h \
 		$(OPIEDIR)/include/qpe/config.h \
 		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
-		transferserver.h
+		transferserver.h \
+		qprocess.h
 
 packageslave.o: packageslave.cpp \
 		packageslave.h \
 		$(OPIEDIR)/include/qpe/process.h \
 		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h
 
 irserver.o: irserver.cpp \
 		irserver.h \
@@ -487,17 +503,16 @@ startmenu.o: startmenu.cpp \
 		$(OPIEDIR)/include/qpe/resource.h
 
 main.o: main.cpp \
 		desktop.h \
 		shutdownimpl.h \
 		shutdown.h \
 		$(OPIEDIR)/include/qpe/qpeapplication.h \
 		taskbar.h \
-		$(OPIEDIR)/include/qpe/custom.h \
 		stabmon.h \
 		$(OPIEDIR)/include/qpe/network.h \
 		$(OPIEDIR)/include/qpe/config.h \
 		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
 		$(OPIEDIR)/include/qpe/alarmserver.h \
 		../calibrate/calibrate.h \
 		../login/qdmdialogimpl.h \
 		$(OPIEDIR)/include/qpe/global.h
@@ -742,26 +757,28 @@ moc_background.o: moc_background.cpp \
 		background.h
 
 moc_desktop.o: moc_desktop.cpp \
 		desktop.h \
 		shutdownimpl.h \
 		shutdown.h \
 		$(OPIEDIR)/include/qpe/qpeapplication.h
 
+moc_qprocess.o: moc_qprocess.cpp \
+		qprocess.h
+
 moc_info.o: moc_info.cpp \
 		info.h \
 		background.h
 
 moc_appicons.o: moc_appicons.cpp \
 		appicons.h
 
 moc_taskbar.o: moc_taskbar.cpp \
-		taskbar.h \
-		$(OPIEDIR)/include/qpe/custom.h
+		taskbar.h
 
 moc_sidething.o: moc_sidething.cpp \
 		sidething.h \
 		startmenu.h
 
 moc_inputmethods.o: moc_inputmethods.cpp \
 		inputmethods.h \
 		$(OPIEDIR)/include/qpe/inputmethodinterface.h \
@@ -800,30 +817,35 @@ moc_qcopbridge.o: moc_qcopbridge.cpp \
 		qcopbridge.h
 
 moc_packageslave.o: moc_packageslave.cpp \
 		packageslave.h
 
 moc_irserver.o: moc_irserver.cpp \
 		irserver.h
 
-moc_shutdown.o: appicons.moc \
+moc_shutdown.o: qprocess_unix.moc \
+		qprocess_unix.cpp \
+		qprocess.h \
+		qcleanuphandler_p.h
+
+moc_syncdialog.o: appicons.moc \
 		appicons.cpp \
 		appicons.h \
 		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h
 
-moc_syncdialog.o: moc_shutdown.cpp \
-		shutdown.h
-
 moc_background.cpp: background.h
 	$(MOC) background.h -o moc_background.cpp
 
 moc_desktop.cpp: desktop.h
 	$(MOC) desktop.h -o moc_desktop.cpp
 
+moc_qprocess.cpp: qprocess.h
+	$(MOC) qprocess.h -o moc_qprocess.cpp
+
 moc_info.cpp: info.h
 	$(MOC) info.h -o moc_info.cpp
 
 moc_appicons.cpp: appicons.h
 	$(MOC) appicons.h -o moc_appicons.cpp
 
 moc_taskbar.cpp: taskbar.h
 	$(MOC) taskbar.h -o moc_taskbar.cpp
@@ -859,16 +881,19 @@ moc_qcopbridge.cpp: qcopbridge.h
 	$(MOC) qcopbridge.h -o moc_qcopbridge.cpp
 
 moc_packageslave.cpp: packageslave.h
 	$(MOC) packageslave.h -o moc_packageslave.cpp
 
 moc_irserver.cpp: irserver.h
 	$(MOC) irserver.h -o moc_irserver.cpp
 
+qprocess_unix.moc: qprocess_unix.cpp
+	$(MOC) qprocess_unix.cpp -o qprocess_unix.moc
+
 appicons.moc: appicons.cpp
 	$(MOC) appicons.cpp -o appicons.moc
 
 moc_shutdown.cpp: shutdown.h
 	$(MOC) shutdown.h -o moc_shutdown.cpp
 
 moc_syncdialog.cpp: syncdialog.h
 	$(MOC) syncdialog.h -o moc_syncdialog.cpp
diff --git a/core/multimedia/opieplayer/Makefile.in b/core/multimedia/opieplayer/Makefile.in
index 3e1f9fc..1b0307a 100644
--- a/core/multimedia/opieplayer/Makefile.in
+++ b/core/multimedia/opieplayer/Makefile.in
@@ -95,20 +95,18 @@ OBJMOC	=	moc_loopcontrol.o \
 
 all: $(DESTDIR)$(TARGET)
 
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 moc: $(SRCMOC)
 
-tmake: Makefile.in
-
-Makefile.in: mpegplayer.pro
-	tmake mpegplayer.pro -o Makefile.in
+tmake:
+	tmake mpegplayer.pro
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
@@ -132,82 +130,130 @@ REQUIRES=
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 main.o: main.cpp \
+		$(OPIEDIR)/include/qpe/qpeapplication.h \
 		mediaplayerstate.h \
 		playlistwidget.h \
+		$(OPIEDIR)/include/qpe/applnk.h \
 		audiowidget.h \
 		videowidget.h \
 		loopcontrol.h \
-		mediaplayer.h
+		mediaplayer.h \
+		$(OPIEDIR)/include/qpe/qlibrary.h \
+		$(OPIEDIR)/include/qpe/qcom.h \
+		$(OPIEDIR)/include/qpe/quuid.h \
+		$(OPIEDIR)/include/qpe/mediaplayerplugininterface.h
 
 loopcontrol.o: loopcontrol.cpp \
+		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
 		loopcontrol.h \
 		videowidget.h \
 		audiodevice.h \
+		mediaplayerplugininterface.h \
+		$(OPIEDIR)/include/qpe/qcom.h \
+		$(OPIEDIR)/include/qpe/quuid.h \
 		mediaplayerstate.h
 
 playlistselection.o: playlistselection.cpp \
+		$(OPIEDIR)/include/qpe/applnk.h \
+		$(OPIEDIR)/include/qpe/resource.h \
 		playlistselection.h
 
 mediaplayerstate.o: mediaplayerstate.cpp \
+		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpe/qlibrary.h \
+		$(OPIEDIR)/include/qpe/qcom.h \
+		$(OPIEDIR)/include/qpe/quuid.h \
+		$(OPIEDIR)/include/qpe/mediaplayerplugininterface.h \
+		$(OPIEDIR)/include/qpe/config.h \
 		mediaplayerstate.h \
 		libmad/libmadpluginimpl.h \
 		libmpeg3/libmpeg3pluginimpl.h \
 		wavplugin/wavpluginimpl.h
 
 videowidget.o: videowidget.cpp \
+		$(OPIEDIR)/include/qpe/resource.h \
+		$(OPIEDIR)/include/qpe/mediaplayerplugininterface.h \
+		$(OPIEDIR)/include/qpe/qcom.h \
+		$(OPIEDIR)/include/qpe/quuid.h \
 		videowidget.h \
 		mediaplayerstate.h
 
 audiowidget.o: audiowidget.cpp \
+		$(OPIEDIR)/include/qpe/resource.h \
 		audiowidget.h \
 		mediaplayerstate.h
 
 playlistwidget.o: playlistwidget.cpp \
+		$(OPIEDIR)/include/qpe/qpemenubar.h \
+		$(OPIEDIR)/include/qpe/qpetoolbar.h \
+		$(OPIEDIR)/include/qpe/fileselector.h \
+		$(OPIEDIR)/include/qpe/applnk.h \
+		$(OPIEDIR)/include/qpe/config.h \
+		$(OPIEDIR)/include/qpe/global.h \
+		$(OPIEDIR)/include/qpe/resource.h \
 		playlistselection.h \
 		playlistwidget.h \
 		mediaplayerstate.h
 
 mediaplayer.o: mediaplayer.cpp \
+		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpe/qlibrary.h \
+		$(OPIEDIR)/include/qpe/qcom.h \
+		$(OPIEDIR)/include/qpe/quuid.h \
+		$(OPIEDIR)/include/qpe/resource.h \
+		$(OPIEDIR)/include/qpe/config.h \
 		mediaplayer.h \
+		$(OPIEDIR)/include/qpe/mediaplayerplugininterface.h \
 		playlistwidget.h \
+		$(OPIEDIR)/include/qpe/applnk.h \
 		audiowidget.h \
 		loopcontrol.h \
 		audiodevice.h \
 		mediaplayerstate.h
 
 audiodevice.o: audiodevice.cpp \
-		audiodevice.h
+		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpe/config.h \
+		audiodevice.h \
+		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h
 
 moc_loopcontrol.o: moc_loopcontrol.cpp \
 		loopcontrol.h
 
 moc_playlistselection.o: moc_playlistselection.cpp \
-		playlistselection.h
+		playlistselection.h \
+		$(OPIEDIR)/include/qpe/applnk.h
 
 moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \
 		mediaplayerstate.h
 
 moc_videowidget.o: moc_videowidget.cpp \
 		videowidget.h
 
 moc_audiowidget.o: moc_audiowidget.cpp \
 		audiowidget.h
 
 moc_playlistwidget.o: moc_playlistwidget.cpp \
-		playlistwidget.h
+		playlistwidget.h \
+		$(OPIEDIR)/include/qpe/applnk.h
 
 moc_mediaplayer.o: moc_mediaplayer.cpp \
-		mediaplayer.h
+		mediaplayer.h \
+		$(OPIEDIR)/include/qpe/qlibrary.h \
+		$(OPIEDIR)/include/qpe/qcom.h \
+		$(OPIEDIR)/include/qpe/quuid.h \
+		$(OPIEDIR)/include/qpe/mediaplayerplugininterface.h
 
 moc_audiodevice.o: moc_audiodevice.cpp \
 		audiodevice.h
 
 moc_loopcontrol.cpp: loopcontrol.h
 	$(MOC) loopcontrol.h -o moc_loopcontrol.cpp
 
 moc_playlistselection.cpp: playlistselection.h
diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in
index d2e1cda..e9f74e7 100644
--- a/core/multimedia/opieplayer/libmad/Makefile.in
+++ b/core/multimedia/opieplayer/libmad/Makefile.in
@@ -95,20 +95,18 @@ OBJMOC	=
 
 all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK_LIB)
 
 moc: $(SRCMOC)
 
-tmake: Makefile.in
-
-Makefile.in: libmad.pro
-	tmake libmad.pro -o Makefile.in
+tmake:
+	tmake libmad.pro
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in
index 4ccdb8c..154f85d 100644
--- a/core/multimedia/opieplayer/libmpeg3/Makefile.in
+++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in
@@ -124,20 +124,18 @@ OBJMOC	=
 
 all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK_LIB)
 
 moc: $(SRCMOC)
 
-tmake: Makefile.in
-
-Makefile.in: libmpeg3.pro
-	tmake libmpeg3.pro -o Makefile.in
+tmake:
+	tmake libmpeg3.pro
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in
index 560534e..bcbe7f2 100644
--- a/core/multimedia/opieplayer/wavplugin/Makefile.in
+++ b/core/multimedia/opieplayer/wavplugin/Makefile.in
@@ -60,20 +60,18 @@ OBJMOC	=
 
 all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK_LIB)
 
 moc: $(SRCMOC)
 
-tmake: Makefile.in
-
-Makefile.in: wavplugin.pro
-	tmake wavplugin.pro -o Makefile.in
+tmake:
+	tmake wavplugin.pro
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
diff --git a/core/pim/datebook/Makefile.in b/core/pim/datebook/Makefile.in
index cc31efe..0c3282e 100644
--- a/core/pim/datebook/Makefile.in
+++ b/core/pim/datebook/Makefile.in
@@ -119,20 +119,18 @@ OBJMOC	=	moc_datebookday.o \
 
 all: $(DESTDIR)$(TARGET)
 
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 moc: $(SRCMOC)
 
-tmake: Makefile.in
-
-Makefile.in: datebook.pro
-	tmake datebook.pro -o Makefile.in
+tmake:
+	tmake datebook.pro
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
@@ -156,58 +154,124 @@ REQUIRES=
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 main.o: main.cpp \
-		datebook.h
+		datebook.h \
+		$(OPIEDIR)/include/qpe/datebookdb.h \
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h \
+		$(OPIEDIR)/include/qpe/qpeapplication.h
 
 datebookday.o: datebookday.cpp \
 		datebookday.h \
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h \
 		datebookdayheaderimpl.h \
-		datebookdayheader.h
+		datebookdayheader.h \
+		$(OPIEDIR)/include/qpe/datebookdb.h \
+		$(OPIEDIR)/include/qpe/resource.h \
+		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpe/timestring.h \
+		$(OPIEDIR)/include/qpe/qpedebug.h
 
 datebook.o: datebook.cpp \
 		datebook.h \
+		$(OPIEDIR)/include/qpe/datebookdb.h \
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h \
 		datebookday.h \
 		datebooksettings.h \
 		datebooksettingsbase.h \
 		datebookweek.h \
 		dateentryimpl.h \
-		dateentry.h
+		dateentry.h \
+		$(OPIEDIR)/include/qpe/datebookmonth.h \
+		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpe/config.h \
+		$(OPIEDIR)/include/qpe/qpedebug.h \
+		$(OPIEDIR)/include/qpe/finddialog.h \
+		$(OPIEDIR)/include/qpe/ir.h \
+		$(OPIEDIR)/include/qpe/qpemenubar.h \
+		$(OPIEDIR)/include/qpe/qpemessagebox.h \
+		$(OPIEDIR)/include/qpe/resource.h \
+		$(OPIEDIR)/include/qpe/sound.h \
+		$(OPIEDIR)/include/qpe/timestring.h \
+		$(OPIEDIR)/include/qpe/qpetoolbar.h \
+		$(OPIEDIR)/include/qpe/tzselect.h \
+		$(OPIEDIR)/include/qpe/xmlreader.h
 
 dateentryimpl.o: dateentryimpl.cpp \
 		dateentryimpl.h \
 		dateentry.h \
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h \
 		repeatentry.h \
-		repeatentrybase.h
+		repeatentrybase.h \
+		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpe/categoryselect.h \
+		$(OPIEDIR)/include/qpe/datebookmonth.h \
+		$(OPIEDIR)/include/qpe/global.h \
+		$(OPIEDIR)/include/qpe/timestring.h \
+		$(OPIEDIR)/include/qpe/tzselect.h
 
 datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \
 		datebookdayheaderimpl.h \
-		datebookdayheader.h
+		datebookdayheader.h \
+		$(OPIEDIR)/include/qpe/datebookmonth.h \
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h \
+		$(OPIEDIR)/include/qpe/timestring.h
 
 datebooksettings.o: datebooksettings.cpp \
 		datebooksettings.h \
-		datebooksettingsbase.h
+		datebooksettingsbase.h \
+		$(OPIEDIR)/include/qpe/qpeapplication.h
 
 datebookweek.o: datebookweek.cpp \
 		datebookweek.h \
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h \
 		datebookweekheaderimpl.h \
-		datebookweekheader.h
+		datebookweekheader.h \
+		$(OPIEDIR)/include/qpe/calendar.h \
+		$(OPIEDIR)/include/qpe/datebookdb.h \
+		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpe/timestring.h
 
 datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \
 		datebookweekheaderimpl.h \
 		datebookweekheader.h
 
 repeatentry.o: repeatentry.cpp \
 		repeatentry.h \
-		repeatentrybase.h
+		repeatentrybase.h \
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h \
+		$(OPIEDIR)/include/qpe/datebookmonth.h \
+		$(OPIEDIR)/include/qpe/qpeapplication.h \
+		$(OPIEDIR)/include/qpe/timestring.h
 
 dateentry.h: dateentry.ui
 	$(UIC) dateentry.ui -o $(INTERFACE_DECL_PATH)/dateentry.h
 
 dateentry.cpp: dateentry.ui
 	$(UIC) dateentry.ui -i dateentry.h -o dateentry.cpp
 
 datebookdayheader.h: datebookdayheader.ui
@@ -240,39 +304,60 @@ datebookdayheader.o: datebookdayheader.cpp
 
 datebooksettingsbase.o: datebooksettingsbase.cpp
 
 datebookweekheader.o: datebookweekheader.cpp
 
 repeatentrybase.o: repeatentrybase.cpp
 
 moc_datebookday.o: moc_datebookday.cpp \
-		datebookday.h
+		datebookday.h \
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h
 
 moc_datebook.o: moc_datebook.cpp \
-		datebook.h
+		datebook.h \
+		$(OPIEDIR)/include/qpe/datebookdb.h \
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h
 
 moc_dateentryimpl.o: moc_dateentryimpl.cpp \
 		dateentryimpl.h \
-		dateentry.h
+		dateentry.h \
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h
 
 moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \
 		datebookdayheaderimpl.h \
 		datebookdayheader.h
 
 moc_datebookweek.o: moc_datebookweek.cpp \
-		datebookweek.h
+		datebookweek.h \
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h
 
 moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \
 		datebookweekheaderimpl.h \
 		datebookweekheader.h
 
 moc_repeatentry.o: moc_repeatentry.cpp \
 		repeatentry.h \
-		repeatentrybase.h
+		repeatentrybase.h \
+		$(OPIEDIR)/include/qpe/event.h \
+		$(OPIEDIR)/include/qpe/palmtoprecord.h \
+		$(OPIEDIR)/include/qpe/timeconversion.h \
+		$(OPIEDIR)/include/qpe/qpcglobal.h
 
 moc_dateentry.o: moc_dateentry.cpp \
 		dateentry.h
 
 moc_datebookdayheader.o: moc_datebookdayheader.cpp \
 		datebookdayheader.h
 
 moc_datebooksettingsbase.o: moc_datebooksettingsbase.cpp \