remove all Makefile.in

You need to set the TMAKEPATH now
author: zecke <zecke> 2002-03-01 18:29:41 (UTC)
committer: zecke <zecke> 2002-03-01 18:29:41 (UTC)
commit: b4d04f29978bbd01a499710860545b233362e748 (patch) (side-by-side diff)
tree: 2d46b909560eb9f47983242ca52f7136df26b6d2
parent: e992a79494ea03005223aef1200338760553aa7d (diff)
download: opie-b4d04f29978bbd01a499710860545b233362e748.zip
opie-b4d04f29978bbd01a499710860545b233362e748.tar.gz
opie-b4d04f29978bbd01a499710860545b233362e748.tar.bz2
53 files changed, 0 insertions, 11422 deletions
diff --git a/core/applets/batteryapplet/Makefile.in b/core/applets/batteryapplet/Makefile.in
deleted file mode 100644
index ccf997b..0000000
--- a/core/applets/batteryapplet/Makefile.in
+++ b/dev/null
@@ -1,122 +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$(OPIEDIR)/include
-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/applets/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= batteryapplet
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	battery.h \
-		batterystatus.h \
-		batteryappletimpl.h
-SOURCES =	battery.cpp \
-		batterystatus.cpp \
-		batteryappletimpl.cpp
-OBJECTS =	battery.o \
-		batterystatus.o \
-		batteryappletimpl.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_battery.cpp
-OBJMOC	=	moc_battery.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:
-	tmake batteryapplet.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
-
-battery.o: battery.cpp \
-		battery.h \
-		batterystatus.h
-
-batterystatus.o: batterystatus.cpp \
-		batterystatus.h
-
-batteryappletimpl.o: batteryappletimpl.cpp \
-		battery.h \
-		batteryappletimpl.h
-
-moc_battery.o: moc_battery.cpp \
-		battery.h
-
-moc_battery.cpp: battery.h
-	$(MOC) battery.h -o moc_battery.cpp
-
-
diff --git a/core/applets/clipboardapplet/Makefile.in b/core/applets/clipboardapplet/Makefile.in
deleted file mode 100644
index c42404e..0000000
--- a/core/applets/clipboardapplet/Makefile.in
+++ b/dev/null
@@ -1,117 +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$(OPIEDIR)/include
-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/applets/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= clipboardapplet
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	clipboard.h \
-		clipboardappletimpl.h
-SOURCES =	clipboard.cpp \
-		clipboardappletimpl.cpp
-OBJECTS =	clipboard.o \
-		clipboardappletimpl.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_clipboard.cpp
-OBJMOC	=	moc_clipboard.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: clipboardapplet.pro
-	tmake clipboardapplet.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
-
-clipboard.o: clipboard.cpp \
-		clipboard.h
-
-clipboardappletimpl.o: clipboardappletimpl.cpp \
-		clipboard.h \
-		clipboardappletimpl.h
-
-moc_clipboard.o: moc_clipboard.cpp \
-		clipboard.h
-
-moc_clipboard.cpp: clipboard.h
-	$(MOC) clipboard.h -o moc_clipboard.cpp
-
-
diff --git a/core/applets/clockapplet/Makefile.in b/core/applets/clockapplet/Makefile.in
deleted file mode 100644
index 742f25f..0000000
--- a/core/applets/clockapplet/Makefile.in
+++ b/dev/null
@@ -1,115 +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$(OPIEDIR)/include
-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/applets/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= clockapplet
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	clock.h \
-		clockappletimpl.h
-SOURCES =	clock.cpp \
-		clockappletimpl.cpp
-OBJECTS =	clock.o \
-		clockappletimpl.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_clock.cpp
-OBJMOC	=	moc_clock.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:
-	tmake clockapplet.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
-
-clock.o: clock.cpp \
-		clock.h
-
-clockappletimpl.o: clockappletimpl.cpp \
-		clock.h \
-		clockappletimpl.h
-
-moc_clock.o: moc_clock.cpp \
-		clock.h
-
-moc_clock.cpp: clock.h
-	$(MOC) clock.h -o moc_clock.cpp
-
-
diff --git a/core/applets/vmemo/Makefile.in b/core/applets/vmemo/Makefile.in
deleted file mode 100644
index f45df83..0000000
--- a/core/applets/vmemo/Makefile.in
+++ b/dev/null
@@ -1,117 +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$(OPIEDIR)/include
-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/applets/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= vmemoapplet
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	vmemo.h \
-		vmemoimpl.h
-SOURCES =	vmemo.cpp \
-		vmemoimpl.cpp
-OBJECTS =	vmemo.o \
-		vmemoimpl.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_vmemo.cpp
-OBJMOC	=	moc_vmemo.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: vmemo.pro
-	tmake vmemo.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
-
-vmemo.o: vmemo.cpp \
-		vmemo.h
-
-vmemoimpl.o: vmemoimpl.cpp \
-		vmemo.h \
-		vmemoimpl.h
-
-moc_vmemo.o: moc_vmemo.cpp \
-		vmemo.h
-
-moc_vmemo.cpp: vmemo.h
-	$(MOC) vmemo.h -o moc_vmemo.cpp
-
-
diff --git a/core/applets/volumeapplet/Makefile.in b/core/applets/volumeapplet/Makefile.in
deleted file mode 100644
index 49acf38..0000000
--- a/core/applets/volumeapplet/Makefile.in
+++ b/dev/null
@@ -1,115 +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$(OPIEDIR)/include
-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/applets/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= volumeapplet
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	volume.h \
-		volumeappletimpl.h
-SOURCES =	volume.cpp \
-		volumeappletimpl.cpp
-OBJECTS =	volume.o \
-		volumeappletimpl.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_volume.cpp
-OBJMOC	=	moc_volume.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:
-	tmake volumeapplet.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
-
-volume.o: volume.cpp \
-		volume.h
-
-volumeappletimpl.o: volumeappletimpl.cpp \
-		volume.h \
-		volumeappletimpl.h
-
-moc_volume.o: moc_volume.cpp \
-		volume.h
-
-moc_volume.cpp: volume.h
-	$(MOC) volume.h -o moc_volume.cpp
-
-
diff --git a/core/apps/embeddedkonsole/Makefile.in b/core/apps/embeddedkonsole/Makefile.in
deleted file mode 100644
index 44310a6..0000000
--- a/core/apps/embeddedkonsole/Makefile.in
+++ b/dev/null
@@ -1,388 +0,0 @@
-#############################################################################
-
-####### 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 = $(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 \
-		commandeditdialog.h \
-		commandeditwidget.h \
-		playlistselection.h \
-		MyPty.h
-SOURCES =	TEScreen.cpp \
-		TEWidget.cpp \
-		TEHistory.cpp \
-		TEmulation.cpp \
-		TEmuVt102.cpp \
-		session.cpp \
-		keytrans.cpp \
-		konsole.cpp \
-		commandeditdialog.cpp \
-		commandeditwidget.cpp \
-		playlistselection.cpp \
-		MyPty.cpp \
-		main.cpp
-OBJECTS =	TEScreen.o \
-		TEWidget.o \
-		TEHistory.o \
-		TEmulation.o \
-		TEmuVt102.o \
-		session.o \
-		keytrans.o \
-		konsole.o \
-		commandeditdialog.o \
-		commandeditwidget.o \
-		playlistselection.o \
-		MyPty.o \
-		main.o \
-		commandeditdialogbase.o \
-		smallcommandeditdialogbase.o
-INTERFACES =    commandeditdialogbase.ui \
-		smallcommandeditdialogbase.ui
-UICDECLS =      commandeditdialogbase.h \
-		smallcommandeditdialogbase.h
-UICIMPLS =      commandeditdialogbase.cpp \
-		smallcommandeditdialogbase.cpp
-SRCMOC	=	moc_TEWidget.cpp \
-		moc_TEmulation.cpp \
-		moc_TEmuVt102.cpp \
-		moc_session.cpp \
-		moc_konsole.cpp \
-		moc_commandeditdialog.cpp \
-		moc_commandeditwidget.cpp \
-		moc_playlistselection.cpp \
-		moc_MyPty.cpp \
-		moc_commandeditdialogbase.cpp \
-		moc_smallcommandeditdialogbase.cpp
-OBJMOC	=	moc_TEWidget.o \
-		moc_TEmulation.o \
-		moc_TEmuVt102.o \
-		moc_session.o \
-		moc_konsole.o \
-		moc_commandeditdialog.o \
-		moc_commandeditwidget.o \
-		moc_playlistselection.o \
-		moc_MyPty.o \
-		moc_commandeditdialogbase.o \
-		moc_smallcommandeditdialogbase.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 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 \
-		$(OPIEDIR)/include/qpe/config.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 \
-		commandeditdialog.h \
-		commandeditdialogbase.h
-
-commandeditdialog.o: commandeditdialog.cpp \
-		commandeditdialog.h \
-		commandeditdialogbase.h \
-		playlistselection.h \
-		$(OPIEDIR)/include/qpe/applnk.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/qpetoolbar.h \
-		$(OPIEDIR)/include/qpe/qpemenubar.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		smallcommandeditdialogbase.h
-
-commandeditwidget.o: commandeditwidget.cpp \
-		commandeditwidget.h \
-		playlistselection.h \
-		$(OPIEDIR)/include/qpe/applnk.h
-
-playlistselection.o: playlistselection.cpp \
-		$(OPIEDIR)/include/qpe/applnk.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		playlistselection.h
-
-MyPty.o: MyPty.cpp \
-		MyPty.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 \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
-
-commandeditdialogbase.h: commandeditdialogbase.ui
-	$(UIC) commandeditdialogbase.ui -o $(INTERFACE_DECL_PATH)/commandeditdialogbase.h
-
-commandeditdialogbase.cpp: commandeditdialogbase.ui
-	$(UIC) commandeditdialogbase.ui -i commandeditdialogbase.h -o commandeditdialogbase.cpp
-
-smallcommandeditdialogbase.h: smallcommandeditdialogbase.ui
-	$(UIC) smallcommandeditdialogbase.ui -o $(INTERFACE_DECL_PATH)/smallcommandeditdialogbase.h
-
-smallcommandeditdialogbase.cpp: smallcommandeditdialogbase.ui
-	$(UIC) smallcommandeditdialogbase.ui -i smallcommandeditdialogbase.h -o smallcommandeditdialogbase.cpp
-
-commandeditdialogbase.o: commandeditdialogbase.cpp \
-		commandeditdialogbase.h \
-		playlistselection.h \
-		$(OPIEDIR)/include/qpe/applnk.h
-
-smallcommandeditdialogbase.o: smallcommandeditdialogbase.cpp \
-		smallcommandeditdialogbase.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_commandeditdialog.o: moc_commandeditdialog.cpp \
-		commandeditdialog.h \
-		commandeditdialogbase.h
-
-moc_commandeditwidget.o: moc_commandeditwidget.cpp \
-		commandeditwidget.h
-
-moc_playlistselection.o: moc_playlistselection.cpp \
-		playlistselection.h \
-		$(OPIEDIR)/include/qpe/applnk.h
-
-moc_MyPty.o: moc_MyPty.cpp \
-		MyPty.h
-
-moc_commandeditdialogbase.o: moc_commandeditdialogbase.cpp \
-		commandeditdialogbase.h
-
-moc_smallcommandeditdialogbase.o: moc_smallcommandeditdialogbase.cpp \
-		smallcommandeditdialogbase.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_commandeditdialog.cpp: commandeditdialog.h
-	$(MOC) commandeditdialog.h -o moc_commandeditdialog.cpp
-
-moc_commandeditwidget.cpp: commandeditwidget.h
-	$(MOC) commandeditwidget.h -o moc_commandeditwidget.cpp
-
-moc_playlistselection.cpp: playlistselection.h
-	$(MOC) playlistselection.h -o moc_playlistselection.cpp
-
-moc_MyPty.cpp: MyPty.h
-	$(MOC) MyPty.h -o moc_MyPty.cpp
-
-moc_commandeditdialogbase.cpp: commandeditdialogbase.h
-	$(MOC) commandeditdialogbase.h -o moc_commandeditdialogbase.cpp
-
-moc_smallcommandeditdialogbase.cpp: smallcommandeditdialogbase.h
-	$(MOC) smallcommandeditdialogbase.h -o moc_smallcommandeditdialogbase.cpp
-
-
diff --git a/core/apps/helpbrowser/Makefile.in b/core/apps/helpbrowser/Makefile.in
deleted file mode 100644
index ed3ea03..0000000
--- a/core/apps/helpbrowser/Makefile.in
+++ b/dev/null
@@ -1,119 +0,0 @@
-#############################################################################
-
-####### 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 = $(OPIEDIR)/bin/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= helpbrowser
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	helpbrowser.h
-SOURCES =	helpbrowser.cpp \
-		main.cpp
-OBJECTS =	helpbrowser.o \
-		main.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_helpbrowser.cpp
-OBJMOC	=	moc_helpbrowser.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 helpbrowser.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
-
-helpbrowser.o: helpbrowser.cpp \
-		helpbrowser.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/global.h \
-		$(OPIEDIR)/include/qpe/qpemenubar.h \
-		$(OPIEDIR)/include/qpe/qpetoolbar.h
-
-main.o: main.cpp \
-		helpbrowser.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
-
-moc_helpbrowser.o: moc_helpbrowser.cpp \
-		helpbrowser.h
-
-moc_helpbrowser.cpp: helpbrowser.h
-	$(MOC) helpbrowser.h -o moc_helpbrowser.cpp
-
-
diff --git a/core/apps/qcop/Makefile.in b/core/apps/qcop/Makefile.in
deleted file mode 100644
index fd543f5..0000000
--- a/core/apps/qcop/Makefile.in
+++ b/dev/null
@@ -1,102 +0,0 @@
-#############################################################################
-
-####### 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	= qcop
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	
-SOURCES =	main.cpp
-OBJECTS =	main.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 qcop.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/qcopenvelope_qws.h
-
-
diff --git a/core/apps/textedit/Makefile.in b/core/apps/textedit/Makefile.in
deleted file mode 100644
index 234965b..0000000
--- a/core/apps/textedit/Makefile.in
+++ b/dev/null
@@ -1,216 +0,0 @@
-#############################################################################
-
-####### 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 = $(OPIEDIR)/bin/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= textedit
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	textedit.h \
-		fileBrowser.h \
-		fontDialog.h \
-		fileSaver.h \
-		filePermissions.h
-SOURCES =	main.cpp \
-		textedit.cpp \
-		fileBrowser.cpp \
-		fontDialog.cpp \
-		fileSaver.cpp \
-		filePermissions.cpp
-OBJECTS =	main.o \
-		textedit.o \
-		fileBrowser.o \
-		fontDialog.o \
-		fileSaver.o \
-		filePermissions.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_textedit.cpp \
-		moc_fileBrowser.cpp \
-		moc_fontDialog.cpp \
-		moc_fileSaver.cpp \
-		moc_filePermissions.cpp
-OBJMOC	=	moc_textedit.o \
-		moc_fileBrowser.o \
-		moc_fontDialog.o \
-		moc_fileSaver.o \
-		moc_filePermissions.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 textedit.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 \
-		textedit.h \
-		fileBrowser.h \
-		fileSaver.h \
-		$(OPIEDIR)/include/qpe/filemanager.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpedecoration_qws.h \
-		$(OPIEDIR)/include/timestring.h
-
-textedit.o: textedit.cpp \
-		textedit.h \
-		fileBrowser.h \
-		fileSaver.h \
-		$(OPIEDIR)/include/qpe/filemanager.h \
-		filePermissions.h \
-		fontDialog.h \
-		$(OPIEDIR)/include/qpe/fontdatabase.h \
-		$(OPIEDIR)/include/qpe/fontfactoryinterface.h \
-		$(OPIEDIR)/include/qpe/qcom.h \
-		$(OPIEDIR)/include/qpe/quuid.h \
-		$(OPIEDIR)/include/qpe/global.h \
-		$(OPIEDIR)/include/qpe/fileselector.h \
-		$(OPIEDIR)/include/filemanager.h \
-		$(OPIEDIR)/include/applnk.h \
-		$(OPIEDIR)/include/qpe/applnk.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpedecoration_qws.h \
-		$(OPIEDIR)/include/timestring.h \
-		$(OPIEDIR)/include/qpe/qpemenubar.h \
-		$(OPIEDIR)/include/qpe/qpetoolbar.h
-
-fileBrowser.o: fileBrowser.cpp \
-		fileBrowser.h \
-		$(OPIEDIR)/include/qpe/config.h
-
-fontDialog.o: fontDialog.cpp \
-		fontDialog.h \
-		$(OPIEDIR)/include/qpe/fontdatabase.h \
-		$(OPIEDIR)/include/qpe/fontfactoryinterface.h \
-		$(OPIEDIR)/include/qpe/qcom.h \
-		$(OPIEDIR)/include/qpe/quuid.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpedecoration_qws.h \
-		$(OPIEDIR)/include/timestring.h
-
-fileSaver.o: fileSaver.cpp \
-		fileSaver.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpedecoration_qws.h \
-		$(OPIEDIR)/include/timestring.h
-
-filePermissions.o: filePermissions.cpp \
-		filePermissions.h
-
-moc_textedit.o: moc_textedit.cpp \
-		textedit.h \
-		fileBrowser.h \
-		fileSaver.h \
-		$(OPIEDIR)/include/qpe/filemanager.h
-
-moc_fileBrowser.o: moc_fileBrowser.cpp \
-		fileBrowser.h
-
-moc_fontDialog.o: moc_fontDialog.cpp \
-		fontDialog.h \
-		$(OPIEDIR)/include/qpe/fontdatabase.h \
-		$(OPIEDIR)/include/qpe/fontfactoryinterface.h \
-		$(OPIEDIR)/include/qpe/qcom.h \
-		$(OPIEDIR)/include/qpe/quuid.h
-
-moc_fileSaver.o: moc_fileSaver.cpp \
-		fileSaver.h
-
-moc_filePermissions.o: moc_filePermissions.cpp \
-		filePermissions.h
-
-moc_textedit.cpp: textedit.h
-	$(MOC) textedit.h -o moc_textedit.cpp
-
-moc_fileBrowser.cpp: fileBrowser.h
-	$(MOC) fileBrowser.h -o moc_fileBrowser.cpp
-
-moc_fontDialog.cpp: fontDialog.h
-	$(MOC) fontDialog.h -o moc_fontDialog.cpp
-
-moc_fileSaver.cpp: fileSaver.h
-	$(MOC) fileSaver.h -o moc_fileSaver.cpp
-
-moc_filePermissions.cpp: filePermissions.h
-	$(MOC) filePermissions.h -o moc_filePermissions.cpp
-
-
diff --git a/core/launcher/Makefile.in b/core/launcher/Makefile.in
deleted file mode 100644
index 52aa401..0000000
--- a/core/launcher/Makefile.in
+++ b/dev/null
@@ -1,902 +0,0 @@
-#############################################################################
-
-####### 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 \
-		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 \
-		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 \
-		$(OPIEDIR)/include/qpe/global.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/process.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/qcopenvelope_qws.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 \
-		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
-
-$(OPIEDIR)/rsync/msg.o: $(OPIEDIR)/rsync/msg.c \
-		$(OPIEDIR)/rsync/config_rsync.h \
-		$(OPIEDIR)/rsync/config_linux.h \
-		$(OPIEDIR)/rsync/rsync.h
-
-$(OPIEDIR)/rsync/netint.o: $(OPIEDIR)/rsync/netint.c \
-		$(OPIEDIR)/rsync/config_rsync.h \
-		$(OPIEDIR)/rsync/config_linux.h \
-		$(OPIEDIR)/rsync/rsync.h \
-		$(OPIEDIR)/rsync/job.h \
-		$(OPIEDIR)/rsync/netint.h \
-		$(OPIEDIR)/rsync/trace.h \
-		$(OPIEDIR)/rsync/stream.h
-
-$(OPIEDIR)/rsync/patch.o: $(OPIEDIR)/rsync/patch.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/protocol.h \
-		$(OPIEDIR)/rsync/netint.h \
-		$(OPIEDIR)/rsync/command.h \
-		$(OPIEDIR)/rsync/sumset.h \
-		$(OPIEDIR)/rsync/prototab.h \
-		$(OPIEDIR)/rsync/stream.h \
-		$(OPIEDIR)/rsync/job.h
-
-$(OPIEDIR)/rsync/prototab.o: $(OPIEDIR)/rsync/prototab.c \
-		$(OPIEDIR)/rsync/config_rsync.h \
-		$(OPIEDIR)/rsync/config_linux.h \
-		$(OPIEDIR)/rsync/rsync.h \
-		$(OPIEDIR)/rsync/protocol.h \
-		$(OPIEDIR)/rsync/command.h \
-		$(OPIEDIR)/rsync/prototab.h
-
-$(OPIEDIR)/rsync/readsums.o: $(OPIEDIR)/rsync/readsums.c \
-		$(OPIEDIR)/rsync/config_rsync.h \
-		$(OPIEDIR)/rsync/config_linux.h \
-		$(OPIEDIR)/rsync/rsync.h \
-		$(OPIEDIR)/rsync/sumset.h \
-		$(OPIEDIR)/rsync/job.h \
-		$(OPIEDIR)/rsync/trace.h \
-		$(OPIEDIR)/rsync/netint.h \
-		$(OPIEDIR)/rsync/protocol.h \
-		$(OPIEDIR)/rsync/util.h \
-		$(OPIEDIR)/rsync/stream.h
-
-$(OPIEDIR)/rsync/scoop.o: $(OPIEDIR)/rsync/scoop.c \
-		$(OPIEDIR)/rsync/config_rsync.h \
-		$(OPIEDIR)/rsync/config_linux.h \
-		$(OPIEDIR)/rsync/rsync.h \
-		$(OPIEDIR)/rsync/job.h \
-		$(OPIEDIR)/rsync/stream.h \
-		$(OPIEDIR)/rsync/trace.h \
-		$(OPIEDIR)/rsync/util.h
-
-$(OPIEDIR)/rsync/search.o: $(OPIEDIR)/rsync/search.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/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
-
-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: 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_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
deleted file mode 100644
index e8ccc34..0000000
--- a/core/multimedia/opieplayer/Makefile.in
+++ b/dev/null
@@ -1,293 +0,0 @@
-#############################################################################
-
-####### 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 -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:
-	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 \
-		$(OPIEDIR)/include/qpedecoration_qws.h \
-		$(OPIEDIR)/include/timestring.h \
-		mediaplayerstate.h \
-		playlistwidget.h \
-		$(OPIEDIR)/include/qpe/applnk.h \
-		audiowidget.h \
-		videowidget.h \
-		loopcontrol.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/qpedecoration_qws.h \
-		$(OPIEDIR)/include/timestring.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/qpedecoration_qws.h \
-		$(OPIEDIR)/include/timestring.h \
-		$(OPIEDIR)/include/qpe/qlibrary.h \
-		$(OPIEDIR)/include/qpe/qcom.h \
-		$(OPIEDIR)/include/qpe/quuid.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		mediaplayerplugininterface.h \
-		mediaplayerstate.h \
-		libmad/libmadpluginimpl.h \
-		libmpeg3/libmpeg3pluginimpl.h \
-		wavplugin/wavpluginimpl.h
-
-videowidget.o: videowidget.cpp \
-		$(OPIEDIR)/include/qpe/resource.h \
-		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/filemanager.h \
-		$(OPIEDIR)/include/applnk.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpedecoration_qws.h \
-		$(OPIEDIR)/include/timestring.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/qpedecoration_qws.h \
-		$(OPIEDIR)/include/timestring.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 \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpedecoration_qws.h \
-		$(OPIEDIR)/include/timestring.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		audiodevice.h
-
-moc_loopcontrol.o: moc_loopcontrol.cpp \
-		loopcontrol.h
-
-moc_playlistselection.o: moc_playlistselection.cpp \
-		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 \
-		$(OPIEDIR)/include/qpe/applnk.h
-
-moc_mediaplayer.o: moc_mediaplayer.cpp \
-		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/libflash/Makefile.in b/core/multimedia/opieplayer/libflash/Makefile.in
deleted file mode 100644
index 0947454..0000000
--- a/core/multimedia/opieplayer/libflash/Makefile.in
+++ b/dev/null
@@ -1,641 +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$(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	= flashplugin
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	libflashplugin.h \
-		libflashpluginimpl.h
-SOURCES =	libflashplugin.cpp \
-		libflashpluginimpl.cpp \
-		adpcm.cc \
-		character.cc \
-		flash.cc \
-		graphic16.cc \
-		matrix.cc \
-		script.cc \
-		sprite.cc \
-		bitmap.cc \
-		cxform.cc \
-		font.cc \
-		graphic24.cc \
-		movie.cc \
-		shape.cc \
-		sqrt.cc \
-		button.cc \
-		displaylist.cc \
-		graphic.cc \
-		graphic32.cc \
-		program.cc \
-		sound.cc \
-		text.cc
-OBJECTS =	libflashplugin.o \
-		libflashpluginimpl.o \
-		adpcm.o \
-		character.o \
-		flash.o \
-		graphic16.o \
-		matrix.o \
-		script.o \
-		sprite.o \
-		bitmap.o \
-		cxform.o \
-		font.o \
-		graphic24.o \
-		movie.o \
-		shape.o \
-		sqrt.o \
-		button.o \
-		displaylist.o \
-		graphic.o \
-		graphic32.o \
-		program.o \
-		sound.o \
-		text.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: libflash.pro
-	tmake libflash.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
-
-libflashplugin.o: libflashplugin.cpp \
-		libflashplugin.h \
-		flash.h
-
-libflashpluginimpl.o: libflashpluginimpl.cpp \
-		libflashplugin.h \
-		flash.h \
-		libflashpluginimpl.h
-
-adpcm.o: adpcm.cc \
-		swf.h \
-		flash.h \
-		matrix.h \
-		cxform.h \
-		rect.h \
-		jpeglib.h \
-		jconfig.h \
-		jmorecfg.h \
-		jerror.h \
-		graphic.h \
-		character.h \
-		bitmap.h \
-		shape.h \
-		displaylist.h \
-		sound.h \
-		button.h \
-		font.h \
-		text.h \
-		adpcm.h \
-		program.h \
-		sprite.h \
-		script.h \
-		movie.h
-
-character.o: character.cc \
-		swf.h \
-		flash.h \
-		matrix.h \
-		cxform.h \
-		rect.h \
-		jpeglib.h \
-		jconfig.h \
-		jmorecfg.h \
-		jerror.h \
-		graphic.h \
-		character.h \
-		bitmap.h \
-		shape.h \
-		displaylist.h \
-		sound.h \
-		button.h \
-		font.h \
-		text.h \
-		adpcm.h \
-		program.h \
-		sprite.h \
-		script.h \
-		movie.h
-
-flash.o: flash.cc \
-		swf.h \
-		flash.h \
-		matrix.h \
-		cxform.h \
-		rect.h \
-		jpeglib.h \
-		jconfig.h \
-		jmorecfg.h \
-		jerror.h \
-		graphic.h \
-		character.h \
-		bitmap.h \
-		shape.h \
-		displaylist.h \
-		sound.h \
-		button.h \
-		font.h \
-		text.h \
-		adpcm.h \
-		program.h \
-		sprite.h \
-		script.h \
-		movie.h \
-		graphic16.h \
-		graphic24.h \
-		graphic32.h
-
-graphic16.o: graphic16.cc \
-		swf.h \
-		flash.h \
-		matrix.h \
-		cxform.h \
-		rect.h \
-		jpeglib.h \
-		jconfig.h \
-		jmorecfg.h \
-		jerror.h \
-		graphic.h \
-		character.h \
-		bitmap.h \
-		shape.h \
-		displaylist.h \
-		sound.h \
-		button.h \
-		font.h \
-		text.h \
-		adpcm.h \
-		program.h \
-		sprite.h \
-		script.h \
-		movie.h \
-		graphic16.h
-
-matrix.o: matrix.cc \
-		matrix.h
-
-script.o: script.cc \
-		swf.h \
-		flash.h \
-		matrix.h \
-		cxform.h \
-		rect.h \
-		jpeglib.h \
-		jconfig.h \
-		jmorecfg.h \
-		jerror.h \
-		graphic.h \
-		character.h \
-		bitmap.h \
-		shape.h \
-		displaylist.h \
-		sound.h \
-		button.h \
-		font.h \
-		text.h \
-		adpcm.h \
-		program.h \
-		sprite.h \
-		script.h \
-		movie.h
-
-sprite.o: sprite.cc \
-		swf.h \
-		flash.h \
-		matrix.h \
-		cxform.h \
-		rect.h \
-		jpeglib.h \
-		jconfig.h \
-		jmorecfg.h \
-		jerror.h \
-		graphic.h \
-		character.h \
-		bitmap.h \
-		shape.h \
-		displaylist.h \
-		sound.h \
-		button.h \
-		font.h \
-		text.h \
-		adpcm.h \
-		program.h \
-		sprite.h \
-		script.h \
-		movie.h
-
-bitmap.o: bitmap.cc \
-		swf.h \
-		flash.h \
-		matrix.h \
-		cxform.h \
-		rect.h \
-		jpeglib.h \
-		jconfig.h \
-		jmorecfg.h \
-		jerror.h \
-		graphic.h \
-		character.h \
-		bitmap.h \
-		shape.h \
-		displaylist.h \
-		sound.h \
-		button.h \
-		font.h \
-		text.h \
-		adpcm.h \
-		program.h \
-		sprite.h \
-		script.h \
-		movie.h
-
-cxform.o: cxform.cc \
-		swf.h \
-		flash.h \
-		matrix.h \
-		cxform.h \
-		rect.h \
-		jpeglib.h \
-		jconfig.h \
-		jmorecfg.h \
-		jerror.h \
-		graphic.h \
-		character.h \
-		bitmap.h \
-		shape.h \
-		displaylist.h \
-		sound.h \
-		button.h \
-		font.h \
-		text.h \
-		adpcm.h \
-		program.h \
-		sprite.h \
-		script.h \
-		movie.h
-
-font.o: font.cc \
-		swf.h \
-		flash.h \
-		matrix.h \
-		cxform.h \
-		rect.h \
-		jpeglib.h \
-		jconfig.h \
-		jmorecfg.h \
-		jerror.h \
-		graphic.h \
-		character.h \
-		bitmap.h \
-		shape.h \
-		displaylist.h \
-		sound.h \
-		button.h \
-		font.h \
-		text.h \
-		adpcm.h \
-		program.h \
-		sprite.h \
-		script.h \
-		movie.h
-
-graphic24.o: graphic24.cc \
-		swf.h \
-		flash.h \
-		matrix.h \
-		cxform.h \
-		rect.h \
-		jpeglib.h \
-		jconfig.h \
-		jmorecfg.h \
-		jerror.h \
-		graphic.h \
-		character.h \
-		bitmap.h \
-		shape.h \
-		displaylist.h \
-		sound.h \
-		button.h \
-		font.h \
-		text.h \
-		adpcm.h \
-		program.h \
-		sprite.h \
-		script.h \
-		movie.h \
-		graphic24.h
-
-movie.o: movie.cc \
-		movie.h \
-		swf.h \
-		flash.h \
-		matrix.h \
-		cxform.h \
-		rect.h \
-		jpeglib.h \
-		jconfig.h \
-		jmorecfg.h \
-		jerror.h \
-		graphic.h \
-		character.h \
-		bitmap.h \
-		shape.h \
-		displaylist.h \
-		sound.h \
-		button.h \
-		font.h \
-		text.h \
-		adpcm.h \
-		program.h \
-		sprite.h \
-		script.h
-
-shape.o: shape.cc \
-		swf.h \
-		flash.h \
-		matrix.h \
-		cxform.h \
-		rect.h \
-		jpeglib.h \
-		jconfig.h \
-		jmorecfg.h \
-		jerror.h \
-		graphic.h \
-		character.h \
-		bitmap.h \
-		shape.h \
-		displaylist.h \
-		sound.h \
-		button.h \
-		font.h \
-		text.h \
-		adpcm.h \
-		program.h \
-		sprite.h \
-		script.h \
-		movie.h
-
-sqrt.o: sqrt.cc
-
-button.o: button.cc \
-		swf.h \
-		flash.h \
-		matrix.h \
-		cxform.h \
-		rect.h \
-		jpeglib.h \
-		jconfig.h \
-		jmorecfg.h \
-		jerror.h \
-		graphic.h \
-		character.h \
-		bitmap.h \
-		shape.h \
-		displaylist.h \
-		sound.h \
-		button.h \
-		font.h \
-		text.h \
-		adpcm.h \
-		program.h \
-		sprite.h \
-		script.h \
-		movie.h
-
-displaylist.o: displaylist.cc \
-		swf.h \
-		flash.h \
-		matrix.h \
-		cxform.h \
-		rect.h \
-		jpeglib.h \
-		jconfig.h \
-		jmorecfg.h \
-		jerror.h \
-		graphic.h \
-		character.h \
-		bitmap.h \
-		shape.h \
-		displaylist.h \
-		sound.h \
-		button.h \
-		font.h \
-		text.h \
-		adpcm.h \
-		program.h \
-		sprite.h \
-		script.h \
-		movie.h
-
-graphic.o: graphic.cc \
-		swf.h \
-		flash.h \
-		matrix.h \
-		cxform.h \
-		rect.h \
-		jpeglib.h \
-		jconfig.h \
-		jmorecfg.h \
-		jerror.h \
-		graphic.h \
-		character.h \
-		bitmap.h \
-		shape.h \
-		displaylist.h \
-		sound.h \
-		button.h \
-		font.h \
-		text.h \
-		adpcm.h \
-		program.h \
-		sprite.h \
-		script.h \
-		movie.h
-
-graphic32.o: graphic32.cc \
-		swf.h \
-		flash.h \
-		matrix.h \
-		cxform.h \
-		rect.h \
-		jpeglib.h \
-		jconfig.h \
-		jmorecfg.h \
-		jerror.h \
-		graphic.h \
-		character.h \
-		bitmap.h \
-		shape.h \
-		displaylist.h \
-		sound.h \
-		button.h \
-		font.h \
-		text.h \
-		adpcm.h \
-		program.h \
-		sprite.h \
-		script.h \
-		movie.h \
-		graphic32.h
-
-program.o: program.cc \
-		swf.h \
-		flash.h \
-		matrix.h \
-		cxform.h \
-		rect.h \
-		jpeglib.h \
-		jconfig.h \
-		jmorecfg.h \
-		jerror.h \
-		graphic.h \
-		character.h \
-		bitmap.h \
-		shape.h \
-		displaylist.h \
-		sound.h \
-		button.h \
-		font.h \
-		text.h \
-		adpcm.h \
-		program.h \
-		sprite.h \
-		script.h \
-		movie.h
-
-sound.o: sound.cc \
-		swf.h \
-		flash.h \
-		matrix.h \
-		cxform.h \
-		rect.h \
-		jpeglib.h \
-		jconfig.h \
-		jmorecfg.h \
-		jerror.h \
-		graphic.h \
-		character.h \
-		bitmap.h \
-		shape.h \
-		displaylist.h \
-		sound.h \
-		button.h \
-		font.h \
-		text.h \
-		adpcm.h \
-		program.h \
-		sprite.h \
-		script.h \
-		movie.h
-
-text.o: text.cc \
-		swf.h \
-		flash.h \
-		matrix.h \
-		cxform.h \
-		rect.h \
-		jpeglib.h \
-		jconfig.h \
-		jmorecfg.h \
-		jerror.h \
-		graphic.h \
-		character.h \
-		bitmap.h \
-		shape.h \
-		displaylist.h \
-		sound.h \
-		button.h \
-		font.h \
-		text.h \
-		adpcm.h \
-		program.h \
-		sprite.h \
-		script.h \
-		movie.h
-
-
diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in
deleted file mode 100644
index 552043c..0000000
--- a/core/multimedia/opieplayer/libmad/Makefile.in
+++ b/dev/null
@@ -1,225 +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$(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:
-	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 \
-		fixed.h \
-		bit.h \
-		stream.h \
-		frame.h \
-		timer.h \
-		huffman.h \
-		layer3.h \
-		rq_table.dat \
-		imdct_s.dat
-
-huffman.o: huffman.c \
-		libmad_global.h \
-		huffman.h
-
-libmadplugin.o: libmadplugin.cpp \
-		libmadplugin.h \
-		../mediaplayerplugininterface.h \
-		mad.h
-
-libmadpluginimpl.o: libmadpluginimpl.cpp \
-		libmadplugin.h \
-		../mediaplayerplugininterface.h \
-		libmadpluginimpl.h
-
-
diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in
deleted file mode 100644
index d255e4f..0000000
--- a/core/multimedia/opieplayer/libmpeg3/Makefile.in
+++ b/dev/null
@@ -1,773 +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$(OPIEDIR)/include -I..
-LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
-LIBS	=	$(SUBLIBS) -lqpe -lpthread -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	= mpeg3plugin
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	libmpeg3plugin.h \
-		libmpeg3pluginimpl.h
-SOURCES =	libmpeg3plugin.cpp \
-		libmpeg3pluginimpl.cpp \
-		bitstream.c \
-		libmpeg3.c \
-		mpeg3atrack.c \
-		mpeg3css.c \
-		mpeg3demux.c \
-		mpeg3io.c \
-		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:
-	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 \
-		../mediaplayerplugininterface.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 \
-		../mediaplayerplugininterface.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 \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		audio/mpeg3audio.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h \
-		mpeg3protos.h
-
-mpeg3css.o: mpeg3css.c \
-		mpeg3css.h \
-		mpeg3private.h \
-		mpeg3atrack.h \
-		mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3private.inc \
-		audio/mpeg3audio.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h
-
-mpeg3demux.o: mpeg3demux.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
-
-mpeg3io.o: mpeg3io.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
-
-mpeg3title.o: mpeg3title.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
-
-mpeg3vtrack.o: mpeg3vtrack.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
-
-audio/ac3.o: audio/ac3.c \
-		audio/mpeg3audio.h \
-		audio/ac3.h \
-		audio/mpeg3real.h \
-		audio/../bitstream.h \
-		mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		audio/../libmpeg3.h \
-		mpeg3private.h \
-		mpeg3atrack.h \
-		audio/mpeg3audio.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h \
-		audio/../mpeg3protos.h
-
-audio/bit_allocation.o: audio/bit_allocation.c \
-		audio/mpeg3audio.h \
-		audio/ac3.h \
-		audio/mpeg3real.h \
-		audio/../bitstream.h \
-		mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		audio/../libmpeg3.h \
-		mpeg3private.h \
-		mpeg3atrack.h \
-		audio/mpeg3audio.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h \
-		audio/../mpeg3protos.h
-
-audio/dct.o: audio/dct.c \
-		audio/mpeg3audio.h \
-		audio/ac3.h \
-		audio/mpeg3real.h \
-		audio/../bitstream.h \
-		mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		audio/../libmpeg3.h \
-		mpeg3private.h \
-		mpeg3atrack.h \
-		audio/mpeg3audio.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h \
-		audio/../mpeg3protos.h \
-		audio/tables.h \
-		audio/fptables.h
-
-audio/exponents.o: audio/exponents.c \
-		audio/mpeg3audio.h \
-		audio/ac3.h \
-		audio/mpeg3real.h \
-		audio/../bitstream.h \
-		mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		audio/../libmpeg3.h \
-		mpeg3private.h \
-		mpeg3atrack.h \
-		audio/mpeg3audio.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h \
-		audio/../mpeg3protos.h
-
-audio/header.o: audio/header.c \
-		audio/mpeg3audio.h \
-		audio/ac3.h \
-		audio/mpeg3real.h \
-		audio/../bitstream.h \
-		mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		audio/tables.h \
-		audio/../libmpeg3.h \
-		mpeg3private.h \
-		mpeg3atrack.h \
-		audio/mpeg3audio.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h \
-		audio/../mpeg3protos.h
-
-audio/layer2.o: audio/layer2.c \
-		audio/mpeg3audio.h \
-		audio/ac3.h \
-		audio/mpeg3real.h \
-		audio/../bitstream.h \
-		mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		audio/../libmpeg3.h \
-		mpeg3private.h \
-		mpeg3atrack.h \
-		audio/mpeg3audio.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h \
-		audio/../mpeg3protos.h \
-		audio/tables.h
-
-audio/layer3.o: audio/layer3.c \
-		huffman.h \
-		audio/mpeg3audio.h \
-		audio/ac3.h \
-		audio/mpeg3real.h \
-		audio/../bitstream.h \
-		mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		audio/../libmpeg3.h \
-		mpeg3private.h \
-		mpeg3atrack.h \
-		audio/mpeg3audio.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h \
-		audio/../mpeg3protos.h \
-		audio/tables.h
-
-audio/mantissa.o: audio/mantissa.c \
-		audio/mpeg3audio.h \
-		audio/ac3.h \
-		audio/mpeg3real.h \
-		audio/../bitstream.h \
-		mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		audio/../libmpeg3.h \
-		mpeg3private.h \
-		mpeg3atrack.h \
-		audio/mpeg3audio.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h \
-		audio/../mpeg3protos.h
-
-audio/mpeg3audio.o: audio/mpeg3audio.c \
-		audio/../libmpeg3.h \
-		mpeg3private.h \
-		mpeg3atrack.h \
-		mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		audio/mpeg3audio.h \
-		audio/ac3.h \
-		audio/mpeg3real.h \
-		audio/../bitstream.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h \
-		audio/../mpeg3protos.h \
-		audio/mpeg3audio.h \
-		audio/tables.h
-
-audio/pcm.o: audio/pcm.c \
-		audio/mpeg3audio.h \
-		audio/ac3.h \
-		audio/mpeg3real.h \
-		audio/../bitstream.h \
-		mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		audio/../libmpeg3.h \
-		mpeg3private.h \
-		mpeg3atrack.h \
-		audio/mpeg3audio.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h \
-		audio/../mpeg3protos.h
-
-audio/synthesizers.o: audio/synthesizers.c \
-		audio/mpeg3audio.h \
-		audio/ac3.h \
-		audio/mpeg3real.h \
-		audio/../bitstream.h \
-		mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		audio/../libmpeg3.h \
-		mpeg3private.h \
-		mpeg3atrack.h \
-		audio/mpeg3audio.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h \
-		audio/../mpeg3protos.h \
-		audio/tables.h
-
-audio/tables.o: audio/tables.c \
-		audio/mpeg3audio.h \
-		audio/ac3.h \
-		audio/mpeg3real.h \
-		audio/../bitstream.h \
-		mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		audio/../libmpeg3.h \
-		mpeg3private.h \
-		mpeg3atrack.h \
-		audio/mpeg3audio.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h \
-		audio/../mpeg3protos.h \
-		audio/tables.h \
-		audio/fptables.h
-
-video/getpicture.o: video/getpicture.c \
-		audio/../libmpeg3.h \
-		mpeg3private.h \
-		mpeg3atrack.h \
-		mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		audio/mpeg3audio.h \
-		audio/ac3.h \
-		audio/mpeg3real.h \
-		audio/../bitstream.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h \
-		video/../mpeg3private.inc \
-		video/idct.h \
-		video/slice.h \
-		video/../timecode.h \
-		video/../mpeg3protos.h \
-		video/mpeg3video.h \
-		video/vlc.h
-
-video/headers.o: video/headers.c \
-		video/../mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		audio/../libmpeg3.h \
-		mpeg3private.h \
-		mpeg3atrack.h \
-		mpeg3demux.h \
-		audio/mpeg3audio.h \
-		audio/ac3.h \
-		audio/mpeg3real.h \
-		audio/../bitstream.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h \
-		video/../mpeg3private.inc \
-		video/idct.h \
-		video/slice.h \
-		video/../timecode.h \
-		video/../mpeg3protos.h \
-		video/mpeg3video.h
-
-video/idct.o: video/idct.c \
-		video/idct.h
-
-video/macroblocks.o: video/macroblocks.c \
-		audio/../libmpeg3.h \
-		mpeg3private.h \
-		mpeg3atrack.h \
-		mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		audio/mpeg3audio.h \
-		audio/ac3.h \
-		audio/mpeg3real.h \
-		audio/../bitstream.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h \
-		video/../mpeg3private.inc \
-		video/idct.h \
-		video/slice.h \
-		video/../timecode.h \
-		video/../mpeg3protos.h \
-		video/mpeg3video.h \
-		video/vlc.h
-
-video/mmxtest.o: video/mmxtest.c \
-		audio/../libmpeg3.h \
-		mpeg3private.h \
-		mpeg3atrack.h \
-		mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		audio/mpeg3audio.h \
-		audio/ac3.h \
-		audio/mpeg3real.h \
-		audio/../bitstream.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h \
-		video/../mpeg3private.inc \
-		video/idct.h \
-		video/slice.h \
-		video/../timecode.h \
-		video/../mpeg3protos.h
-
-video/motion.o: video/motion.c \
-		video/mpeg3video.h \
-		audio/../bitstream.h \
-		mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		video/../mpeg3private.inc \
-		video/idct.h \
-		video/slice.h \
-		video/../timecode.h \
-		audio/../libmpeg3.h \
-		mpeg3private.h \
-		mpeg3atrack.h \
-		audio/mpeg3audio.h \
-		audio/ac3.h \
-		audio/mpeg3real.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h \
-		video/../mpeg3protos.h \
-		video/vlc.h
-
-video/mpeg3video.o: video/mpeg3video.c \
-		audio/../libmpeg3.h \
-		mpeg3private.h \
-		mpeg3atrack.h \
-		mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		audio/mpeg3audio.h \
-		audio/ac3.h \
-		audio/mpeg3real.h \
-		audio/../bitstream.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h \
-		video/../mpeg3private.inc \
-		video/idct.h \
-		video/slice.h \
-		video/../timecode.h \
-		video/../mpeg3protos.h \
-		video/mpeg3video.h \
-		video/mpeg3videoprotos.h
-
-video/output.o: video/output.c \
-		audio/../libmpeg3.h \
-		mpeg3private.h \
-		mpeg3atrack.h \
-		mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		audio/mpeg3audio.h \
-		audio/ac3.h \
-		audio/mpeg3real.h \
-		audio/../bitstream.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h \
-		video/../mpeg3private.inc \
-		video/idct.h \
-		video/slice.h \
-		video/../timecode.h \
-		video/../mpeg3protos.h \
-		video/mpeg3video.h
-
-video/reconstruct.o: video/reconstruct.c \
-		audio/../libmpeg3.h \
-		mpeg3private.h \
-		mpeg3atrack.h \
-		mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		audio/mpeg3audio.h \
-		audio/ac3.h \
-		audio/mpeg3real.h \
-		audio/../bitstream.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h \
-		video/../mpeg3private.inc \
-		video/idct.h \
-		video/slice.h \
-		video/../timecode.h \
-		video/../mpeg3protos.h \
-		video/mpeg3video.h
-
-video/seek.o: video/seek.c \
-		video/../mpeg3private.h \
-		mpeg3atrack.h \
-		mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		audio/mpeg3audio.h \
-		audio/ac3.h \
-		audio/mpeg3real.h \
-		audio/../bitstream.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h \
-		video/../mpeg3private.inc \
-		video/idct.h \
-		video/slice.h \
-		video/../timecode.h \
-		video/../mpeg3protos.h \
-		video/mpeg3video.h
-
-video/slice.o: video/slice.c \
-		audio/../libmpeg3.h \
-		mpeg3private.h \
-		mpeg3atrack.h \
-		mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		audio/mpeg3audio.h \
-		audio/ac3.h \
-		audio/mpeg3real.h \
-		audio/../bitstream.h \
-		mpeg3vtrack.h \
-		video/mpeg3video.h \
-		video/../mpeg3private.inc \
-		video/idct.h \
-		video/slice.h \
-		video/../timecode.h \
-		video/../mpeg3protos.h \
-		video/mpeg3video.h \
-		video/mpeg3videoprotos.h
-
-video/vlc.o: video/vlc.c \
-		video/mpeg3video.h \
-		audio/../bitstream.h \
-		mpeg3demux.h \
-		mpeg3title.h \
-		mpeg3io.h \
-		mpeg3css.h \
-		mpeg3private.inc \
-		video/../mpeg3private.inc \
-		video/idct.h \
-		video/slice.h \
-		video/../timecode.h \
-		video/vlc.h
-
-
diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in
deleted file mode 100644
index a46b925..0000000
--- a/core/multimedia/opieplayer/wavplugin/Makefile.in
+++ b/dev/null
@@ -1,111 +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$(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:
-	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 \
-		../mediaplayerplugininterface.h
-
-wavpluginimpl.o: wavpluginimpl.cpp \
-		wavplugin.h \
-		../mediaplayerplugininterface.h \
-		wavpluginimpl.h
-
-
diff --git a/core/pim/addressbook/Makefile.in b/core/pim/addressbook/Makefile.in
deleted file mode 100644
index c46d0e5..0000000
--- a/core/pim/addressbook/Makefile.in
+++ b/dev/null
@@ -1,244 +0,0 @@
-#############################################################################
-
-####### 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 = $(OPIEDIR)/bin/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= addressbook
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	addressbook.h \
-		abeditor.h \
-		ablabel.h \
-		abtable.h \
-		addresssettings.h
-SOURCES =	main.cpp \
-		addressbook.cpp \
-		abeditor.cpp \
-		ablabel.cpp \
-		abtable.cpp \
-		addresssettings.cpp
-OBJECTS =	main.o \
-		addressbook.o \
-		abeditor.o \
-		ablabel.o \
-		abtable.o \
-		addresssettings.o \
-		addresssettingsbase.o
-INTERFACES =    addresssettingsbase.ui
-UICDECLS =      addresssettingsbase.h
-UICIMPLS =      addresssettingsbase.cpp
-SRCMOC	=	moc_addressbook.cpp \
-		moc_abeditor.cpp \
-		moc_ablabel.cpp \
-		moc_abtable.cpp \
-		moc_addresssettings.cpp \
-		moc_addresssettingsbase.cpp
-OBJMOC	=	moc_addressbook.o \
-		moc_abeditor.o \
-		moc_ablabel.o \
-		moc_abtable.o \
-		moc_addresssettings.o \
-		moc_addresssettingsbase.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 addressbook.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 \
-		addressbook.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h
-
-addressbook.o: addressbook.cpp \
-		abeditor.h \
-		$(OPIEDIR)/include/qpe/contact.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/recordfields.h \
-		ablabel.h \
-		abtable.h \
-		$(OPIEDIR)/include/qpe/categories.h \
-		addresssettings.h \
-		addresssettingsbase.h \
-		addressbook.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/finddialog.h \
-		$(OPIEDIR)/include/qpe/global.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/ir.h \
-		$(OPIEDIR)/include/qpe/qpemessagebox.h \
-		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
-		$(OPIEDIR)/include/qpe/qpemenubar.h \
-		$(OPIEDIR)/include/qpe/qpetoolbar.h
-
-abeditor.o: abeditor.cpp \
-		abeditor.h \
-		$(OPIEDIR)/include/qpe/contact.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/recordfields.h \
-		addresspicker.h \
-		$(OPIEDIR)/include/qpe/categoryselect.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/qpedialog.h
-
-ablabel.o: ablabel.cpp \
-		ablabel.h \
-		$(OPIEDIR)/include/qpe/contact.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/recordfields.h \
-		$(OPIEDIR)/include/qpe/stringutil.h
-
-abtable.o: abtable.cpp \
-		$(OPIEDIR)/include/qpe/categoryselect.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/stringutil.h \
-		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
-		abtable.h \
-		$(OPIEDIR)/include/qpe/categories.h \
-		$(OPIEDIR)/include/qpe/contact.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/recordfields.h
-
-addresssettings.o: addresssettings.cpp \
-		addresssettings.h \
-		addresssettingsbase.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/contact.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/recordfields.h
-
-addresssettingsbase.h: addresssettingsbase.ui
-	$(UIC) addresssettingsbase.ui -o $(INTERFACE_DECL_PATH)/addresssettingsbase.h
-
-addresssettingsbase.cpp: addresssettingsbase.ui
-	$(UIC) addresssettingsbase.ui -i addresssettingsbase.h -o addresssettingsbase.cpp
-
-addresssettingsbase.o: addresssettingsbase.cpp \
-		addresssettingsbase.h \
-		addresssettingsbase.ui
-
-moc_addressbook.o: moc_addressbook.cpp \
-		addressbook.h
-
-moc_abeditor.o: moc_abeditor.cpp \
-		abeditor.h \
-		$(OPIEDIR)/include/qpe/contact.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/recordfields.h
-
-moc_ablabel.o: moc_ablabel.cpp \
-		ablabel.h \
-		$(OPIEDIR)/include/qpe/contact.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/recordfields.h
-
-moc_abtable.o: moc_abtable.cpp \
-		abtable.h \
-		$(OPIEDIR)/include/qpe/categories.h \
-		$(OPIEDIR)/include/qpe/contact.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/recordfields.h
-
-moc_addresssettings.o: moc_addresssettings.cpp \
-		addresssettings.h \
-		addresssettingsbase.h
-
-moc_addresssettingsbase.o: moc_addresssettingsbase.cpp \
-		addresssettingsbase.h
-
-moc_addressbook.cpp: addressbook.h
-	$(MOC) addressbook.h -o moc_addressbook.cpp
-
-moc_abeditor.cpp: abeditor.h
-	$(MOC) abeditor.h -o moc_abeditor.cpp
-
-moc_ablabel.cpp: ablabel.h
-	$(MOC) ablabel.h -o moc_ablabel.cpp
-
-moc_abtable.cpp: abtable.h
-	$(MOC) abtable.h -o moc_abtable.cpp
-
-moc_addresssettings.cpp: addresssettings.h
-	$(MOC) addresssettings.h -o moc_addresssettings.cpp
-
-moc_addresssettingsbase.cpp: addresssettingsbase.h
-	$(MOC) addresssettingsbase.h -o moc_addresssettingsbase.cpp
-
-
diff --git a/core/pim/datebook/Makefile.in b/core/pim/datebook/Makefile.in
deleted file mode 100644
index 0c3282e..0000000
--- a/core/pim/datebook/Makefile.in
+++ b/dev/null
@@ -1,408 +0,0 @@
-#############################################################################
-
-####### 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 = $(OPIEDIR)/bin/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= datebook
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	datebookday.h \
-		datebook.h \
-		dateentryimpl.h \
-		datebookdayheaderimpl.h \
-		datebooksettings.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:
-	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 \
-		$(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 \
-		$(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 \
-		$(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 \
-		$(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 \
-		$(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 \
-		$(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 \
-		$(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 \
-		$(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 \
-		$(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 \
-		$(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 \
-		$(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 \
-		$(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 \
-		$(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/core/pim/today/Makefile.in b/core/pim/today/Makefile.in
deleted file mode 100644
index 65243f2..0000000
--- a/core/pim/today/Makefile.in
+++ b/dev/null
@@ -1,184 +0,0 @@
-#############################################################################
-
-####### 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 = $(OPIEDIR)/bin/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= today
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	today.h \
-		TodoItem.h \
-		minidom.h \
-		todaybase.h \
-		todayconfig.h
-SOURCES =	main.cpp \
-		today.cpp \
-		todaybase.cpp \
-		todayconfig.cpp \
-		minidom.c \
-		TodoItem.cpp
-OBJECTS =	main.o \
-		today.o \
-		todaybase.o \
-		todayconfig.o \
-		minidom.o \
-		TodoItem.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_today.cpp \
-		moc_todaybase.cpp \
-		moc_todayconfig.cpp
-OBJMOC	=	moc_today.o \
-		moc_todaybase.o \
-		moc_todayconfig.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 today.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 \
-		today.h \
-		todaybase.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 \
-		TodoItem.h \
-		todayconfig.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
-
-today.o: today.cpp \
-		today.h \
-		todaybase.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 \
-		TodoItem.h \
-		todayconfig.h \
-		minidom.h \
-		$(OPIEDIR)/include/qpe/timestring.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
-		$(OPIEDIR)/include/qpe/qprocess.h
-
-todaybase.o: todaybase.cpp \
-		todaybase.h \
-		$(OPIEDIR)/include/qpe/resource.h
-
-todayconfig.o: todayconfig.cpp \
-		todayconfig.h
-
-minidom.o: minidom.c \
-		minidom.h
-
-TodoItem.o: TodoItem.cpp \
-		TodoItem.h
-
-moc_today.o: moc_today.cpp \
-		today.h \
-		todaybase.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 \
-		TodoItem.h \
-		todayconfig.h
-
-moc_todaybase.o: moc_todaybase.cpp \
-		todaybase.h
-
-moc_todayconfig.o: moc_todayconfig.cpp \
-		todayconfig.h
-
-moc_today.cpp: today.h
-	$(MOC) today.h -o moc_today.cpp
-
-moc_todaybase.cpp: todaybase.h
-	$(MOC) todaybase.h -o moc_todaybase.cpp
-
-moc_todayconfig.cpp: todayconfig.h
-	$(MOC) todayconfig.h -o moc_todayconfig.cpp
-
-
diff --git a/core/pim/todo/Makefile.in b/core/pim/todo/Makefile.in
deleted file mode 100644
index efe6a35..0000000
--- a/core/pim/todo/Makefile.in
+++ b/dev/null
@@ -1,203 +0,0 @@
-#############################################################################
-
-####### 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 = $(OPIEDIR)/bin/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= todolist
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	mainwindow.h \
-		todotable.h \
-		todoentryimpl.h
-SOURCES =	main.cpp \
-		mainwindow.cpp \
-		todotable.cpp \
-		todoentryimpl.cpp
-OBJECTS =	main.o \
-		mainwindow.o \
-		todotable.o \
-		todoentryimpl.o \
-		todoentry.o
-INTERFACES =    todoentry.ui
-UICDECLS =      todoentry.h
-UICIMPLS =      todoentry.cpp
-SRCMOC	=	moc_mainwindow.cpp \
-		moc_todotable.cpp \
-		moc_todoentryimpl.cpp \
-		moc_todoentry.cpp
-OBJMOC	=	moc_mainwindow.o \
-		moc_todotable.o \
-		moc_todoentryimpl.o \
-		moc_todoentry.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 todo.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 \
-		mainwindow.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
-
-mainwindow.o: mainwindow.cpp \
-		mainwindow.h \
-		todoentryimpl.h \
-		todoentry.h \
-		$(OPIEDIR)/include/qpe/task.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/stringutil.h \
-		todotable.h \
-		$(OPIEDIR)/include/qpe/categories.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/finddialog.h \
-		$(OPIEDIR)/include/qpe/global.h \
-		$(OPIEDIR)/include/qpe/ir.h \
-		$(OPIEDIR)/include/qpe/qpemenubar.h \
-		$(OPIEDIR)/include/qpe/qpemessagebox.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/qpetoolbar.h
-
-todotable.o: todotable.cpp \
-		todotable.h \
-		$(OPIEDIR)/include/qpe/categories.h \
-		$(OPIEDIR)/include/qpe/stringutil.h \
-		$(OPIEDIR)/include/qpe/task.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/categoryselect.h \
-		$(OPIEDIR)/include/qpe/xmlreader.h
-
-todoentryimpl.o: todoentryimpl.cpp \
-		todoentryimpl.h \
-		todoentry.h \
-		$(OPIEDIR)/include/qpe/task.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/stringutil.h \
-		$(OPIEDIR)/include/qpe/categoryselect.h \
-		$(OPIEDIR)/include/qpe/datebookmonth.h \
-		$(OPIEDIR)/include/qpe/event.h \
-		$(OPIEDIR)/include/qpe/timeconversion.h \
-		$(OPIEDIR)/include/qpe/qpcglobal.h \
-		$(OPIEDIR)/include/qpe/global.h \
-		$(OPIEDIR)/include/qpe/imageedit.h \
-		$(OPIEDIR)/include/qpe/timestring.h
-
-todoentry.h: todoentry.ui
-	$(UIC) todoentry.ui -o $(INTERFACE_DECL_PATH)/todoentry.h
-
-todoentry.cpp: todoentry.ui
-	$(UIC) todoentry.ui -i todoentry.h -o todoentry.cpp
-
-todoentry.o: todoentry.cpp \
-		todoentry.h \
-		todoentry.ui
-
-moc_mainwindow.o: moc_mainwindow.cpp \
-		mainwindow.h
-
-moc_todotable.o: moc_todotable.cpp \
-		todotable.h \
-		$(OPIEDIR)/include/qpe/categories.h \
-		$(OPIEDIR)/include/qpe/stringutil.h \
-		$(OPIEDIR)/include/qpe/task.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h
-
-moc_todoentryimpl.o: moc_todoentryimpl.cpp \
-		todoentryimpl.h \
-		todoentry.h \
-		$(OPIEDIR)/include/qpe/task.h \
-		$(OPIEDIR)/include/qpe/palmtoprecord.h \
-		$(OPIEDIR)/include/qpe/stringutil.h
-
-moc_todoentry.o: moc_todoentry.cpp \
-		todoentry.h
-
-moc_mainwindow.cpp: mainwindow.h
-	$(MOC) mainwindow.h -o moc_mainwindow.cpp
-
-moc_todotable.cpp: todotable.h
-	$(MOC) todotable.h -o moc_todotable.cpp
-
-moc_todoentryimpl.cpp: todoentryimpl.h
-	$(MOC) todoentryimpl.h -o moc_todoentryimpl.cpp
-
-moc_todoentry.cpp: todoentry.h
-	$(MOC) todoentry.h -o moc_todoentry.cpp
-
-
diff --git a/core/settings/citytime/Makefile.in b/core/settings/citytime/Makefile.in
deleted file mode 100644
index 4112a68..0000000
--- a/core/settings/citytime/Makefile.in
+++ b/dev/null
@@ -1,184 +0,0 @@
-#############################################################################
-
-####### 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 = $(OPIEDIR)/bin/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= citytime
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	citytime.h \
-		zonemap.h \
-		sun.h \
-		stylusnormalizer.h
-SOURCES =	citytime.cpp \
-		zonemap.cpp \
-		main.cpp \
-		sun.c \
-		stylusnormalizer.cpp
-OBJECTS =	citytime.o \
-		zonemap.o \
-		main.o \
-		sun.o \
-		stylusnormalizer.o \
-		citytimebase.o
-INTERFACES =    citytimebase.ui
-UICDECLS =      citytimebase.h
-UICIMPLS =      citytimebase.cpp
-SRCMOC	=	moc_citytime.cpp \
-		moc_zonemap.cpp \
-		moc_stylusnormalizer.cpp \
-		moc_citytimebase.cpp
-OBJMOC	=	moc_citytime.o \
-		moc_zonemap.o \
-		moc_stylusnormalizer.o \
-		moc_citytimebase.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 citytime.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
-
-citytime.o: citytime.cpp \
-		zonemap.h \
-		stylusnormalizer.h \
-		citytime.h \
-		citytimebase.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/timestring.h \
-		$(OPIEDIR)/include/qpe/tzselect.h \
-		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h
-
-zonemap.o: zonemap.cpp \
-		sun.h \
-		zonemap.h \
-		stylusnormalizer.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/timestring.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
-
-main.o: main.cpp \
-		citytime.h \
-		citytimebase.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
-
-sun.o: sun.c \
-		sun.h \
-		$(OPIEDIR)/include/qpe/qmath.h
-
-stylusnormalizer.o: stylusnormalizer.cpp \
-		stylusnormalizer.h
-
-citytimebase.h: citytimebase.ui
-	$(UIC) citytimebase.ui -o $(INTERFACE_DECL_PATH)/citytimebase.h
-
-citytimebase.cpp: citytimebase.ui
-	$(UIC) citytimebase.ui -i citytimebase.h -o citytimebase.cpp
-
-citytimebase.o: citytimebase.cpp \
-		citytimebase.h \
-		citytimebase.ui
-
-moc_citytime.o: moc_citytime.cpp \
-		citytime.h \
-		citytimebase.h
-
-moc_zonemap.o: moc_zonemap.cpp \
-		zonemap.h \
-		stylusnormalizer.h
-
-moc_stylusnormalizer.o: moc_stylusnormalizer.cpp \
-		stylusnormalizer.h
-
-moc_citytimebase.o: moc_citytimebase.cpp \
-		citytimebase.h
-
-moc_citytime.cpp: citytime.h
-	$(MOC) citytime.h -o moc_citytime.cpp
-
-moc_zonemap.cpp: zonemap.h
-	$(MOC) zonemap.h -o moc_zonemap.cpp
-
-moc_stylusnormalizer.cpp: stylusnormalizer.h
-	$(MOC) stylusnormalizer.h -o moc_stylusnormalizer.cpp
-
-moc_citytimebase.cpp: citytimebase.h
-	$(MOC) citytimebase.h -o moc_citytimebase.cpp
-
-
diff --git a/core/settings/light-and-power/Makefile.in b/core/settings/light-and-power/Makefile.in
deleted file mode 100644
index 5caa249..0000000
--- a/core/settings/light-and-power/Makefile.in
+++ b/dev/null
@@ -1,135 +0,0 @@
-#############################################################################
-
-####### 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	= light-and-power
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	settings.h
-SOURCES =	light.cpp \
-		main.cpp
-OBJECTS =	light.o \
-		main.o \
-		lightsettingsbase.o
-INTERFACES =    lightsettingsbase.ui
-UICDECLS =      lightsettingsbase.h
-UICIMPLS =      lightsettingsbase.cpp
-SRCMOC	=	moc_settings.cpp \
-		moc_lightsettingsbase.cpp
-OBJMOC	=	moc_settings.o \
-		moc_lightsettingsbase.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 light-and-power.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
-
-light.o: light.cpp \
-		settings.h \
-		lightsettingsbase.h
-
-main.o: main.cpp \
-		settings.h \
-		lightsettingsbase.h
-
-lightsettingsbase.h: lightsettingsbase.ui
-	$(UIC) lightsettingsbase.ui -o $(INTERFACE_DECL_PATH)/lightsettingsbase.h
-
-lightsettingsbase.cpp: lightsettingsbase.ui
-	$(UIC) lightsettingsbase.ui -i lightsettingsbase.h -o lightsettingsbase.cpp
-
-lightsettingsbase.o: lightsettingsbase.cpp \
-		lightsettingsbase.h \
-		lightsettingsbase.ui
-
-moc_settings.o: moc_settings.cpp \
-		settings.h \
-		lightsettingsbase.h
-
-moc_lightsettingsbase.o: moc_lightsettingsbase.cpp \
-		lightsettingsbase.h
-
-moc_settings.cpp: settings.h
-	$(MOC) settings.h -o moc_settings.cpp
-
-moc_lightsettingsbase.cpp: lightsettingsbase.h
-	$(MOC) lightsettingsbase.h -o moc_lightsettingsbase.cpp
-
-
diff --git a/core/settings/security/Makefile.in b/core/settings/security/Makefile.in
deleted file mode 100644
index f190e79..0000000
--- a/core/settings/security/Makefile.in
+++ b/dev/null
@@ -1,135 +0,0 @@
-#############################################################################
-
-####### 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	= security
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	security.h
-SOURCES =	security.cpp \
-		main.cpp
-OBJECTS =	security.o \
-		main.o \
-		securitybase.o
-INTERFACES =    securitybase.ui
-UICDECLS =      securitybase.h
-UICIMPLS =      securitybase.cpp
-SRCMOC	=	moc_security.cpp \
-		moc_securitybase.cpp
-OBJMOC	=	moc_security.o \
-		moc_securitybase.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 security.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
-
-security.o: security.cpp \
-		security.h \
-		securitybase.h
-
-main.o: main.cpp \
-		security.h \
-		securitybase.h
-
-securitybase.h: securitybase.ui
-	$(UIC) securitybase.ui -o $(INTERFACE_DECL_PATH)/securitybase.h
-
-securitybase.cpp: securitybase.ui
-	$(UIC) securitybase.ui -i securitybase.h -o securitybase.cpp
-
-securitybase.o: securitybase.cpp \
-		securitybase.h \
-		securitybase.ui
-
-moc_security.o: moc_security.cpp \
-		security.h \
-		securitybase.h
-
-moc_securitybase.o: moc_securitybase.cpp \
-		securitybase.h
-
-moc_security.cpp: security.h
-	$(MOC) security.h -o moc_security.cpp
-
-moc_securitybase.cpp: securitybase.h
-	$(MOC) securitybase.h -o moc_securitybase.cpp
-
-
diff --git a/freetype/Makefile.in b/freetype/Makefile.in
deleted file mode 100644
index cdc6fa4..0000000
--- a/freetype/Makefile.in
+++ b/dev/null
@@ -1,113 +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$(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
-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
-
-
diff --git a/inputmethods/dvorak/Makefile.in b/inputmethods/dvorak/Makefile.in
deleted file mode 100644
index 186b6d1..0000000
--- a/inputmethods/dvorak/Makefile.in
+++ b/dev/null
@@ -1,153 +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$(QPEDIR)/include
-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/inputmethods/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= qdvorak
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	dvorak.h \
-		../pickboard/pickboardcfg.h \
-		../pickboard/pickboardpicks.h \
-		dvorakimpl.h
-SOURCES =	dvorak.cpp \
-		../pickboard/pickboardcfg.cpp \
-		../pickboard/pickboardpicks.cpp \
-		dvorakimpl.cpp
-OBJECTS =	dvorak.o \
-		../pickboard/pickboardcfg.o \
-		../pickboard/pickboardpicks.o \
-		dvorakimpl.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_dvorak.cpp \
-		../pickboard/moc_pickboardcfg.cpp \
-		../pickboard/moc_pickboardpicks.cpp
-OBJMOC	=	moc_dvorak.o \
-		../pickboard/moc_pickboardcfg.o \
-		../pickboard/moc_pickboardpicks.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: dvorak.pro
-	tmake dvorak.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
-
-dvorak.o: dvorak.cpp \
-		dvorak.h \
-		../pickboard/pickboardcfg.h \
-		../pickboard/pickboardpicks.h
-
-../pickboard/pickboardcfg.o: ../pickboard/pickboardcfg.cpp \
-		../pickboard/pickboardcfg.h \
-		../pickboard/pickboardpicks.h
-
-../pickboard/pickboardpicks.o: ../pickboard/pickboardpicks.cpp \
-		../pickboard/pickboardpicks.h \
-		../pickboard/pickboardcfg.h
-
-dvorakimpl.o: dvorakimpl.cpp \
-		dvorak.h \
-		../pickboard/pickboardcfg.h \
-		../pickboard/pickboardpicks.h \
-		dvorakimpl.h
-
-moc_dvorak.o: moc_dvorak.cpp \
-		dvorak.h \
-		../pickboard/pickboardcfg.h \
-		../pickboard/pickboardpicks.h
-
-../pickboard/moc_pickboardcfg.o: ../pickboard/moc_pickboardcfg.cpp \
-		../pickboard/pickboardcfg.h
-
-../pickboard/moc_pickboardpicks.o: ../pickboard/moc_pickboardpicks.cpp \
-		../pickboard/pickboardpicks.h
-
-moc_dvorak.cpp: dvorak.h
-	$(MOC) dvorak.h -o moc_dvorak.cpp
-
-../pickboard/moc_pickboardcfg.cpp: ../pickboard/pickboardcfg.h
-	$(MOC) ../pickboard/pickboardcfg.h -o ../pickboard/moc_pickboardcfg.cpp
-
-../pickboard/moc_pickboardpicks.cpp: ../pickboard/pickboardpicks.h
-	$(MOC) ../pickboard/pickboardpicks.h -o ../pickboard/moc_pickboardpicks.cpp
-
-
diff --git a/inputmethods/handwriting/Makefile.in b/inputmethods/handwriting/Makefile.in
deleted file mode 100644
index cd2b47c..0000000
--- a/inputmethods/handwriting/Makefile.in
+++ b/dev/null
@@ -1,281 +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$(OPIEDIR)/include
-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/inputmethods/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= qhandwriting
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	qimpenchar.h \
-		qimpenprofile.h \
-		qimpencombining.h \
-		qimpenhelp.h \
-		qimpeninput.h \
-		qimpenmatch.h \
-		qimpensetup.h \
-		qimpenstroke.h \
-		qimpenwidget.h \
-		qimpenwordpick.h \
-		handwritingimpl.h
-SOURCES =	qimpenchar.cpp \
-		qimpenprofile.cpp \
-		qimpencombining.cpp \
-		qimpenhelp.cpp \
-		qimpeninput.cpp \
-		qimpenmatch.cpp \
-		qimpensetup.cpp \
-		qimpenstroke.cpp \
-		qimpenwidget.cpp \
-		qimpenwordpick.cpp \
-		handwritingimpl.cpp
-OBJECTS =	qimpenchar.o \
-		qimpenprofile.o \
-		qimpencombining.o \
-		qimpenhelp.o \
-		qimpeninput.o \
-		qimpenmatch.o \
-		qimpensetup.o \
-		qimpenstroke.o \
-		qimpenwidget.o \
-		qimpenwordpick.o \
-		handwritingimpl.o \
-		qimpenprefbase.o
-INTERFACES =    qimpenprefbase.ui
-UICDECLS =      qimpenprefbase.h
-UICIMPLS =      qimpenprefbase.cpp
-SRCMOC	=	moc_qimpenhelp.cpp \
-		moc_qimpeninput.cpp \
-		moc_qimpenmatch.cpp \
-		moc_qimpensetup.cpp \
-		moc_qimpenwidget.cpp \
-		moc_qimpenwordpick.cpp \
-		moc_qimpenprefbase.cpp
-OBJMOC	=	moc_qimpenhelp.o \
-		moc_qimpeninput.o \
-		moc_qimpenmatch.o \
-		moc_qimpensetup.o \
-		moc_qimpenwidget.o \
-		moc_qimpenwordpick.o \
-		moc_qimpenprefbase.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:
-	tmake handwriting.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
-
-qimpenchar.o: qimpenchar.cpp \
-		qimpencombining.h \
-		qimpenchar.h \
-		qimpenstroke.h
-
-qimpenprofile.o: qimpenprofile.cpp \
-		qimpencombining.h \
-		qimpenchar.h \
-		qimpenstroke.h \
-		qimpenprofile.h
-
-qimpencombining.o: qimpencombining.cpp \
-		qimpencombining.h \
-		qimpenchar.h \
-		qimpenstroke.h
-
-qimpenhelp.o: qimpenhelp.cpp \
-		qimpenwidget.h \
-		qimpenchar.h \
-		qimpenstroke.h \
-		qimpencombining.h \
-		qimpenmatch.h \
-		qimpenhelp.h \
-		qimpenprofile.h
-
-qimpeninput.o: qimpeninput.cpp \
-		qimpenwidget.h \
-		qimpenchar.h \
-		qimpenstroke.h \
-		qimpensetup.h \
-		qimpenprofile.h \
-		qimpeninput.h \
-		qimpencombining.h \
-		qimpenwordpick.h \
-		qimpenmatch.h \
-		qimpenhelp.h
-
-qimpenmatch.o: qimpenmatch.cpp \
-		qimpenmatch.h \
-		qimpenchar.h \
-		qimpenstroke.h
-
-qimpensetup.o: qimpensetup.cpp \
-		qimpenwidget.h \
-		qimpenchar.h \
-		qimpenstroke.h \
-		qimpenprefbase.h \
-		qimpensetup.h \
-		qimpenprofile.h
-
-qimpenstroke.o: qimpenstroke.cpp \
-		qimpenstroke.h
-
-qimpenwidget.o: qimpenwidget.cpp \
-		qimpenchar.h \
-		qimpenstroke.h \
-		qimpenwidget.h
-
-qimpenwordpick.o: qimpenwordpick.cpp \
-		qimpenwordpick.h \
-		qimpenmatch.h \
-		qimpenchar.h \
-		qimpenstroke.h
-
-handwritingimpl.o: handwritingimpl.cpp \
-		qimpeninput.h \
-		qimpenprofile.h \
-		qimpenchar.h \
-		qimpenstroke.h \
-		handwritingimpl.h
-
-qimpenprefbase.h: qimpenprefbase.ui
-	$(UIC) qimpenprefbase.ui -o $(INTERFACE_DECL_PATH)/qimpenprefbase.h
-
-qimpenprefbase.cpp: qimpenprefbase.ui
-	$(UIC) qimpenprefbase.ui -i qimpenprefbase.h -o qimpenprefbase.cpp
-
-qimpenprefbase.o: qimpenprefbase.cpp \
-		qimpenprefbase.h \
-		qimpenprefbase.ui
-
-moc_qimpenhelp.o: moc_qimpenhelp.cpp \
-		qimpenhelp.h \
-		qimpenchar.h \
-		qimpenstroke.h \
-		qimpenprofile.h
-
-moc_qimpeninput.o: moc_qimpeninput.cpp \
-		qimpeninput.h \
-		qimpenprofile.h \
-		qimpenchar.h \
-		qimpenstroke.h
-
-moc_qimpenmatch.o: moc_qimpenmatch.cpp \
-		qimpenmatch.h \
-		qimpenchar.h \
-		qimpenstroke.h
-
-moc_qimpensetup.o: moc_qimpensetup.cpp \
-		qimpensetup.h \
-		qimpenprofile.h \
-		qimpenchar.h \
-		qimpenstroke.h
-
-moc_qimpenwidget.o: moc_qimpenwidget.cpp \
-		qimpenwidget.h \
-		qimpenchar.h \
-		qimpenstroke.h
-
-moc_qimpenwordpick.o: moc_qimpenwordpick.cpp \
-		qimpenwordpick.h \
-		qimpenmatch.h \
-		qimpenchar.h \
-		qimpenstroke.h
-
-moc_qimpenprefbase.o: moc_qimpenprefbase.cpp \
-		qimpenprefbase.h
-
-moc_qimpenhelp.cpp: qimpenhelp.h
-	$(MOC) qimpenhelp.h -o moc_qimpenhelp.cpp
-
-moc_qimpeninput.cpp: qimpeninput.h
-	$(MOC) qimpeninput.h -o moc_qimpeninput.cpp
-
-moc_qimpenmatch.cpp: qimpenmatch.h
-	$(MOC) qimpenmatch.h -o moc_qimpenmatch.cpp
-
-moc_qimpensetup.cpp: qimpensetup.h
-	$(MOC) qimpensetup.h -o moc_qimpensetup.cpp
-
-moc_qimpenwidget.cpp: qimpenwidget.h
-	$(MOC) qimpenwidget.h -o moc_qimpenwidget.cpp
-
-moc_qimpenwordpick.cpp: qimpenwordpick.h
-	$(MOC) qimpenwordpick.h -o moc_qimpenwordpick.cpp
-
-moc_qimpenprefbase.cpp: qimpenprefbase.h
-	$(MOC) qimpenprefbase.h -o moc_qimpenprefbase.cpp
-
-
diff --git a/inputmethods/jumpx/Makefile.in b/inputmethods/jumpx/Makefile.in
deleted file mode 100644
index 0fabaa5..0000000
--- a/inputmethods/jumpx/Makefile.in
+++ b/dev/null
@@ -1,119 +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$(OPIEDIR)/include
-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/inputmethods/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= qjumpx
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	keyboard.h \
-		keyboardimpl.h
-SOURCES =	keyboard.cpp \
-		keyboardimpl.cpp
-OBJECTS =	keyboard.o \
-		keyboardimpl.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_keyboard.cpp
-OBJMOC	=	moc_keyboard.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:
-	tmake jumpx.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
-
-keyboard.o: keyboard.cpp \
-		keyboard.h \
-		$(OPIEDIR)/include/qpe/resource.h
-
-keyboardimpl.o: keyboardimpl.cpp \
-		keyboard.h \
-		keyboardimpl.h \
-		$(OPIEDIR)/include/qpe/inputmethodinterface.h \
-		$(OPIEDIR)/include/qpe/qcom.h \
-		$(OPIEDIR)/include/qpe/quuid.h
-
-moc_keyboard.o: moc_keyboard.cpp \
-		keyboard.h
-
-moc_keyboard.cpp: keyboard.h
-	$(MOC) keyboard.h -o moc_keyboard.cpp
-
-
diff --git a/inputmethods/keyboard/Makefile.in b/inputmethods/keyboard/Makefile.in
deleted file mode 100644
index 16fdcb7..0000000
--- a/inputmethods/keyboard/Makefile.in
+++ b/dev/null
@@ -1,151 +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$(OPIEDIR)/include
-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/inputmethods/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= qkeyboard
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	keyboard.h \
-		../pickboard/pickboardcfg.h \
-		../pickboard/pickboardpicks.h \
-		keyboardimpl.h
-SOURCES =	keyboard.cpp \
-		../pickboard/pickboardcfg.cpp \
-		../pickboard/pickboardpicks.cpp \
-		keyboardimpl.cpp
-OBJECTS =	keyboard.o \
-		../pickboard/pickboardcfg.o \
-		../pickboard/pickboardpicks.o \
-		keyboardimpl.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_keyboard.cpp \
-		../pickboard/moc_pickboardcfg.cpp \
-		../pickboard/moc_pickboardpicks.cpp
-OBJMOC	=	moc_keyboard.o \
-		../pickboard/moc_pickboardcfg.o \
-		../pickboard/moc_pickboardpicks.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:
-	tmake keyboard.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
-
-keyboard.o: keyboard.cpp \
-		keyboard.h \
-		../pickboard/pickboardcfg.h \
-		../pickboard/pickboardpicks.h
-
-../pickboard/pickboardcfg.o: ../pickboard/pickboardcfg.cpp \
-		../pickboard/pickboardcfg.h \
-		../pickboard/pickboardpicks.h
-
-../pickboard/pickboardpicks.o: ../pickboard/pickboardpicks.cpp \
-		../pickboard/pickboardpicks.h \
-		../pickboard/pickboardcfg.h
-
-keyboardimpl.o: keyboardimpl.cpp \
-		keyboard.h \
-		../pickboard/pickboardcfg.h \
-		../pickboard/pickboardpicks.h \
-		keyboardimpl.h
-
-moc_keyboard.o: moc_keyboard.cpp \
-		keyboard.h \
-		../pickboard/pickboardcfg.h \
-		../pickboard/pickboardpicks.h
-
-../pickboard/moc_pickboardcfg.o: ../pickboard/moc_pickboardcfg.cpp \
-		../pickboard/pickboardcfg.h
-
-../pickboard/moc_pickboardpicks.o: ../pickboard/moc_pickboardpicks.cpp \
-		../pickboard/pickboardpicks.h
-
-moc_keyboard.cpp: keyboard.h
-	$(MOC) keyboard.h -o moc_keyboard.cpp
-
-../pickboard/moc_pickboardcfg.cpp: ../pickboard/pickboardcfg.h
-	$(MOC) ../pickboard/pickboardcfg.h -o ../pickboard/moc_pickboardcfg.cpp
-
-../pickboard/moc_pickboardpicks.cpp: ../pickboard/pickboardpicks.h
-	$(MOC) ../pickboard/pickboardpicks.h -o ../pickboard/moc_pickboardpicks.cpp
-
-
diff --git a/inputmethods/pickboard/Makefile.in b/inputmethods/pickboard/Makefile.in
deleted file mode 100644
index 44310a4..0000000
--- a/inputmethods/pickboard/Makefile.in
+++ b/dev/null
@@ -1,147 +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$(OPIEDIR)/include
-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/inputmethods/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= qpickboard
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	pickboard.h \
-		pickboardcfg.h \
-		pickboardimpl.h \
-		pickboardpicks.h
-SOURCES =	pickboard.cpp \
-		pickboardcfg.cpp \
-		pickboardimpl.cpp \
-		pickboardpicks.cpp
-OBJECTS =	pickboard.o \
-		pickboardcfg.o \
-		pickboardimpl.o \
-		pickboardpicks.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_pickboard.cpp \
-		moc_pickboardcfg.cpp \
-		moc_pickboardpicks.cpp
-OBJMOC	=	moc_pickboard.o \
-		moc_pickboardcfg.o \
-		moc_pickboardpicks.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:
-	tmake pickboard.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
-
-pickboard.o: pickboard.cpp \
-		pickboard.h \
-		pickboardpicks.h \
-		pickboardcfg.h
-
-pickboardcfg.o: pickboardcfg.cpp \
-		pickboardcfg.h \
-		pickboardpicks.h
-
-pickboardimpl.o: pickboardimpl.cpp \
-		pickboard.h \
-		pickboardimpl.h
-
-pickboardpicks.o: pickboardpicks.cpp \
-		pickboardpicks.h \
-		pickboardcfg.h
-
-moc_pickboard.o: moc_pickboard.cpp \
-		pickboard.h
-
-moc_pickboardcfg.o: moc_pickboardcfg.cpp \
-		pickboardcfg.h
-
-moc_pickboardpicks.o: moc_pickboardpicks.cpp \
-		pickboardpicks.h
-
-moc_pickboard.cpp: pickboard.h
-	$(MOC) pickboard.h -o moc_pickboard.cpp
-
-moc_pickboardcfg.cpp: pickboardcfg.h
-	$(MOC) pickboardcfg.h -o moc_pickboardcfg.cpp
-
-moc_pickboardpicks.cpp: pickboardpicks.h
-	$(MOC) pickboardpicks.h -o moc_pickboardpicks.cpp
-
-
diff --git a/inputmethods/unikeyboard/Makefile.in b/inputmethods/unikeyboard/Makefile.in
deleted file mode 100644
index f64d6c8..0000000
--- a/inputmethods/unikeyboard/Makefile.in
+++ b/dev/null
@@ -1,115 +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$(OPIEDIR)/include
-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/inputmethods/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= qunikeyboard
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	unikeyboard.h \
-		unikeyboardimpl.h
-SOURCES =	unikeyboard.cpp \
-		unikeyboardimpl.cpp
-OBJECTS =	unikeyboard.o \
-		unikeyboardimpl.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_unikeyboard.cpp
-OBJMOC	=	moc_unikeyboard.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:
-	tmake unikeyboard.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
-
-unikeyboard.o: unikeyboard.cpp \
-		unikeyboard.h
-
-unikeyboardimpl.o: unikeyboardimpl.cpp \
-		unikeyboard.h \
-		unikeyboardimpl.h
-
-moc_unikeyboard.o: moc_unikeyboard.cpp \
-		unikeyboard.h
-
-moc_unikeyboard.cpp: unikeyboard.h
-	$(MOC) unikeyboard.h -o moc_unikeyboard.cpp
-
-
diff --git a/library/Makefile.in b/library/Makefile.in
deleted file mode 100644
index dcea4b8..0000000
--- a/library/Makefile.in
+++ b/dev/null
@@ -1,846 +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$(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 \
-		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 \
-		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:
-	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
-
-imageedit.o: imageedit.cpp \
-		imageedit.h
-
-resource.o: resource.cpp \
-		qpeapplication.h \
-		qpedecoration_qws.h \
-		timestring.h \
-		resource.h \
-		inlinepics_p.h
-
-qpedecoration_qws.o: qpedecoration_qws.cpp \
-		qcopenvelope_qws.h \
-		qpedecoration_qws.h \
-		qpeapplication.h \
-		timestring.h \
-		resource.h \
-		global.h
-
-qcopenvelope_qws.o: qcopenvelope_qws.cpp \
-		qcopenvelope_qws.h \
-		global.h
-
-qpeapplication.o: qpeapplication.cpp \
-		qcopenvelope_qws.h \
-		qpeapplication.h \
-		qpedecoration_qws.h \
-		timestring.h \
-		qpestyle.h \
-		lightstyle.h \
-		global.h \
-		resource.h \
-		config.h \
-		network.h \
-		fontmanager.h \
-		power.h \
-		alarmserver.h \
-		applnk.h \
-		qpemenubar.h
-
-qpestyle.o: qpestyle.cpp \
-		qpestyle.h \
-		qpeapplication.h \
-		qpedecoration_qws.h \
-		timestring.h
-
-qpedialog.o: qpedialog.cpp \
-		qpedialog.h \
-		qpeapplication.h \
-		qpedecoration_qws.h \
-		timestring.h
-
-lightstyle.o: lightstyle.cpp \
-		lightstyle.h
-
-config.o: config.cpp \
-		config.h
-
-applnk.o: applnk.cpp \
-		applnk.h
-
-sound.o: sound.cpp
-
-tzselect.o: tzselect.cpp \
-		tzselect.h \
-		resource.h \
-		global.h \
-		config.h
-
-qmath.o: qmath.c \
-		qmath.h
-
-datebookdb.o: datebookdb.cpp \
-		datebookdb.h
-
-alarmserver.o: alarmserver.cpp \
-		qpeapplication.h \
-		qpedecoration_qws.h \
-		timestring.h \
-		global.h \
-		resource.h \
-		qcopenvelope_qws.h \
-		alarmserver.h
-
-password.o: password.cpp \
-		password.moc \
-		password.h \
-		config.h \
-		global.h \
-		backend/contact.h \
-		passwordbase_p.h
-
-process.o: process.cpp \
-		process.h
-
-process_unix.o: process_unix.cpp \
-		process_unix.moc \
-		process.h
-
-timestring.o: timestring.cpp \
-		timestring.moc \
-		timestring.h \
-		qpeapplication.h \
-		qpedecoration_qws.h \
-		config.h
-
-fontdatabase.o: fontdatabase.cpp \
-		qpeapplication.h \
-		qpedecoration_qws.h \
-		timestring.h \
-		fontfactoryinterface.h \
-		fontdatabase.h
-
-power.o: power.cpp \
-		power.h
-
-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
deleted file mode 100644
index e135d82..0000000
--- a/noncore/apps/tableviewer/Makefile.in
+++ b/dev/null
@@ -1,314 +0,0 @@
-#############################################################################
-
-####### 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	= 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
-
-tableviewer.o: tableviewer.cpp \
-		tableviewer.h \
-		db/common.h \
-		ui/tvbrowseview.h \
-		ui/tvfilterview.h \
-		ui/tvlistview.h \
-		ui/tveditview.h \
-		ui/tvkeyedit.h \
-		tvkeyedit_gen.h \
-		db/datacache.h \
-		/home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/qpemenubar.h
-
-ui/commonwidgets.o: ui/commonwidgets.cpp \
-		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 \
-		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
-
-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/comm/keypebble/Makefile.in b/noncore/comm/keypebble/Makefile.in
deleted file mode 100644
index 18c43e8..0000000
--- a/noncore/comm/keypebble/Makefile.in
+++ b/dev/null
@@ -1,286 +0,0 @@
-#############################################################################
-
-####### 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	= keypebble
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	d3des.h \
-		krfbbuffer.h \
-		krfbcanvas.h \
-		krfbconnection.h \
-		krfbdecoder.h \
-		krfblogin.h \
-		krfboptions.h \
-		krfbserverinfo.h \
-		kvnc.h \
-		kvncconnectdlg.h \
-		kvncoptionsdlg.h \
-		version.h \
-		vncauth.h
-SOURCES =	d3des.c \
-		vncauth.c \
-		krfbbuffer.cpp \
-		krfbcanvas.cpp \
-		krfbconnection.cpp \
-		krfbdecoder.cpp \
-		krfblogin.cpp \
-		krfboptions.cpp \
-		kvnc.cpp \
-		kvncconnectdlg.cpp \
-		kvncoptionsdlg.cpp \
-		main.cpp
-OBJECTS =	d3des.o \
-		vncauth.o \
-		krfbbuffer.o \
-		krfbcanvas.o \
-		krfbconnection.o \
-		krfbdecoder.o \
-		krfblogin.o \
-		krfboptions.o \
-		kvnc.o \
-		kvncconnectdlg.o \
-		kvncoptionsdlg.o \
-		main.o \
-		vncoptionsbase.o
-INTERFACES =    vncoptionsbase.ui
-UICDECLS =      vncoptionsbase.h
-UICIMPLS =      vncoptionsbase.cpp
-SRCMOC	=	moc_krfbbuffer.cpp \
-		moc_krfbcanvas.cpp \
-		moc_krfbconnection.cpp \
-		moc_krfbdecoder.cpp \
-		moc_krfblogin.cpp \
-		moc_kvnc.cpp \
-		moc_kvncconnectdlg.cpp \
-		moc_kvncoptionsdlg.cpp \
-		moc_vncoptionsbase.cpp
-OBJMOC	=	moc_krfbbuffer.o \
-		moc_krfbcanvas.o \
-		moc_krfbconnection.o \
-		moc_krfbdecoder.o \
-		moc_krfblogin.o \
-		moc_kvnc.o \
-		moc_kvncconnectdlg.o \
-		moc_kvncoptionsdlg.o \
-		moc_vncoptionsbase.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 keypebble.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
-
-d3des.o: d3des.c \
-		d3des.h
-
-vncauth.o: vncauth.c \
-		vncauth.h \
-		d3des.h
-
-krfbbuffer.o: krfbbuffer.cpp \
-		krfbdecoder.h \
-		krfbbuffer.h \
-		krfbserverinfo.h
-
-krfbcanvas.o: krfbcanvas.cpp \
-		kvncconnectdlg.h \
-		krfbconnection.h \
-		krfbcanvas.h \
-		krfboptions.h \
-		krfbbuffer.h \
-		$(OPIEDIR)/include/qpe/config.h
-
-krfbconnection.o: krfbconnection.cpp \
-		krfbconnection.h \
-		krfblogin.h \
-		krfboptions.h \
-		krfbdecoder.h \
-		krfbbuffer.h
-
-krfbdecoder.o: krfbdecoder.cpp \
-		krfbconnection.h \
-		krfboptions.h \
-		krfbserverinfo.h \
-		krfbdecoder.h \
-		krfbbuffer.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
-
-krfblogin.o: krfblogin.cpp \
-		vncauth.h \
-		krfblogin.h \
-		krfbconnection.h
-
-krfboptions.o: krfboptions.cpp \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		krfboptions.h
-
-kvnc.o: kvnc.cpp \
-		$(OPIEDIR)/include/qpe/qpemenubar.h \
-		$(OPIEDIR)/include/qpe/qpetoolbar.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/global.h \
-		kvnc.h \
-		krfbcanvas.h \
-		kvncoptionsdlg.h \
-		vncoptionsbase.h \
-		krfbconnection.h
-
-kvncconnectdlg.o: kvncconnectdlg.cpp \
-		krfbconnection.h \
-		kvncoptionsdlg.h \
-		vncoptionsbase.h \
-		kvncconnectdlg.h
-
-kvncoptionsdlg.o: kvncoptionsdlg.cpp \
-		krfboptions.h \
-		kvncoptionsdlg.h \
-		vncoptionsbase.h
-
-main.o: main.cpp \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		kvnc.h
-
-vncoptionsbase.h: vncoptionsbase.ui
-	$(UIC) vncoptionsbase.ui -o $(INTERFACE_DECL_PATH)/vncoptionsbase.h
-
-vncoptionsbase.cpp: vncoptionsbase.ui
-	$(UIC) vncoptionsbase.ui -i vncoptionsbase.h -o vncoptionsbase.cpp
-
-vncoptionsbase.o: vncoptionsbase.cpp \
-		vncoptionsbase.h \
-		vncoptionsbase.ui
-
-moc_krfbbuffer.o: moc_krfbbuffer.cpp \
-		krfbbuffer.h
-
-moc_krfbcanvas.o: moc_krfbcanvas.cpp \
-		krfbcanvas.h
-
-moc_krfbconnection.o: moc_krfbconnection.cpp \
-		krfbconnection.h
-
-moc_krfbdecoder.o: moc_krfbdecoder.cpp \
-		krfbdecoder.h
-
-moc_krfblogin.o: moc_krfblogin.cpp \
-		krfblogin.h
-
-moc_kvnc.o: moc_kvnc.cpp \
-		kvnc.h
-
-moc_kvncconnectdlg.o: moc_kvncconnectdlg.cpp \
-		kvncconnectdlg.h
-
-moc_kvncoptionsdlg.o: moc_kvncoptionsdlg.cpp \
-		kvncoptionsdlg.h \
-		vncoptionsbase.h
-
-moc_vncoptionsbase.o: moc_vncoptionsbase.cpp \
-		vncoptionsbase.h
-
-moc_krfbbuffer.cpp: krfbbuffer.h
-	$(MOC) krfbbuffer.h -o moc_krfbbuffer.cpp
-
-moc_krfbcanvas.cpp: krfbcanvas.h
-	$(MOC) krfbcanvas.h -o moc_krfbcanvas.cpp
-
-moc_krfbconnection.cpp: krfbconnection.h
-	$(MOC) krfbconnection.h -o moc_krfbconnection.cpp
-
-moc_krfbdecoder.cpp: krfbdecoder.h
-	$(MOC) krfbdecoder.h -o moc_krfbdecoder.cpp
-
-moc_krfblogin.cpp: krfblogin.h
-	$(MOC) krfblogin.h -o moc_krfblogin.cpp
-
-moc_kvnc.cpp: kvnc.h
-	$(MOC) kvnc.h -o moc_kvnc.cpp
-
-moc_kvncconnectdlg.cpp: kvncconnectdlg.h
-	$(MOC) kvncconnectdlg.h -o moc_kvncconnectdlg.cpp
-
-moc_kvncoptionsdlg.cpp: kvncoptionsdlg.h
-	$(MOC) kvncoptionsdlg.h -o moc_kvncoptionsdlg.cpp
-
-moc_vncoptionsbase.cpp: vncoptionsbase.h
-	$(MOC) vncoptionsbase.h -o moc_vncoptionsbase.cpp
-
-
diff --git a/noncore/games/chess/Makefile.in b/noncore/games/chess/Makefile.in
deleted file mode 100644
index 0987d58..0000000
--- a/noncore/games/chess/Makefile.in
+++ b/dev/null
@@ -1,141 +0,0 @@
-#############################################################################
-
-####### 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	= 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 \
-		/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 \
-		/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 \
-		/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/fifteen/Makefile.in b/noncore/games/fifteen/Makefile.in
deleted file mode 100644
index 1cae722..0000000
--- a/noncore/games/fifteen/Makefile.in
+++ b/dev/null
@@ -1,118 +0,0 @@
-#############################################################################
-
-####### 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	= fifteen
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	fifteen.h
-SOURCES =	fifteen.cpp \
-		main.cpp
-OBJECTS =	fifteen.o \
-		main.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_fifteen.cpp
-OBJMOC	=	moc_fifteen.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 fifteen.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
-
-fifteen.o: fifteen.cpp \
-		fifteen.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/qpetoolbar.h \
-		$(OPIEDIR)/include/qpe/qpemenubar.h
-
-main.o: main.cpp \
-		fifteen.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
-
-moc_fifteen.o: moc_fifteen.cpp \
-		fifteen.h
-
-moc_fifteen.cpp: fifteen.h
-	$(MOC) fifteen.h -o moc_fifteen.cpp
-
-
diff --git a/noncore/games/go/Makefile.in b/noncore/games/go/Makefile.in
deleted file mode 100644
index 985eff0..0000000
--- a/noncore/games/go/Makefile.in
+++ b/dev/null
@@ -1,158 +0,0 @@
-#############################################################################
-
-####### 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:
-	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 \
-		$(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 \
-		$(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/noncore/games/mindbreaker/Makefile.in b/noncore/games/mindbreaker/Makefile.in
deleted file mode 100644
index ff29d19..0000000
--- a/noncore/games/mindbreaker/Makefile.in
+++ b/dev/null
@@ -1,117 +0,0 @@
-#############################################################################
-
-####### 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 = $(OPIEDIR)/bin/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= mindbreaker
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	mindbreaker.h
-SOURCES =	main.cpp \
-		mindbreaker.cpp
-OBJECTS =	main.o \
-		mindbreaker.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_mindbreaker.cpp
-OBJMOC	=	moc_mindbreaker.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 mindbreaker.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 \
-		mindbreaker.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
-
-mindbreaker.o: mindbreaker.cpp \
-		mindbreaker.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/qpetoolbar.h
-
-moc_mindbreaker.o: moc_mindbreaker.cpp \
-		mindbreaker.h
-
-moc_mindbreaker.cpp: mindbreaker.h
-	$(MOC) mindbreaker.h -o moc_mindbreaker.cpp
-
-
diff --git a/noncore/games/minesweep/Makefile.in b/noncore/games/minesweep/Makefile.in
deleted file mode 100644
index 4835d7a..0000000
--- a/noncore/games/minesweep/Makefile.in
+++ b/dev/null
@@ -1,136 +0,0 @@
-#############################################################################
-
-####### 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 = $(OPIEDIR)/bin/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= minesweep
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	minefield.h \
-		minesweep.h
-SOURCES =	main.cpp \
-		minefield.cpp \
-		minesweep.cpp
-OBJECTS =	main.o \
-		minefield.o \
-		minesweep.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_minefield.cpp \
-		moc_minesweep.cpp
-OBJMOC	=	moc_minefield.o \
-		moc_minesweep.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: minesweep.pro
-	tmake minesweep.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 \
-		minesweep.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
-
-minefield.o: minefield.cpp \
-		minefield.h \
-		$(OPIEDIR)/include/qpe/config.h
-
-minesweep.o: minesweep.cpp \
-		minesweep.h \
-		minefield.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/qpetoolbar.h \
-		$(OPIEDIR)/include/qpe/qpemenubar.h
-
-moc_minefield.o: moc_minefield.cpp \
-		minefield.h
-
-moc_minesweep.o: moc_minesweep.cpp \
-		minesweep.h
-
-moc_minefield.cpp: minefield.h
-	$(MOC) minefield.h -o moc_minefield.cpp
-
-moc_minesweep.cpp: minesweep.h
-	$(MOC) minesweep.h -o moc_minesweep.cpp
-
-
diff --git a/noncore/games/parashoot/Makefile.in b/noncore/games/parashoot/Makefile.in
deleted file mode 100644
index 254bcd2..0000000
--- a/noncore/games/parashoot/Makefile.in
+++ b/dev/null
@@ -1,203 +0,0 @@
-#############################################################################
-
-####### 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 = $(OPIEDIR)/bin/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= parashoot
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	interface.h \
-		man.h \
-		cannon.h \
-		base.h \
-		bullet.h \
-		helicopter.h
-SOURCES =	main.cpp \
-		interface.cpp \
-		man.cpp \
-		cannon.cpp \
-		base.cpp \
-		bullet.cpp \
-		helicopter.cpp
-OBJECTS =	main.o \
-		interface.o \
-		man.o \
-		cannon.o \
-		base.o \
-		bullet.o \
-		helicopter.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_interface.cpp \
-		moc_cannon.cpp \
-		moc_bullet.cpp
-OBJMOC	=	moc_interface.o \
-		moc_cannon.o \
-		moc_bullet.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 parashoot.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 \
-		interface.h \
-		cannon.h \
-		bullet.h \
-		$(OPIEDIR)/include/qpe/sound.h \
-		base.h \
-		helicopter.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
-
-interface.o: interface.cpp \
-		interface.h \
-		cannon.h \
-		bullet.h \
-		$(OPIEDIR)/include/qpe/sound.h \
-		base.h \
-		helicopter.h \
-		man.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/qpetoolbar.h
-
-man.o: man.cpp \
-		codes.h \
-		man.h \
-		$(OPIEDIR)/include/qpe/sound.h \
-		base.h \
-		$(OPIEDIR)/include/qpe/resource.h
-
-cannon.o: cannon.cpp \
-		$(OPIEDIR)/include/qpe/resource.h \
-		codes.h \
-		cannon.h \
-		bullet.h \
-		$(OPIEDIR)/include/qpe/sound.h
-
-base.o: base.cpp \
-		codes.h \
-		base.h \
-		$(OPIEDIR)/include/qpe/sound.h \
-		man.h \
-		$(OPIEDIR)/include/qpe/resource.h
-
-bullet.o: bullet.cpp \
-		codes.h \
-		bullet.h \
-		$(OPIEDIR)/include/qpe/sound.h \
-		man.h \
-		helicopter.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/qmath.h
-
-helicopter.o: helicopter.cpp \
-		helicopter.h \
-		$(OPIEDIR)/include/qpe/sound.h \
-		man.h \
-		codes.h \
-		$(OPIEDIR)/include/qpe/resource.h
-
-moc_interface.o: moc_interface.cpp \
-		interface.h \
-		cannon.h \
-		bullet.h \
-		$(OPIEDIR)/include/qpe/sound.h \
-		base.h \
-		helicopter.h
-
-moc_cannon.o: moc_cannon.cpp \
-		cannon.h \
-		bullet.h \
-		$(OPIEDIR)/include/qpe/sound.h
-
-moc_bullet.o: moc_bullet.cpp \
-		bullet.h \
-		$(OPIEDIR)/include/qpe/sound.h
-
-moc_interface.cpp: interface.h
-	$(MOC) interface.h -o moc_interface.cpp
-
-moc_cannon.cpp: cannon.h
-	$(MOC) cannon.h -o moc_cannon.cpp
-
-moc_bullet.cpp: bullet.h
-	$(MOC) bullet.h -o moc_bullet.cpp
-
-
diff --git a/noncore/games/qasteroids/Makefile.in b/noncore/games/qasteroids/Makefile.in
deleted file mode 100644
index 0dbd9bc..0000000
--- a/noncore/games/qasteroids/Makefile.in
+++ b/dev/null
@@ -1,155 +0,0 @@
-#############################################################################
-
-####### 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 = $(OPIEDIR)/bin/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= qasteroids
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	ledmeter.h \
-		sprites.h \
-		toplevel.h \
-		view.h
-SOURCES =	ledmeter.cpp \
-		toplevel.cpp \
-		view.cpp \
-		main.cpp
-OBJECTS =	ledmeter.o \
-		toplevel.o \
-		view.o \
-		main.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_ledmeter.cpp \
-		moc_toplevel.cpp \
-		moc_view.cpp
-OBJMOC	=	moc_ledmeter.o \
-		moc_toplevel.o \
-		moc_view.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 qasteroids.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
-
-ledmeter.o: ledmeter.cpp \
-		ledmeter.h
-
-toplevel.o: toplevel.cpp \
-		toplevel.h \
-		view.h \
-		sprites.h \
-		ledmeter.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/resource.h
-
-view.o: view.cpp \
-		view.h \
-		sprites.h \
-		$(OPIEDIR)/include/qpe/resource.h
-
-main.o: main.cpp \
-		toplevel.h \
-		view.h \
-		sprites.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
-
-moc_ledmeter.o: moc_ledmeter.cpp \
-		ledmeter.h
-
-moc_toplevel.o: moc_toplevel.cpp \
-		toplevel.h \
-		view.h \
-		sprites.h
-
-moc_view.o: moc_view.cpp \
-		view.h \
-		sprites.h
-
-moc_ledmeter.cpp: ledmeter.h
-	$(MOC) ledmeter.h -o moc_ledmeter.cpp
-
-moc_toplevel.cpp: toplevel.h
-	$(MOC) toplevel.h -o moc_toplevel.cpp
-
-moc_view.cpp: view.h
-	$(MOC) view.h -o moc_view.cpp
-
-
diff --git a/noncore/games/snake/Makefile.in b/noncore/games/snake/Makefile.in
deleted file mode 100644
index 0801db3..0000000
--- a/noncore/games/snake/Makefile.in
+++ b/dev/null
@@ -1,159 +0,0 @@
-#############################################################################
-
-####### 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 = $(OPIEDIR)/bin/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= snake
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	snake.h \
-		target.h \
-		obstacle.h \
-		interface.h \
-		codes.h
-SOURCES =	snake.cpp \
-		target.cpp \
-		obstacle.cpp \
-		interface.cpp \
-		main.cpp
-OBJECTS =	snake.o \
-		target.o \
-		obstacle.o \
-		interface.o \
-		main.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_snake.cpp \
-		moc_interface.cpp
-OBJMOC	=	moc_snake.o \
-		moc_interface.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 snake.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
-
-snake.o: snake.cpp \
-		snake.h \
-		target.h \
-		codes.h \
-		$(OPIEDIR)/include/qpe/resource.h
-
-target.o: target.cpp \
-		target.h \
-		codes.h \
-		$(OPIEDIR)/include/qpe/resource.h
-
-obstacle.o: obstacle.cpp \
-		obstacle.h \
-		codes.h \
-		$(OPIEDIR)/include/qpe/resource.h
-
-interface.o: interface.cpp \
-		interface.h \
-		snake.h \
-		target.h \
-		obstacle.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/qpetoolbar.h
-
-main.o: main.cpp \
-		interface.h \
-		snake.h \
-		target.h \
-		obstacle.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
-
-moc_snake.o: moc_snake.cpp \
-		snake.h
-
-moc_interface.o: moc_interface.cpp \
-		interface.h \
-		snake.h \
-		target.h \
-		obstacle.h
-
-moc_snake.cpp: snake.h
-	$(MOC) snake.h -o moc_snake.cpp
-
-moc_interface.cpp: interface.h
-	$(MOC) interface.h -o moc_interface.cpp
-
-
diff --git a/noncore/games/solitaire/Makefile.in b/noncore/games/solitaire/Makefile.in
deleted file mode 100644
index a0a64fb..0000000
--- a/noncore/games/solitaire/Makefile.in
+++ b/dev/null
@@ -1,235 +0,0 @@
-#############################################################################
-
-####### 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 = $(OPIEDIR)/bin/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= patience
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	canvascard.h \
-		canvasshapes.h \
-		cardgame.h \
-		cardgamelayout.h \
-		cardpile.h \
-		card.h \
-		carddeck.h \
-		canvascardgame.h \
-		freecellcardgame.h \
-		patiencecardgame.h \
-		canvascardwindow.h
-SOURCES =	canvascard.cpp \
-		canvasshapes.cpp \
-		cardgame.cpp \
-		cardgamelayout.cpp \
-		cardpile.cpp \
-		card.cpp \
-		carddeck.cpp \
-		canvascardgame.cpp \
-		freecellcardgame.cpp \
-		patiencecardgame.cpp \
-		canvascardwindow.cpp \
-		main.cpp
-OBJECTS =	canvascard.o \
-		canvasshapes.o \
-		cardgame.o \
-		cardgamelayout.o \
-		cardpile.o \
-		card.o \
-		carddeck.o \
-		canvascardgame.o \
-		freecellcardgame.o \
-		patiencecardgame.o \
-		canvascardwindow.o \
-		main.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_canvascardwindow.cpp
-OBJMOC	=	moc_canvascardwindow.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 solitaire.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=patience
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-
-####### Compile
-
-canvascard.o: canvascard.cpp \
-		cardgame.h \
-		card.h \
-		cardpile.h \
-		carddeck.h \
-		cardgamelayout.h \
-		canvascard.h \
-		$(OPIEDIR)/include/qpe/resource.h
-
-canvasshapes.o: canvasshapes.cpp \
-		canvasshapes.h
-
-cardgame.o: cardgame.cpp \
-		cardgame.h \
-		card.h \
-		cardpile.h \
-		carddeck.h \
-		cardgamelayout.h
-
-cardgamelayout.o: cardgamelayout.cpp \
-		cardgamelayout.h \
-		cardpile.h
-
-cardpile.o: cardpile.cpp \
-		cardpile.h \
-		card.h \
-		$(OPIEDIR)/include/qpe/config.h
-
-card.o: card.cpp \
-		card.h \
-		$(OPIEDIR)/include/qpe/config.h
-
-carddeck.o: carddeck.cpp \
-		card.h \
-		carddeck.h
-
-canvascardgame.o: canvascardgame.cpp \
-		cardgame.h \
-		card.h \
-		cardpile.h \
-		carddeck.h \
-		cardgamelayout.h \
-		canvasshapes.h \
-		canvascard.h \
-		canvascardgame.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/qpemenubar.h
-
-freecellcardgame.o: freecellcardgame.cpp \
-		freecellcardgame.h \
-		patiencecardgame.h \
-		canvascardgame.h \
-		cardgame.h \
-		card.h \
-		cardpile.h \
-		carddeck.h \
-		cardgamelayout.h \
-		canvasshapes.h \
-		canvascard.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/qpemenubar.h
-
-patiencecardgame.o: patiencecardgame.cpp \
-		patiencecardgame.h \
-		canvascardgame.h \
-		cardgame.h \
-		card.h \
-		cardpile.h \
-		carddeck.h \
-		cardgamelayout.h \
-		canvasshapes.h \
-		canvascard.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/qpemenubar.h
-
-canvascardwindow.o: canvascardwindow.cpp \
-		canvascardwindow.h \
-		patiencecardgame.h \
-		canvascardgame.h \
-		cardgame.h \
-		card.h \
-		cardpile.h \
-		carddeck.h \
-		cardgamelayout.h \
-		canvasshapes.h \
-		canvascard.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/qpemenubar.h \
-		freecellcardgame.h
-
-main.o: main.cpp \
-		canvascardwindow.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
-
-moc_canvascardwindow.o: moc_canvascardwindow.cpp \
-		canvascardwindow.h
-
-moc_canvascardwindow.cpp: canvascardwindow.h
-	$(MOC) canvascardwindow.h -o moc_canvascardwindow.cpp
-
-
diff --git a/noncore/games/tetrix/Makefile.in b/noncore/games/tetrix/Makefile.in
deleted file mode 100644
index 59e172c..0000000
--- a/noncore/games/tetrix/Makefile.in
+++ b/dev/null
@@ -1,157 +0,0 @@
-#############################################################################
-
-####### 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	= tetrix
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	minefield.h \
-		gtetrix.h \
-		qtetrix.h \
-		qtetrixb.h \
-		tpiece.h
-SOURCES =	main.cpp \
-		gtetrix.cpp \
-		qtetrix.cpp \
-		qtetrixb.cpp \
-		tpiece.cpp
-OBJECTS =	main.o \
-		gtetrix.o \
-		qtetrix.o \
-		qtetrixb.o \
-		tpiece.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_qtetrix.cpp \
-		moc_qtetrixb.cpp
-OBJMOC	=	moc_qtetrix.o \
-		moc_qtetrixb.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 tetrix.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 \
-		qtetrix.h \
-		qtetrixb.h \
-		gtetrix.h \
-		tpiece.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
-
-gtetrix.o: gtetrix.cpp \
-		gtetrix.h \
-		tpiece.h
-
-qtetrix.o: qtetrix.cpp \
-		qtetrix.h \
-		qtetrixb.h \
-		gtetrix.h \
-		tpiece.h \
-		$(OPIEDIR)/include/qpe/resource.h
-
-qtetrixb.o: qtetrixb.cpp \
-		qtetrixb.h \
-		gtetrix.h \
-		tpiece.h \
-		qtetrix.h
-
-tpiece.o: tpiece.cpp \
-		tpiece.h
-
-moc_qtetrix.o: moc_qtetrix.cpp \
-		qtetrix.h \
-		qtetrixb.h \
-		gtetrix.h \
-		tpiece.h
-
-moc_qtetrixb.o: moc_qtetrixb.cpp \
-		qtetrixb.h \
-		gtetrix.h \
-		tpiece.h
-
-moc_qtetrix.cpp: qtetrix.h
-	$(MOC) qtetrix.h -o moc_qtetrix.cpp
-
-moc_qtetrixb.cpp: qtetrixb.h
-	$(MOC) qtetrixb.h -o moc_qtetrixb.cpp
-
-
diff --git a/noncore/games/wordgame/Makefile.in b/noncore/games/wordgame/Makefile.in
deleted file mode 100644
index 2e0a47c..0000000
--- a/noncore/games/wordgame/Makefile.in
+++ b/dev/null
@@ -1,168 +0,0 @@
-#############################################################################
-
-####### 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 = $(OPIEDIR)/bin/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= wordgame
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	wordgame.h
-SOURCES =	main.cpp \
-		wordgame.cpp
-OBJECTS =	main.o \
-		wordgame.o \
-		newgamebase.o \
-		rulesbase.o
-INTERFACES =    newgamebase.ui \
-		rulesbase.ui
-UICDECLS =      newgamebase.h \
-		rulesbase.h
-UICIMPLS =      newgamebase.cpp \
-		rulesbase.cpp
-SRCMOC	=	moc_wordgame.cpp \
-		moc_newgamebase.cpp \
-		moc_rulesbase.cpp
-OBJMOC	=	moc_wordgame.o \
-		moc_newgamebase.o \
-		moc_rulesbase.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 wordgame.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 \
-		wordgame.h \
-		newgamebase.h \
-		rulesbase.h \
-		$(OPIEDIR)/include/qpe/qdawg.h \
-		$(OPIEDIR)/include/qpe/applnk.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
-
-wordgame.o: wordgame.cpp \
-		wordgame.h \
-		newgamebase.h \
-		rulesbase.h \
-		$(OPIEDIR)/include/qpe/qdawg.h \
-		$(OPIEDIR)/include/qpe/applnk.h \
-		$(OPIEDIR)/include/qpe/global.h \
-		$(OPIEDIR)/include/qpe/filemanager.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/qpetoolbar.h
-
-newgamebase.h: newgamebase.ui
-	$(UIC) newgamebase.ui -o $(INTERFACE_DECL_PATH)/newgamebase.h
-
-newgamebase.cpp: newgamebase.ui
-	$(UIC) newgamebase.ui -i newgamebase.h -o newgamebase.cpp
-
-rulesbase.h: rulesbase.ui
-	$(UIC) rulesbase.ui -o $(INTERFACE_DECL_PATH)/rulesbase.h
-
-rulesbase.cpp: rulesbase.ui
-	$(UIC) rulesbase.ui -i rulesbase.h -o rulesbase.cpp
-
-newgamebase.o: newgamebase.cpp
-
-rulesbase.o: rulesbase.cpp
-
-moc_wordgame.o: moc_wordgame.cpp \
-		wordgame.h \
-		newgamebase.h \
-		rulesbase.h \
-		$(OPIEDIR)/include/qpe/qdawg.h \
-		$(OPIEDIR)/include/qpe/applnk.h
-
-moc_newgamebase.o: moc_newgamebase.cpp \
-		newgamebase.h
-
-moc_rulesbase.o: moc_rulesbase.cpp \
-		rulesbase.h
-
-moc_wordgame.cpp: wordgame.h
-	$(MOC) wordgame.h -o moc_wordgame.cpp
-
-moc_newgamebase.cpp: newgamebase.h
-	$(MOC) newgamebase.h -o moc_newgamebase.cpp
-
-moc_rulesbase.cpp: rulesbase.h
-	$(MOC) rulesbase.h -o moc_rulesbase.cpp
-
-
diff --git a/noncore/multimedia/showimg/Makefile.in b/noncore/multimedia/showimg/Makefile.in
deleted file mode 100644
index 7c58da1..0000000
--- a/noncore/multimedia/showimg/Makefile.in
+++ b/dev/null
@@ -1,119 +0,0 @@
-#############################################################################
-
-####### 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 = $(OPIEDIR)/bin/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= showimg
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	showimg.h
-SOURCES =	main.cpp \
-		showimg.cpp
-OBJECTS =	main.o \
-		showimg.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_showimg.cpp
-OBJMOC	=	moc_showimg.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 showimg.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=showimg
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-
-####### Compile
-
-main.o: main.cpp \
-		showimg.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
-
-showimg.o: showimg.cpp \
-		showimg.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/fileselector.h \
-		$(OPIEDIR)/include/qpe/applnk.h \
-		$(OPIEDIR)/include/qpe/qpemenubar.h \
-		$(OPIEDIR)/include/qpe/qpetoolbar.h
-
-moc_showimg.o: moc_showimg.cpp \
-		showimg.h
-
-moc_showimg.cpp: showimg.h
-	$(MOC) showimg.h -o moc_showimg.cpp
-
-
diff --git a/noncore/settings/language/Makefile.in b/noncore/settings/language/Makefile.in
deleted file mode 100644
index d1a602d..0000000
--- a/noncore/settings/language/Makefile.in
+++ b/dev/null
@@ -1,135 +0,0 @@
-#############################################################################
-
-####### 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	= language
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	settings.h
-SOURCES =	language.cpp \
-		main.cpp
-OBJECTS =	language.o \
-		main.o \
-		languagesettingsbase.o
-INTERFACES =    languagesettingsbase.ui
-UICDECLS =      languagesettingsbase.h
-UICIMPLS =      languagesettingsbase.cpp
-SRCMOC	=	moc_settings.cpp \
-		moc_languagesettingsbase.cpp
-OBJMOC	=	moc_settings.o \
-		moc_languagesettingsbase.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 language.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
-
-language.o: language.cpp \
-		settings.h \
-		languagesettingsbase.h
-
-main.o: main.cpp \
-		settings.h \
-		languagesettingsbase.h
-
-languagesettingsbase.h: languagesettingsbase.ui
-	$(UIC) languagesettingsbase.ui -o $(INTERFACE_DECL_PATH)/languagesettingsbase.h
-
-languagesettingsbase.cpp: languagesettingsbase.ui
-	$(UIC) languagesettingsbase.ui -i languagesettingsbase.h -o languagesettingsbase.cpp
-
-languagesettingsbase.o: languagesettingsbase.cpp \
-		languagesettingsbase.h \
-		languagesettingsbase.ui
-
-moc_settings.o: moc_settings.cpp \
-		settings.h \
-		languagesettingsbase.h
-
-moc_languagesettingsbase.o: moc_languagesettingsbase.cpp \
-		languagesettingsbase.h
-
-moc_settings.cpp: settings.h
-	$(MOC) settings.h -o moc_settings.cpp
-
-moc_languagesettingsbase.cpp: languagesettingsbase.h
-	$(MOC) languagesettingsbase.h -o moc_languagesettingsbase.cpp
-
-
diff --git a/noncore/settings/sound/Makefile.in b/noncore/settings/sound/Makefile.in
deleted file mode 100644
index b42f2e9..0000000
--- a/noncore/settings/sound/Makefile.in
+++ b/dev/null
@@ -1,135 +0,0 @@
-#############################################################################
-
-####### 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	= sound
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	soundsettings.h
-SOURCES =	soundsettings.cpp \
-		main.cpp
-OBJECTS =	soundsettings.o \
-		main.o \
-		soundsettingsbase.o
-INTERFACES =    soundsettingsbase.ui
-UICDECLS =      soundsettingsbase.h
-UICIMPLS =      soundsettingsbase.cpp
-SRCMOC	=	moc_soundsettings.cpp \
-		moc_soundsettingsbase.cpp
-OBJMOC	=	moc_soundsettings.o \
-		moc_soundsettingsbase.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 sound.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
-
-soundsettings.o: soundsettings.cpp \
-		soundsettings.h \
-		soundsettingsbase.h
-
-main.o: main.cpp \
-		soundsettings.h \
-		soundsettingsbase.h
-
-soundsettingsbase.h: soundsettingsbase.ui
-	$(UIC) soundsettingsbase.ui -o $(INTERFACE_DECL_PATH)/soundsettingsbase.h
-
-soundsettingsbase.cpp: soundsettingsbase.ui
-	$(UIC) soundsettingsbase.ui -i soundsettingsbase.h -o soundsettingsbase.cpp
-
-soundsettingsbase.o: soundsettingsbase.cpp \
-		soundsettingsbase.h \
-		soundsettingsbase.ui
-
-moc_soundsettings.o: moc_soundsettings.cpp \
-		soundsettings.h \
-		soundsettingsbase.h
-
-moc_soundsettingsbase.o: moc_soundsettingsbase.cpp \
-		soundsettingsbase.h
-
-moc_soundsettings.cpp: soundsettings.h
-	$(MOC) soundsettings.h -o moc_soundsettings.cpp
-
-moc_soundsettingsbase.cpp: soundsettingsbase.h
-	$(MOC) soundsettingsbase.h -o moc_soundsettingsbase.cpp
-
-
diff --git a/noncore/settings/sysinfo/Makefile.in b/noncore/settings/sysinfo/Makefile.in
deleted file mode 100644
index fb9d15e..0000000
--- a/noncore/settings/sysinfo/Makefile.in
+++ b/dev/null
@@ -1,193 +0,0 @@
-#############################################################################
-
-####### 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 = $(OPIEDIR)/bin/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= sysinfo
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	memory.h \
-		graph.h \
-		load.h \
-		storage.h \
-		versioninfo.h \
-		sysinfo.h
-SOURCES =	main.cpp \
-		memory.cpp \
-		graph.cpp \
-		load.cpp \
-		storage.cpp \
-		versioninfo.cpp \
-		sysinfo.cpp
-OBJECTS =	main.o \
-		memory.o \
-		graph.o \
-		load.o \
-		storage.o \
-		versioninfo.o \
-		sysinfo.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_memory.cpp \
-		moc_graph.cpp \
-		moc_load.cpp \
-		moc_storage.cpp \
-		moc_versioninfo.cpp \
-		moc_sysinfo.cpp
-OBJMOC	=	moc_memory.o \
-		moc_graph.o \
-		moc_load.o \
-		moc_storage.o \
-		moc_versioninfo.o \
-		moc_sysinfo.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 sysinfo.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 \
-		sysinfo.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
-
-memory.o: memory.cpp \
-		graph.h \
-		memory.h
-
-graph.o: graph.cpp \
-		graph.h
-
-load.o: load.cpp \
-		load.h
-
-storage.o: storage.cpp \
-		graph.h \
-		storage.h
-
-versioninfo.o: versioninfo.cpp \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/version.h \
-		versioninfo.h
-
-sysinfo.o: sysinfo.cpp \
-		memory.h \
-		load.h \
-		storage.h \
-		versioninfo.h \
-		sysinfo.h \
-		$(OPIEDIR)/include/qpe/resource.h
-
-moc_memory.o: moc_memory.cpp \
-		memory.h
-
-moc_graph.o: moc_graph.cpp \
-		graph.h
-
-moc_load.o: moc_load.cpp \
-		load.h
-
-moc_storage.o: moc_storage.cpp \
-		storage.h
-
-moc_versioninfo.o: moc_versioninfo.cpp \
-		versioninfo.h
-
-moc_sysinfo.o: moc_sysinfo.cpp \
-		sysinfo.h
-
-moc_memory.cpp: memory.h
-	$(MOC) memory.h -o moc_memory.cpp
-
-moc_graph.cpp: graph.h
-	$(MOC) graph.h -o moc_graph.cpp
-
-moc_load.cpp: load.h
-	$(MOC) load.h -o moc_load.cpp
-
-moc_storage.cpp: storage.h
-	$(MOC) storage.h -o moc_storage.cpp
-
-moc_versioninfo.cpp: versioninfo.h
-	$(MOC) versioninfo.h -o moc_versioninfo.cpp
-
-moc_sysinfo.cpp: sysinfo.h
-	$(MOC) sysinfo.h -o moc_sysinfo.cpp
-
-
diff --git a/noncore/tools/calculator/Makefile.in b/noncore/tools/calculator/Makefile.in
deleted file mode 100644
index ba78df5..0000000
--- a/noncore/tools/calculator/Makefile.in
+++ b/dev/null
@@ -1,139 +0,0 @@
-#############################################################################
-
-####### 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 = $(OPIEDIR)/bin/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= calculator
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	calculatorimpl.h
-SOURCES =	calculatorimpl.cpp \
-		main.cpp
-OBJECTS =	calculatorimpl.o \
-		main.o \
-		calculator.o
-INTERFACES =    calculator.ui
-UICDECLS =      calculator.h
-UICIMPLS =      calculator.cpp
-SRCMOC	=	moc_calculatorimpl.cpp \
-		moc_calculator.cpp
-OBJMOC	=	moc_calculatorimpl.o \
-		moc_calculator.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 calculator.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
-
-calculatorimpl.o: calculatorimpl.cpp \
-		calculatorimpl.h \
-		calculator.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/qmath.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
-
-main.o: main.cpp \
-		calculatorimpl.h \
-		calculator.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
-
-calculator.h: calculator.ui
-	$(UIC) calculator.ui -o $(INTERFACE_DECL_PATH)/calculator.h
-
-calculator.cpp: calculator.ui
-	$(UIC) calculator.ui -i calculator.h -o calculator.cpp
-
-calculator.o: calculator.cpp \
-		calculator.h \
-		calculator.ui
-
-moc_calculatorimpl.o: moc_calculatorimpl.cpp \
-		calculatorimpl.h \
-		calculator.h
-
-moc_calculator.o: moc_calculator.cpp \
-		calculator.h
-
-moc_calculatorimpl.cpp: calculatorimpl.h
-	$(MOC) calculatorimpl.h -o moc_calculatorimpl.cpp
-
-moc_calculator.cpp: calculator.h
-	$(MOC) calculator.h -o moc_calculator.cpp
-
-
diff --git a/noncore/tools/clock/Makefile.in b/noncore/tools/clock/Makefile.in
deleted file mode 100644
index efa7808..0000000
--- a/noncore/tools/clock/Makefile.in
+++ b/dev/null
@@ -1,118 +0,0 @@
-#############################################################################
-
-####### 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 = $(OPIEDIR)/bin/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= clock
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	clock.h
-SOURCES =	clock.cpp \
-		main.cpp
-OBJECTS =	clock.o \
-		main.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_clock.cpp
-OBJMOC	=	moc_clock.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 clock.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
-
-clock.o: clock.cpp \
-		clock.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
-		$(OPIEDIR)/include/qpe/config.h \
-		$(OPIEDIR)/include/qpe/timestring.h
-
-main.o: main.cpp \
-		clock.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
-
-moc_clock.o: moc_clock.cpp \
-		clock.h
-
-moc_clock.cpp: clock.h
-	$(MOC) clock.h -o moc_clock.cpp
-
-
diff --git a/noncore/unsupported/filebrowser/Makefile.in b/noncore/unsupported/filebrowser/Makefile.in
deleted file mode 100644
index c3336cf..0000000
--- a/noncore/unsupported/filebrowser/Makefile.in
+++ b/dev/null
@@ -1,156 +0,0 @@
-#############################################################################
-
-####### 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 = $(OPIEDIR)/bin/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= filebrowser
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	inlineedit.h \
-		filebrowser.h \
-		filePermissions.h
-SOURCES =	filebrowser.cpp \
-		inlineedit.cpp \
-		filePermissions.cpp \
-		main.cpp
-OBJECTS =	filebrowser.o \
-		inlineedit.o \
-		filePermissions.o \
-		main.o
-INTERFACES =    
-UICDECLS =      
-UICIMPLS =      
-SRCMOC	=	moc_inlineedit.cpp \
-		moc_filebrowser.cpp \
-		moc_filePermissions.cpp
-OBJMOC	=	moc_inlineedit.o \
-		moc_filebrowser.o \
-		moc_filePermissions.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: filebrowser.pro
-	tmake filebrowser.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
-
-filebrowser.o: filebrowser.cpp \
-		inlineedit.h \
-		filebrowser.h \
-		filePermissions.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/global.h \
-		$(OPIEDIR)/include/qpe/mimetype.h \
-		$(OPIEDIR)/include/qpe/applnk.h \
-		$(OPIEDIR)/include/qcopenvelope_qws.h \
-		$(OPIEDIR)/include/qpe/qpetoolbar.h \
-		$(OPIEDIR)/include/qpe/qpemenubar.h
-
-inlineedit.o: inlineedit.cpp \
-		inlineedit.h
-
-filePermissions.o: filePermissions.cpp \
-		filePermissions.h
-
-main.o: main.cpp \
-		filebrowser.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpedecoration_qws.h \
-		$(OPIEDIR)/include/timestring.h \
-		$(OPIEDIR)/include/qpe/mimetype.h
-
-moc_inlineedit.o: moc_inlineedit.cpp \
-		inlineedit.h
-
-moc_filebrowser.o: moc_filebrowser.cpp \
-		filebrowser.h
-
-moc_filePermissions.o: moc_filePermissions.cpp \
-		filePermissions.h
-
-moc_inlineedit.cpp: inlineedit.h
-	$(MOC) inlineedit.h -o moc_inlineedit.cpp
-
-moc_filebrowser.cpp: filebrowser.h
-	$(MOC) filebrowser.h -o moc_filebrowser.cpp
-
-moc_filePermissions.cpp: filePermissions.h
-	$(MOC) filePermissions.h -o moc_filePermissions.cpp
-
-
diff --git a/noncore/unsupported/oipkg/Makefile.in b/noncore/unsupported/oipkg/Makefile.in
deleted file mode 100644
index a7e22ef..0000000
--- a/noncore/unsupported/oipkg/Makefile.in
+++ b/dev/null
@@ -1,203 +0,0 @@
-#############################################################################
-
-####### 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 = $(OPIEDIR)/bin/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= qipkg
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	packagemanager.h
-SOURCES =	packagemanager.cpp \
-		main.cpp
-OBJECTS =	packagemanager.o \
-		main.o \
-		packagemanagerbase.o \
-		pkdesc.o \
-		pkfind.o \
-		pksettings.o
-INTERFACES =    packagemanagerbase.ui \
-		pkdesc.ui \
-		pkfind.ui \
-		pksettings.ui
-UICDECLS =      packagemanagerbase.h \
-		pkdesc.h \
-		pkfind.h \
-		pksettings.h
-UICIMPLS =      packagemanagerbase.cpp \
-		pkdesc.cpp \
-		pkfind.cpp \
-		pksettings.cpp
-SRCMOC	=	moc_packagemanager.cpp \
-		moc_packagemanagerbase.cpp \
-		moc_pkdesc.cpp \
-		moc_pkfind.cpp \
-		moc_pksettings.cpp
-OBJMOC	=	moc_packagemanager.o \
-		moc_packagemanagerbase.o \
-		moc_pkdesc.o \
-		moc_pkfind.o \
-		moc_pksettings.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 qipkg.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
-
-packagemanager.o: packagemanager.cpp \
-		packagemanager.h \
-		packagemanagerbase.h \
-		pkdesc.h \
-		pkfind.h \
-		pksettings.h \
-		$(OPIEDIR)/include/qpe/process.h \
-		$(OPIEDIR)/include/qpe/resource.h \
-		$(OPIEDIR)/include/qpe/stringutil.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h \
-		$(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
-		$(OPIEDIR)/include/qpe/applnk.h
-
-main.o: main.cpp \
-		packagemanager.h \
-		packagemanagerbase.h \
-		$(OPIEDIR)/include/qpe/qpeapplication.h
-
-packagemanagerbase.h: packagemanagerbase.ui
-	$(UIC) packagemanagerbase.ui -o $(INTERFACE_DECL_PATH)/packagemanagerbase.h
-
-packagemanagerbase.cpp: packagemanagerbase.ui
-	$(UIC) packagemanagerbase.ui -i packagemanagerbase.h -o packagemanagerbase.cpp
-
-pkdesc.h: pkdesc.ui
-	$(UIC) pkdesc.ui -o $(INTERFACE_DECL_PATH)/pkdesc.h
-
-pkdesc.cpp: pkdesc.ui
-	$(UIC) pkdesc.ui -i pkdesc.h -o pkdesc.cpp
-
-pkfind.h: pkfind.ui
-	$(UIC) pkfind.ui -o $(INTERFACE_DECL_PATH)/pkfind.h
-
-pkfind.cpp: pkfind.ui
-	$(UIC) pkfind.ui -i pkfind.h -o pkfind.cpp
-
-pksettings.h: pksettings.ui
-	$(UIC) pksettings.ui -o $(INTERFACE_DECL_PATH)/pksettings.h
-
-pksettings.cpp: pksettings.ui
-	$(UIC) pksettings.ui -i pksettings.h -o pksettings.cpp
-
-packagemanagerbase.o: packagemanagerbase.cpp
-
-pkdesc.o: pkdesc.cpp
-
-pkfind.o: pkfind.cpp
-
-pksettings.o: pksettings.cpp
-
-moc_packagemanager.o: moc_packagemanager.cpp \
-		packagemanager.h \
-		packagemanagerbase.h
-
-moc_packagemanagerbase.o: moc_packagemanagerbase.cpp \
-		packagemanagerbase.h
-
-moc_pkdesc.o: moc_pkdesc.cpp \
-		pkdesc.h
-
-moc_pkfind.o: moc_pkfind.cpp \
-		pkfind.h
-
-moc_pksettings.o: moc_pksettings.cpp \
-		pksettings.h
-
-moc_packagemanager.cpp: packagemanager.h
-	$(MOC) packagemanager.h -o moc_packagemanager.cpp
-
-moc_packagemanagerbase.cpp: packagemanagerbase.h
-	$(MOC) packagemanagerbase.h -o moc_packagemanagerbase.cpp
-
-moc_pkdesc.cpp: pkdesc.h
-	$(MOC) pkdesc.h -o moc_pkdesc.cpp
-
-moc_pkfind.cpp: pkfind.h
-	$(MOC) pkfind.h -o moc_pkfind.cpp
-
-moc_pksettings.cpp: pksettings.h
-	$(MOC) pksettings.h -o moc_pksettings.cpp
-
-
diff --git a/quickexec/Makefile.in b/quickexec/Makefile.in
deleted file mode 100644
index d3ac9dc..0000000
--- a/quickexec/Makefile.in
+++ b/dev/null
@@ -1,103 +0,0 @@
-#############################################################################
-
-####### 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: 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
deleted file mode 100644
index e69de29..0000000
--- a/rsync/Makefile.in
+++ b/dev/null
author	zecke <zecke>	2002-03-01 18:29:41 (UTC)
committer	zecke <zecke>	2002-03-01 18:29:41 (UTC)
commit	b4d04f29978bbd01a499710860545b233362e748 (patch) (side-by-side diff)
tree	2d46b909560eb9f47983242ca52f7136df26b6d2
parent	e992a79494ea03005223aef1200338760553aa7d (diff)
download	opie-b4d04f29978bbd01a499710860545b233362e748.zip opie-b4d04f29978bbd01a499710860545b233362e748.tar.gz opie-b4d04f29978bbd01a499710860545b233362e748.tar.bz2