Making opie compile again.

14 files changed, 274 insertions, 489 deletions

diff --git a/core/apps/embeddedkonsole/Makefile.in b/core/apps/embeddedkonsole/Makefile.in
index 0da49d7..1c24ded 100644
--- a/core/apps/embeddedkonsole/Makefile.in
+++ b/core/apps/embeddedkonsole/Makefile.in
@@ -6,277 +6,283 @@ CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
 CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
 CC	=	$(SYSCONF_CC) $(QT_C_MT)
 CFLAGS	=	$(SYSCONF_CFLAGS)
 INCPATH =	-I$(OPIEDIR)/include
 LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
 LIBS	=	$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
 MOC	=	$(SYSCONF_MOC)
 UIC	=	$(SYSCONF_UIC)
 
 ####### Target
 
 DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
 TARGET	= embeddedkonsole
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
 HEADERS =	TEWidget.h \
 		TEScreen.h \
 		TECommon.h \
 		TEHistory.h \
 		TEmulation.h \
 		TEmuVt102.h \
 		session.h \
 		keytrans.h \
 		konsole.h \
 		MyPty.h
 SOURCES =	TEScreen.cpp \
 		TEWidget.cpp \
 		TEHistory.cpp \
 		TEmulation.cpp \
 		TEmuVt102.cpp \
 		session.cpp \
 		keytrans.cpp \
 		konsole.cpp \
 		main.cpp \
 		MyPty.cpp
 OBJECTS =	TEScreen.o \
 		TEWidget.o \
 		TEHistory.o \
 		TEmulation.o \
 		TEmuVt102.o \
 		session.o \
 		keytrans.o \
 		konsole.o \
 		main.o \
 		MyPty.o
 INTERFACES =    
 UICDECLS =      
 UICIMPLS =      
 SRCMOC	=	moc_TEWidget.cpp \
 		moc_TEmulation.cpp \
 		moc_TEmuVt102.cpp \
 		moc_session.cpp \
 		moc_konsole.cpp \
 		moc_MyPty.cpp
 OBJMOC	=	moc_TEWidget.o \
 		moc_TEmulation.o \
 		moc_TEmuVt102.o \
 		moc_session.o \
 		moc_konsole.o \
 		moc_MyPty.o
 
 
 ####### Implicit rules
 
 .SUFFIXES: .cpp .cxx .cc .C .c
 
 .cpp.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cxx.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cc.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .C.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 
 ####### Build rules
 
 
 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
 
 listpromodules:
 	@echo 
 
 listallmodules:
 	@echo 
 
 listaddonpromodules:
 	@echo 
 
 listaddonentmodules:
 	@echo 
 
 
 REQUIRES=embeddedkonsole
 
 ####### Sub-libraries
 
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 TEScreen.o: TEScreen.cpp \
 		TEScreen.h \
 		TECommon.h \
 		TEHistory.h
 
 TEWidget.o: TEWidget.cpp \
 		TEWidget.h \
 		TECommon.h \
 		session.h \
 		MyPty.h \
 		TEmuVt102.h \
 		TEScreen.h \
 		TEHistory.h \
 		TEmulation.h \
 		keytrans.h
 
 TEHistory.o: TEHistory.cpp \
 		TEHistory.h \
 		TECommon.h
 
 TEmulation.o: TEmulation.cpp \
 		TEmulation.h \
 		TEWidget.h \
 		TECommon.h \
 		TEScreen.h \
 		TEHistory.h \
 		keytrans.h
 
 TEmuVt102.o: TEmuVt102.cpp \
 		TEmuVt102.h \
 		TEWidget.h \
 		TECommon.h \
 		TEScreen.h \
 		TEHistory.h \
 		TEmulation.h \
 		keytrans.h
 
 session.o: session.cpp \
 		session.h \
 		MyPty.h \
 		TEWidget.h \
 		TECommon.h \
 		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
 
 moc_TEmulation.o: moc_TEmulation.cpp \
 		TEmulation.h \
 		TEWidget.h \
 		TECommon.h \
 		TEScreen.h \
 		TEHistory.h \
 		keytrans.h
 
 moc_TEmuVt102.o: moc_TEmuVt102.cpp \
 		TEmuVt102.h \
 		TEWidget.h \
 		TECommon.h \
 		TEScreen.h \
 		TEHistory.h \
 		TEmulation.h \
 		keytrans.h
 
 moc_session.o: moc_session.cpp \
 		session.h \
 		MyPty.h \
 		TEWidget.h \
 		TECommon.h \
 		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 \
 		session.h
 
 moc_MyPty.o: moc_MyPty.cpp \
 		MyPty.h
 
 moc_TEWidget.cpp: TEWidget.h
 	$(MOC) TEWidget.h -o moc_TEWidget.cpp
 
 moc_TEmulation.cpp: TEmulation.h
 	$(MOC) TEmulation.h -o moc_TEmulation.cpp
 
 moc_TEmuVt102.cpp: TEmuVt102.h
 	$(MOC) TEmuVt102.h -o moc_TEmuVt102.cpp
 
 moc_session.cpp: session.h
 	$(MOC) session.h -o moc_session.cpp
 
 moc_konsole.cpp: konsole.h
 	$(MOC) konsole.h -o moc_konsole.cpp
 
 moc_MyPty.cpp: MyPty.h
 	$(MOC) MyPty.h -o moc_MyPty.cpp
 
 
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
@@ -1,591 +1,606 @@
 #############################################################################
 
 ####### Compiler, tools and options
 
 CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
 CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
 CC	=	$(SYSCONF_CC) $(QT_C_MT)
 CFLAGS	=	$(SYSCONF_CFLAGS)
 INCPATH =	-I$(OPIEDIR)/include -I$(OPIEDIR)/calibrate -I$(OPIEDIR)/rsync
 LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
 LIBS	=	$(SUBLIBS) -lqpe -lcrypt $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
 MOC	=	$(SYSCONF_MOC)
 UIC	=	$(SYSCONF_UIC)
 
 ####### Target
 
 DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
 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 \
 		wait.h \
 		shutdownimpl.h \
 		launcher.h \
 		launcherview.h \
 		../calibrate/calibrate.h \
 		startmenu.h \
 		transferserver.h \
 		qcopbridge.h \
 		packageslave.h \
 		irserver.h \
 		$(OPIEDIR)/rsync/buf.h \
 		$(OPIEDIR)/rsync/checksum.h \
 		$(OPIEDIR)/rsync/command.h \
 		$(OPIEDIR)/rsync/emit.h \
 		$(OPIEDIR)/rsync/job.h \
 		$(OPIEDIR)/rsync/netint.h \
 		$(OPIEDIR)/rsync/protocol.h \
 		$(OPIEDIR)/rsync/prototab.h \
 		$(OPIEDIR)/rsync/rsync.h \
 		$(OPIEDIR)/rsync/search.h \
 		$(OPIEDIR)/rsync/stream.h \
 		$(OPIEDIR)/rsync/sumset.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 \
 		wait.cpp \
 		shutdownimpl.cpp \
 		launcher.cpp \
 		launcherview.cpp \
 		$(OPIEDIR)/calibrate/calibrate.cpp \
 		transferserver.cpp \
 		packageslave.cpp \
 		irserver.cpp \
 		qcopbridge.cpp \
 		startmenu.cpp \
 		main.cpp \
 		$(OPIEDIR)/rsync/base64.c \
 		$(OPIEDIR)/rsync/buf.c \
 		$(OPIEDIR)/rsync/checksum.c \
 		$(OPIEDIR)/rsync/command.c \
 		$(OPIEDIR)/rsync/delta.c \
 		$(OPIEDIR)/rsync/emit.c \
 		$(OPIEDIR)/rsync/hex.c \
 		$(OPIEDIR)/rsync/job.c \
 		$(OPIEDIR)/rsync/mdfour.c \
 		$(OPIEDIR)/rsync/mksum.c \
 		$(OPIEDIR)/rsync/msg.c \
 		$(OPIEDIR)/rsync/netint.c \
 		$(OPIEDIR)/rsync/patch.c \
 		$(OPIEDIR)/rsync/prototab.c \
 		$(OPIEDIR)/rsync/readsums.c \
 		$(OPIEDIR)/rsync/scoop.c \
 		$(OPIEDIR)/rsync/search.c \
 		$(OPIEDIR)/rsync/stats.c \
 		$(OPIEDIR)/rsync/stream.c \
 		$(OPIEDIR)/rsync/sumset.c \
 		$(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 \
 		wait.o \
 		shutdownimpl.o \
 		launcher.o \
 		launcherview.o \
 		$(OPIEDIR)/calibrate/calibrate.o \
 		transferserver.o \
 		packageslave.o \
 		irserver.o \
 		qcopbridge.o \
 		startmenu.o \
 		main.o \
 		$(OPIEDIR)/rsync/base64.o \
 		$(OPIEDIR)/rsync/buf.o \
 		$(OPIEDIR)/rsync/checksum.o \
 		$(OPIEDIR)/rsync/command.o \
 		$(OPIEDIR)/rsync/delta.o \
 		$(OPIEDIR)/rsync/emit.o \
 		$(OPIEDIR)/rsync/hex.o \
 		$(OPIEDIR)/rsync/job.o \
 		$(OPIEDIR)/rsync/mdfour.o \
 		$(OPIEDIR)/rsync/mksum.o \
 		$(OPIEDIR)/rsync/msg.o \
 		$(OPIEDIR)/rsync/netint.o \
 		$(OPIEDIR)/rsync/patch.o \
 		$(OPIEDIR)/rsync/prototab.o \
 		$(OPIEDIR)/rsync/readsums.o \
 		$(OPIEDIR)/rsync/scoop.o \
 		$(OPIEDIR)/rsync/search.o \
 		$(OPIEDIR)/rsync/stats.o \
 		$(OPIEDIR)/rsync/stream.o \
 		$(OPIEDIR)/rsync/sumset.o \
 		$(OPIEDIR)/rsync/trace.o \
 		$(OPIEDIR)/rsync/tube.o \
 		$(OPIEDIR)/rsync/util.o \
 		$(OPIEDIR)/rsync/version.o \
 		$(OPIEDIR)/rsync/whole.o \
 		$(OPIEDIR)/rsync/qrsync.o \
 		shutdown.o \
 		syncdialog.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 \
 		moc_launcherview.o \
 		../calibrate/moc_calibrate.o \
 		moc_startmenu.o \
 		moc_transferserver.o \
 		moc_qcopbridge.o \
 		moc_packageslave.o \
 		moc_irserver.o \
 		moc_shutdown.o \
 		moc_syncdialog.o
 
 
 ####### Implicit rules
 
 .SUFFIXES: .cpp .cxx .cc .C .c
 
 .cpp.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cxx.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cc.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .C.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 
 ####### Build rules
 
 
 all: $(DESTDIR)$(TARGET)
 
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 moc: $(SRCMOC)
 
 tmake:
 	tmake taskbar.pro
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
 listpromodules:
 	@echo 
 
 listallmodules:
 	@echo 
 
 listaddonpromodules:
 	@echo 
 
 listaddonentmodules:
 	@echo 
 
 
 REQUIRES=
 
 ####### Sub-libraries
 
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 background.o: background.cpp \
 		background.h \
 		desktop.h \
 		shutdownimpl.h \
 		shutdown.h \
 		$(OPIEDIR)/include/qpe/qpeapplication.h \
 		$(OPIEDIR)/include/qpe/resource.h
 
 desktop.o: desktop.cpp \
 		desktop.h \
 		shutdownimpl.h \
 		shutdown.h \
 		$(OPIEDIR)/include/qpe/qpeapplication.h \
 		info.h \
 		background.h \
 		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 \
 		$(OPIEDIR)/include/qpe/version.h
 
 appicons.o: appicons.cpp \
 		appicons.moc \
 		appicons.h \
 		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h
 
 taskbar.o: taskbar.cpp \
 		startmenu.h \
 		inputmethods.h \
 		$(OPIEDIR)/include/qpe/inputmethodinterface.h \
 		$(OPIEDIR)/include/qpe/qcom.h \
 		$(OPIEDIR)/include/qpe/quuid.h \
 		mrulist.h \
 		$(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 \
 		../datebook/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 \
 		../helpbrowser/helpbrowser.h \
 		../minesweep/minesweep.h \
 		../textedit/textedit.h \
 		$(OPIEDIR)/include/qpe/filemanager.h \
 		../todo/mainwindow.h \
 		../citytime/citytime.h \
 		../clock/clock.h \
 		../calculator/calculatorimpl.h \
 		../sysinfo/sysinfo.h \
 		../settings/appearance/settings.h \
 		../settings/systemtime/settime.h \
 		$(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
 
 mrulist.o: mrulist.cpp \
 		mrulist.h \
 		$(OPIEDIR)/include/qpe/applnk.h \
 		$(OPIEDIR)/include/qpe/global.h \
 		$(OPIEDIR)/include/qpe/resource.h
 
 stabmon.o: stabmon.cpp \
 		stabmon.h \
 		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h
 
 inputmethods.o: inputmethods.cpp \
 		inputmethods.h \
 		$(OPIEDIR)/include/qpe/inputmethodinterface.h \
 		$(OPIEDIR)/include/qpe/qcom.h \
 		$(OPIEDIR)/include/qpe/quuid.h \
 		$(OPIEDIR)/include/qpe/config.h \
 		$(OPIEDIR)/include/qpe/qpeapplication.h \
 		$(OPIEDIR)/include/qpe/qlibrary.h
 
 systray.o: systray.cpp \
 		$(OPIEDIR)/include/qpe/qpeapplication.h \
 		$(OPIEDIR)/include/qpe/qlibrary.h \
 		$(OPIEDIR)/include/qpe/qcom.h \
 		$(OPIEDIR)/include/qpe/quuid.h \
 		$(OPIEDIR)/include/qpe/config.h \
 		quicklauncher.h \
 		systray.h \
 		$(OPIEDIR)/include/qpe/taskbarappletinterface.h
 
 wait.o: wait.cpp \
 		wait.h \
 		$(OPIEDIR)/include/qpe/resource.h
 
 shutdownimpl.o: shutdownimpl.cpp \
 		shutdownimpl.h \
 		shutdown.h \
 		$(OPIEDIR)/include/qpe/global.h
 
 launcher.o: launcher.cpp \
 		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
 		$(OPIEDIR)/include/qpe/resource.h \
 		$(OPIEDIR)/include/qpe/applnk.h \
 		$(OPIEDIR)/include/qpe/config.h \
 		$(OPIEDIR)/include/qpe/global.h \
 		$(OPIEDIR)/include/qpe/qpeapplication.h \
 		$(OPIEDIR)/include/qpe/mimetype.h \
 		$(OPIEDIR)/include/qpe/storage.h \
 		$(OPIEDIR)/include/qpe/palmtoprecord.h \
 		launcherview.h \
 		launcher.h \
 		syncdialog.h \
 		desktop.h \
 		shutdownimpl.h \
 		shutdown.h \
 		$(OPIEDIR)/include/qpe/lnkproperties.h \
 		mrulist.h \
 		$(OPIEDIR)/rsync/qrsync.h
 
 launcherview.o: launcherview.cpp \
 		launcherview.h \
 		$(OPIEDIR)/include/qpe/storage.h \
 		$(OPIEDIR)/include/qpe/qpeapplication.h \
 		$(OPIEDIR)/include/qpe/applnk.h \
 		$(OPIEDIR)/include/qpe/qpedebug.h \
 		$(OPIEDIR)/include/qpe/categories.h \
 		$(OPIEDIR)/include/qpe/categoryselect.h \
 		$(OPIEDIR)/include/qpe/menubutton.h \
 		$(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 \
 		$(OPIEDIR)/include/qpe/qlibrary.h \
 		$(OPIEDIR)/include/qpe/qcom.h \
 		$(OPIEDIR)/include/qpe/quuid.h \
 		$(OPIEDIR)/include/qpe/qpeapplication.h \
 		obexinterface.h
 
 qcopbridge.o: qcopbridge.cpp \
 		qcopbridge.h \
 		transferserver.h \
 		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
 		$(OPIEDIR)/include/qpe/qpeapplication.h
 
 startmenu.o: startmenu.cpp \
 		startmenu.h \
 		sidething.h \
 		mrulist.h \
 		$(OPIEDIR)/include/qpe/applnk.h \
 		info.h \
 		background.h \
 		$(OPIEDIR)/include/qpe/qpeapplication.h \
 		$(OPIEDIR)/include/qpe/config.h \
 		$(OPIEDIR)/include/qpe/global.h \
 		$(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
 
 $(OPIEDIR)/rsync/base64.o: $(OPIEDIR)/rsync/base64.c \
 		$(OPIEDIR)/rsync/config_rsync.h \
 		$(OPIEDIR)/rsync/config_linux.h \
 		$(OPIEDIR)/rsync/rsync.h
 
 $(OPIEDIR)/rsync/buf.o: $(OPIEDIR)/rsync/buf.c \
 		$(OPIEDIR)/rsync/config_rsync.h \
 		$(OPIEDIR)/rsync/config_linux.h \
 		$(OPIEDIR)/rsync/rsync.h \
 		$(OPIEDIR)/rsync/trace.h \
 		$(OPIEDIR)/rsync/buf.h \
 		$(OPIEDIR)/rsync/util.h
 
 $(OPIEDIR)/rsync/checksum.o: $(OPIEDIR)/rsync/checksum.c \
 		$(OPIEDIR)/rsync/config_rsync.h \
 		$(OPIEDIR)/rsync/config_linux.h \
 		$(OPIEDIR)/rsync/rsync.h \
 		$(OPIEDIR)/rsync/checksum.h
 
 $(OPIEDIR)/rsync/command.o: $(OPIEDIR)/rsync/command.c \
 		$(OPIEDIR)/rsync/config_rsync.h \
 		$(OPIEDIR)/rsync/config_linux.h \
 		$(OPIEDIR)/rsync/rsync.h \
 		$(OPIEDIR)/rsync/command.h
 
 $(OPIEDIR)/rsync/delta.o: $(OPIEDIR)/rsync/delta.c \
 		$(OPIEDIR)/rsync/config_rsync.h \
 		$(OPIEDIR)/rsync/config_linux.h \
 		$(OPIEDIR)/rsync/rsync.h \
 		$(OPIEDIR)/rsync/emit.h \
 		$(OPIEDIR)/rsync/stream.h \
 		$(OPIEDIR)/rsync/util.h \
 		$(OPIEDIR)/rsync/sumset.h \
 		$(OPIEDIR)/rsync/job.h \
 		$(OPIEDIR)/rsync/trace.h \
 		$(OPIEDIR)/rsync/checksum.h \
 		$(OPIEDIR)/rsync/search.h \
 		$(OPIEDIR)/rsync/types.h
 
 $(OPIEDIR)/rsync/emit.o: $(OPIEDIR)/rsync/emit.c \
 		$(OPIEDIR)/rsync/config_rsync.h \
 		$(OPIEDIR)/rsync/config_linux.h \
 		$(OPIEDIR)/rsync/rsync.h \
 		$(OPIEDIR)/rsync/command.h \
 		$(OPIEDIR)/rsync/protocol.h \
 		$(OPIEDIR)/rsync/trace.h \
 		$(OPIEDIR)/rsync/emit.h \
 		$(OPIEDIR)/rsync/prototab.h \
 		$(OPIEDIR)/rsync/netint.h \
 		$(OPIEDIR)/rsync/sumset.h \
 		$(OPIEDIR)/rsync/job.h
 
 $(OPIEDIR)/rsync/hex.o: $(OPIEDIR)/rsync/hex.c \
 		$(OPIEDIR)/rsync/config_rsync.h \
 		$(OPIEDIR)/rsync/config_linux.h \
 		$(OPIEDIR)/rsync/rsync.h
 
 $(OPIEDIR)/rsync/job.o: $(OPIEDIR)/rsync/job.c \
 		$(OPIEDIR)/rsync/config_rsync.h \
 		$(OPIEDIR)/rsync/config_linux.h \
 		$(OPIEDIR)/rsync/rsync.h \
 		$(OPIEDIR)/rsync/stream.h \
 		$(OPIEDIR)/rsync/util.h \
 		$(OPIEDIR)/rsync/sumset.h \
 		$(OPIEDIR)/rsync/job.h \
 		$(OPIEDIR)/rsync/trace.h
 
 $(OPIEDIR)/rsync/mdfour.o: $(OPIEDIR)/rsync/mdfour.c \
 		$(OPIEDIR)/rsync/config_rsync.h \
 		$(OPIEDIR)/rsync/config_linux.h \
 		$(OPIEDIR)/rsync/rsync.h \
 		$(OPIEDIR)/rsync/trace.h \
 		$(OPIEDIR)/rsync/types.h
 
 $(OPIEDIR)/rsync/mksum.o: $(OPIEDIR)/rsync/mksum.c \
 		$(OPIEDIR)/rsync/config_rsync.h \
 		$(OPIEDIR)/rsync/config_linux.h \
 		$(OPIEDIR)/rsync/rsync.h \
 		$(OPIEDIR)/rsync/stream.h \
 		$(OPIEDIR)/rsync/util.h \
 		$(OPIEDIR)/rsync/sumset.h \
 		$(OPIEDIR)/rsync/job.h \
 		$(OPIEDIR)/rsync/protocol.h \
 		$(OPIEDIR)/rsync/netint.h \
 		$(OPIEDIR)/rsync/trace.h \
 		$(OPIEDIR)/rsync/checksum.h
 
@@ -654,223 +669,233 @@ $(OPIEDIR)/rsync/search.o: $(OPIEDIR)/rsync/search.c \
 		$(OPIEDIR)/rsync/util.h \
 		$(OPIEDIR)/rsync/sumset.h \
 		$(OPIEDIR)/rsync/search.h \
 		$(OPIEDIR)/rsync/checksum.h
 
 $(OPIEDIR)/rsync/stats.o: $(OPIEDIR)/rsync/stats.c \
 		$(OPIEDIR)/rsync/config_rsync.h \
 		$(OPIEDIR)/rsync/config_linux.h \
 		$(OPIEDIR)/rsync/rsync.h \
 		$(OPIEDIR)/rsync/trace.h
 
 $(OPIEDIR)/rsync/stream.o: $(OPIEDIR)/rsync/stream.c \
 		$(OPIEDIR)/rsync/config_rsync.h \
 		$(OPIEDIR)/rsync/config_linux.h \
 		$(OPIEDIR)/rsync/rsync.h \
 		$(OPIEDIR)/rsync/stream.h \
 		$(OPIEDIR)/rsync/util.h \
 		$(OPIEDIR)/rsync/trace.h
 
 $(OPIEDIR)/rsync/sumset.o: $(OPIEDIR)/rsync/sumset.c \
 		$(OPIEDIR)/rsync/config_rsync.h \
 		$(OPIEDIR)/rsync/config_linux.h \
 		$(OPIEDIR)/rsync/rsync.h \
 		$(OPIEDIR)/rsync/sumset.h \
 		$(OPIEDIR)/rsync/util.h \
 		$(OPIEDIR)/rsync/trace.h
 
 $(OPIEDIR)/rsync/trace.o: $(OPIEDIR)/rsync/trace.c \
 		$(OPIEDIR)/rsync/config_rsync.h \
 		$(OPIEDIR)/rsync/config_linux.h \
 		$(OPIEDIR)/rsync/rsync.h \
 		$(OPIEDIR)/rsync/util.h \
 		$(OPIEDIR)/rsync/trace.h
 
 $(OPIEDIR)/rsync/tube.o: $(OPIEDIR)/rsync/tube.c \
 		$(OPIEDIR)/rsync/config_rsync.h \
 		$(OPIEDIR)/rsync/config_linux.h \
 		$(OPIEDIR)/rsync/rsync.h \
 		$(OPIEDIR)/rsync/trace.h \
 		$(OPIEDIR)/rsync/util.h \
 		$(OPIEDIR)/rsync/job.h \
 		$(OPIEDIR)/rsync/stream.h
 
 $(OPIEDIR)/rsync/util.o: $(OPIEDIR)/rsync/util.c \
 		$(OPIEDIR)/rsync/config_rsync.h \
 		$(OPIEDIR)/rsync/config_linux.h \
 		$(OPIEDIR)/rsync/util.h \
 		$(OPIEDIR)/rsync/rsync.h \
 		$(OPIEDIR)/rsync/trace.h
 
 $(OPIEDIR)/rsync/version.o: $(OPIEDIR)/rsync/version.c \
 		$(OPIEDIR)/rsync/config_rsync.h \
 		$(OPIEDIR)/rsync/config_linux.h \
 		$(OPIEDIR)/rsync/rsync.h
 
 $(OPIEDIR)/rsync/whole.o: $(OPIEDIR)/rsync/whole.c \
 		$(OPIEDIR)/rsync/config_rsync.h \
 		$(OPIEDIR)/rsync/config_linux.h \
 		$(OPIEDIR)/rsync/rsync.h \
 		$(OPIEDIR)/rsync/trace.h \
 		$(OPIEDIR)/rsync/fileutil.h \
 		$(OPIEDIR)/rsync/sumset.h \
 		$(OPIEDIR)/rsync/job.h \
 		$(OPIEDIR)/rsync/buf.h \
 		$(OPIEDIR)/rsync/whole.h \
 		$(OPIEDIR)/rsync/util.h
 
 $(OPIEDIR)/rsync/qrsync.o: $(OPIEDIR)/rsync/qrsync.cpp \
 		$(OPIEDIR)/rsync/qrsync.h \
 		$(OPIEDIR)/rsync/rsync.h
 
 shutdown.h: shutdown.ui
 	$(UIC) shutdown.ui -o $(INTERFACE_DECL_PATH)/shutdown.h
 
 shutdown.cpp: shutdown.ui
 	$(UIC) shutdown.ui -i shutdown.h -o shutdown.cpp
 
 syncdialog.h: syncdialog.ui
 	$(UIC) syncdialog.ui -o $(INTERFACE_DECL_PATH)/syncdialog.h
 
 syncdialog.cpp: syncdialog.ui
 	$(UIC) syncdialog.ui -i syncdialog.h -o syncdialog.cpp
 
 shutdown.o: shutdown.cpp
 
 syncdialog.o: syncdialog.cpp
 
 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 \
 		$(OPIEDIR)/include/qpe/qcom.h \
 		$(OPIEDIR)/include/qpe/quuid.h
 
 moc_systray.o: moc_systray.cpp \
 		systray.h \
 		$(OPIEDIR)/include/qpe/taskbarappletinterface.h \
 		$(OPIEDIR)/include/qpe/qcom.h \
 		$(OPIEDIR)/include/qpe/quuid.h
 
 moc_shutdownimpl.o: moc_shutdownimpl.cpp \
 		shutdownimpl.h \
 		shutdown.h
 
 moc_launcher.o: moc_launcher.cpp \
 		launcher.h \
 		launcherview.h \
 		$(OPIEDIR)/include/qpe/storage.h
 
 moc_launcherview.o: moc_launcherview.cpp \
 		launcherview.h \
 		$(OPIEDIR)/include/qpe/storage.h
 
 ../calibrate/moc_calibrate.o: ../calibrate/moc_calibrate.cpp \
 		../calibrate/calibrate.h
 
 moc_startmenu.o: moc_startmenu.cpp \
 		startmenu.h
 
 moc_transferserver.o: moc_transferserver.cpp \
 		transferserver.h
 
 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
 
 moc_sidething.cpp: sidething.h
 	$(MOC) sidething.h -o moc_sidething.cpp
 
 moc_inputmethods.cpp: inputmethods.h
 	$(MOC) inputmethods.h -o moc_inputmethods.cpp
 
 moc_systray.cpp: systray.h
 	$(MOC) systray.h -o moc_systray.cpp
 
 moc_shutdownimpl.cpp: shutdownimpl.h
 	$(MOC) shutdownimpl.h -o moc_shutdownimpl.cpp
 
 moc_launcher.cpp: launcher.h
 	$(MOC) launcher.h -o moc_launcher.cpp
 
 moc_launcherview.cpp: launcherview.h
 	$(MOC) launcherview.h -o moc_launcherview.cpp
 
 ../calibrate/moc_calibrate.cpp: ../calibrate/calibrate.h
 	$(MOC) ../calibrate/calibrate.h -o ../calibrate/moc_calibrate.cpp
 
 moc_startmenu.cpp: startmenu.h
 	$(MOC) startmenu.h -o moc_startmenu.cpp
 
 moc_transferserver.cpp: transferserver.h
 	$(MOC) transferserver.h -o moc_transferserver.cpp
 
 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
@@ -7,228 +7,274 @@ CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
 CC	=	$(SYSCONF_CC) $(QT_C_MT)
 CFLAGS	=	$(SYSCONF_CFLAGS)
 INCPATH =	-I$(OPIEDIR)/include
 LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
 LIBS	=	$(SUBLIBS) -lqpe -lpthread $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
 MOC	=	$(SYSCONF_MOC)
 UIC	=	$(SYSCONF_UIC)
 
 ####### Target
 
 DESTDIR = $(OPIEDIR)/bin/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
 TARGET	= mpegplayer
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
 HEADERS =	loopcontrol.h \
 		mediaplayerplugininterface.h \
 		playlistselection.h \
 		mediaplayerstate.h \
 		videowidget.h \
 		audiowidget.h \
 		playlistwidget.h \
 		mediaplayer.h \
 		audiodevice.h
 SOURCES =	main.cpp \
 		loopcontrol.cpp \
 		playlistselection.cpp \
 		mediaplayerstate.cpp \
 		videowidget.cpp \
 		audiowidget.cpp \
 		playlistwidget.cpp \
 		mediaplayer.cpp \
 		audiodevice.cpp
 OBJECTS =	main.o \
 		loopcontrol.o \
 		playlistselection.o \
 		mediaplayerstate.o \
 		videowidget.o \
 		audiowidget.o \
 		playlistwidget.o \
 		mediaplayer.o \
 		audiodevice.o
 INTERFACES =    
 UICDECLS =      
 UICIMPLS =      
 SRCMOC	=	moc_loopcontrol.cpp \
 		moc_playlistselection.cpp \
 		moc_mediaplayerstate.cpp \
 		moc_videowidget.cpp \
 		moc_audiowidget.cpp \
 		moc_playlistwidget.cpp \
 		moc_mediaplayer.cpp \
 		moc_audiodevice.cpp
 OBJMOC	=	moc_loopcontrol.o \
 		moc_playlistselection.o \
 		moc_mediaplayerstate.o \
 		moc_videowidget.o \
 		moc_audiowidget.o \
 		moc_playlistwidget.o \
 		moc_mediaplayer.o \
 		moc_audiodevice.o
 
 
 ####### Implicit rules
 
 .SUFFIXES: .cpp .cxx .cc .C .c
 
 .cpp.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cxx.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cc.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .C.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 
 ####### Build rules
 
 
 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
 
 listpromodules:
 	@echo 
 
 listallmodules:
 	@echo 
 
 listaddonpromodules:
 	@echo 
 
 listaddonentmodules:
 	@echo 
 
 
 REQUIRES=
 
 ####### Sub-libraries
 
 
 ###### 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
 	$(MOC) playlistselection.h -o moc_playlistselection.cpp
 
 moc_mediaplayerstate.cpp: mediaplayerstate.h
 	$(MOC) mediaplayerstate.h -o moc_mediaplayerstate.cpp
 
 moc_videowidget.cpp: videowidget.h
 	$(MOC) videowidget.h -o moc_videowidget.cpp
 
 moc_audiowidget.cpp: audiowidget.h
 	$(MOC) audiowidget.h -o moc_audiowidget.cpp
 
 moc_playlistwidget.cpp: playlistwidget.h
 	$(MOC) playlistwidget.h -o moc_playlistwidget.cpp
 
 moc_mediaplayer.cpp: mediaplayer.h
 	$(MOC) mediaplayer.h -o moc_mediaplayer.cpp
 
 moc_audiodevice.cpp: audiodevice.h
 	$(MOC) audiodevice.h -o moc_audiodevice.cpp
 
 
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
@@ -7,196 +7,194 @@ CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
 CC	=	$(SYSCONF_CC) $(QT_C_MT)
 CFLAGS	=	$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
 INCPATH =	-I$(OPIEDIR)/include -I..
 LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
 LIBS	=	$(SUBLIBS) -lqpe -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
 MOC	=	$(SYSCONF_MOC)
 UIC	=	$(SYSCONF_UIC)
 
 ####### Target
 
 DESTDIR = ../../plugins/codecs/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
 TARGET	= madplugin
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
 HEADERS =	libmad_version.h \
 		fixed.h \
 		bit.h \
 		timer.h \
 		stream.h \
 		frame.h \
 		synth.h \
 		decoder.h \
 		layer12.h \
 		layer3.h \
 		huffman.h \
 		libmad_global.h \
 		mad.h \
 		libmadplugin.h \
 		libmadpluginimpl.h
 SOURCES =	version.c \
 		fixed.c \
 		bit.c \
 		timer.c \
 		stream.c \
 		frame.c \
 		synth.c \
 		decoder.c \
 		layer12.c \
 		layer3.c \
 		huffman.c \
 		libmadplugin.cpp \
 		libmadpluginimpl.cpp
 OBJECTS =	version.o \
 		fixed.o \
 		bit.o \
 		timer.o \
 		stream.o \
 		frame.o \
 		synth.o \
 		decoder.o \
 		layer12.o \
 		layer3.o \
 		huffman.o \
 		libmadplugin.o \
 		libmadpluginimpl.o
 INTERFACES =    
 UICDECLS =      
 UICIMPLS =      
 SRCMOC	=	
 OBJMOC	=	
 
 
 ####### Implicit rules
 
 .SUFFIXES: .cpp .cxx .cc .C .c
 
 .cpp.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cxx.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cc.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .C.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 
 ####### Build rules
 
 
 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
 
 listpromodules:
 	@echo 
 
 listallmodules:
 	@echo 
 
 listaddonpromodules:
 	@echo 
 
 listaddonentmodules:
 	@echo 
 
 
 REQUIRES=
 
 ####### Sub-libraries
 
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 version.o: version.c \
 		libmad_global.h \
 		libmad_version.h
 
 fixed.o: fixed.c \
 		libmad_global.h \
 		fixed.h
 
 bit.o: bit.c \
 		libmad_global.h \
 		bit.h
 
 timer.o: timer.c \
 		libmad_global.h \
 		timer.h
 
 stream.o: stream.c \
 		libmad_global.h \
 		bit.h \
 		stream.h
 
 frame.o: frame.c \
 		libmad_global.h \
 		bit.h \
 		stream.h \
 		frame.h \
 		fixed.h \
 		timer.h \
 		layer12.h \
 		layer3.h
 
 synth.o: synth.c \
 		libmad_global.h \
 		fixed.h \
 		frame.h \
 		timer.h \
 		stream.h \
 		bit.h \
 		synth.h \
 		D.dat
 
 decoder.o: decoder.c \
 		libmad_global.h \
 		stream.h \
 		bit.h \
 		frame.h \
 		fixed.h \
 		timer.h \
 		synth.h \
 		decoder.h
 
 layer12.o: layer12.c \
 		libmad_global.h \
 		fixed.h \
 		bit.h \
 		stream.h \
 		frame.h \
 		timer.h \
 		layer12.h \
 		sf_table.dat \
 		qc_table.dat
 
 layer3.o: layer3.c \
 		libmad_global.h \
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
@@ -36,196 +36,194 @@ SOURCES =	libmpeg3plugin.cpp \
 		mpeg3title.c \
 		mpeg3vtrack.c \
 		audio/ac3.c \
 		audio/bit_allocation.c \
 		audio/dct.c \
 		audio/exponents.c \
 		audio/header.c \
 		audio/layer2.c \
 		audio/layer3.c \
 		audio/mantissa.c \
 		audio/mpeg3audio.c \
 		audio/pcm.c \
 		audio/synthesizers.c \
 		audio/tables.c \
 		video/getpicture.c \
 		video/headers.c \
 		video/idct.c \
 		video/macroblocks.c \
 		video/mmxtest.c \
 		video/motion.c \
 		video/mpeg3video.c \
 		video/output.c \
 		video/reconstruct.c \
 		video/seek.c \
 		video/slice.c \
 		video/vlc.c
 OBJECTS =	libmpeg3plugin.o \
 		libmpeg3pluginimpl.o \
 		bitstream.o \
 		libmpeg3.o \
 		mpeg3atrack.o \
 		mpeg3css.o \
 		mpeg3demux.o \
 		mpeg3io.o \
 		mpeg3title.o \
 		mpeg3vtrack.o \
 		audio/ac3.o \
 		audio/bit_allocation.o \
 		audio/dct.o \
 		audio/exponents.o \
 		audio/header.o \
 		audio/layer2.o \
 		audio/layer3.o \
 		audio/mantissa.o \
 		audio/mpeg3audio.o \
 		audio/pcm.o \
 		audio/synthesizers.o \
 		audio/tables.o \
 		video/getpicture.o \
 		video/headers.o \
 		video/idct.o \
 		video/macroblocks.o \
 		video/mmxtest.o \
 		video/motion.o \
 		video/mpeg3video.o \
 		video/output.o \
 		video/reconstruct.o \
 		video/seek.o \
 		video/slice.o \
 		video/vlc.o
 INTERFACES =    
 UICDECLS =      
 UICIMPLS =      
 SRCMOC	=	
 OBJMOC	=	
 
 
 ####### Implicit rules
 
 .SUFFIXES: .cpp .cxx .cc .C .c
 
 .cpp.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cxx.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cc.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .C.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 
 ####### Build rules
 
 
 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
 
 listpromodules:
 	@echo 
 
 listallmodules:
 	@echo 
 
 listaddonpromodules:
 	@echo 
 
 listaddonentmodules:
 	@echo 
 
 
 REQUIRES=
 
 ####### Sub-libraries
 
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 libmpeg3plugin.o: libmpeg3plugin.cpp \
 		libmpeg3plugin.h \
 		libmpeg3.h \
 		mpeg3private.h \
 		mpeg3atrack.h \
 		mpeg3demux.h \
 		mpeg3title.h \
 		mpeg3io.h \
 		mpeg3css.h \
 		mpeg3private.inc \
 		audio/mpeg3audio.h \
 		mpeg3vtrack.h \
 		video/mpeg3video.h \
 		mpeg3protos.h
 
 libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
 		libmpeg3plugin.h \
 		libmpeg3.h \
 		mpeg3private.h \
 		mpeg3atrack.h \
 		mpeg3demux.h \
 		mpeg3title.h \
 		mpeg3io.h \
 		mpeg3css.h \
 		mpeg3private.inc \
 		audio/mpeg3audio.h \
 		mpeg3vtrack.h \
 		video/mpeg3video.h \
 		mpeg3protos.h \
 		libmpeg3pluginimpl.h
 
 bitstream.o: bitstream.c \
 		mpeg3private.h \
 		mpeg3atrack.h \
 		mpeg3demux.h \
 		mpeg3title.h \
 		mpeg3io.h \
 		mpeg3css.h \
 		mpeg3private.inc \
 		audio/mpeg3audio.h \
 		mpeg3vtrack.h \
 		video/mpeg3video.h \
 		mpeg3protos.h
 
 libmpeg3.o: libmpeg3.c \
 		libmpeg3.h \
 		mpeg3private.h \
 		mpeg3atrack.h \
 		mpeg3demux.h \
 		mpeg3title.h \
 		mpeg3io.h \
 		mpeg3css.h \
 		mpeg3private.inc \
 		audio/mpeg3audio.h \
 		mpeg3vtrack.h \
 		video/mpeg3video.h \
 		mpeg3protos.h
 
 mpeg3atrack.o: mpeg3atrack.c \
 		libmpeg3.h \
 		mpeg3private.h \
 		mpeg3atrack.h \
 		mpeg3demux.h \
 		mpeg3title.h \
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
@@ -1,111 +1,109 @@
 #############################################################################
 
 ####### Compiler, tools and options
 
 CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
 CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
 CC	=	$(SYSCONF_CC) $(QT_C_MT)
 CFLAGS	=	$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
 INCPATH =	-I$(OPIEDIR)/include -I..
 LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
 LIBS	=	$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
 MOC	=	$(SYSCONF_MOC)
 UIC	=	$(SYSCONF_UIC)
 
 ####### Target
 
 DESTDIR = ../../plugins/codecs/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
 TARGET	= wavplugin
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
 HEADERS =	wavplugin.h \
 		wavpluginimpl.h
 SOURCES =	wavplugin.cpp \
 		wavpluginimpl.cpp
 OBJECTS =	wavplugin.o \
 		wavpluginimpl.o
 INTERFACES =    
 UICDECLS =      
 UICIMPLS =      
 SRCMOC	=	
 OBJMOC	=	
 
 
 ####### Implicit rules
 
 .SUFFIXES: .cpp .cxx .cc .C .c
 
 .cpp.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cxx.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cc.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .C.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 
 ####### Build rules
 
 
 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
 
 listpromodules:
 	@echo 
 
 listallmodules:
 	@echo 
 
 listaddonpromodules:
 	@echo 
 
 listaddonentmodules:
 	@echo 
 
 
 REQUIRES=
 
 ####### Sub-libraries
 
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 wavplugin.o: wavplugin.cpp \
 		wavplugin.h
 
 wavpluginimpl.o: wavpluginimpl.cpp \
 		wavplugin.h \
 		wavpluginimpl.h
 
 
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
@@ -31,293 +31,378 @@ HEADERS =	datebookday.h \
 		datebookweek.h \
 		datebookweekheaderimpl.h \
 		repeatentry.h
 SOURCES =	main.cpp \
 		datebookday.cpp \
 		datebook.cpp \
 		dateentryimpl.cpp \
 		datebookdayheaderimpl.cpp \
 		datebooksettings.cpp \
 		datebookweek.cpp \
 		datebookweekheaderimpl.cpp \
 		repeatentry.cpp
 OBJECTS =	main.o \
 		datebookday.o \
 		datebook.o \
 		dateentryimpl.o \
 		datebookdayheaderimpl.o \
 		datebooksettings.o \
 		datebookweek.o \
 		datebookweekheaderimpl.o \
 		repeatentry.o \
 		dateentry.o \
 		datebookdayheader.o \
 		datebooksettingsbase.o \
 		datebookweekheader.o \
 		repeatentrybase.o
 INTERFACES =    dateentry.ui \
 		datebookdayheader.ui \
 		datebooksettingsbase.ui \
 		datebookweekheader.ui \
 		repeatentrybase.ui
 UICDECLS =      dateentry.h \
 		datebookdayheader.h \
 		datebooksettingsbase.h \
 		datebookweekheader.h \
 		repeatentrybase.h
 UICIMPLS =      dateentry.cpp \
 		datebookdayheader.cpp \
 		datebooksettingsbase.cpp \
 		datebookweekheader.cpp \
 		repeatentrybase.cpp
 SRCMOC	=	moc_datebookday.cpp \
 		moc_datebook.cpp \
 		moc_dateentryimpl.cpp \
 		moc_datebookdayheaderimpl.cpp \
 		moc_datebookweek.cpp \
 		moc_datebookweekheaderimpl.cpp \
 		moc_repeatentry.cpp \
 		moc_dateentry.cpp \
 		moc_datebookdayheader.cpp \
 		moc_datebooksettingsbase.cpp \
 		moc_datebookweekheader.cpp \
 		moc_repeatentrybase.cpp
 OBJMOC	=	moc_datebookday.o \
 		moc_datebook.o \
 		moc_dateentryimpl.o \
 		moc_datebookdayheaderimpl.o \
 		moc_datebookweek.o \
 		moc_datebookweekheaderimpl.o \
 		moc_repeatentry.o \
 		moc_dateentry.o \
 		moc_datebookdayheader.o \
 		moc_datebooksettingsbase.o \
 		moc_datebookweekheader.o \
 		moc_repeatentrybase.o
 
 
 ####### Implicit rules
 
 .SUFFIXES: .cpp .cxx .cc .C .c
 
 .cpp.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cxx.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cc.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .C.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 
 ####### Build rules
 
 
 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
 
 listpromodules:
 	@echo 
 
 listallmodules:
 	@echo 
 
 listaddonpromodules:
 	@echo 
 
 listaddonentmodules:
 	@echo 
 
 
 REQUIRES=
 
 ####### Sub-libraries
 
 
 ###### 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
 	$(UIC) datebookdayheader.ui -o $(INTERFACE_DECL_PATH)/datebookdayheader.h
 
 datebookdayheader.cpp: datebookdayheader.ui
 	$(UIC) datebookdayheader.ui -i datebookdayheader.h -o datebookdayheader.cpp
 
 datebooksettingsbase.h: datebooksettingsbase.ui
 	$(UIC) datebooksettingsbase.ui -o $(INTERFACE_DECL_PATH)/datebooksettingsbase.h
 
 datebooksettingsbase.cpp: datebooksettingsbase.ui
 	$(UIC) datebooksettingsbase.ui -i datebooksettingsbase.h -o datebooksettingsbase.cpp
 
 datebookweekheader.h: datebookweekheader.ui
 	$(UIC) datebookweekheader.ui -o $(INTERFACE_DECL_PATH)/datebookweekheader.h
 
 datebookweekheader.cpp: datebookweekheader.ui
 	$(UIC) datebookweekheader.ui -i datebookweekheader.h -o datebookweekheader.cpp
 
 repeatentrybase.h: repeatentrybase.ui
 	$(UIC) repeatentrybase.ui -o $(INTERFACE_DECL_PATH)/repeatentrybase.h
 
 repeatentrybase.cpp: repeatentrybase.ui
 	$(UIC) repeatentrybase.ui -i repeatentrybase.h -o repeatentrybase.cpp
 
 dateentry.o: dateentry.cpp
 
 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 \
 		datebooksettingsbase.h
 
 moc_datebookweekheader.o: moc_datebookweekheader.cpp \
 		datebookweekheader.h
 
 moc_repeatentrybase.o: moc_repeatentrybase.cpp \
 		repeatentrybase.h
 
 moc_datebookday.cpp: datebookday.h
 	$(MOC) datebookday.h -o moc_datebookday.cpp
 
 moc_datebook.cpp: datebook.h
 	$(MOC) datebook.h -o moc_datebook.cpp
 
 moc_dateentryimpl.cpp: dateentryimpl.h
 	$(MOC) dateentryimpl.h -o moc_dateentryimpl.cpp
 
 moc_datebookdayheaderimpl.cpp: datebookdayheaderimpl.h
 	$(MOC) datebookdayheaderimpl.h -o moc_datebookdayheaderimpl.cpp
 
 moc_datebookweek.cpp: datebookweek.h
 	$(MOC) datebookweek.h -o moc_datebookweek.cpp
 
 moc_datebookweekheaderimpl.cpp: datebookweekheaderimpl.h
 	$(MOC) datebookweekheaderimpl.h -o moc_datebookweekheaderimpl.cpp
 
 moc_repeatentry.cpp: repeatentry.h
 	$(MOC) repeatentry.h -o moc_repeatentry.cpp
 
 moc_dateentry.cpp: dateentry.h
 	$(MOC) dateentry.h -o moc_dateentry.cpp
 
 moc_datebookdayheader.cpp: datebookdayheader.h
 	$(MOC) datebookdayheader.h -o moc_datebookdayheader.cpp
 
 moc_datebooksettingsbase.cpp: datebooksettingsbase.h
 	$(MOC) datebooksettingsbase.h -o moc_datebooksettingsbase.cpp
 
 moc_datebookweekheader.cpp: datebookweekheader.h
 	$(MOC) datebookweekheader.h -o moc_datebookweekheader.cpp
 
 moc_repeatentrybase.cpp: repeatentrybase.h
 	$(MOC) repeatentrybase.h -o moc_repeatentrybase.cpp
 
 
diff --git a/freetype/Makefile.in b/freetype/Makefile.in
index ba4c829..cdc6fa4 100644
--- a/freetype/Makefile.in
+++ b/freetype/Makefile.in
@@ -1,117 +1,113 @@
 #############################################################################
 
 ####### Compiler, tools and options
 
 CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
 CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
 CC	=	$(SYSCONF_CC) $(QT_C_MT)
 CFLAGS	=	$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-INCPATH =	-I../library
+INCPATH =	-I$(OPIEDIR)/include
 LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
 LIBS	=	$(SUBLIBS) -lqpe -lfreetype $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
 MOC	=	$(SYSCONF_MOC)
 UIC	=	$(SYSCONF_UIC)
 
 ####### Target
 
 DESTDIR = ../plugins/fontfactories/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
 TARGET	= freetypefactory
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
 HEADERS =	fontfactoryttf_qws.h \
-		freetypefactoryimpl.h \
-		qfontdata_p.h
+		freetypefactoryimpl.h
 SOURCES =	fontfactoryttf_qws.cpp \
 		freetypefactoryimpl.cpp
 OBJECTS =	fontfactoryttf_qws.o \
 		freetypefactoryimpl.o
 INTERFACES =    
 UICDECLS =      
 UICIMPLS =      
 SRCMOC	=	
 OBJMOC	=	
 
 
 ####### Implicit rules
 
 .SUFFIXES: .cpp .cxx .cc .C .c
 
 .cpp.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cxx.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cc.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .C.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 
 ####### Build rules
 
 
 all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK_LIB)
 
 moc: $(SRCMOC)
 
 tmake: Makefile.in
 
 Makefile.in: freetype.pro
 	tmake freetype.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
 listpromodules:
 	@echo 
 
 listallmodules:
 	@echo 
 
 listaddonpromodules:
 	@echo 
 
 listaddonentmodules:
 	@echo 
 
 
 REQUIRES=
 
 ####### Sub-libraries
 
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 fontfactoryttf_qws.o: fontfactoryttf_qws.cpp \
 		fontfactoryttf_qws.h \
 		qfontdata_p.h
 
 freetypefactoryimpl.o: freetypefactoryimpl.cpp \
 		fontfactoryttf_qws.h \
 		qfontdata_p.h \
-		freetypefactoryimpl.h \
-		../library/fontfactoryinterface.h \
-		../library/qcom.h \
-		../library/quuid.h
+		freetypefactoryimpl.h
 
 
diff --git a/library/Makefile.in b/library/Makefile.in
index b8fc1f6..dcea4b8 100644
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -1,393 +1,403 @@
 #############################################################################
 
 ####### Compiler, tools and options
 
 CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
 CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
 CC	=	$(SYSCONF_CC) $(QT_C_MT)
 CFLAGS	=	$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
 INCPATH =	-I$(OPIEDIR)/include -Ibackend
 LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
 LIBS	=	$(SUBLIBS) -ldl -lcrypt -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
 MOC	=	$(SYSCONF_MOC)
 UIC	=	$(SYSCONF_UIC)
 
 ####### Target
 
 DESTDIR = $(QTDIR)/lib$(PROJMAK)/
 VER_MAJ = 1
 VER_MIN = 5
 VER_PATCH = 0
 TARGET	= qpe
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
 HEADERS =	calendar.h \
 		global.h \
 		resource.h \
 		xmlreader.h \
 		mimetype.h \
 		menubutton.h \
 		network.h \
 		networkinterface.h \
 		filemanager.h \
 		fontmanager.h \
 		qdawg.h \
 		datebookmonth.h \
 		fileselector.h \
 		fileselector_p.h \
 		imageedit.h \
 		qcopenvelope_qws.h \
 		qpedecoration_qws.h \
 		qpeapplication.h \
 		qpestyle.h \
 		qpedialog.h \
 		lightstyle.h \
 		config.h \
 		applnk.h \
 		sound.h \
 		tzselect.h \
 		qmath.h \
 		datebookdb.h \
 		alarmserver.h \
 		process.h \
 		password.h \
 		timestring.h \
 		fontfactoryinterface.h \
 		fontdatabase.h \
 		power.h \
 		storage.h \
 		qpemessagebox.h \
 		backend/timeconversion.h \
 		qpedebug.h \
 		qpemenubar.h \
 		qpetoolbar.h \
 		backend/categories.h \
 		backend/stringutil.h \
 		backend/palmtopuid.h \
 		backend/palmtoprecord.h \
 		backend/task.h \
 		backend/event.h \
 		backend/contact.h \
 		categorymenu.h \
 		categoryedit_p.h \
 		categoryselect.h \
 		categorywidget.h \
 		ir.h \
 		backend/vobject_p.h \
 		findwidget_p.h \
 		finddialog.h \
-		lnkproperties.h
+		lnkproperties.h \
+		quuid.h \
+		qcom.h \
+		qlibrary.h \
+		qlibrary_p.h
 SOURCES =	calendar.cpp \
 		global.cpp \
 		xmlreader.cpp \
 		mimetype.cpp \
 		menubutton.cpp \
 		network.cpp \
 		networkinterface.cpp \
 		filemanager.cpp \
 		fontmanager.cpp \
 		qdawg.cpp \
 		datebookmonth.cpp \
 		fileselector.cpp \
 		imageedit.cpp \
 		resource.cpp \
 		qpedecoration_qws.cpp \
 		qcopenvelope_qws.cpp \
 		qpeapplication.cpp \
 		qpestyle.cpp \
 		qpedialog.cpp \
 		lightstyle.cpp \
 		config.cpp \
 		applnk.cpp \
 		sound.cpp \
 		tzselect.cpp \
 		qmath.c \
 		datebookdb.cpp \
 		alarmserver.cpp \
 		password.cpp \
 		process.cpp \
 		process_unix.cpp \
 		timestring.cpp \
 		fontdatabase.cpp \
 		power.cpp \
 		storage.cpp \
 		qpemessagebox.cpp \
 		backend/timeconversion.cpp \
 		qpedebug.cpp \
 		qpemenubar.cpp \
 		qpetoolbar.cpp \
 		backend/categories.cpp \
 		backend/stringutil.cpp \
 		backend/palmtoprecord.cpp \
 		backend/task.cpp \
 		backend/event.cpp \
 		backend/contact.cpp \
 		categorymenu.cpp \
 		categoryedit_p.cpp \
 		categoryselect.cpp \
 		categorywidget.cpp \
 		ir.cpp \
 		backend/vcc_yacc.cpp \
 		backend/vobject.cpp \
 		findwidget_p.cpp \
 		finddialog.cpp \
-		lnkproperties.cpp
+		lnkproperties.cpp \
+		quuid.cpp \
+		qlibrary.cpp \
+		qlibrary_unix.cpp
 OBJECTS =	calendar.o \
 		global.o \
 		xmlreader.o \
 		mimetype.o \
 		menubutton.o \
 		network.o \
 		networkinterface.o \
 		filemanager.o \
 		fontmanager.o \
 		qdawg.o \
 		datebookmonth.o \
 		fileselector.o \
 		imageedit.o \
 		resource.o \
 		qpedecoration_qws.o \
 		qcopenvelope_qws.o \
 		qpeapplication.o \
 		qpestyle.o \
 		qpedialog.o \
 		lightstyle.o \
 		config.o \
 		applnk.o \
 		sound.o \
 		tzselect.o \
 		qmath.o \
 		datebookdb.o \
 		alarmserver.o \
 		password.o \
 		process.o \
 		process_unix.o \
 		timestring.o \
 		fontdatabase.o \
 		power.o \
 		storage.o \
 		qpemessagebox.o \
 		backend/timeconversion.o \
 		qpedebug.o \
 		qpemenubar.o \
 		qpetoolbar.o \
 		backend/categories.o \
 		backend/stringutil.o \
 		backend/palmtoprecord.o \
 		backend/task.o \
 		backend/event.o \
 		backend/contact.o \
 		categorymenu.o \
 		categoryedit_p.o \
 		categoryselect.o \
 		categorywidget.o \
 		ir.o \
 		backend/vcc_yacc.o \
 		backend/vobject.o \
 		findwidget_p.o \
 		finddialog.o \
 		lnkproperties.o \
+		quuid.o \
+		qlibrary.o \
+		qlibrary_unix.o \
 		passwordbase_p.o \
 		categoryeditbase_p.o \
 		findwidgetbase_p.o \
 		lnkpropertiesbase_p.o
 INTERFACES =    passwordbase_p.ui \
 		categoryeditbase_p.ui \
 		findwidgetbase_p.ui \
 		lnkpropertiesbase_p.ui
 UICDECLS =      passwordbase_p.h \
 		categoryeditbase_p.h \
 		findwidgetbase_p.h \
 		lnkpropertiesbase_p.h
 UICIMPLS =      passwordbase_p.cpp \
 		categoryeditbase_p.cpp \
 		findwidgetbase_p.cpp \
 		lnkpropertiesbase_p.cpp
 SRCMOC	=	moc_menubutton.cpp \
 		moc_datebookmonth.cpp \
 		moc_fileselector.cpp \
 		moc_fileselector_p.cpp \
 		moc_imageedit.cpp \
 		moc_qpedecoration_qws.cpp \
 		moc_qpeapplication.cpp \
 		moc_qpedialog.cpp \
 		moc_tzselect.cpp \
 		moc_process.cpp \
 		moc_storage.cpp \
 		moc_qpemenubar.cpp \
 		moc_qpetoolbar.cpp \
 		backend/moc_categories.cpp \
 		moc_categorymenu.cpp \
 		moc_categoryedit_p.cpp \
 		moc_categoryselect.cpp \
 		moc_ir.cpp \
 		moc_findwidget_p.cpp \
 		moc_finddialog.cpp \
 		moc_lnkproperties.cpp \
+		moc_qlibrary_p.cpp \
 		global.moc \
 		network.moc \
 		password.moc \
 		process_unix.moc \
 		timestring.moc \
 		moc_passwordbase_p.cpp \
 		moc_categoryeditbase_p.cpp \
 		moc_findwidgetbase_p.cpp \
 		moc_lnkpropertiesbase_p.cpp
 OBJMOC	=	moc_menubutton.o \
 		moc_datebookmonth.o \
 		moc_fileselector.o \
 		moc_fileselector_p.o \
 		moc_imageedit.o \
 		moc_qpedecoration_qws.o \
 		moc_qpeapplication.o \
 		moc_qpedialog.o \
 		moc_tzselect.o \
 		moc_process.o \
 		moc_storage.o \
 		moc_qpemenubar.o \
 		moc_qpetoolbar.o \
 		backend/moc_categories.o \
 		moc_categorymenu.o \
 		moc_categoryedit_p.o \
 		moc_categoryselect.o \
 		moc_ir.o \
 		moc_findwidget_p.o \
 		moc_finddialog.o \
 		moc_lnkproperties.o \
+		moc_qlibrary_p.o \
 		moc_passwordbase_p.o \
 		moc_categoryeditbase_p.o \
 		moc_findwidgetbase_p.o \
 		moc_lnkpropertiesbase_p.o
 
 
 ####### Implicit rules
 
 .SUFFIXES: .cpp .cxx .cc .C .c
 
 .cpp.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cxx.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cc.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .C.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 
 ####### Build rules
 
 
 all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
 
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK_LIB)
 
 moc: $(SRCMOC)
 
-tmake: Makefile.in
-
-Makefile.in: library.pro
-	tmake library.pro -o Makefile.in
+tmake:
+	tmake library.pro
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
 listpromodules:
 	@echo 
 
 listallmodules:
 	@echo 
 
 listaddonpromodules:
 	@echo 
 
 listaddonentmodules:
 	@echo 
 
 
 REQUIRES=
 
 ####### Sub-libraries
 
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 calendar.o: calendar.cpp \
 		calendar.h
 
 global.o: global.cpp \
 		global.moc
 
 xmlreader.o: xmlreader.cpp \
 		xmlreader.h
 
 mimetype.o: mimetype.cpp \
 		mimetype.h \
 		applnk.h \
 		resource.h \
 		qpeapplication.h \
 		qpedecoration_qws.h \
 		timestring.h
 
 menubutton.o: menubutton.cpp \
 		menubutton.h
 
 network.o: network.cpp \
 		network.moc
 
 networkinterface.o: networkinterface.cpp \
 		networkinterface.h \
 		network.h \
 		config.h
 
 filemanager.o: filemanager.cpp \
 		filemanager.h \
 		applnk.h
 
 fontmanager.o: fontmanager.cpp \
 		fontmanager.h
 
 qdawg.o: qdawg.cpp \
 		qdawg.h
 
 datebookmonth.o: datebookmonth.cpp \
 		config.h \
 		datebookmonth.h \
 		calendar.h \
 		timestring.h \
 		datebookdb.h \
 		resource.h \
 		qpeapplication.h \
 		qpedecoration_qws.h
 
 fileselector.o: fileselector.cpp \
 		fileselector.h \
 		filemanager.h \
 		applnk.h \
 		fileselector_p.h \
 		global.h \
 		resource.h \
 		config.h \
 		storage.h \
 		qpemenubar.h \
 		lnkproperties.h \
 		qpeapplication.h \
 		qpedecoration_qws.h \
 		timestring.h \
 		categorymenu.h
 
@@ -509,310 +519,328 @@ power.o: power.cpp \
 storage.o: storage.cpp
 
 qpemessagebox.o: qpemessagebox.cpp \
 		qpemessagebox.h
 
 backend/timeconversion.o: backend/timeconversion.cpp \
 		backend/timeconversion.h
 
 qpedebug.o: qpedebug.cpp \
 		qpedebug.h
 
 qpemenubar.o: qpemenubar.cpp \
 		qpemenubar.h
 
 qpetoolbar.o: qpetoolbar.cpp \
 		qpetoolbar.h \
 		qpemenubar.h
 
 backend/categories.o: backend/categories.cpp \
 		backend/categories.h \
 		backend/qpcglobal.h \
 		backend/palmtopuidgen.h \
 		backend/stringutil.h
 
 backend/stringutil.o: backend/stringutil.cpp \
 		backend/stringutil.h \
 		backend/qpcglobal.h
 
 backend/palmtoprecord.o: backend/palmtoprecord.cpp \
 		backend/palmtoprecord.h \
 		backend/qpcglobal.h \
 		backend/palmtopuidgen.h \
 		backend/stringutil.h
 
 backend/task.o: backend/task.cpp \
 		backend/vobject_p.h \
 		backend/timeconversion.h \
 		backend/qfiledirect_p.h
 
 backend/event.o: backend/event.cpp \
 		backend/event.h \
 		backend/qfiledirect_p.h \
 		backend/vobject_p.h
 
 backend/contact.o: backend/contact.cpp \
 		backend/contact.h \
 		backend/vobject_p.h \
 		backend/qfiledirect_p.h
 
 categorymenu.o: categorymenu.cpp \
 		categorymenu.h \
 		backend/categories.h \
 		backend/qpcglobal.h \
 		backend/palmtopuidgen.h \
 		categoryselect.h
 
 categoryedit_p.o: categoryedit_p.cpp \
 		categoryedit_p.h \
 		categoryeditbase_p.h
 
 categoryselect.o: categoryselect.cpp \
 		categorywidget.h \
 		categoryselect.h
 
 categorywidget.o: categorywidget.cpp \
 		categoryedit_p.h \
 		categoryeditbase_p.h \
 		categorywidget.h
 
 ir.o: ir.cpp \
 		ir.h \
 		qcopenvelope_qws.h \
 		applnk.h
 
 backend/vcc_yacc.o: backend/vcc_yacc.cpp \
 		backend/vobject_p.h \
 		backend/qfiledirect_p.h
 
 backend/vobject.o: backend/vobject.cpp \
 		backend/vobject_p.h \
 		backend/qfiledirect_p.h
 
 findwidget_p.o: findwidget_p.cpp \
 		findwidget_p.h \
 		findwidgetbase_p.h
 
 finddialog.o: finddialog.cpp \
 		finddialog.h \
 		findwidget_p.h \
 		findwidgetbase_p.h
 
 lnkproperties.o: lnkproperties.cpp \
 		lnkproperties.h \
 		lnkpropertiesbase_p.h \
 		ir.h
 
+quuid.o: quuid.cpp \
+		quuid.h
+
+qlibrary.o: qlibrary.cpp \
+		qlibrary_p.h \
+		qlibrary.h
+
+qlibrary_unix.o: qlibrary_unix.cpp \
+		qlibrary_p.h \
+		qlibrary.h
+
 passwordbase_p.h: passwordbase_p.ui
 	$(UIC) passwordbase_p.ui -o $(INTERFACE_DECL_PATH)/passwordbase_p.h
 
 passwordbase_p.cpp: passwordbase_p.ui
 	$(UIC) passwordbase_p.ui -i passwordbase_p.h -o passwordbase_p.cpp
 
 categoryeditbase_p.h: categoryeditbase_p.ui
 	$(UIC) categoryeditbase_p.ui -o $(INTERFACE_DECL_PATH)/categoryeditbase_p.h
 
 categoryeditbase_p.cpp: categoryeditbase_p.ui
 	$(UIC) categoryeditbase_p.ui -i categoryeditbase_p.h -o categoryeditbase_p.cpp
 
 findwidgetbase_p.h: findwidgetbase_p.ui
 	$(UIC) findwidgetbase_p.ui -o $(INTERFACE_DECL_PATH)/findwidgetbase_p.h
 
 findwidgetbase_p.cpp: findwidgetbase_p.ui
 	$(UIC) findwidgetbase_p.ui -i findwidgetbase_p.h -o findwidgetbase_p.cpp
 
 lnkpropertiesbase_p.h: lnkpropertiesbase_p.ui
 	$(UIC) lnkpropertiesbase_p.ui -o $(INTERFACE_DECL_PATH)/lnkpropertiesbase_p.h
 
 lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui
 	$(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp
 
 passwordbase_p.o: passwordbase_p.cpp
 
 categoryeditbase_p.o: categoryeditbase_p.cpp
 
 findwidgetbase_p.o: findwidgetbase_p.cpp
 
 lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp
 
 moc_menubutton.o: moc_menubutton.cpp \
 		menubutton.h
 
 moc_datebookmonth.o: moc_datebookmonth.cpp \
 		datebookmonth.h \
 		calendar.h \
 		timestring.h
 
 moc_fileselector.o: moc_fileselector.cpp \
 		fileselector.h \
 		filemanager.h \
 		applnk.h
 
 moc_fileselector_p.o: moc_fileselector_p.cpp \
 		fileselector_p.h
 
 moc_imageedit.o: moc_imageedit.cpp \
 		imageedit.h
 
 moc_qpedecoration_qws.o: moc_qpedecoration_qws.cpp \
 		qpedecoration_qws.h
 
 moc_qpeapplication.o: moc_qpeapplication.cpp \
 		qpeapplication.h \
 		qpedecoration_qws.h \
 		timestring.h
 
 moc_qpedialog.o: moc_qpedialog.cpp \
 		qpedialog.h
 
 moc_tzselect.o: moc_tzselect.cpp \
 		tzselect.h
 
 moc_process.o: moc_process.cpp \
 		process.h
 
 moc_storage.o: moc_storage.cpp \
 		storage.h
 
 moc_qpemenubar.o: moc_qpemenubar.cpp \
 		qpemenubar.h
 
 moc_qpetoolbar.o: moc_qpetoolbar.cpp \
 		qpetoolbar.h
 
 backend/moc_categories.o: backend/moc_categories.cpp \
 		backend/categories.h \
 		backend/qpcglobal.h \
 		backend/palmtopuidgen.h
 
 moc_categorymenu.o: moc_categorymenu.cpp \
 		categorymenu.h
 
 moc_categoryedit_p.o: moc_categoryedit_p.cpp \
 		categoryedit_p.h \
 		categoryeditbase_p.h
 
 moc_categoryselect.o: moc_categoryselect.cpp \
 		categoryselect.h
 
 moc_ir.o: moc_ir.cpp \
 		ir.h
 
 moc_findwidget_p.o: moc_findwidget_p.cpp \
 		findwidget_p.h \
 		findwidgetbase_p.h
 
 moc_finddialog.o: moc_finddialog.cpp \
 		finddialog.h
 
 moc_lnkproperties.o: moc_lnkproperties.cpp \
 		lnkproperties.h
 
+moc_qlibrary_p.o: moc_qlibrary_p.cpp \
+		qlibrary_p.h \
+		qlibrary.h
+
 moc_passwordbase_p.o: global.moc \
 		global.cpp
 
 moc_categoryeditbase_p.o: network.moc \
 		network.cpp
 
 moc_findwidgetbase_p.o: password.moc \
 		password.cpp \
 		password.h \
 		config.h \
 		global.h \
 		backend/contact.h \
 		passwordbase_p.h
 
 moc_lnkpropertiesbase_p.o: process_unix.moc \
 		process_unix.cpp \
 		process.h
 
 moc_menubutton.cpp: menubutton.h
 	$(MOC) menubutton.h -o moc_menubutton.cpp
 
 moc_datebookmonth.cpp: datebookmonth.h
 	$(MOC) datebookmonth.h -o moc_datebookmonth.cpp
 
 moc_fileselector.cpp: fileselector.h
 	$(MOC) fileselector.h -o moc_fileselector.cpp
 
 moc_fileselector_p.cpp: fileselector_p.h
 	$(MOC) fileselector_p.h -o moc_fileselector_p.cpp
 
 moc_imageedit.cpp: imageedit.h
 	$(MOC) imageedit.h -o moc_imageedit.cpp
 
 moc_qpedecoration_qws.cpp: qpedecoration_qws.h
 	$(MOC) qpedecoration_qws.h -o moc_qpedecoration_qws.cpp
 
 moc_qpeapplication.cpp: qpeapplication.h
 	$(MOC) qpeapplication.h -o moc_qpeapplication.cpp
 
 moc_qpedialog.cpp: qpedialog.h
 	$(MOC) qpedialog.h -o moc_qpedialog.cpp
 
 moc_tzselect.cpp: tzselect.h
 	$(MOC) tzselect.h -o moc_tzselect.cpp
 
 moc_process.cpp: process.h
 	$(MOC) process.h -o moc_process.cpp
 
 moc_storage.cpp: storage.h
 	$(MOC) storage.h -o moc_storage.cpp
 
 moc_qpemenubar.cpp: qpemenubar.h
 	$(MOC) qpemenubar.h -o moc_qpemenubar.cpp
 
 moc_qpetoolbar.cpp: qpetoolbar.h
 	$(MOC) qpetoolbar.h -o moc_qpetoolbar.cpp
 
 backend/moc_categories.cpp: backend/categories.h
 	$(MOC) backend/categories.h -o backend/moc_categories.cpp
 
 moc_categorymenu.cpp: categorymenu.h
 	$(MOC) categorymenu.h -o moc_categorymenu.cpp
 
 moc_categoryedit_p.cpp: categoryedit_p.h
 	$(MOC) categoryedit_p.h -o moc_categoryedit_p.cpp
 
 moc_categoryselect.cpp: categoryselect.h
 	$(MOC) categoryselect.h -o moc_categoryselect.cpp
 
 moc_ir.cpp: ir.h
 	$(MOC) ir.h -o moc_ir.cpp
 
 moc_findwidget_p.cpp: findwidget_p.h
 	$(MOC) findwidget_p.h -o moc_findwidget_p.cpp
 
 moc_finddialog.cpp: finddialog.h
 	$(MOC) finddialog.h -o moc_finddialog.cpp
 
 moc_lnkproperties.cpp: lnkproperties.h
 	$(MOC) lnkproperties.h -o moc_lnkproperties.cpp
 
+moc_qlibrary_p.cpp: qlibrary_p.h
+	$(MOC) qlibrary_p.h -o moc_qlibrary_p.cpp
+
 global.moc: global.cpp
 	$(MOC) global.cpp -o global.moc
 
 network.moc: network.cpp
 	$(MOC) network.cpp -o network.moc
 
 password.moc: password.cpp
 	$(MOC) password.cpp -o password.moc
 
 process_unix.moc: process_unix.cpp
 	$(MOC) process_unix.cpp -o process_unix.moc
 
 timestring.moc: timestring.cpp
 	$(MOC) timestring.cpp -o timestring.moc
 
 moc_passwordbase_p.cpp: passwordbase_p.h
 	$(MOC) passwordbase_p.h -o moc_passwordbase_p.cpp
 
 moc_categoryeditbase_p.cpp: categoryeditbase_p.h
 	$(MOC) categoryeditbase_p.h -o moc_categoryeditbase_p.cpp
 
 moc_findwidgetbase_p.cpp: findwidgetbase_p.h
 	$(MOC) findwidgetbase_p.h -o moc_findwidgetbase_p.cpp
 
 moc_lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.h
 	$(MOC) lnkpropertiesbase_p.h -o moc_lnkpropertiesbase_p.cpp
 
 
diff --git a/noncore/apps/tableviewer/Makefile.in b/noncore/apps/tableviewer/Makefile.in
index 8c5dc26..e135d82 100644
--- a/noncore/apps/tableviewer/Makefile.in
+++ b/noncore/apps/tableviewer/Makefile.in
@@ -1,330 +1,314 @@
 #############################################################################
 
 ####### Compiler, tools and options
 
 CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
 CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
 CC	=	$(SYSCONF_CC) $(QT_C_MT)
 CFLAGS	=	$(SYSCONF_CFLAGS)
-INCPATH =	-I../library
+INCPATH =	-I$(OPIEDIR)/include
 LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
 LIBS	=	$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
 MOC	=	$(SYSCONF_MOC)
 UIC	=	$(SYSCONF_UIC)
 
 ####### Target
 
 DESTDIR = ../bin/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
 TARGET	= tableviewer
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
 HEADERS =	tableviewer.h \
 		ui/commonwidgets.h \
 		ui/tvbrowseview.h \
 		ui/tvlistview.h \
 		ui/tvfilterview.h \
 		ui/tveditview.h \
 		ui/browsekeyentry.h \
 		ui/filterkeyentry.h \
 		ui/tvkeyedit.h \
 		db/datacache.h \
 		db/common.h \
 		db/xmlsource.h \
 		db/csvsource.h
 SOURCES =	main.cpp \
 		tableviewer.cpp \
 		ui/commonwidgets.cpp \
 		ui/tvbrowseview.cpp \
 		ui/tvfilterview.cpp \
 		ui/browsekeyentry.cpp \
 		ui/filterkeyentry.cpp \
 		ui/tvlistview.cpp \
 		ui/tveditview.cpp \
 		ui/tvkeyedit.cpp \
 		db/datacache.cpp \
 		db/xmlsource.cpp \
 		db/csvsource.cpp \
 		db/common.cpp
 OBJECTS =	main.o \
 		tableviewer.o \
 		ui/commonwidgets.o \
 		ui/tvbrowseview.o \
 		ui/tvfilterview.o \
 		ui/browsekeyentry.o \
 		ui/filterkeyentry.o \
 		ui/tvlistview.o \
 		ui/tveditview.o \
 		ui/tvkeyedit.o \
 		db/datacache.o \
 		db/xmlsource.o \
 		db/csvsource.o \
 		db/common.o \
 		ui/tvkeyedit_gen.o
 INTERFACES =    ui/tvkeyedit_gen.ui
 UICDECLS =      ui/tvkeyedit_gen.h
 UICIMPLS =      ui/tvkeyedit_gen.cpp
 SRCMOC	=	moc_tableviewer.cpp \
 		ui/moc_commonwidgets.cpp \
 		ui/moc_tvbrowseview.cpp \
 		ui/moc_tvlistview.cpp \
 		ui/moc_tvfilterview.cpp \
 		ui/moc_tveditview.cpp \
 		ui/moc_browsekeyentry.cpp \
 		ui/moc_filterkeyentry.cpp \
 		ui/moc_tvkeyedit.cpp \
 		ui/moc_tvkeyedit_gen.cpp
 OBJMOC	=	moc_tableviewer.o \
 		ui/moc_commonwidgets.o \
 		ui/moc_tvbrowseview.o \
 		ui/moc_tvlistview.o \
 		ui/moc_tvfilterview.o \
 		ui/moc_tveditview.o \
 		ui/moc_browsekeyentry.o \
 		ui/moc_filterkeyentry.o \
 		ui/moc_tvkeyedit.o \
 		ui/moc_tvkeyedit_gen.o
 
 
 ####### Implicit rules
 
 .SUFFIXES: .cpp .cxx .cc .C .c
 
 .cpp.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cxx.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cc.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .C.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 
 ####### Build rules
 
 
 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: tableviewer.pro
 	tmake tableviewer.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
 listpromodules:
 	@echo 
 
 listallmodules:
 	@echo 
 
 listaddonpromodules:
 	@echo 
 
 listaddonentmodules:
 	@echo 
 
 
 REQUIRES=
 
 ####### Sub-libraries
 
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 main.o: main.cpp \
 		tableviewer.h \
-		db/common.h \
-		../library/fileselector.h \
-		../library/filemanager.h \
-		../library/applnk.h \
-		../library/qpeapplication.h \
-		../library/qpedecoration_qws.h
+		db/common.h
 
 tableviewer.o: tableviewer.cpp \
 		tableviewer.h \
 		db/common.h \
-		../library/fileselector.h \
-		../library/filemanager.h \
-		../library/applnk.h \
 		ui/tvbrowseview.h \
 		ui/tvfilterview.h \
 		ui/tvlistview.h \
 		ui/tveditview.h \
 		ui/tvkeyedit.h \
 		tvkeyedit_gen.h \
 		db/datacache.h \
-		../library/resource.h
+		/home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/qpemenubar.h
 
 ui/commonwidgets.o: ui/commonwidgets.cpp \
-		../library/datebookmonth.h \
-		../library/organizer.h \
-		../library/xmlreader.h \
-		../library/calendar.h \
 		ui/commonwidgets.h
 
 ui/tvbrowseview.o: ui/tvbrowseview.cpp \
 		ui/tvbrowseview.h \
 		ui/../db/common.h \
 		ui/browsekeyentry.h
 
 ui/tvfilterview.o: ui/tvfilterview.cpp \
 		ui/tvfilterview.h \
 		ui/filterkeyentry.h \
 		ui/../db/common.h
 
 ui/browsekeyentry.o: ui/browsekeyentry.cpp \
 		ui/browsekeyentry.h \
 		ui/../db/common.h \
 		ui/commonwidgets.h
 
 ui/filterkeyentry.o: ui/filterkeyentry.cpp \
 		ui/filterkeyentry.h \
 		ui/../db/common.h \
 		ui/commonwidgets.h
 
 ui/tvlistview.o: ui/tvlistview.cpp \
 		ui/tvlistview.h \
 		ui/../db/common.h
 
 ui/tveditview.o: ui/tveditview.cpp \
 		ui/tveditview.h \
 		ui/../db/common.h \
 		ui/commonwidgets.h
 
 ui/tvkeyedit.o: ui/tvkeyedit.cpp \
 		ui/tvkeyedit.h \
 		tvkeyedit_gen.h \
 		ui/../db/common.h
 
 db/datacache.o: db/datacache.cpp \
 		db/datacache.h \
 		db/common.h \
 		db/xmlsource.h \
 		db/csvsource.h
 
 db/xmlsource.o: db/xmlsource.cpp \
 		db/xmlsource.h \
 		db/datacache.h \
 		db/common.h
 
 db/csvsource.o: db/csvsource.cpp \
 		db/csvsource.h \
 		db/datacache.h \
 		db/common.h
 
 db/common.o: db/common.cpp \
-		../library/timestring.h \
 		db/common.h \
 		db/datacache.h
 
 ui/tvkeyedit_gen.h: ui/tvkeyedit_gen.ui
 	$(UIC) ui/tvkeyedit_gen.ui -o $(INTERFACE_DECL_PATH)/ui/tvkeyedit_gen.h
 
 tvkeyedit_gen.h: ui/tvkeyedit_gen.ui
 	$(UIC) ui/tvkeyedit_gen.ui -o tvkeyedit_gen.h
 
 ui/tvkeyedit_gen.cpp: ui/tvkeyedit_gen.ui
 	$(UIC) ui/tvkeyedit_gen.ui -i tvkeyedit_gen.h -o ui/tvkeyedit_gen.cpp
 
 ui/tvkeyedit_gen.o: ui/tvkeyedit_gen.cpp \
 		ui/tvkeyedit_gen.h \
 		ui/tvkeyedit_gen.ui
 
 moc_tableviewer.o: moc_tableviewer.cpp \
 		tableviewer.h \
-		db/common.h \
-		../library/fileselector.h \
-		../library/filemanager.h \
-		../library/applnk.h
+		db/common.h
 
 ui/moc_commonwidgets.o: ui/moc_commonwidgets.cpp \
 		ui/commonwidgets.h
 
 ui/moc_tvbrowseview.o: ui/moc_tvbrowseview.cpp \
 		ui/tvbrowseview.h \
 		ui/../db/common.h
 
 ui/moc_tvlistview.o: ui/moc_tvlistview.cpp \
 		ui/tvlistview.h \
 		ui/../db/common.h
 
 ui/moc_tvfilterview.o: ui/moc_tvfilterview.cpp \
 		ui/tvfilterview.h \
 		ui/filterkeyentry.h \
 		ui/../db/common.h
 
 ui/moc_tveditview.o: ui/moc_tveditview.cpp \
 		ui/tveditview.h \
 		ui/../db/common.h
 
 ui/moc_browsekeyentry.o: ui/moc_browsekeyentry.cpp \
 		ui/browsekeyentry.h \
 		ui/../db/common.h
 
 ui/moc_filterkeyentry.o: ui/moc_filterkeyentry.cpp \
 		ui/filterkeyentry.h \
 		ui/../db/common.h
 
 ui/moc_tvkeyedit.o: ui/moc_tvkeyedit.cpp \
 		ui/tvkeyedit.h \
 		tvkeyedit_gen.h \
 		ui/../db/common.h
 
 ui/moc_tvkeyedit_gen.o: ui/moc_tvkeyedit_gen.cpp \
 		ui/tvkeyedit_gen.h
 
 moc_tableviewer.cpp: tableviewer.h
 	$(MOC) tableviewer.h -o moc_tableviewer.cpp
 
 ui/moc_commonwidgets.cpp: ui/commonwidgets.h
 	$(MOC) ui/commonwidgets.h -o ui/moc_commonwidgets.cpp
 
 ui/moc_tvbrowseview.cpp: ui/tvbrowseview.h
 	$(MOC) ui/tvbrowseview.h -o ui/moc_tvbrowseview.cpp
 
 ui/moc_tvlistview.cpp: ui/tvlistview.h
 	$(MOC) ui/tvlistview.h -o ui/moc_tvlistview.cpp
 
 ui/moc_tvfilterview.cpp: ui/tvfilterview.h
 	$(MOC) ui/tvfilterview.h -o ui/moc_tvfilterview.cpp
 
 ui/moc_tveditview.cpp: ui/tveditview.h
 	$(MOC) ui/tveditview.h -o ui/moc_tveditview.cpp
 
 ui/moc_browsekeyentry.cpp: ui/browsekeyentry.h
 	$(MOC) ui/browsekeyentry.h -o ui/moc_browsekeyentry.cpp
 
 ui/moc_filterkeyentry.cpp: ui/filterkeyentry.h
 	$(MOC) ui/filterkeyentry.h -o ui/moc_filterkeyentry.cpp
 
 ui/moc_tvkeyedit.cpp: ui/tvkeyedit.h
 	$(MOC) ui/tvkeyedit.h -o ui/moc_tvkeyedit.cpp
 
 ui/moc_tvkeyedit_gen.cpp: ui/tvkeyedit_gen.h
 	$(MOC) ui/tvkeyedit_gen.h -o ui/moc_tvkeyedit_gen.cpp
 
 
diff --git a/noncore/games/chess/Makefile.in b/noncore/games/chess/Makefile.in
index a1f2cd7..0987d58 100644
--- a/noncore/games/chess/Makefile.in
+++ b/noncore/games/chess/Makefile.in
@@ -11,124 +11,131 @@ LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_
 LIBS	=	$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
 MOC	=	$(SYSCONF_MOC)
 UIC	=	$(SYSCONF_UIC)
 
 ####### Target
 
 DESTDIR = ../bin/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
 TARGET	= chess
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
 HEADERS =	chess.h
 SOURCES =	chess.cpp \
 		main.cpp
 OBJECTS =	chess.o \
 		main.o \
 		mainwindow.o
 INTERFACES =    mainwindow.ui
 UICDECLS =      mainwindow.h
 UICIMPLS =      mainwindow.cpp
 SRCMOC	=	moc_chess.cpp \
 		moc_mainwindow.cpp
 OBJMOC	=	moc_chess.o \
 		moc_mainwindow.o
 
 
 ####### Implicit rules
 
 .SUFFIXES: .cpp .cxx .cc .C .c
 
 .cpp.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cxx.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cc.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .C.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 
 ####### Build rules
 
 
 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: chess.pro
 	tmake chess.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
 listpromodules:
 	@echo 
 
 listallmodules:
 	@echo 
 
 listaddonpromodules:
 	@echo 
 
 listaddonentmodules:
 	@echo 
 
 
 REQUIRES=
 
 ####### Sub-libraries
 
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 chess.o: chess.cpp \
-		chess.h
+		/home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/config.h \
+		/home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/resource.h \
+		chess.h \
+		/home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/process.h
 
 main.o: main.cpp \
-		chess.h
+		/home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/qpeapplication.h \
+		/home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/qpetoolbar.h \
+		chess.h \
+		/home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/process.h
 
 mainwindow.h: mainwindow.ui
 	$(UIC) mainwindow.ui -o $(INTERFACE_DECL_PATH)/mainwindow.h
 
 mainwindow.cpp: mainwindow.ui
 	$(UIC) mainwindow.ui -i mainwindow.h -o mainwindow.cpp
 
 mainwindow.o: mainwindow.cpp \
 		mainwindow.h \
 		mainwindow.ui
 
 moc_chess.o: moc_chess.cpp \
-		chess.h
+		chess.h \
+		/home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/process.h
 
 moc_mainwindow.o: moc_mainwindow.cpp \
 		mainwindow.h
 
 moc_chess.cpp: chess.h
 	$(MOC) chess.h -o moc_chess.cpp
 
 moc_mainwindow.cpp: mainwindow.h
 	$(MOC) mainwindow.h -o moc_mainwindow.cpp
 
 
diff --git a/noncore/games/go/Makefile.in b/noncore/games/go/Makefile.in
index 0395dff..985eff0 100644
--- a/noncore/games/go/Makefile.in
+++ b/noncore/games/go/Makefile.in
@@ -1,155 +1,158 @@
 #############################################################################
 
 ####### Compiler, tools and options
 
 CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
 CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
 CC	=	$(SYSCONF_CC) $(QT_C_MT)
 CFLAGS	=	$(SYSCONF_CFLAGS)
 INCPATH =	-I$(OPIEDIR)/include
 LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
 LIBS	=	$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
 MOC	=	$(SYSCONF_MOC)
 UIC	=	$(SYSCONF_UIC)
 
 ####### Target
 
 DESTDIR = ../bin/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
 TARGET	= go
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
 HEADERS =	amigo.h \
 		go.h \
 		goplayutils.h \
 		gowidget.h
 SOURCES =	amigo.c \
 		goplayer.c \
 		goplayutils.c \
 		killable.c \
 		gowidget.cpp \
 		main.cpp
 OBJECTS =	amigo.o \
 		goplayer.o \
 		goplayutils.o \
 		killable.o \
 		gowidget.o \
 		main.o
 INTERFACES =    
 UICDECLS =      
 UICIMPLS =      
 SRCMOC	=	moc_gowidget.cpp
 OBJMOC	=	moc_gowidget.o
 
 
 ####### Implicit rules
 
 .SUFFIXES: .cpp .cxx .cc .C .c
 
 .cpp.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cxx.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cc.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .C.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 
 ####### Build rules
 
 
 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: go.pro
-	tmake go.pro -o Makefile.in
+tmake:
+	tmake go.pro
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
 listpromodules:
 	@echo 
 
 listallmodules:
 	@echo 
 
 listaddonpromodules:
 	@echo 
 
 listaddonentmodules:
 	@echo 
 
 
 REQUIRES=
 
 ####### Sub-libraries
 
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 amigo.o: amigo.c \
 		go.h \
 		goplayutils.h \
 		amigo.h
 
 goplayer.o: goplayer.c \
 		go.h \
 		goplayutils.h \
 		amigo.h
 
 goplayutils.o: goplayutils.c \
 		goplayutils.h \
 		amigo.h \
 		go.h
 
 killable.o: killable.c \
 		go.h \
 		goplayutils.h \
 		amigo.h
 
 gowidget.o: gowidget.cpp \
 		gowidget.h \
 		amigo.h \
 		go.h \
-		goplayutils.h
+		goplayutils.h \
+		$(OPIEDIR)/include/qpe/config.h \
+		$(OPIEDIR)/include/qpe/resource.h \
+		$(OPIEDIR)/include/qpe/qpetoolbar.h \
+		$(OPIEDIR)/include/qpe/qpemenubar.h
 
 main.o: main.cpp \
 		gowidget.h \
 		amigo.h \
 		go.h \
-		goplayutils.h
+		goplayutils.h \
+		$(OPIEDIR)/include/qpe/qpeapplication.h
 
 moc_gowidget.o: moc_gowidget.cpp \
 		gowidget.h \
 		amigo.h \
 		go.h \
 		goplayutils.h
 
 moc_gowidget.cpp: gowidget.h
 	$(MOC) gowidget.h -o moc_gowidget.cpp
 
 
diff --git a/quickexec/Makefile.in b/quickexec/Makefile.in
index 514e6cc..d3ac9dc 100644
--- a/quickexec/Makefile.in
+++ b/quickexec/Makefile.in
@@ -1,101 +1,103 @@
 #############################################################################
 
 ####### Compiler, tools and options
 
 CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
 CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
 CC	=	$(SYSCONF_CC) $(QT_C_MT)
 CFLAGS	=	$(SYSCONF_CFLAGS)
 INCPATH =	
 LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
 LIBS	=	$(SUBLIBS) -ldl -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
 MOC	=	$(SYSCONF_MOC)
 UIC	=	$(SYSCONF_UIC)
 
 ####### Target
 
 DESTDIR = ../bin/
 VER_MAJ = 1
 VER_MIN = 0
 VER_PATCH = 0
 TARGET	= quickexec
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
 HEADERS =	
 SOURCES =	quickexec.cpp
 OBJECTS =	quickexec.o
 INTERFACES =    
 UICDECLS =      
 UICIMPLS =      
 SRCMOC	=	
 OBJMOC	=	
 
 
 ####### Implicit rules
 
 .SUFFIXES: .cpp .cxx .cc .C .c
 
 .cpp.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cxx.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cc.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .C.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 
 ####### Build rules
 
 
 all: $(DESTDIR)$(TARGET)
 
 $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake quickexec.pro
+tmake: Makefile.in
+
+Makefile.in: quickexec.pro
+	tmake quickexec.pro -o Makefile.in
 
 clean:
 	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
 	-rm -f *~ core
 	-rm -f allmoc.cpp
 
 ####### Extension Modules
 
 listpromodules:
 	@echo 
 
 listallmodules:
 	@echo 
 
 listaddonpromodules:
 	@echo 
 
 listaddonentmodules:
 	@echo 
 
 
 REQUIRES=
 
 ####### Sub-libraries
 
 
 ###### Combined headers
 
 
 
 ####### Compile
 
 quickexec.o: quickexec.cpp
 
 
diff --git a/rsync/Makefile.in b/rsync/Makefile.in
index 50e7b3d..e69de29 100644
--- a/rsync/Makefile.in
+++ b/rsync/Makefile.in
@@ -1,391 +0,0 @@
-#############################################################################
-
-####### Compiler, tools and options
-
-CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
-CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
-CC	=	$(SYSCONF_CC) $(QT_C_MT)
-CFLAGS	=	$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-INCPATH =	-I.
-LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
-LIBS	=	$(SUBLIBS) $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
-MOC	=	$(SYSCONF_MOC)
-UIC	=	$(SYSCONF_UIC)
-
-####### Target
-
-DESTDIR = $(QTDIR)/lib$(PROJMAK)/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= rsync
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	buf.h \
-		checksum.h \
-		command.h \
-		emit.h \
-		fileutil.h \
-		job.h \
-		netint.h \
-		protocol.h \
-		prototab.h \
-		rsync.h \
-		search.h \
-		stream.h \
-		sumset.h \
-		trace.h \
-		types.h \
-		util.h \
-		whole.h \
-		config.h
-SOURCES =	base64.c \
-		buf.c \
-		checksum.c \
-		command.c \
-		delta.c \
-		emit.c \
-		fileutil.c \
-		hex.c \
-		job.c \
-		mdfour.c \
-		mksum.c \
-		msg.c \
-		netint.c \
-		patch.c \
-		prototab.c \
-		readsums.c \
-		scoop.c \
-		search.c \
-		stats.c \
-		stream.c \
-		sumset.c \
-		trace.c \
-		tube.c \
-		util.c \
-		version.c \
-		whole.c
-OBJECTS =	base64.o \
-		buf.o \
-		checksum.o \
-		command.o \
-		delta.o \
-		emit.o \
-		fileutil.o \
-		hex.o \
-		job.o \
-		mdfour.o \
-		mksum.o \
-		msg.o \
-		netint.o \
-		patch.o \
-		prototab.o \
-		readsums.o \
-		scoop.o \
-		search.o \
-		stats.o \
-		stream.o \
-		sumset.o \
-		trace.o \
-		tube.o \
-		util.o \
-		version.o \
-		whole.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	
-OBJMOC	=	
-
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
-
-$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
-	$(SYSCONF_LINK_LIB)
-
-moc: $(SRCMOC)
-
-tmake: Makefile.in
-
-Makefile.in: rsync.pro
-	tmake rsync.pro -o Makefile.in
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
-	-rm -f *~ core
-	-rm -f allmoc.cpp
-
-####### Extension Modules
-
-listpromodules:
-	@echo 
-
-listallmodules:
-	@echo 
-
-listaddonpromodules:
-	@echo 
-
-listaddonentmodules:
-	@echo 
-
-
-REQUIRES=
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-
-####### Compile
-
-base64.o: base64.c \
-		config.h \
-		config_linux.h \
-		rsync.h
-
-buf.o: buf.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		trace.h \
-		buf.h \
-		util.h
-
-checksum.o: checksum.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		checksum.h
-
-command.o: command.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		command.h
-
-delta.o: delta.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		emit.h \
-		stream.h \
-		util.h \
-		sumset.h \
-		job.h \
-		trace.h \
-		checksum.h \
-		search.h \
-		types.h
-
-emit.o: emit.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		command.h \
-		protocol.h \
-		trace.h \
-		emit.h \
-		prototab.h \
-		netint.h \
-		sumset.h \
-		job.h
-
-fileutil.o: fileutil.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		fileutil.h \
-		trace.h
-
-hex.o: hex.c \
-		config.h \
-		config_linux.h \
-		rsync.h
-
-job.o: job.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		stream.h \
-		util.h \
-		sumset.h \
-		job.h \
-		trace.h
-
-mdfour.o: mdfour.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		trace.h \
-		types.h
-
-mksum.o: mksum.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		stream.h \
-		util.h \
-		sumset.h \
-		job.h \
-		protocol.h \
-		netint.h \
-		trace.h \
-		checksum.h
-
-msg.o: msg.c \
-		config.h \
-		config_linux.h \
-		rsync.h
-
-netint.o: netint.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		job.h \
-		netint.h \
-		trace.h \
-		stream.h
-
-patch.o: patch.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		util.h \
-		trace.h \
-		protocol.h \
-		netint.h \
-		command.h \
-		sumset.h \
-		prototab.h \
-		stream.h \
-		job.h
-
-prototab.o: prototab.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		protocol.h \
-		command.h \
-		prototab.h
-
-readsums.o: readsums.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		sumset.h \
-		job.h \
-		trace.h \
-		netint.h \
-		protocol.h \
-		util.h \
-		stream.h
-
-scoop.o: scoop.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		job.h \
-		stream.h \
-		trace.h \
-		util.h
-
-search.o: search.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		trace.h \
-		util.h \
-		sumset.h \
-		search.h \
-		checksum.h
-
-stats.o: stats.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		trace.h
-
-stream.o: stream.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		stream.h \
-		util.h \
-		trace.h
-
-sumset.o: sumset.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		sumset.h \
-		util.h \
-		trace.h
-
-trace.o: trace.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		util.h \
-		trace.h
-
-tube.o: tube.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		trace.h \
-		util.h \
-		job.h \
-		stream.h
-
-util.o: util.c \
-		config.h \
-		config_linux.h \
-		util.h \
-		rsync.h \
-		trace.h
-
-version.o: version.c \
-		config.h \
-		config_linux.h \
-		rsync.h
-
-whole.o: whole.c \
-		config.h \
-		config_linux.h \
-		rsync.h \
-		trace.h \
-		fileutil.h \
-		sumset.h \
-		job.h \
-		buf.h \
-		whole.h \
-		util.h
-
-