- remove bogus mak and pro files

- fix build order
- fix binary name
- add bogus include files

73 files changed, 5 insertions, 10225 deletions

diff --git a/noncore/apps/opie-reader/AportisCodec.mak b/noncore/apps/opie-reader/AportisCodec.mak
deleted file mode 100644
index 89bf57d..0000000
--- a/noncore/apps/opie-reader/AportisCodec.mak
+++ b/dev/null
@@ -1,166 +0,0 @@
-#############################################################################
-# Makefile for building: libAportis.so.1.0.0
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:36:46 2004
-# Project:  AportisCodec.pro
-# Template: lib
-# Command: $(QMAKE) -o AportisCodec.mak AportisCodec.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
-LINK     = g++
-LFLAGS   = -shared -Wl,-soname,libAportis.so.1
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(READERDIR)/lib -lreader_pdb -lreader_codec -lqt-mt -lXext -lX11 -lm -lpthread
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QREADEROBJS/
-
-####### Files
-
-HEADERS = Aportis.h
-SOURCES = Aportis.cpp
-OBJECTS = QREADEROBJS/Aportis.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = 
-OBJMOC = 
-DIST	   = AportisCodec.pro
-QMAKE_TARGET = Aportis
-DESTDIR  = $(READERDIR)/codecs/
-TARGET   = libAportis.so.1.0.0
-TARGETA	= $(READERDIR)/codecs/libAportis.a
-TARGETD	= libAportis.so.1.0.0
-TARGET0	= libAportis.so
-TARGET1	= libAportis.so.1
-TARGET2	= libAportis.so.1.0
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: AportisCodec.mak  $(READERDIR)/codecs/$(TARGET)
-
-$(READERDIR)/codecs/$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)  
-	test -d $(READERDIR)/codecs/ || mkdir -p $(READERDIR)/codecs/
-	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET1)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET2)
-	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/codecs/
-
-
-
-staticlib: $(TARGETA)
-
-$(TARGETA):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
-	-$(DEL_FILE) $(TARGETA) 
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-AportisCodec.mak: AportisCodec.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o AportisCodec.mak AportisCodec.pro
-qmake: 
-	@$(QMAKE) -o AportisCodec.mak AportisCodec.pro
-
-dist: 
-	@mkdir -p QREADEROBJS/Aportis && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/Aportis/ && ( cd `dirname QREADEROBJS/Aportis` && $(TAR) Aportis.tar Aportis && $(GZIP) Aportis.tar ) && $(MOVE) `dirname QREADEROBJS/Aportis`/Aportis.tar.gz . && $(DEL_FILE) -r QREADEROBJS/Aportis
-
-mocclean:
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean:
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET) $(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0) $(READERDIR)/codecs/$(TARGET1) $(READERDIR)/codecs/$(TARGET2) $(TARGETA)
-
-
-FORCE:
-
-####### Compile
-
-QREADEROBJS/Aportis.o: Aportis.cpp Aportis.h \
-		my_list.h \
-		Bkmks.h \
-		QREADERINC/static.h \
-		CExpander.h \
-		pdb.h \
-		QREADERINC/useqpe.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h \
-		Filedata.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/Aportis.o Aportis.cpp
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/AportisCodec.omak b/noncore/apps/opie-reader/AportisCodec.omak
deleted file mode 100644
index 2de7cd6..0000000
--- a/noncore/apps/opie-reader/AportisCodec.omak
+++ b/dev/null
@@ -1,139 +0,0 @@
-#############################################################################
-# Makefile for building libAportis.so.1.0.0
-# Generated by tmake at 15:14, 2004/05/08
-#     Project: AportisCodec.opro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
-INCPATH	=	-IOREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libAportis.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	Aportis.h \
-		CExpander.h \
-		OREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		pdb.h \
-		my_list.h \
-		Bkmks.h \
-		Filedata.h
-SOURCES =	Aportis.cpp
-OBJECTS =	OREADEROBJS/Aportis.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libAportis.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libAportis.a
-TARGETD	=	libAportis.so.1.0.0
-TARGET0	=	libAportis.so
-TARGET1	=	libAportis.so.1
-TARGET2	=	libAportis.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/plugins/reader/codecs/libAportis.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libAportis.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: AportisCodec.omak
-
-AportisCodec.omak: AportisCodec.opro
-	tmake AportisCodec.opro -o AportisCodec.omak
-
-dist:
-	$(TAR) AportisCodec.opro.tar AportisCodec.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) AportisCodec.opro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-OREADEROBJS/Aportis.o: Aportis.cpp \
-		Aportis.h \
-		CExpander.h \
-		OREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		pdb.h \
-		my_list.h \
-		Bkmks.h \
-		Filedata.h \
-		OREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/Aportis.o Aportis.cpp
-
diff --git a/noncore/apps/opie-reader/AportisCodec.wmak b/noncore/apps/opie-reader/AportisCodec.wmak
deleted file mode 100644
index 02c9ef0..0000000
--- a/noncore/apps/opie-reader/AportisCodec.wmak
+++ b/dev/null
@@ -1,127 +0,0 @@
-#############################################################################
-# Makefile for building libAportis.so.1.0.0
-# Generated by tmake at 23:23, 2004/03/09
-#     Project: AportisCodec.wpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	gcc-2.96
-CXX	=	g++-2.96
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IWSREADERINC -I$(QTDIR)/include
-LINK	=	g++-2.96
-LFLAGS	=	-shared -Wl,-soname,libAportis.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
-AR	=	ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	Aportis.h
-SOURCES =	Aportis.cpp
-OBJECTS =	WSREADEROBJS/Aportis.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libAportis.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libAportis.a
-TARGETD	=	libAportis.so.1.0.0
-TARGET0	=	libAportis.so
-TARGET1	=	libAportis.so.1
-TARGET2	=	libAportis.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/plugins/reader/codecs/libAportis.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libAportis.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: AportisCodec.wmak
-
-AportisCodec.wmak: AportisCodec.wpro
-	tmake AportisCodec.wpro -o AportisCodec.wmak
-
-dist:
-	$(TAR) AportisCodec.wpro.tar AportisCodec.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) AportisCodec.wpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-WSREADEROBJS/Aportis.o: Aportis.cpp \
-		Aportis.h \
-		CExpander.h \
-		WSREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		pdb.h \
-		my_list.h \
-		Bkmks.h \
-		Filedata.h \
-		WSREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/Aportis.o Aportis.cpp
-
diff --git a/noncore/apps/opie-reader/AportisCodec.wpro b/noncore/apps/opie-reader/AportisCodec.wpro
deleted file mode 100644
index b21f2cb..0000000
--- a/noncore/apps/opie-reader/AportisCodec.wpro
+++ b/dev/null
@@ -1,17 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= Aportis.h
-
-SOURCES		= Aportis.cpp
-
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/codecs
-TARGET		= Aportis
-LIBS            += -lreader_pdb -lreader_codec
-
-
-OBJECTS_DIR = WSREADEROBJS
-MOC_DIR = WSREADERMOCS
-INCLUDEPATH	+= WSREADERINC
-DEPENDPATH	+= WSREADERINC
diff --git a/noncore/apps/opie-reader/AportisCodec.zmak b/noncore/apps/opie-reader/AportisCodec.zmak
deleted file mode 100644
index 6fb0444..0000000
--- a/noncore/apps/opie-reader/AportisCodec.zmak
+++ b/dev/null
@@ -1,127 +0,0 @@
-#############################################################################
-# Makefile for building libAportis.so.1.0.0
-# Generated by tmake at 15:17, 2004/05/08
-#     Project: AportisCodec.zpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IZREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libAportis.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	Aportis.h
-SOURCES =	Aportis.cpp
-OBJECTS =	ZREADEROBJS/Aportis.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libAportis.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libAportis.a
-TARGETD	=	libAportis.so.1.0.0
-TARGET0	=	libAportis.so
-TARGET1	=	libAportis.so.1
-TARGET2	=	libAportis.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/plugins/reader/codecs/libAportis.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libAportis.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: AportisCodec.zmak
-
-AportisCodec.zmak: AportisCodec.zpro
-	tmake AportisCodec.zpro -o AportisCodec.zmak
-
-dist:
-	$(TAR) AportisCodec.zpro.tar AportisCodec.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) AportisCodec.zpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZREADEROBJS/Aportis.o: Aportis.cpp \
-		Aportis.h \
-		CExpander.h \
-		ZREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		pdb.h \
-		my_list.h \
-		Bkmks.h \
-		Filedata.h \
-		ZREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/Aportis.o Aportis.cpp
-
diff --git a/noncore/apps/opie-reader/AportisCodec.zpro b/noncore/apps/opie-reader/AportisCodec.zpro
deleted file mode 100644
index 8e4b26c..0000000
--- a/noncore/apps/opie-reader/AportisCodec.zpro
+++ b/dev/null
@@ -1,17 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= Aportis.h
-
-SOURCES		= Aportis.cpp
-
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/codecs
-TARGET		= Aportis
-LIBS            += -lreader_pdb -lreader_codec
-
-
-OBJECTS_DIR = ZREADEROBJS
-MOC_DIR = ZREADERMOCS
-INCLUDEPATH	+= ZREADERINC
-DEPENDPATH	+= ZREADERINC
diff --git a/noncore/apps/opie-reader/CDrawBuffer.cpp b/noncore/apps/opie-reader/CDrawBuffer.cpp
index cd79fec..caccf1b 100644
--- a/noncore/apps/opie-reader/CDrawBuffer.cpp
+++ b/noncore/apps/opie-reader/CDrawBuffer.cpp
@@ -1,104 +1,103 @@
 #include "CDrawBuffer.h"
 #include "FontControl.h"
 #include <qfontmetrics.h>
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qimage.h>
 #include "useqpe.h"
-#include "opie.h"
 
 CDrawBuffer::~CDrawBuffer()
 {
     while (!segs.isEmpty()) segs.erase(0);
 }
 
 void CDrawBuffer::setright(CDrawBuffer& rhs, int f)
 {
   int i;
   len = rhs.len;
   fc = rhs.fc;
   m_ascent = m_descent = m_lineSpacing = m_lineExtraSpacing = 0;
   while (!segs.isEmpty())
   {
       segs.erase(0);
   }
   for (CList<textsegment>::iterator iter = rhs.segs.begin(); iter != rhs.segs.end(); )
   {
       CList<textsegment>::iterator next = iter;
       iter++;
       if (iter == rhs.segs.end() || iter->start > f)
       {
 	  int st = next->start-f;
 	  if (st < 0) st = 0;
 
 	  CStyle _style = next->style;
 	  segs.push_back(textsegment(st,next->style));
       }
   }
   for (i = f; rhs[i] != '\0'; i++) (*this)[i-f] = rhs[i];
   (*this)[i-f] = '\0';
   len = i;
 }
 
 CDrawBuffer& CDrawBuffer::operator=(CDrawBuffer& rhs)
 {
   int i;
 //  //qDebug("Trying 2");
   len = rhs.len;
   m_ascent = rhs.m_ascent;
   m_descent = rhs.m_descent;
   m_lineSpacing = rhs.m_lineSpacing;
   m_lineExtraSpacing = rhs.m_lineExtraSpacing;
   m_showPartial = rhs.m_showPartial;
   while (!segs.isEmpty())
   {
       segs.erase(0);
   }
   for (CList<textsegment>::iterator iter = rhs.segs.begin(); iter != rhs.segs.end(); iter++)
   {
       segs.push_back(*iter);
   }
   for (i = 0; rhs[i] != '\0'; i++) (*this)[i] = rhs[i];
   (*this)[i] = '\0';
   len = i;
 //  //qDebug("Tried 2");
   return *this;
 }
 
 CDrawBuffer& CDrawBuffer::operator=(const tchar*sztmp)
 {
   int i;
   while (!segs.isEmpty())
   {
       segs.erase(0);
   }
   segs.push_back(textsegment(0, CStyle()));
   for (i = 0; sztmp[i] != '\0'; i++) (*this)[i] = sztmp[i];
   (*this)[i] = '\0';
   len = i;
   return *this;
 }
 
 void CDrawBuffer::empty()
 {
     m_bSop = false;
     m_bEop = false;
     m_bBop = false;
     len = 0;
     (*this)[0] = 0;
     while (!segs.isEmpty())
     {
 	segs.erase(0);
     }
     segs.push_back(textsegment(0,CStyle()));
     m_ascent = m_descent = m_lineSpacing = m_lineExtraSpacing = 0;
     m_bEof = false;
 }
 
 void CDrawBuffer::setendpara(const CStyle& _style/* = ucFontBase*/)
 {
    m_bEop = true;
    if (len == 0)
     {
 	segs.first().start = 0;
 	segs.first().style = _style;
diff --git a/noncore/apps/opie-reader/CHM.mak b/noncore/apps/opie-reader/CHM.mak
deleted file mode 100644
index e14db5b..0000000
--- a/noncore/apps/opie-reader/CHM.mak
+++ b/dev/null
@@ -1,177 +0,0 @@
-#############################################################################
-# Makefile for building: libCHM.so.1.0.0
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:37:00 2004
-# Project:  CHM.pro
-# Template: lib
-# Command: $(QMAKE) -o CHM.mak CHM.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -w -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-CXXFLAGS = -pipe -w -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
-LINK     = g++
-LFLAGS   = -shared -Wl,-soname,libCHM.so.1
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(READERDIR)/lib -lreader_codec -lqt-mt -lXext -lX11 -lm -lpthread
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QREADEROBJS/
-
-####### Files
-
-HEADERS = CHM.h \
-		chm_lib.h \
-		lzx.h
-SOURCES = CHM.cpp \
-		chm_lib.c \
-		lzx.c
-OBJECTS = QREADEROBJS/CHM.o \
-		QREADEROBJS/chm_lib.o \
-		QREADEROBJS/lzx.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = 
-OBJMOC = 
-DIST	   = CHM.pro
-QMAKE_TARGET = CHM
-DESTDIR  = $(READERDIR)/codecs/
-TARGET   = libCHM.so.1.0.0
-TARGETA	= $(READERDIR)/codecs/libCHM.a
-TARGETD	= libCHM.so.1.0.0
-TARGET0	= libCHM.so
-TARGET1	= libCHM.so.1
-TARGET2	= libCHM.so.1.0
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: CHM.mak  $(READERDIR)/codecs/$(TARGET)
-
-$(READERDIR)/codecs/$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)  
-	test -d $(READERDIR)/codecs/ || mkdir -p $(READERDIR)/codecs/
-	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET1)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET2)
-	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/codecs/
-
-
-
-staticlib: $(TARGETA)
-
-$(TARGETA):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
-	-$(DEL_FILE) $(TARGETA) 
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-CHM.mak: CHM.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o CHM.mak CHM.pro
-qmake: 
-	@$(QMAKE) -o CHM.mak CHM.pro
-
-dist: 
-	@mkdir -p QREADEROBJS/CHM && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/CHM/ && ( cd `dirname QREADEROBJS/CHM` && $(TAR) CHM.tar CHM && $(GZIP) CHM.tar ) && $(MOVE) `dirname QREADEROBJS/CHM`/CHM.tar.gz . && $(DEL_FILE) -r QREADEROBJS/CHM
-
-mocclean:
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean:
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET) $(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0) $(READERDIR)/codecs/$(TARGET1) $(READERDIR)/codecs/$(TARGET2) $(TARGETA)
-
-
-FORCE:
-
-####### Compile
-
-QREADEROBJS/CHM.o: CHM.cpp CHM.h \
-		chm_lib.h \
-		QREADERINC/static.h \
-		QREADERINC/useqpe.h \
-		CExpander.h \
-		my_list.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CHM.o CHM.cpp
-
-QREADEROBJS/chm_lib.o: chm_lib.c chm_lib.h \
-		lzx.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o QREADEROBJS/chm_lib.o chm_lib.c
-
-QREADEROBJS/lzx.o: lzx.c lzx.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o QREADEROBJS/lzx.o lzx.c
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/CHM.omak b/noncore/apps/opie-reader/CHM.omak
deleted file mode 100644
index 4cdfbe2..0000000
--- a/noncore/apps/opie-reader/CHM.omak
+++ b/dev/null
@@ -1,140 +0,0 @@
-#############################################################################
-# Makefile for building libCHM.so.1.0.0
-# Generated by tmake at 15:14, 2004/05/08
-#     Project: CHM.opro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
-INCPATH	=	-IOREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libCHM.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	CHM.h \
-		chm_lib.h \
-		lzx.h
-SOURCES =	CHM.cpp \
-		chm_lib.c \
-		lzx.c
-OBJECTS =	OREADEROBJS/CHM.o \
-		OREADEROBJS/chm_lib.o \
-		OREADEROBJS/lzx.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libCHM.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libCHM.a
-TARGETD	=	libCHM.so.1.0.0
-TARGET0	=	libCHM.so
-TARGET1	=	libCHM.so.1
-TARGET2	=	libCHM.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/plugins/reader/codecs/libCHM.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libCHM.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: CHM.omak
-
-CHM.omak: CHM.opro
-	tmake CHM.opro -o CHM.omak
-
-dist:
-	$(TAR) CHM.opro.tar CHM.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) CHM.opro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-OREADEROBJS/CHM.o: CHM.cpp \
-		CHM.h \
-		OREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		chm_lib.h \
-		my_list.h \
-		OREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CHM.o CHM.cpp
-
-OREADEROBJS/chm_lib.o: chm_lib.c \
-		chm_lib.h \
-		lzx.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o OREADEROBJS/chm_lib.o chm_lib.c
-
-OREADEROBJS/lzx.o: lzx.c \
-		lzx.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o OREADEROBJS/lzx.o lzx.c
-
diff --git a/noncore/apps/opie-reader/CHM.zmak b/noncore/apps/opie-reader/CHM.zmak
deleted file mode 100644
index 6cde457..0000000
--- a/noncore/apps/opie-reader/CHM.zmak
+++ b/dev/null
@@ -1,140 +0,0 @@
-#############################################################################
-# Makefile for building libCHM.so.1.0.0
-# Generated by tmake at 15:17, 2004/05/08
-#     Project: CHM.zpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IZREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libCHM.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	CHM.h \
-		chm_lib.h \
-		lzx.h
-SOURCES =	CHM.cpp \
-		chm_lib.c \
-		lzx.c
-OBJECTS =	ZREADEROBJS/CHM.o \
-		ZREADEROBJS/chm_lib.o \
-		ZREADEROBJS/lzx.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libCHM.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libCHM.a
-TARGETD	=	libCHM.so.1.0.0
-TARGET0	=	libCHM.so
-TARGET1	=	libCHM.so.1
-TARGET2	=	libCHM.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/plugins/reader/codecs/libCHM.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libCHM.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: CHM.zmak
-
-CHM.zmak: CHM.zpro
-	tmake CHM.zpro -o CHM.zmak
-
-dist:
-	$(TAR) CHM.zpro.tar CHM.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) CHM.zpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZREADEROBJS/CHM.o: CHM.cpp \
-		CHM.h \
-		ZREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		chm_lib.h \
-		my_list.h \
-		ZREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CHM.o CHM.cpp
-
-ZREADEROBJS/chm_lib.o: chm_lib.c \
-		chm_lib.h \
-		lzx.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o ZREADEROBJS/chm_lib.o chm_lib.c
-
-ZREADEROBJS/lzx.o: lzx.c \
-		lzx.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o ZREADEROBJS/lzx.o lzx.c
-
diff --git a/noncore/apps/opie-reader/CHM.zpro b/noncore/apps/opie-reader/CHM.zpro
deleted file mode 100644
index 1f2464a..0000000
--- a/noncore/apps/opie-reader/CHM.zpro
+++ b/dev/null
@@ -1,16 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= CHM.h chm_lib.h lzx.h
-
-SOURCES		= CHM.cpp chm_lib.c lzx.c
-
-
-INTERFACES	=
-DESTDIR		= $(QTDIR)/plugins/reader/codecs
-TARGET		= CHM
-LIBS            += -lreader_codec
-
-OBJECTS_DIR = ZREADEROBJS
-MOC_DIR = ZREADERMOCS
-INCLUDEPATH	+= ZREADERINC
-DEPENDPATH += ZREADERINC
diff --git a/noncore/apps/opie-reader/FontControl.cpp b/noncore/apps/opie-reader/FontControl.cpp
index d082898..bbd9fe0 100644
--- a/noncore/apps/opie-reader/FontControl.cpp
+++ b/noncore/apps/opie-reader/FontControl.cpp
@@ -1,68 +1,67 @@
 #include <qfontdatabase.h>
-#include "opie.h"
 #include "useqpe.h"
 #include "FontControl.h"
 
 int FontControl::gzoom()
 {
   if (m_fixgraphics)
     {
       return 100;
     }
   else
     {
       int ret;
       if (m_size == g_size)
 	{
 	  ret = m_fontsizes[m_size]*m_basesize;
 	}
       else if (g_size < 0)
 	{
 	  int f = -g_size;
 	  ret = (m_fontsizes[0]*m_basesize) >> (f/2);
 	  if (f%2) ret = (2*ret/3);
 	}
       else
 	{
 	  int f = g_size - m_maxsize + 1;
 	  ret = (m_fontsizes[m_maxsize-1]*m_basesize) << (f/2);
 	  if (f%2) ret = (3*ret/2);
 	}
       return ret;
     }
 }
 
 bool FontControl::ChangeFont(QString& n, int tgt)
 {
     QValueList<int>::Iterator it;
     QFontDatabase fdb;
     QValueList<int> sizes = fdb.pointSizes(n);
     if (sizes.count() == 0)
     {
 	return false;
     }
     else
     {
 	m_fontname = n;
 	m_maxsize = sizes.count();
 	if (m_fontsizes != NULL) delete [] m_fontsizes;
 	m_fontsizes = new int[m_maxsize];
 	uint i = 0;
 	uint best = 0;
 	for (it = sizes.begin(); it != sizes.end(); it++)
 	{
 #if defined(OPIE) || !defined(USEQPE)
 	    m_fontsizes[i] = (*it);
 #else
 	    m_fontsizes[i] = (*it)/10;
 #endif
 	    if (abs(tgt-m_fontsizes[i]) < abs(tgt-m_fontsizes[best]))
 	    {
 		best = i;
 	    }
 	    i++;
 	}
 	g_size = m_size = best;
     }
     return true;
 }
diff --git a/noncore/apps/opie-reader/HTMLFilter.mak b/noncore/apps/opie-reader/HTMLFilter.mak
deleted file mode 100644
index e1a2125..0000000
--- a/noncore/apps/opie-reader/HTMLFilter.mak
+++ b/dev/null
@@ -1,170 +0,0 @@
-#############################################################################
-# Makefile for building: libHTMLfilter.so.1.0.0
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:38:47 2004
-# Project:  HTMLFilter.pro
-# Template: lib
-# Command: $(QMAKE) -o HTMLFilter.mak HTMLFilter.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
-LINK     = g++
-LFLAGS   = -shared -Wl,-soname,libHTMLfilter.so.1
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm -lpthread
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QREADEROBJS/
-
-####### Files
-
-HEADERS = CFilter.h
-SOURCES = striphtml.cpp
-OBJECTS = QREADEROBJS/striphtml.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = 
-OBJMOC = 
-DIST	   = HTMLFilter.pro
-QMAKE_TARGET = HTMLfilter
-DESTDIR  = $(READERDIR)/filters/
-TARGET   = libHTMLfilter.so.1.0.0
-TARGETA	= $(READERDIR)/filters/libHTMLfilter.a
-TARGETD	= libHTMLfilter.so.1.0.0
-TARGET0	= libHTMLfilter.so
-TARGET1	= libHTMLfilter.so.1
-TARGET2	= libHTMLfilter.so.1.0
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: HTMLFilter.mak  $(READERDIR)/filters/$(TARGET)
-
-$(READERDIR)/filters/$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)  
-	test -d $(READERDIR)/filters/ || mkdir -p $(READERDIR)/filters/
-	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-$(DEL_FILE) $(READERDIR)/filters/$(TARGET)
-	-$(DEL_FILE) $(READERDIR)/filters/$(TARGET0)
-	-$(DEL_FILE) $(READERDIR)/filters/$(TARGET1)
-	-$(DEL_FILE) $(READERDIR)/filters/$(TARGET2)
-	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/filters/
-
-
-
-staticlib: $(TARGETA)
-
-$(TARGETA):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
-	-$(DEL_FILE) $(TARGETA) 
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-HTMLFilter.mak: HTMLFilter.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o HTMLFilter.mak HTMLFilter.pro
-qmake: 
-	@$(QMAKE) -o HTMLFilter.mak HTMLFilter.pro
-
-dist: 
-	@mkdir -p QREADEROBJS/HTMLfilter && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/HTMLfilter/ && ( cd `dirname QREADEROBJS/HTMLfilter` && $(TAR) HTMLfilter.tar HTMLfilter && $(GZIP) HTMLfilter.tar ) && $(MOVE) `dirname QREADEROBJS/HTMLfilter`/HTMLfilter.tar.gz . && $(DEL_FILE) -r QREADEROBJS/HTMLfilter
-
-mocclean:
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean:
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) $(READERDIR)/filters/$(TARGET) $(TARGET)
-	-$(DEL_FILE) $(READERDIR)/filters/$(TARGET0) $(READERDIR)/filters/$(TARGET1) $(READERDIR)/filters/$(TARGET2) $(TARGETA)
-
-
-FORCE:
-
-####### Compile
-
-QREADEROBJS/striphtml.o: striphtml.cpp QREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		striphtml.h \
-		hrule.h \
-		StyleConsts.h \
-		CBuffer.h \
-		my_list.h \
-		linktype.h \
-		config.h \
-		ustring.h \
-		CFilter.h \
-		Navigation.h \
-		CExpander.h \
-		CEncoding.h \
-		QREADERINC/static.h \
-		Markups.h \
-		names.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/striphtml.o striphtml.cpp
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/HTMLFilter.omak b/noncore/apps/opie-reader/HTMLFilter.omak
deleted file mode 100644
index 1ab671f..0000000
--- a/noncore/apps/opie-reader/HTMLFilter.omak
+++ b/dev/null
@@ -1,131 +0,0 @@
-#############################################################################
-# Makefile for building libHTMLfilter.so.1.0.0
-# Generated by tmake at 15:14, 2004/05/08
-#     Project: HTMLFilter.opro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
-INCPATH	=	-IOREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libHTMLfilter.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	CFilter.h
-SOURCES =	striphtml.cpp
-OBJECTS =	OREADEROBJS/striphtml.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libHTMLfilter.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/filters/libHTMLfilter.a
-TARGETD	=	libHTMLfilter.so.1.0.0
-TARGET0	=	libHTMLfilter.so
-TARGET1	=	libHTMLfilter.so.1
-TARGET2	=	libHTMLfilter.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/plugins/reader/filters/libHTMLfilter.so.1.0.0
-
-$(QTDIR)/plugins/reader/filters/libHTMLfilter.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/filters/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: HTMLFilter.omak
-
-HTMLFilter.omak: HTMLFilter.opro
-	tmake HTMLFilter.opro -o HTMLFilter.omak
-
-dist:
-	$(TAR) HTMLFilter.opro.tar HTMLFilter.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) HTMLFilter.opro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-OREADEROBJS/striphtml.o: striphtml.cpp \
-		OREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		striphtml.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		OREADERINC/static.h \
-		Navigation.h \
-		hrule.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/striphtml.o striphtml.cpp
-
diff --git a/noncore/apps/opie-reader/HTMLFilter.wmak b/noncore/apps/opie-reader/HTMLFilter.wmak
deleted file mode 100644
index 485bb21..0000000
--- a/noncore/apps/opie-reader/HTMLFilter.wmak
+++ b/dev/null
@@ -1,131 +0,0 @@
-#############################################################################
-# Makefile for building libHTMLfilter.so.1.0.0
-# Generated by tmake at 23:23, 2004/03/09
-#     Project: HTMLFilter.wpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	gcc-2.96
-CXX	=	g++-2.96
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IWSREADERINC -I$(QTDIR)/include
-LINK	=	g++-2.96
-LFLAGS	=	-shared -Wl,-soname,libHTMLfilter.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	CFilter.h
-SOURCES =	striphtml.cpp
-OBJECTS =	WSREADEROBJS/striphtml.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libHTMLfilter.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/filters/libHTMLfilter.a
-TARGETD	=	libHTMLfilter.so.1.0.0
-TARGET0	=	libHTMLfilter.so
-TARGET1	=	libHTMLfilter.so.1
-TARGET2	=	libHTMLfilter.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/plugins/reader/filters/libHTMLfilter.so.1.0.0
-
-$(QTDIR)/plugins/reader/filters/libHTMLfilter.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/filters/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: HTMLFilter.wmak
-
-HTMLFilter.wmak: HTMLFilter.wpro
-	tmake HTMLFilter.wpro -o HTMLFilter.wmak
-
-dist:
-	$(TAR) HTMLFilter.wpro.tar HTMLFilter.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) HTMLFilter.wpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-WSREADEROBJS/striphtml.o: striphtml.cpp \
-		WSREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		striphtml.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		WSREADERINC/static.h \
-		Navigation.h \
-		hrule.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/striphtml.o striphtml.cpp
-
diff --git a/noncore/apps/opie-reader/HTMLFilter.wpro b/noncore/apps/opie-reader/HTMLFilter.wpro
deleted file mode 100644
index e0425b4..0000000
--- a/noncore/apps/opie-reader/HTMLFilter.wpro
+++ b/dev/null
@@ -1,17 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= CFilter.h
-
-SOURCES		= striphtml.cpp
-
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/filters
-TARGET		= HTMLfilter
-
-
-
-OBJECTS_DIR = WSREADEROBJS
-MOC_DIR = WSREADERMOCS
-INCLUDEPATH	+= WSREADERINC
-DEPENDPATH	+= WSREADERINC
diff --git a/noncore/apps/opie-reader/HTMLFilter.zmak b/noncore/apps/opie-reader/HTMLFilter.zmak
deleted file mode 100644
index d1af765..0000000
--- a/noncore/apps/opie-reader/HTMLFilter.zmak
+++ b/dev/null
@@ -1,131 +0,0 @@
-#############################################################################
-# Makefile for building libHTMLfilter.so.1.0.0
-# Generated by tmake at 15:17, 2004/05/08
-#     Project: HTMLFilter.zpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IZREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libHTMLfilter.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	CFilter.h
-SOURCES =	striphtml.cpp
-OBJECTS =	ZREADEROBJS/striphtml.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libHTMLfilter.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/filters/libHTMLfilter.a
-TARGETD	=	libHTMLfilter.so.1.0.0
-TARGET0	=	libHTMLfilter.so
-TARGET1	=	libHTMLfilter.so.1
-TARGET2	=	libHTMLfilter.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/plugins/reader/filters/libHTMLfilter.so.1.0.0
-
-$(QTDIR)/plugins/reader/filters/libHTMLfilter.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/filters/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/filters/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: HTMLFilter.zmak
-
-HTMLFilter.zmak: HTMLFilter.zpro
-	tmake HTMLFilter.zpro -o HTMLFilter.zmak
-
-dist:
-	$(TAR) HTMLFilter.zpro.tar HTMLFilter.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) HTMLFilter.zpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZREADEROBJS/striphtml.o: striphtml.cpp \
-		ZREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		striphtml.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		ZREADERINC/static.h \
-		Navigation.h \
-		hrule.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/striphtml.o striphtml.cpp
-
diff --git a/noncore/apps/opie-reader/HTMLFilter.zpro b/noncore/apps/opie-reader/HTMLFilter.zpro
deleted file mode 100644
index ba570b1..0000000
--- a/noncore/apps/opie-reader/HTMLFilter.zpro
+++ b/dev/null
@@ -1,17 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= CFilter.h
-
-SOURCES		= striphtml.cpp
-
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/filters
-TARGET		= HTMLfilter
-
-
-
-OBJECTS_DIR = ZREADEROBJS
-MOC_DIR = ZREADERMOCS
-INCLUDEPATH	+= ZREADERINC
-DEPENDPATH	+= ZREADERINC
diff --git a/noncore/apps/opie-reader/PluckerCodec.mak b/noncore/apps/opie-reader/PluckerCodec.mak
deleted file mode 100644
index ffd6ba8..0000000
--- a/noncore/apps/opie-reader/PluckerCodec.mak
+++ b/dev/null
@@ -1,176 +0,0 @@
-#############################################################################
-# Makefile for building: libPlucker.so.1.0.0
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:40:46 2004
-# Project:  PluckerCodec.pro
-# Template: lib
-# Command: $(QMAKE) -o PluckerCodec.mak PluckerCodec.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
-LINK     = g++
-LFLAGS   = -shared -Wl,-soname,libPlucker.so.1
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(READERDIR)/lib -lreader_pdb -lreader_pluckerbase -lreader_codec -lqt-mt -lXext -lX11 -lm -lpthread
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QREADEROBJS/
-
-####### Files
-
-HEADERS = plucker.h
-SOURCES = plucker.cpp \
-		Palm2QImage.cpp
-OBJECTS = QREADEROBJS/plucker.o \
-		QREADEROBJS/Palm2QImage.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = 
-OBJMOC = 
-DIST	   = PluckerCodec.pro
-QMAKE_TARGET = Plucker
-DESTDIR  = $(READERDIR)/codecs/
-TARGET   = libPlucker.so.1.0.0
-TARGETA	= $(READERDIR)/codecs/libPlucker.a
-TARGETD	= libPlucker.so.1.0.0
-TARGET0	= libPlucker.so
-TARGET1	= libPlucker.so.1
-TARGET2	= libPlucker.so.1.0
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: PluckerCodec.mak  $(READERDIR)/codecs/$(TARGET)
-
-$(READERDIR)/codecs/$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)  
-	test -d $(READERDIR)/codecs/ || mkdir -p $(READERDIR)/codecs/
-	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET1)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET2)
-	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/codecs/
-
-
-
-staticlib: $(TARGETA)
-
-$(TARGETA):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
-	-$(DEL_FILE) $(TARGETA) 
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-PluckerCodec.mak: PluckerCodec.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o PluckerCodec.mak PluckerCodec.pro
-qmake: 
-	@$(QMAKE) -o PluckerCodec.mak PluckerCodec.pro
-
-dist: 
-	@mkdir -p QREADEROBJS/Plucker && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/Plucker/ && ( cd `dirname QREADEROBJS/Plucker` && $(TAR) Plucker.tar Plucker && $(GZIP) Plucker.tar ) && $(MOVE) `dirname QREADEROBJS/Plucker`/Plucker.tar.gz . && $(DEL_FILE) -r QREADEROBJS/Plucker
-
-mocclean:
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean:
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET) $(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0) $(READERDIR)/codecs/$(TARGET1) $(READERDIR)/codecs/$(TARGET2) $(TARGETA)
-
-
-FORCE:
-
-####### Compile
-
-QREADEROBJS/plucker.o: plucker.cpp QREADERINC/useqpe.h \
-		plucker.h \
-		Aportis.h \
-		Palm2QImage.h \
-		QREADERINC/static.h \
-		plucker_base.h \
-		CExpander.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		hrule.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/plucker.o plucker.cpp
-
-QREADEROBJS/Palm2QImage.o: Palm2QImage.cpp QREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/Palm2QImage.o Palm2QImage.cpp
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/PluckerCodec.omak b/noncore/apps/opie-reader/PluckerCodec.omak
deleted file mode 100644
index 27a5c93..0000000
--- a/noncore/apps/opie-reader/PluckerCodec.omak
+++ b/dev/null
@@ -1,138 +0,0 @@
-#############################################################################
-# Makefile for building libPlucker.so.1.0.0
-# Generated by tmake at 15:14, 2004/05/08
-#     Project: PluckerCodec.opro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
-INCPATH	=	-IOREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libPlucker.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_pluckerbase -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	plucker.h
-SOURCES =	plucker.cpp \
-		Palm2QImage.cpp
-OBJECTS =	OREADEROBJS/plucker.o \
-		OREADEROBJS/Palm2QImage.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libPlucker.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libPlucker.a
-TARGETD	=	libPlucker.so.1.0.0
-TARGET0	=	libPlucker.so
-TARGET1	=	libPlucker.so.1
-TARGET2	=	libPlucker.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/plugins/reader/codecs/libPlucker.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libPlucker.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: PluckerCodec.omak
-
-PluckerCodec.omak: PluckerCodec.opro
-	tmake PluckerCodec.opro -o PluckerCodec.omak
-
-dist:
-	$(TAR) PluckerCodec.opro.tar PluckerCodec.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) PluckerCodec.opro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-OREADEROBJS/plucker.o: plucker.cpp \
-		OREADERINC/useqpe.h \
-		plucker.h \
-		plucker_base.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		hrule.h \
-		Aportis.h \
-		Palm2QImage.h \
-		OREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/plucker.o plucker.cpp
-
-OREADEROBJS/Palm2QImage.o: Palm2QImage.cpp \
-		OREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/Palm2QImage.o Palm2QImage.cpp
-
diff --git a/noncore/apps/opie-reader/PluckerCodec.wmak b/noncore/apps/opie-reader/PluckerCodec.wmak
deleted file mode 100644
index 6c1f37a..0000000
--- a/noncore/apps/opie-reader/PluckerCodec.wmak
+++ b/dev/null
@@ -1,138 +0,0 @@
-#############################################################################
-# Makefile for building libPlucker.so.1.0.0
-# Generated by tmake at 23:23, 2004/03/09
-#     Project: PluckerCodec.wpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	gcc-2.96
-CXX	=	g++-2.96
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IWSREADERINC -I$(QTDIR)/include
-LINK	=	g++-2.96
-LFLAGS	=	-shared -Wl,-soname,libPlucker.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_pluckerbase -lreader_codec -lqte
-AR	=	ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	plucker.h
-SOURCES =	plucker.cpp \
-		Palm2QImage.cpp
-OBJECTS =	WSREADEROBJS/plucker.o \
-		WSREADEROBJS/Palm2QImage.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libPlucker.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libPlucker.a
-TARGETD	=	libPlucker.so.1.0.0
-TARGET0	=	libPlucker.so
-TARGET1	=	libPlucker.so.1
-TARGET2	=	libPlucker.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/plugins/reader/codecs/libPlucker.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libPlucker.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: PluckerCodec.wmak
-
-PluckerCodec.wmak: PluckerCodec.wpro
-	tmake PluckerCodec.wpro -o PluckerCodec.wmak
-
-dist:
-	$(TAR) PluckerCodec.wpro.tar PluckerCodec.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) PluckerCodec.wpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-WSREADEROBJS/plucker.o: plucker.cpp \
-		WSREADERINC/useqpe.h \
-		plucker.h \
-		plucker_base.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		hrule.h \
-		Aportis.h \
-		Palm2QImage.h \
-		WSREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/plucker.o plucker.cpp
-
-WSREADEROBJS/Palm2QImage.o: Palm2QImage.cpp \
-		WSREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/Palm2QImage.o Palm2QImage.cpp
-
diff --git a/noncore/apps/opie-reader/PluckerCodec.wpro b/noncore/apps/opie-reader/PluckerCodec.wpro
deleted file mode 100644
index 8f80a8b..0000000
--- a/noncore/apps/opie-reader/PluckerCodec.wpro
+++ b/dev/null
@@ -1,16 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= plucker.h
-
-SOURCES		= plucker.cpp \
-                  Palm2QImage.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/codecs
-TARGET		= Plucker
-LIBS            += -lreader_pdb -lreader_pluckerbase -lreader_codec
-
-OBJECTS_DIR = WSREADEROBJS
-MOC_DIR = WSREADERMOCS
-INCLUDEPATH	+= WSREADERINC
-DEPENDPATH	+= WSREADERINC
diff --git a/noncore/apps/opie-reader/PluckerCodec.zmak b/noncore/apps/opie-reader/PluckerCodec.zmak
deleted file mode 100644
index 9aa5e39..0000000
--- a/noncore/apps/opie-reader/PluckerCodec.zmak
+++ b/dev/null
@@ -1,138 +0,0 @@
-#############################################################################
-# Makefile for building libPlucker.so.1.0.0
-# Generated by tmake at 15:17, 2004/05/08
-#     Project: PluckerCodec.zpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IZREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libPlucker.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_pluckerbase -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	plucker.h
-SOURCES =	plucker.cpp \
-		Palm2QImage.cpp
-OBJECTS =	ZREADEROBJS/plucker.o \
-		ZREADEROBJS/Palm2QImage.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libPlucker.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libPlucker.a
-TARGETD	=	libPlucker.so.1.0.0
-TARGET0	=	libPlucker.so
-TARGET1	=	libPlucker.so.1
-TARGET2	=	libPlucker.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/plugins/reader/codecs/libPlucker.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libPlucker.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: PluckerCodec.zmak
-
-PluckerCodec.zmak: PluckerCodec.zpro
-	tmake PluckerCodec.zpro -o PluckerCodec.zmak
-
-dist:
-	$(TAR) PluckerCodec.zpro.tar PluckerCodec.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) PluckerCodec.zpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZREADEROBJS/plucker.o: plucker.cpp \
-		ZREADERINC/useqpe.h \
-		plucker.h \
-		plucker_base.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		hrule.h \
-		Aportis.h \
-		Palm2QImage.h \
-		ZREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/plucker.o plucker.cpp
-
-ZREADEROBJS/Palm2QImage.o: Palm2QImage.cpp \
-		ZREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/Palm2QImage.o Palm2QImage.cpp
-
diff --git a/noncore/apps/opie-reader/PluckerCodec.zpro b/noncore/apps/opie-reader/PluckerCodec.zpro
deleted file mode 100644
index e462d96..0000000
--- a/noncore/apps/opie-reader/PluckerCodec.zpro
+++ b/dev/null
@@ -1,16 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= plucker.h
-
-SOURCES		= plucker.cpp \
-                  Palm2QImage.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/codecs
-TARGET		= Plucker
-LIBS            += -lreader_pdb -lreader_pluckerbase -lreader_codec
-
-OBJECTS_DIR = ZREADEROBJS
-MOC_DIR = ZREADERMOCS
-INCLUDEPATH	+= ZREADERINC
-DEPENDPATH	+= ZREADERINC
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp
index 63d1fb0..ec7a29c 100644
--- a/noncore/apps/opie-reader/QTReaderApp.cpp
+++ b/noncore/apps/opie-reader/QTReaderApp.cpp
@@ -1,166 +1,165 @@
 /**********************************************************************

 ** Copyright (C) 2000 Trolltech AS.  Allrights reserved.

 **

 ** This file is part of Qt Palmtop Environment.

 **

 ** This file may be distributed and/or modified under the terms of the

 ** GNU General Public License version 2 as published by the Free Software

 ** Foundation and appearing in the file LICENSE.GPL included in the

 ** packaging of this file.

 **

 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE

 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

 **

 ** See http://www.trolltech.com/gpl/ for GPL licensing information.

 **

 ** Contact info@trolltech.com if any conditions of this licensing are

 ** not clear to you.

 **

 **********************************************************************/

 #include "useqpe.h"

 #include <qregexp.h>

 #include <qclipboard.h>

 #include <qwidgetstack.h>

 #ifdef USEQPE

 #include <qpe/qpemenubar.h>

 #include <qpe/qpetoolbar.h>

 #endif

 #include <qmenubar.h>

 #include <qtoolbar.h>

 #ifdef USEQPE

 #include <qpe/menubutton.h>

 #endif

 #include <qcombobox.h>

 #include <qpopupmenu.h>

 #include <qaction.h>

 #include <qapplication.h>

 #include <qlineedit.h>

 #include <qtoolbutton.h>

 #include <qspinbox.h>

 #include <qobjectlist.h>

 #include <qstatusbar.h>

 #ifdef USEQPE

 #include <qpe/global.h>

 #include <qpe/applnk.h>

 #endif

 #include <qfileinfo.h>

 #include <stdlib.h> //getenv

 #include <qprogressbar.h>

 #ifdef USEQPE

 #include <qpe/config.h>

 #endif

 #include <qbuttongroup.h>

 #include <qradiobutton.h>

 #ifdef USEQPE

 #include <qpe/qcopenvelope_qws.h>

 #endif

 #include "QTReader.h"

 #include "GraphicWin.h"

 #include "Bkmks.h"

 #include "cbkmkselector.h"

 #include "infowin.h"

 #include "ToolbarPrefs.h"

 #include "Prefs.h"

 #include "CAnnoEdit.h"

 #include "QFloatBar.h"

 #include "FixedFont.h"

 #include "URLDialog.h"

 #include "util.h"

 #include <qfontdatabase.h>

-#include "opie.h"

 #ifdef USEQPE

 #include <qpe/resource.h>

 #ifdef OPIE

 //#include <qpe/applnk.h>

 #include <opie2/ofiledialog.h>

 using namespace Opie::Ui;

 #else

 #include "fileBrowser.h"

 #endif

 #else

 #include "qfiledialog.h"

 #endif

 

 #include "QTReaderApp.h"

 #include "CDrawBuffer.h"

 #include "Filedata.h"

 #include "useqpe.h"

 #include "names.h"

 #include "CEncoding_tables.h"

 #include "CloseDialog.h"

 

 #include "ButtonPrefs.h"

 

 bool CheckVersion(int&, int&, char&);

 

 #ifdef _WINDOWS

 #define PICDIR "c:\\uqtreader\\pics\\"

 #else

 #ifdef USEQPE

 #define USEMSGS

 #define PICDIR "opie-reader/"

 #else

 //#define PICDIR "/home/tim/uqtreader/pics/"

 QString picdir()

 {

   QString hd(getenv("READERDIR"));

   return hd + "/pics";

 }

 #define PICDIR picdir()

 #endif

 #endif

 

 unsigned long QTReaderApp::m_uid = 0;

 

 void QTReaderApp::setScrollState(bool _b) { m_scrollButton->setOn(_b); }

 

 #ifdef USEQPE

 #define geticon(iconname) Resource::loadPixmap( iconname )

 #define getmyicon(iconname) Resource::loadPixmap( PICDIR iconname )

 #else

 //#define geticon(iconname) QPixmap(PICDIR iconname ".png")

 #define geticon(iconname) QPixmap(PICDIR +"/"+iconname+".png")

 #define getmyicon(iconname) geticon(iconname)

 //#define geticon(iconname) QIconSet( QPixmap(PICDIR iconname) )

 #endif

 

 #ifndef _WINDOWS

 #include <unistd.h>

 #endif

 #include <stddef.h>

 #ifndef _WINDOWS

 #include <dirent.h>

 #endif

 

 void QTReaderApp::listBkmkFiles()

 {

     bkmkselector->clear();

     bkmkselector->setText("Cancel");

 #ifndef USEQPE

     int cnt = 0;

 

     QDir d = QDir::home();                      // "/"

     if ( !d.cd(APPDIR) ) {                       // "/tmp"

         qWarning( "Cannot find the \"~/" APPDIR "\" directory" );

 		d = QDir::home();

 		d.mkdir(APPDIR);

 		d.cd(APPDIR);

     }

 

 

   

 		

         d.setFilter( QDir::Files | QDir::NoSymLinks );

 //        d.setSorting( QDir::Size | QDir::Reversed );

 

         const QFileInfoList *list = d.entryInfoList();

         QFileInfoListIterator it( *list );      // create list iterator

         QFileInfo *fi;                          // pointer for traversing

 

         while ( (fi=it.current()) ) {           // for each file...

   

 		    bkmkselector->insertItem(fi->fileName());

 		    cnt++;

 			

 			//qDebug( "%10li %s", fi->size(), fi->fileName().data() );

             ++it;                               // goto next list element

diff --git a/noncore/apps/opie-reader/WeaselCodec.mak b/noncore/apps/opie-reader/WeaselCodec.mak
deleted file mode 100644
index 3bac5b9..0000000
--- a/noncore/apps/opie-reader/WeaselCodec.mak
+++ b/dev/null
@@ -1,166 +0,0 @@
-#############################################################################
-# Makefile for building: libWeasel.so.1.0.0
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:43:37 2004
-# Project:  WeaselCodec.pro
-# Template: lib
-# Command: $(QMAKE) -o WeaselCodec.mak WeaselCodec.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
-LINK     = g++
-LFLAGS   = -shared -Wl,-soname,libWeasel.so.1
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(READERDIR)/lib -lreader_pdb -lreader_codec -lqt-mt -lXext -lX11 -lm -lpthread
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QREADEROBJS/
-
-####### Files
-
-HEADERS = ztxt.h
-SOURCES = ztxt.cpp
-OBJECTS = QREADEROBJS/ztxt.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = 
-OBJMOC = 
-DIST	   = WeaselCodec.pro
-QMAKE_TARGET = Weasel
-DESTDIR  = $(READERDIR)/codecs/
-TARGET   = libWeasel.so.1.0.0
-TARGETA	= $(READERDIR)/codecs/libWeasel.a
-TARGETD	= libWeasel.so.1.0.0
-TARGET0	= libWeasel.so
-TARGET1	= libWeasel.so.1
-TARGET2	= libWeasel.so.1.0
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: WeaselCodec.mak  $(READERDIR)/codecs/$(TARGET)
-
-$(READERDIR)/codecs/$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)  
-	test -d $(READERDIR)/codecs/ || mkdir -p $(READERDIR)/codecs/
-	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET1)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET2)
-	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/codecs/
-
-
-
-staticlib: $(TARGETA)
-
-$(TARGETA):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
-	-$(DEL_FILE) $(TARGETA) 
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-WeaselCodec.mak: WeaselCodec.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o WeaselCodec.mak WeaselCodec.pro
-qmake: 
-	@$(QMAKE) -o WeaselCodec.mak WeaselCodec.pro
-
-dist: 
-	@mkdir -p QREADEROBJS/Weasel && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/Weasel/ && ( cd `dirname QREADEROBJS/Weasel` && $(TAR) Weasel.tar Weasel && $(GZIP) Weasel.tar ) && $(MOVE) `dirname QREADEROBJS/Weasel`/Weasel.tar.gz . && $(DEL_FILE) -r QREADEROBJS/Weasel
-
-mocclean:
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean:
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET) $(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0) $(READERDIR)/codecs/$(TARGET1) $(READERDIR)/codecs/$(TARGET2) $(TARGETA)
-
-
-FORCE:
-
-####### Compile
-
-QREADEROBJS/ztxt.o: ztxt.cpp ztxt.h \
-		my_list.h \
-		Bkmks.h \
-		QREADERINC/static.h \
-		CExpander.h \
-		pdb.h \
-		QREADERINC/useqpe.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h \
-		Filedata.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/ztxt.o ztxt.cpp
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/WeaselCodec.omak b/noncore/apps/opie-reader/WeaselCodec.omak
deleted file mode 100644
index c3976c7..0000000
--- a/noncore/apps/opie-reader/WeaselCodec.omak
+++ b/dev/null
@@ -1,127 +0,0 @@
-#############################################################################
-# Makefile for building libWeasel.so.1.0.0
-# Generated by tmake at 15:14, 2004/05/08
-#     Project: WeaselCodec.opro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
-INCPATH	=	-IOREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libWeasel.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	ztxt.h
-SOURCES =	ztxt.cpp
-OBJECTS =	OREADEROBJS/ztxt.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libWeasel.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libWeasel.a
-TARGETD	=	libWeasel.so.1.0.0
-TARGET0	=	libWeasel.so
-TARGET1	=	libWeasel.so.1
-TARGET2	=	libWeasel.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/plugins/reader/codecs/libWeasel.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libWeasel.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: WeaselCodec.omak
-
-WeaselCodec.omak: WeaselCodec.opro
-	tmake WeaselCodec.opro -o WeaselCodec.omak
-
-dist:
-	$(TAR) WeaselCodec.opro.tar WeaselCodec.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) WeaselCodec.opro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-OREADEROBJS/ztxt.o: ztxt.cpp \
-		ztxt.h \
-		CExpander.h \
-		OREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		pdb.h \
-		my_list.h \
-		Bkmks.h \
-		Filedata.h \
-		OREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/ztxt.o ztxt.cpp
-
diff --git a/noncore/apps/opie-reader/WeaselCodec.wmak b/noncore/apps/opie-reader/WeaselCodec.wmak
deleted file mode 100644
index fd41b8a..0000000
--- a/noncore/apps/opie-reader/WeaselCodec.wmak
+++ b/dev/null
@@ -1,127 +0,0 @@
-#############################################################################
-# Makefile for building libWeasel.so.1.0.0
-# Generated by tmake at 23:23, 2004/03/09
-#     Project: WeaselCodec.wpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	gcc-2.96
-CXX	=	g++-2.96
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IWSREADERINC -I$(QTDIR)/include
-LINK	=	g++-2.96
-LFLAGS	=	-shared -Wl,-soname,libWeasel.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
-AR	=	ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	ztxt.h
-SOURCES =	ztxt.cpp
-OBJECTS =	WSREADEROBJS/ztxt.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libWeasel.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libWeasel.a
-TARGETD	=	libWeasel.so.1.0.0
-TARGET0	=	libWeasel.so
-TARGET1	=	libWeasel.so.1
-TARGET2	=	libWeasel.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/plugins/reader/codecs/libWeasel.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libWeasel.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: WeaselCodec.wmak
-
-WeaselCodec.wmak: WeaselCodec.wpro
-	tmake WeaselCodec.wpro -o WeaselCodec.wmak
-
-dist:
-	$(TAR) WeaselCodec.wpro.tar WeaselCodec.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) WeaselCodec.wpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-WSREADEROBJS/ztxt.o: ztxt.cpp \
-		ztxt.h \
-		CExpander.h \
-		WSREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		pdb.h \
-		my_list.h \
-		Bkmks.h \
-		Filedata.h \
-		WSREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/ztxt.o ztxt.cpp
-
diff --git a/noncore/apps/opie-reader/WeaselCodec.wpro b/noncore/apps/opie-reader/WeaselCodec.wpro
deleted file mode 100644
index b71eefb..0000000
--- a/noncore/apps/opie-reader/WeaselCodec.wpro
+++ b/dev/null
@@ -1,15 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= ztxt.h
-
-SOURCES		= ztxt.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/codecs
-TARGET		= Weasel
-LIBS            += -lreader_pdb -lreader_codec
-
-OBJECTS_DIR = WSREADEROBJS
-MOC_DIR = WSREADERMOCS
-INCLUDEPATH	+= WSREADERINC
-DEPENDPATH	+= WSREADERINC
diff --git a/noncore/apps/opie-reader/WeaselCodec.zmak b/noncore/apps/opie-reader/WeaselCodec.zmak
deleted file mode 100644
index 50a54f7..0000000
--- a/noncore/apps/opie-reader/WeaselCodec.zmak
+++ b/dev/null
@@ -1,127 +0,0 @@
-#############################################################################
-# Makefile for building libWeasel.so.1.0.0
-# Generated by tmake at 15:17, 2004/05/08
-#     Project: WeaselCodec.zpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IZREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libWeasel.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	ztxt.h
-SOURCES =	ztxt.cpp
-OBJECTS =	ZREADEROBJS/ztxt.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libWeasel.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libWeasel.a
-TARGETD	=	libWeasel.so.1.0.0
-TARGET0	=	libWeasel.so
-TARGET1	=	libWeasel.so.1
-TARGET2	=	libWeasel.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/plugins/reader/codecs/libWeasel.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libWeasel.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: WeaselCodec.zmak
-
-WeaselCodec.zmak: WeaselCodec.zpro
-	tmake WeaselCodec.zpro -o WeaselCodec.zmak
-
-dist:
-	$(TAR) WeaselCodec.zpro.tar WeaselCodec.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) WeaselCodec.zpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZREADEROBJS/ztxt.o: ztxt.cpp \
-		ztxt.h \
-		CExpander.h \
-		ZREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		pdb.h \
-		my_list.h \
-		Bkmks.h \
-		Filedata.h \
-		ZREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/ztxt.o ztxt.cpp
-
diff --git a/noncore/apps/opie-reader/WeaselCodec.zpro b/noncore/apps/opie-reader/WeaselCodec.zpro
deleted file mode 100644
index 1ab1553..0000000
--- a/noncore/apps/opie-reader/WeaselCodec.zpro
+++ b/dev/null
@@ -1,15 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= ztxt.h
-
-SOURCES		= ztxt.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/codecs
-TARGET		= Weasel
-LIBS            += -lreader_pdb -lreader_codec
-
-OBJECTS_DIR = ZREADEROBJS
-MOC_DIR = ZREADERMOCS
-INCLUDEPATH	+= ZREADERINC
-DEPENDPATH	+= ZREADERINC
diff --git a/noncore/apps/opie-reader/codeclib.mak b/noncore/apps/opie-reader/codeclib.mak
deleted file mode 100644
index bfdd7bb..0000000
--- a/noncore/apps/opie-reader/codeclib.mak
+++ b/dev/null
@@ -1,195 +0,0 @@
-#############################################################################
-# Makefile for building: libreader_codec.so.1.0.0
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:37:45 2004
-# Project:  codeclib.pro
-# Template: lib
-# Command: $(QMAKE) -o codeclib.mak codeclib.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
-LINK     = g++
-LFLAGS   = -shared -Wl,-soname,libreader_codec.so.1
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm -lpthread
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QREADEROBJS/
-
-####### Files
-
-HEADERS = pdb.h
-SOURCES = CExpander.cpp \
-		CBuffer.cpp \
-		StyleConsts.cpp \
-		hrule.cpp \
-		Navigation.cpp \
-		Bkmks.cpp
-OBJECTS = QREADEROBJS/CExpander.o \
-		QREADEROBJS/CBuffer.o \
-		QREADEROBJS/StyleConsts.o \
-		QREADEROBJS/hrule.o \
-		QREADEROBJS/Navigation.o \
-		QREADEROBJS/Bkmks.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = 
-OBJMOC = 
-DIST	   = codeclib.pro
-QMAKE_TARGET = reader_codec
-DESTDIR  = $(READERDIR)/lib/
-TARGET   = libreader_codec.so.1.0.0
-TARGETA	= $(READERDIR)/lib/libreader_codec.a
-TARGETD	= libreader_codec.so.1.0.0
-TARGET0	= libreader_codec.so
-TARGET1	= libreader_codec.so.1
-TARGET2	= libreader_codec.so.1.0
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: codeclib.mak  $(READERDIR)/lib/$(TARGET)
-
-$(READERDIR)/lib/$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)  
-	test -d $(READERDIR)/lib/ || mkdir -p $(READERDIR)/lib/
-	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET0)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET1)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET2)
-	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/lib/
-
-
-
-staticlib: $(TARGETA)
-
-$(TARGETA):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
-	-$(DEL_FILE) $(TARGETA) 
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-codeclib.mak: codeclib.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o codeclib.mak codeclib.pro
-qmake: 
-	@$(QMAKE) -o codeclib.mak codeclib.pro
-
-dist: 
-	@mkdir -p QREADEROBJS/reader_codec && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/reader_codec/ && ( cd `dirname QREADEROBJS/reader_codec` && $(TAR) reader_codec.tar reader_codec && $(GZIP) reader_codec.tar ) && $(MOVE) `dirname QREADEROBJS/reader_codec`/reader_codec.tar.gz . && $(DEL_FILE) -r QREADEROBJS/reader_codec
-
-mocclean:
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean:
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET) $(TARGET)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET0) $(READERDIR)/lib/$(TARGET1) $(READERDIR)/lib/$(TARGET2) $(TARGETA)
-
-
-FORCE:
-
-####### Compile
-
-QREADEROBJS/CExpander.o: CExpander.cpp CExpander.h \
-		QREADERINC/useqpe.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CExpander.o CExpander.cpp
-
-QREADEROBJS/CBuffer.o: CBuffer.cpp CBuffer.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CBuffer.o CBuffer.cpp
-
-QREADEROBJS/StyleConsts.o: StyleConsts.cpp StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/StyleConsts.o StyleConsts.cpp
-
-QREADEROBJS/hrule.o: hrule.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/hrule.o hrule.cpp
-
-QREADEROBJS/Navigation.o: Navigation.cpp Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/Navigation.o Navigation.cpp
-
-QREADEROBJS/Bkmks.o: Bkmks.cpp Bkmks.h \
-		StyleConsts.h \
-		Markups.h \
-		my_list.h \
-		version.h \
-		names.h \
-		config.h \
-		Filedata.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/Bkmks.o Bkmks.cpp
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/codeclib.omak b/noncore/apps/opie-reader/codeclib.omak
deleted file mode 100644
index 1ea5fbc..0000000
--- a/noncore/apps/opie-reader/codeclib.omak
+++ b/dev/null
@@ -1,160 +0,0 @@
-#############################################################################
-# Makefile for building libreader_codec.so.1.0.0
-# Generated by tmake at 15:14, 2004/05/08
-#     Project: codeclib.opro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
-INCPATH	=	-IOREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libreader_codec.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	pdb.h
-SOURCES =	CExpander.cpp \
-		CBuffer.cpp \
-		StyleConsts.cpp \
-		hrule.cpp \
-		Navigation.cpp \
-		Bkmks.cpp
-OBJECTS =	OREADEROBJS/CExpander.o \
-		OREADEROBJS/CBuffer.o \
-		OREADEROBJS/StyleConsts.o \
-		OREADEROBJS/hrule.o \
-		OREADEROBJS/Navigation.o \
-		OREADEROBJS/Bkmks.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libreader_codec.so.1.0.0
-TARGETA	=	$(QTDIR)/lib/libreader_codec.a
-TARGETD	=	libreader_codec.so.1.0.0
-TARGET0	=	libreader_codec.so
-TARGET1	=	libreader_codec.so.1
-TARGET2	=	libreader_codec.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/lib/libreader_codec.so.1.0.0
-
-$(QTDIR)/lib/libreader_codec.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/lib/$(TARGET)
-	-rm -f $(QTDIR)/lib/$(TARGET0)
-	-rm -f $(QTDIR)/lib/$(TARGET1)
-	-rm -f $(QTDIR)/lib/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: codeclib.omak
-
-codeclib.omak: codeclib.opro
-	tmake codeclib.opro -o codeclib.omak
-
-dist:
-	$(TAR) codeclib.opro.tar codeclib.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) codeclib.opro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-OREADEROBJS/CExpander.o: CExpander.cpp \
-		CExpander.h \
-		OREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CExpander.o CExpander.cpp
-
-OREADEROBJS/CBuffer.o: CBuffer.cpp \
-		CBuffer.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CBuffer.o CBuffer.cpp
-
-OREADEROBJS/StyleConsts.o: StyleConsts.cpp \
-		StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/StyleConsts.o StyleConsts.cpp
-
-OREADEROBJS/hrule.o: hrule.cpp
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/hrule.o hrule.cpp
-
-OREADEROBJS/Navigation.o: Navigation.cpp \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/Navigation.o Navigation.cpp
-
-OREADEROBJS/Bkmks.o: Bkmks.cpp \
-		Bkmks.h \
-		config.h \
-		ustring.h \
-		Filedata.h \
-		StyleConsts.h \
-		Markups.h \
-		my_list.h \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/Bkmks.o Bkmks.cpp
-
diff --git a/noncore/apps/opie-reader/codeclib.wmak b/noncore/apps/opie-reader/codeclib.wmak
deleted file mode 100644
index ea09e49..0000000
--- a/noncore/apps/opie-reader/codeclib.wmak
+++ b/dev/null
@@ -1,160 +0,0 @@
-#############################################################################
-# Makefile for building libreader_codec.so.1.0.0
-# Generated by tmake at 23:23, 2004/03/09
-#     Project: codeclib.wpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	gcc-2.96
-CXX	=	g++-2.96
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IWSREADERINC -I$(QTDIR)/include
-LINK	=	g++-2.96
-LFLAGS	=	-shared -Wl,-soname,libreader_codec.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	pdb.h
-SOURCES =	CExpander.cpp \
-		CBuffer.cpp \
-		StyleConsts.cpp \
-		hrule.cpp \
-		Navigation.cpp \
-		Bkmks.cpp
-OBJECTS =	WSREADEROBJS/CExpander.o \
-		WSREADEROBJS/CBuffer.o \
-		WSREADEROBJS/StyleConsts.o \
-		WSREADEROBJS/hrule.o \
-		WSREADEROBJS/Navigation.o \
-		WSREADEROBJS/Bkmks.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libreader_codec.so.1.0.0
-TARGETA	=	$(QTDIR)/lib/libreader_codec.a
-TARGETD	=	libreader_codec.so.1.0.0
-TARGET0	=	libreader_codec.so
-TARGET1	=	libreader_codec.so.1
-TARGET2	=	libreader_codec.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/lib/libreader_codec.so.1.0.0
-
-$(QTDIR)/lib/libreader_codec.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/lib/$(TARGET)
-	-rm -f $(QTDIR)/lib/$(TARGET0)
-	-rm -f $(QTDIR)/lib/$(TARGET1)
-	-rm -f $(QTDIR)/lib/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: codeclib.wmak
-
-codeclib.wmak: codeclib.wpro
-	tmake codeclib.wpro -o codeclib.wmak
-
-dist:
-	$(TAR) codeclib.wpro.tar codeclib.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) codeclib.wpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-WSREADEROBJS/CExpander.o: CExpander.cpp \
-		CExpander.h \
-		WSREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CExpander.o CExpander.cpp
-
-WSREADEROBJS/CBuffer.o: CBuffer.cpp \
-		CBuffer.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CBuffer.o CBuffer.cpp
-
-WSREADEROBJS/StyleConsts.o: StyleConsts.cpp \
-		StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/StyleConsts.o StyleConsts.cpp
-
-WSREADEROBJS/hrule.o: hrule.cpp
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/hrule.o hrule.cpp
-
-WSREADEROBJS/Navigation.o: Navigation.cpp \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/Navigation.o Navigation.cpp
-
-WSREADEROBJS/Bkmks.o: Bkmks.cpp \
-		Bkmks.h \
-		config.h \
-		ustring.h \
-		Filedata.h \
-		StyleConsts.h \
-		Markups.h \
-		my_list.h \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/Bkmks.o Bkmks.cpp
-
diff --git a/noncore/apps/opie-reader/codeclib.wpro b/noncore/apps/opie-reader/codeclib.wpro
deleted file mode 100644
index f4a467a..0000000
--- a/noncore/apps/opie-reader/codeclib.wpro
+++ b/dev/null
@@ -1,15 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= pdb.h
-
-SOURCES		= CExpander.cpp CBuffer.cpp StyleConsts.cpp \
-		  hrule.cpp Navigation.cpp Bkmks.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/lib
-TARGET		= reader_codec
-
-OBJECTS_DIR = WSREADEROBJS
-MOC_DIR = WSREADERMOCS
-INCLUDEPATH	+= WSREADERINC
-DEPENDPATH	+= WSREADERINC
diff --git a/noncore/apps/opie-reader/codeclib.zmak b/noncore/apps/opie-reader/codeclib.zmak
deleted file mode 100644
index d81d347..0000000
--- a/noncore/apps/opie-reader/codeclib.zmak
+++ b/dev/null
@@ -1,160 +0,0 @@
-#############################################################################
-# Makefile for building libreader_codec.so.1.0.0
-# Generated by tmake at 15:17, 2004/05/08
-#     Project: codeclib.zpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IZREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libreader_codec.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	pdb.h
-SOURCES =	CExpander.cpp \
-		CBuffer.cpp \
-		StyleConsts.cpp \
-		hrule.cpp \
-		Navigation.cpp \
-		Bkmks.cpp
-OBJECTS =	ZREADEROBJS/CExpander.o \
-		ZREADEROBJS/CBuffer.o \
-		ZREADEROBJS/StyleConsts.o \
-		ZREADEROBJS/hrule.o \
-		ZREADEROBJS/Navigation.o \
-		ZREADEROBJS/Bkmks.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libreader_codec.so.1.0.0
-TARGETA	=	$(QTDIR)/lib/libreader_codec.a
-TARGETD	=	libreader_codec.so.1.0.0
-TARGET0	=	libreader_codec.so
-TARGET1	=	libreader_codec.so.1
-TARGET2	=	libreader_codec.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/lib/libreader_codec.so.1.0.0
-
-$(QTDIR)/lib/libreader_codec.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/lib/$(TARGET)
-	-rm -f $(QTDIR)/lib/$(TARGET0)
-	-rm -f $(QTDIR)/lib/$(TARGET1)
-	-rm -f $(QTDIR)/lib/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: codeclib.zmak
-
-codeclib.zmak: codeclib.zpro
-	tmake codeclib.zpro -o codeclib.zmak
-
-dist:
-	$(TAR) codeclib.zpro.tar codeclib.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) codeclib.zpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZREADEROBJS/CExpander.o: CExpander.cpp \
-		CExpander.h \
-		ZREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CExpander.o CExpander.cpp
-
-ZREADEROBJS/CBuffer.o: CBuffer.cpp \
-		CBuffer.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CBuffer.o CBuffer.cpp
-
-ZREADEROBJS/StyleConsts.o: StyleConsts.cpp \
-		StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/StyleConsts.o StyleConsts.cpp
-
-ZREADEROBJS/hrule.o: hrule.cpp
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/hrule.o hrule.cpp
-
-ZREADEROBJS/Navigation.o: Navigation.cpp \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/Navigation.o Navigation.cpp
-
-ZREADEROBJS/Bkmks.o: Bkmks.cpp \
-		Bkmks.h \
-		config.h \
-		ustring.h \
-		Filedata.h \
-		StyleConsts.h \
-		Markups.h \
-		my_list.h \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/Bkmks.o Bkmks.cpp
-
diff --git a/noncore/apps/opie-reader/codeclib.zpro b/noncore/apps/opie-reader/codeclib.zpro
deleted file mode 100644
index 93908c6..0000000
--- a/noncore/apps/opie-reader/codeclib.zpro
+++ b/dev/null
@@ -1,15 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= pdb.h
-
-SOURCES		= CExpander.cpp CBuffer.cpp StyleConsts.cpp \
-		  hrule.cpp Navigation.cpp Bkmks.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/lib
-TARGET		= reader_codec
-
-OBJECTS_DIR = ZREADEROBJS
-MOC_DIR = ZREADERMOCS
-INCLUDEPATH	+= ZREADERINC
-DEPENDPATH	+= ZREADERINC
diff --git a/noncore/apps/opie-reader/iSiloCodec.mak b/noncore/apps/opie-reader/iSiloCodec.mak
deleted file mode 100644
index d0ef46e..0000000
--- a/noncore/apps/opie-reader/iSiloCodec.mak
+++ b/dev/null
@@ -1,162 +0,0 @@
-#############################################################################
-# Makefile for building: libiSilo.so.1.0.0
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:39:31 2004
-# Project:  iSiloCodec.pro
-# Template: lib
-# Command: $(QMAKE) -o iSiloCodec.mak iSiloCodec.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
-LINK     = g++
-LFLAGS   = -shared -Wl,-soname,libiSilo.so.1
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(READERDIR)/lib -lreader_pdb -lreader_codec -lqt-mt -lXext -lX11 -lm -lpthread
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QREADEROBJS/
-
-####### Files
-
-HEADERS = 
-SOURCES = iSilo.cpp
-OBJECTS = QREADEROBJS/iSilo.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = 
-OBJMOC = 
-DIST	   = iSiloCodec.pro
-QMAKE_TARGET = iSilo
-DESTDIR  = $(READERDIR)/codecs/
-TARGET   = libiSilo.so.1.0.0
-TARGETA	= $(READERDIR)/codecs/libiSilo.a
-TARGETD	= libiSilo.so.1.0.0
-TARGET0	= libiSilo.so
-TARGET1	= libiSilo.so.1
-TARGET2	= libiSilo.so.1.0
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: iSiloCodec.mak  $(READERDIR)/codecs/$(TARGET)
-
-$(READERDIR)/codecs/$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)  
-	test -d $(READERDIR)/codecs/ || mkdir -p $(READERDIR)/codecs/
-	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET1)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET2)
-	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/codecs/
-
-
-
-staticlib: $(TARGETA)
-
-$(TARGETA):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
-	-$(DEL_FILE) $(TARGETA) 
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-iSiloCodec.mak: iSiloCodec.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o iSiloCodec.mak iSiloCodec.pro
-qmake: 
-	@$(QMAKE) -o iSiloCodec.mak iSiloCodec.pro
-
-dist: 
-	@mkdir -p QREADEROBJS/iSilo && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/iSilo/ && ( cd `dirname QREADEROBJS/iSilo` && $(TAR) iSilo.tar iSilo && $(GZIP) iSilo.tar ) && $(MOVE) `dirname QREADEROBJS/iSilo`/iSilo.tar.gz . && $(DEL_FILE) -r QREADEROBJS/iSilo
-
-mocclean:
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean:
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET) $(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0) $(READERDIR)/codecs/$(TARGET1) $(READERDIR)/codecs/$(TARGET2) $(TARGETA)
-
-
-FORCE:
-
-####### Compile
-
-QREADEROBJS/iSilo.o: iSilo.cpp iSilo.h \
-		pdb.h \
-		QREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/iSilo.o iSilo.cpp
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/iSiloCodec.omak b/noncore/apps/opie-reader/iSiloCodec.omak
deleted file mode 100644
index a3f1d90..0000000
--- a/noncore/apps/opie-reader/iSiloCodec.omak
+++ b/dev/null
@@ -1,123 +0,0 @@
-#############################################################################
-# Makefile for building libiSilo.so.1.0.0
-# Generated by tmake at 15:14, 2004/05/08
-#     Project: iSiloCodec.opro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
-INCPATH	=	-IOREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libiSilo.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	
-SOURCES =	iSilo.cpp
-OBJECTS =	OREADEROBJS/iSilo.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libiSilo.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libiSilo.a
-TARGETD	=	libiSilo.so.1.0.0
-TARGET0	=	libiSilo.so
-TARGET1	=	libiSilo.so.1
-TARGET2	=	libiSilo.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/plugins/reader/codecs/libiSilo.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libiSilo.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: iSiloCodec.omak
-
-iSiloCodec.omak: iSiloCodec.opro
-	tmake iSiloCodec.opro -o iSiloCodec.omak
-
-dist:
-	$(TAR) iSiloCodec.opro.tar iSiloCodec.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) iSiloCodec.opro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-OREADEROBJS/iSilo.o: iSilo.cpp \
-		iSilo.h \
-		pdb.h \
-		OREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/iSilo.o iSilo.cpp
-
diff --git a/noncore/apps/opie-reader/iSiloCodec.wmak b/noncore/apps/opie-reader/iSiloCodec.wmak
deleted file mode 100644
index 452b220..0000000
--- a/noncore/apps/opie-reader/iSiloCodec.wmak
+++ b/dev/null
@@ -1,123 +0,0 @@
-#############################################################################
-# Makefile for building libiSilo.so.1.0.0
-# Generated by tmake at 23:23, 2004/03/09
-#     Project: iSiloCodec.wpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	gcc-2.96
-CXX	=	g++-2.96
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IWSREADERINC -I$(QTDIR)/include
-LINK	=	g++-2.96
-LFLAGS	=	-shared -Wl,-soname,libiSilo.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
-AR	=	ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	
-SOURCES =	iSilo.cpp
-OBJECTS =	WSREADEROBJS/iSilo.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libiSilo.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libiSilo.a
-TARGETD	=	libiSilo.so.1.0.0
-TARGET0	=	libiSilo.so
-TARGET1	=	libiSilo.so.1
-TARGET2	=	libiSilo.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/plugins/reader/codecs/libiSilo.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libiSilo.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: iSiloCodec.wmak
-
-iSiloCodec.wmak: iSiloCodec.wpro
-	tmake iSiloCodec.wpro -o iSiloCodec.wmak
-
-dist:
-	$(TAR) iSiloCodec.wpro.tar iSiloCodec.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) iSiloCodec.wpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-WSREADEROBJS/iSilo.o: iSilo.cpp \
-		iSilo.h \
-		pdb.h \
-		WSREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/iSilo.o iSilo.cpp
-
diff --git a/noncore/apps/opie-reader/iSiloCodec.wpro b/noncore/apps/opie-reader/iSiloCodec.wpro
deleted file mode 100644
index 4967689..0000000
--- a/noncore/apps/opie-reader/iSiloCodec.wpro
+++ b/dev/null
@@ -1,17 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-#HEADERS		= Aportis.h
-
-SOURCES		= iSilo.cpp
-
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/codecs
-TARGET		= iSilo
-LIBS            += -lreader_pdb -lreader_codec
-
-
-OBJECTS_DIR = WSREADEROBJS
-MOC_DIR = WSREADERMOCS
-INCLUDEPATH	+= WSREADERINC
-DEPENDPATH	+= WSREADERINC
diff --git a/noncore/apps/opie-reader/iSiloCodec.zmak b/noncore/apps/opie-reader/iSiloCodec.zmak
deleted file mode 100644
index c6c9ed6..0000000
--- a/noncore/apps/opie-reader/iSiloCodec.zmak
+++ b/dev/null
@@ -1,123 +0,0 @@
-#############################################################################
-# Makefile for building libiSilo.so.1.0.0
-# Generated by tmake at 15:17, 2004/05/08
-#     Project: iSiloCodec.zpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IZREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libiSilo.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_pdb -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	
-SOURCES =	iSilo.cpp
-OBJECTS =	ZREADEROBJS/iSilo.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libiSilo.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libiSilo.a
-TARGETD	=	libiSilo.so.1.0.0
-TARGET0	=	libiSilo.so
-TARGET1	=	libiSilo.so.1
-TARGET2	=	libiSilo.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/plugins/reader/codecs/libiSilo.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libiSilo.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: iSiloCodec.zmak
-
-iSiloCodec.zmak: iSiloCodec.zpro
-	tmake iSiloCodec.zpro -o iSiloCodec.zmak
-
-dist:
-	$(TAR) iSiloCodec.zpro.tar iSiloCodec.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) iSiloCodec.zpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZREADEROBJS/iSilo.o: iSilo.cpp \
-		iSilo.h \
-		pdb.h \
-		ZREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/iSilo.o iSilo.cpp
-
diff --git a/noncore/apps/opie-reader/iSiloCodec.zpro b/noncore/apps/opie-reader/iSiloCodec.zpro
deleted file mode 100644
index 525b044..0000000
--- a/noncore/apps/opie-reader/iSiloCodec.zpro
+++ b/dev/null
@@ -1,17 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-#HEADERS		= Aportis.h
-
-SOURCES		= iSilo.cpp
-
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/codecs
-TARGET		= iSilo
-LIBS            += -lreader_pdb -lreader_codec
-
-
-OBJECTS_DIR = ZREADEROBJS
-MOC_DIR = ZREADERMOCS
-INCLUDEPATH	+= ZREADERINC
-DEPENDPATH	+= ZREADERINC
diff --git a/noncore/apps/opie-reader/opie-reader.pro b/noncore/apps/opie-reader/opie-reader.pro
index bf8e8f2..fc1d721 100644
--- a/noncore/apps/opie-reader/opie-reader.pro
+++ b/noncore/apps/opie-reader/opie-reader.pro
@@ -1,16 +1,16 @@
 TEMPLATE        = subdirs
 SUBDIRS         = pluckerbaselib \
                   codeclib \
+                  pdblib \
                   PluckerCodec \
                   AportisCodec \
                   CHM \
                   HTMLFilter \
                   WeaselCodec \
                   iSiloCodec \
-                  pdblib \
                   ppmsCodec \
                   reader
 
 include ( $(OPIEDIR)/include.pro )
 
 
diff --git a/noncore/apps/opie-reader/pdblib.mak b/noncore/apps/opie-reader/pdblib.mak
deleted file mode 100644
index 8174309..0000000
--- a/noncore/apps/opie-reader/pdblib.mak
+++ b/dev/null
@@ -1,161 +0,0 @@
-#############################################################################
-# Makefile for building: libreader_pdb.so.1.0.0
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:39:56 2004
-# Project:  pdblib.pro
-# Template: lib
-# Command: $(QMAKE) -o pdblib.mak pdblib.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
-LINK     = g++
-LFLAGS   = -shared -Wl,-soname,libreader_pdb.so.1
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm -lpthread
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QREADEROBJS/
-
-####### Files
-
-HEADERS = pdb.h
-SOURCES = pdb.cpp
-OBJECTS = QREADEROBJS/pdb.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = 
-OBJMOC = 
-DIST	   = pdblib.pro
-QMAKE_TARGET = reader_pdb
-DESTDIR  = $(READERDIR)/lib/
-TARGET   = libreader_pdb.so.1.0.0
-TARGETA	= $(READERDIR)/lib/libreader_pdb.a
-TARGETD	= libreader_pdb.so.1.0.0
-TARGET0	= libreader_pdb.so
-TARGET1	= libreader_pdb.so.1
-TARGET2	= libreader_pdb.so.1.0
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: pdblib.mak  $(READERDIR)/lib/$(TARGET)
-
-$(READERDIR)/lib/$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)  
-	test -d $(READERDIR)/lib/ || mkdir -p $(READERDIR)/lib/
-	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET0)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET1)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET2)
-	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/lib/
-
-
-
-staticlib: $(TARGETA)
-
-$(TARGETA):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
-	-$(DEL_FILE) $(TARGETA) 
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-pdblib.mak: pdblib.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o pdblib.mak pdblib.pro
-qmake: 
-	@$(QMAKE) -o pdblib.mak pdblib.pro
-
-dist: 
-	@mkdir -p QREADEROBJS/reader_pdb && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/reader_pdb/ && ( cd `dirname QREADEROBJS/reader_pdb` && $(TAR) reader_pdb.tar reader_pdb && $(GZIP) reader_pdb.tar ) && $(MOVE) `dirname QREADEROBJS/reader_pdb`/reader_pdb.tar.gz . && $(DEL_FILE) -r QREADEROBJS/reader_pdb
-
-mocclean:
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean:
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET) $(TARGET)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET0) $(READERDIR)/lib/$(TARGET1) $(READERDIR)/lib/$(TARGET2) $(TARGETA)
-
-
-FORCE:
-
-####### Compile
-
-QREADEROBJS/pdb.o: pdb.cpp pdb.h \
-		QREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/pdb.o pdb.cpp
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/pdblib.omak b/noncore/apps/opie-reader/pdblib.omak
deleted file mode 100644
index b3a67c7..0000000
--- a/noncore/apps/opie-reader/pdblib.omak
+++ b/dev/null
@@ -1,122 +0,0 @@
-#############################################################################
-# Makefile for building libreader_pdb.so.1.0.0
-# Generated by tmake at 15:14, 2004/05/08
-#     Project: pdblib.opro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
-INCPATH	=	-IOREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libreader_pdb.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	pdb.h
-SOURCES =	pdb.cpp
-OBJECTS =	OREADEROBJS/pdb.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libreader_pdb.so.1.0.0
-TARGETA	=	$(QTDIR)/lib/libreader_pdb.a
-TARGETD	=	libreader_pdb.so.1.0.0
-TARGET0	=	libreader_pdb.so
-TARGET1	=	libreader_pdb.so.1
-TARGET2	=	libreader_pdb.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/lib/libreader_pdb.so.1.0.0
-
-$(QTDIR)/lib/libreader_pdb.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/lib/$(TARGET)
-	-rm -f $(QTDIR)/lib/$(TARGET0)
-	-rm -f $(QTDIR)/lib/$(TARGET1)
-	-rm -f $(QTDIR)/lib/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: pdblib.omak
-
-pdblib.omak: pdblib.opro
-	tmake pdblib.opro -o pdblib.omak
-
-dist:
-	$(TAR) pdblib.opro.tar pdblib.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) pdblib.opro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-OREADEROBJS/pdb.o: pdb.cpp \
-		pdb.h \
-		OREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/pdb.o pdb.cpp
-
diff --git a/noncore/apps/opie-reader/pdblib.wmak b/noncore/apps/opie-reader/pdblib.wmak
deleted file mode 100644
index f06f05ad..0000000
--- a/noncore/apps/opie-reader/pdblib.wmak
+++ b/dev/null
@@ -1,122 +0,0 @@
-#############################################################################
-# Makefile for building libreader_pdb.so.1.0.0
-# Generated by tmake at 23:23, 2004/03/09
-#     Project: pdblib.wpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	gcc-2.96
-CXX	=	g++-2.96
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IWSREADERINC -I$(QTDIR)/include
-LINK	=	g++-2.96
-LFLAGS	=	-shared -Wl,-soname,libreader_pdb.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	pdb.h
-SOURCES =	pdb.cpp
-OBJECTS =	WSREADEROBJS/pdb.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libreader_pdb.so.1.0.0
-TARGETA	=	$(QTDIR)/lib/libreader_pdb.a
-TARGETD	=	libreader_pdb.so.1.0.0
-TARGET0	=	libreader_pdb.so
-TARGET1	=	libreader_pdb.so.1
-TARGET2	=	libreader_pdb.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/lib/libreader_pdb.so.1.0.0
-
-$(QTDIR)/lib/libreader_pdb.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/lib/$(TARGET)
-	-rm -f $(QTDIR)/lib/$(TARGET0)
-	-rm -f $(QTDIR)/lib/$(TARGET1)
-	-rm -f $(QTDIR)/lib/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: pdblib.wmak
-
-pdblib.wmak: pdblib.wpro
-	tmake pdblib.wpro -o pdblib.wmak
-
-dist:
-	$(TAR) pdblib.wpro.tar pdblib.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) pdblib.wpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-WSREADEROBJS/pdb.o: pdb.cpp \
-		pdb.h \
-		WSREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/pdb.o pdb.cpp
-
diff --git a/noncore/apps/opie-reader/pdblib.wpro b/noncore/apps/opie-reader/pdblib.wpro
deleted file mode 100644
index d78cc29..0000000
--- a/noncore/apps/opie-reader/pdblib.wpro
+++ b/dev/null
@@ -1,14 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= pdb.h
-
-SOURCES		= pdb.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/lib
-TARGET		= reader_pdb
-
-OBJECTS_DIR = WSREADEROBJS
-MOC_DIR = WSREADERMOCS
-INCLUDEPATH	+= WSREADERINC
-DEPENDPATH	+= WSREADERINC
diff --git a/noncore/apps/opie-reader/pdblib.zmak b/noncore/apps/opie-reader/pdblib.zmak
deleted file mode 100644
index 2ee26d4..0000000
--- a/noncore/apps/opie-reader/pdblib.zmak
+++ b/dev/null
@@ -1,122 +0,0 @@
-#############################################################################
-# Makefile for building libreader_pdb.so.1.0.0
-# Generated by tmake at 15:17, 2004/05/08
-#     Project: pdblib.zpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IZREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libreader_pdb.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	pdb.h
-SOURCES =	pdb.cpp
-OBJECTS =	ZREADEROBJS/pdb.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libreader_pdb.so.1.0.0
-TARGETA	=	$(QTDIR)/lib/libreader_pdb.a
-TARGETD	=	libreader_pdb.so.1.0.0
-TARGET0	=	libreader_pdb.so
-TARGET1	=	libreader_pdb.so.1
-TARGET2	=	libreader_pdb.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/lib/libreader_pdb.so.1.0.0
-
-$(QTDIR)/lib/libreader_pdb.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/lib/$(TARGET)
-	-rm -f $(QTDIR)/lib/$(TARGET0)
-	-rm -f $(QTDIR)/lib/$(TARGET1)
-	-rm -f $(QTDIR)/lib/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: pdblib.zmak
-
-pdblib.zmak: pdblib.zpro
-	tmake pdblib.zpro -o pdblib.zmak
-
-dist:
-	$(TAR) pdblib.zpro.tar pdblib.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) pdblib.zpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZREADEROBJS/pdb.o: pdb.cpp \
-		pdb.h \
-		ZREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/pdb.o pdb.cpp
-
diff --git a/noncore/apps/opie-reader/pdblib.zpro b/noncore/apps/opie-reader/pdblib.zpro
deleted file mode 100644
index 94d3910..0000000
--- a/noncore/apps/opie-reader/pdblib.zpro
+++ b/dev/null
@@ -1,14 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= pdb.h
-
-SOURCES		= pdb.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/lib
-TARGET		= reader_pdb
-
-OBJECTS_DIR = ZREADEROBJS
-MOC_DIR = ZREADERMOCS
-INCLUDEPATH	+= ZREADERINC
-DEPENDPATH	+= ZREADERINC
diff --git a/noncore/apps/opie-reader/pluckerbaselib.mak b/noncore/apps/opie-reader/pluckerbaselib.mak
deleted file mode 100644
index 325f3c3..0000000
--- a/noncore/apps/opie-reader/pluckerbaselib.mak
+++ b/dev/null
@@ -1,169 +0,0 @@
-#############################################################################
-# Makefile for building: libreader_pluckerbase.so.1.0.0
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:40:18 2004
-# Project:  pluckerbaselib.pro
-# Template: lib
-# Command: $(QMAKE) -o pluckerbaselib.mak pluckerbaselib.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
-LINK     = g++
-LFLAGS   = -shared -Wl,-soname,libreader_pluckerbase.so.1
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm -lpthread
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QREADEROBJS/
-
-####### Files
-
-HEADERS = pdb.h
-SOURCES = plucker_base.cpp
-OBJECTS = QREADEROBJS/plucker_base.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = 
-OBJMOC = 
-DIST	   = pluckerbaselib.pro
-QMAKE_TARGET = reader_pluckerbase
-DESTDIR  = $(READERDIR)/lib/
-TARGET   = libreader_pluckerbase.so.1.0.0
-TARGETA	= $(READERDIR)/lib/libreader_pluckerbase.a
-TARGETD	= libreader_pluckerbase.so.1.0.0
-TARGET0	= libreader_pluckerbase.so
-TARGET1	= libreader_pluckerbase.so.1
-TARGET2	= libreader_pluckerbase.so.1.0
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: pluckerbaselib.mak  $(READERDIR)/lib/$(TARGET)
-
-$(READERDIR)/lib/$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)  
-	test -d $(READERDIR)/lib/ || mkdir -p $(READERDIR)/lib/
-	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET0)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET1)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET2)
-	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/lib/
-
-
-
-staticlib: $(TARGETA)
-
-$(TARGETA):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
-	-$(DEL_FILE) $(TARGETA) 
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-pluckerbaselib.mak: pluckerbaselib.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o pluckerbaselib.mak pluckerbaselib.pro
-qmake: 
-	@$(QMAKE) -o pluckerbaselib.mak pluckerbaselib.pro
-
-dist: 
-	@mkdir -p QREADEROBJS/reader_pluckerbase && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/reader_pluckerbase/ && ( cd `dirname QREADEROBJS/reader_pluckerbase` && $(TAR) reader_pluckerbase.tar reader_pluckerbase && $(GZIP) reader_pluckerbase.tar ) && $(MOVE) `dirname QREADEROBJS/reader_pluckerbase`/reader_pluckerbase.tar.gz . && $(DEL_FILE) -r QREADEROBJS/reader_pluckerbase
-
-mocclean:
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean:
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET) $(TARGET)
-	-$(DEL_FILE) $(READERDIR)/lib/$(TARGET0) $(READERDIR)/lib/$(TARGET1) $(READERDIR)/lib/$(TARGET2) $(TARGETA)
-
-
-FORCE:
-
-####### Compile
-
-QREADEROBJS/plucker_base.o: plucker_base.cpp QREADERINC/useqpe.h \
-		QREADERINC/static.h \
-		plucker_base.h \
-		Aportis.h \
-		hrule.h \
-		CExpander.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/plucker_base.o plucker_base.cpp
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/pluckerbaselib.omak b/noncore/apps/opie-reader/pluckerbaselib.omak
deleted file mode 100644
index 605eabd..0000000
--- a/noncore/apps/opie-reader/pluckerbaselib.omak
+++ b/dev/null
@@ -1,131 +0,0 @@
-#############################################################################
-# Makefile for building libreader_pluckerbase.so.1.0.0
-# Generated by tmake at 15:14, 2004/05/08
-#     Project: pluckerbaselib.opro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
-INCPATH	=	-IOREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libreader_pluckerbase.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	pdb.h
-SOURCES =	plucker_base.cpp
-OBJECTS =	OREADEROBJS/plucker_base.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libreader_pluckerbase.so.1.0.0
-TARGETA	=	$(QTDIR)/lib/libreader_pluckerbase.a
-TARGETD	=	libreader_pluckerbase.so.1.0.0
-TARGET0	=	libreader_pluckerbase.so
-TARGET1	=	libreader_pluckerbase.so.1
-TARGET2	=	libreader_pluckerbase.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/lib/libreader_pluckerbase.so.1.0.0
-
-$(QTDIR)/lib/libreader_pluckerbase.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/lib/$(TARGET)
-	-rm -f $(QTDIR)/lib/$(TARGET0)
-	-rm -f $(QTDIR)/lib/$(TARGET1)
-	-rm -f $(QTDIR)/lib/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: pluckerbaselib.omak
-
-pluckerbaselib.omak: pluckerbaselib.opro
-	tmake pluckerbaselib.opro -o pluckerbaselib.omak
-
-dist:
-	$(TAR) pluckerbaselib.opro.tar pluckerbaselib.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) pluckerbaselib.opro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-OREADEROBJS/plucker_base.o: plucker_base.cpp \
-		OREADERINC/useqpe.h \
-		OREADERINC/static.h \
-		plucker_base.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		hrule.h \
-		Aportis.h \
-		Model.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/plucker_base.o plucker_base.cpp
-
diff --git a/noncore/apps/opie-reader/pluckerbaselib.wmak b/noncore/apps/opie-reader/pluckerbaselib.wmak
deleted file mode 100644
index 3cc63a4..0000000
--- a/noncore/apps/opie-reader/pluckerbaselib.wmak
+++ b/dev/null
@@ -1,131 +0,0 @@
-#############################################################################
-# Makefile for building libreader_pluckerbase.so.1.0.0
-# Generated by tmake at 23:23, 2004/03/09
-#     Project: pluckerbaselib.wpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	gcc-2.96
-CXX	=	g++-2.96
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IWSREADERINC -I$(QTDIR)/include
-LINK	=	g++-2.96
-LFLAGS	=	-shared -Wl,-soname,libreader_pluckerbase.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	pdb.h
-SOURCES =	plucker_base.cpp
-OBJECTS =	WSREADEROBJS/plucker_base.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libreader_pluckerbase.so.1.0.0
-TARGETA	=	$(QTDIR)/lib/libreader_pluckerbase.a
-TARGETD	=	libreader_pluckerbase.so.1.0.0
-TARGET0	=	libreader_pluckerbase.so
-TARGET1	=	libreader_pluckerbase.so.1
-TARGET2	=	libreader_pluckerbase.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/lib/libreader_pluckerbase.so.1.0.0
-
-$(QTDIR)/lib/libreader_pluckerbase.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/lib/$(TARGET)
-	-rm -f $(QTDIR)/lib/$(TARGET0)
-	-rm -f $(QTDIR)/lib/$(TARGET1)
-	-rm -f $(QTDIR)/lib/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: pluckerbaselib.wmak
-
-pluckerbaselib.wmak: pluckerbaselib.wpro
-	tmake pluckerbaselib.wpro -o pluckerbaselib.wmak
-
-dist:
-	$(TAR) pluckerbaselib.wpro.tar pluckerbaselib.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) pluckerbaselib.wpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-WSREADEROBJS/plucker_base.o: plucker_base.cpp \
-		WSREADERINC/useqpe.h \
-		WSREADERINC/static.h \
-		plucker_base.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		hrule.h \
-		Aportis.h \
-		Model.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/plucker_base.o plucker_base.cpp
-
diff --git a/noncore/apps/opie-reader/pluckerbaselib.wpro b/noncore/apps/opie-reader/pluckerbaselib.wpro
deleted file mode 100644
index 6798c0d..0000000
--- a/noncore/apps/opie-reader/pluckerbaselib.wpro
+++ b/dev/null
@@ -1,14 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= pdb.h
-
-SOURCES		= plucker_base.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/lib
-TARGET		= reader_pluckerbase
-
-OBJECTS_DIR = WSREADEROBJS
-MOC_DIR = WSREADERMOCS
-INCLUDEPATH	+= WSREADERINC
-DEPENDPATH	+= WSREADERINC
diff --git a/noncore/apps/opie-reader/pluckerbaselib.zmak b/noncore/apps/opie-reader/pluckerbaselib.zmak
deleted file mode 100644
index 16dd6e4..0000000
--- a/noncore/apps/opie-reader/pluckerbaselib.zmak
+++ b/dev/null
@@ -1,131 +0,0 @@
-#############################################################################
-# Makefile for building libreader_pluckerbase.so.1.0.0
-# Generated by tmake at 15:17, 2004/05/08
-#     Project: pluckerbaselib.zpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IZREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libreader_pluckerbase.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	pdb.h
-SOURCES =	plucker_base.cpp
-OBJECTS =	ZREADEROBJS/plucker_base.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libreader_pluckerbase.so.1.0.0
-TARGETA	=	$(QTDIR)/lib/libreader_pluckerbase.a
-TARGETD	=	libreader_pluckerbase.so.1.0.0
-TARGET0	=	libreader_pluckerbase.so
-TARGET1	=	libreader_pluckerbase.so.1
-TARGET2	=	libreader_pluckerbase.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/lib/libreader_pluckerbase.so.1.0.0
-
-$(QTDIR)/lib/libreader_pluckerbase.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/lib/$(TARGET)
-	-rm -f $(QTDIR)/lib/$(TARGET0)
-	-rm -f $(QTDIR)/lib/$(TARGET1)
-	-rm -f $(QTDIR)/lib/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: pluckerbaselib.zmak
-
-pluckerbaselib.zmak: pluckerbaselib.zpro
-	tmake pluckerbaselib.zpro -o pluckerbaselib.zmak
-
-dist:
-	$(TAR) pluckerbaselib.zpro.tar pluckerbaselib.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) pluckerbaselib.zpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZREADEROBJS/plucker_base.o: plucker_base.cpp \
-		ZREADERINC/useqpe.h \
-		ZREADERINC/static.h \
-		plucker_base.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		hrule.h \
-		Aportis.h \
-		Model.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/plucker_base.o plucker_base.cpp
-
diff --git a/noncore/apps/opie-reader/pluckerbaselib.zpro b/noncore/apps/opie-reader/pluckerbaselib.zpro
deleted file mode 100644
index 006aa07..0000000
--- a/noncore/apps/opie-reader/pluckerbaselib.zpro
+++ b/dev/null
@@ -1,14 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= pdb.h
-
-SOURCES		= plucker_base.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/lib
-TARGET		= reader_pluckerbase
-
-OBJECTS_DIR = ZREADEROBJS
-MOC_DIR = ZREADERMOCS
-INCLUDEPATH	+= ZREADERINC
-DEPENDPATH	+= ZREADERINC
diff --git a/noncore/apps/opie-reader/ppmsCodec.mak b/noncore/apps/opie-reader/ppmsCodec.mak
deleted file mode 100644
index 19d3a2c..0000000
--- a/noncore/apps/opie-reader/ppmsCodec.mak
+++ b/dev/null
@@ -1,178 +0,0 @@
-#############################################################################
-# Makefile for building: libppms.so.1.0.0
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:41:16 2004
-# Project:  ppmsCodec.pro
-# Template: lib
-# Command: $(QMAKE) -o ppmsCodec.mak ppmsCodec.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro -D_REENTRANT -fPIC  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
-LINK     = g++
-LFLAGS   = -shared -Wl,-soname,libppms.so.1
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(READERDIR)/lib -lreader_codec -lqt-mt -lXext -lX11 -lm -lpthread
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QREADEROBJS/
-
-####### Files
-
-HEADERS = Aportis.h
-SOURCES = ppm_expander.cpp \
-		ppm.cpp \
-		arith_d.cpp
-OBJECTS = QREADEROBJS/ppm_expander.o \
-		QREADEROBJS/ppm.o \
-		QREADEROBJS/arith_d.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = 
-OBJMOC = 
-DIST	   = ppmsCodec.pro
-QMAKE_TARGET = ppms
-DESTDIR  = $(READERDIR)/codecs/
-TARGET   = libppms.so.1.0.0
-TARGETA	= $(READERDIR)/codecs/libppms.a
-TARGETD	= libppms.so.1.0.0
-TARGET0	= libppms.so
-TARGET1	= libppms.so.1
-TARGET2	= libppms.so.1.0
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: ppmsCodec.mak  $(READERDIR)/codecs/$(TARGET)
-
-$(READERDIR)/codecs/$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)  
-	test -d $(READERDIR)/codecs/ || mkdir -p $(READERDIR)/codecs/
-	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET1)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET2)
-	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(READERDIR)/codecs/
-
-
-
-staticlib: $(TARGETA)
-
-$(TARGETA):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)
-	-$(DEL_FILE) $(TARGETA) 
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-ppmsCodec.mak: ppmsCodec.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o ppmsCodec.mak ppmsCodec.pro
-qmake: 
-	@$(QMAKE) -o ppmsCodec.mak ppmsCodec.pro
-
-dist: 
-	@mkdir -p QREADEROBJS/ppms && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/ppms/ && ( cd `dirname QREADEROBJS/ppms` && $(TAR) ppms.tar ppms && $(GZIP) ppms.tar ) && $(MOVE) `dirname QREADEROBJS/ppms`/ppms.tar.gz . && $(DEL_FILE) -r QREADEROBJS/ppms
-
-mocclean:
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean:
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET) $(TARGET)
-	-$(DEL_FILE) $(READERDIR)/codecs/$(TARGET0) $(READERDIR)/codecs/$(TARGET1) $(READERDIR)/codecs/$(TARGET2) $(TARGETA)
-
-
-FORCE:
-
-####### Compile
-
-QREADEROBJS/ppm_expander.o: ppm_expander.cpp QREADERINC/static.h \
-		ppm_expander.h \
-		QREADERINC/useqpe.h \
-		CExpander.h \
-		utypes.h \
-		ppm.h \
-		arith.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/ppm_expander.o ppm_expander.cpp
-
-QREADEROBJS/ppm.o: ppm.cpp arith.h \
-		ppm.h \
-		utypes.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/ppm.o ppm.cpp
-
-QREADEROBJS/arith_d.o: arith_d.cpp arith.h \
-		utypes.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/arith_d.o arith_d.cpp
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/ppmsCodec.omak b/noncore/apps/opie-reader/ppmsCodec.omak
deleted file mode 100644
index c974898..0000000
--- a/noncore/apps/opie-reader/ppmsCodec.omak
+++ b/dev/null
@@ -1,141 +0,0 @@
-#############################################################################
-# Makefile for building libppms.so.1.0.0
-# Generated by tmake at 15:14, 2004/05/08
-#     Project: ppmsCodec.opro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O3 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -fPIC -DNO_DEBUG
-INCPATH	=	-IOREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libppms.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	Aportis.h
-SOURCES =	ppm_expander.cpp \
-		ppm.cpp \
-		arith_d.cpp
-OBJECTS =	OREADEROBJS/ppm_expander.o \
-		OREADEROBJS/ppm.o \
-		OREADEROBJS/arith_d.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libppms.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libppms.a
-TARGETD	=	libppms.so.1.0.0
-TARGET0	=	libppms.so
-TARGET1	=	libppms.so.1
-TARGET2	=	libppms.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/plugins/reader/codecs/libppms.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libppms.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: ppmsCodec.omak
-
-ppmsCodec.omak: ppmsCodec.opro
-	tmake ppmsCodec.opro -o ppmsCodec.omak
-
-dist:
-	$(TAR) ppmsCodec.opro.tar ppmsCodec.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) ppmsCodec.opro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-OREADEROBJS/ppm_expander.o: ppm_expander.cpp \
-		OREADERINC/static.h \
-		ppm_expander.h \
-		OREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		utypes.h \
-		ppm.h \
-		arith.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/ppm_expander.o ppm_expander.cpp
-
-OREADEROBJS/ppm.o: ppm.cpp \
-		arith.h \
-		utypes.h \
-		ppm.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/ppm.o ppm.cpp
-
-OREADEROBJS/arith_d.o: arith_d.cpp \
-		arith.h \
-		utypes.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/arith_d.o arith_d.cpp
-
diff --git a/noncore/apps/opie-reader/ppmsCodec.wmak b/noncore/apps/opie-reader/ppmsCodec.wmak
deleted file mode 100644
index 5d8d4a7..0000000
--- a/noncore/apps/opie-reader/ppmsCodec.wmak
+++ b/dev/null
@@ -1,141 +0,0 @@
-#############################################################################
-# Makefile for building libppms.so.1.0.0
-# Generated by tmake at 23:23, 2004/03/09
-#     Project: ppmsCodec.wpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	gcc-2.96
-CXX	=	g++-2.96
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IWSREADERINC -I$(QTDIR)/include
-LINK	=	g++-2.96
-LFLAGS	=	-shared -Wl,-soname,libppms.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_codec -lqte
-AR	=	ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	Aportis.h
-SOURCES =	ppm_expander.cpp \
-		ppm.cpp \
-		arith_d.cpp
-OBJECTS =	WSREADEROBJS/ppm_expander.o \
-		WSREADEROBJS/ppm.o \
-		WSREADEROBJS/arith_d.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libppms.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libppms.a
-TARGETD	=	libppms.so.1.0.0
-TARGET0	=	libppms.so
-TARGET1	=	libppms.so.1
-TARGET2	=	libppms.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/plugins/reader/codecs/libppms.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libppms.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: ppmsCodec.wmak
-
-ppmsCodec.wmak: ppmsCodec.wpro
-	tmake ppmsCodec.wpro -o ppmsCodec.wmak
-
-dist:
-	$(TAR) ppmsCodec.wpro.tar ppmsCodec.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) ppmsCodec.wpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-WSREADEROBJS/ppm_expander.o: ppm_expander.cpp \
-		WSREADERINC/static.h \
-		ppm_expander.h \
-		WSREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		utypes.h \
-		ppm.h \
-		arith.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/ppm_expander.o ppm_expander.cpp
-
-WSREADEROBJS/ppm.o: ppm.cpp \
-		arith.h \
-		utypes.h \
-		ppm.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/ppm.o ppm.cpp
-
-WSREADEROBJS/arith_d.o: arith_d.cpp \
-		arith.h \
-		utypes.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/arith_d.o arith_d.cpp
-
diff --git a/noncore/apps/opie-reader/ppmsCodec.wpro b/noncore/apps/opie-reader/ppmsCodec.wpro
deleted file mode 100644
index f250d90..0000000
--- a/noncore/apps/opie-reader/ppmsCodec.wpro
+++ b/dev/null
@@ -1,17 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= Aportis.h
-
-SOURCES		= ppm_expander.cpp \
-                  ppm.cpp \
-                  arith_d.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/codecs
-TARGET		= ppms
-LIBS            += -lreader_codec
-
-OBJECTS_DIR = WSREADEROBJS
-MOC_DIR = WSREADERMOCS
-INCLUDEPATH	+= WSREADERINC
-DEPENDPATH	+= WSREADERINC
diff --git a/noncore/apps/opie-reader/ppmsCodec.zmak b/noncore/apps/opie-reader/ppmsCodec.zmak
deleted file mode 100644
index df92c50..0000000
--- a/noncore/apps/opie-reader/ppmsCodec.zmak
+++ b/dev/null
@@ -1,141 +0,0 @@
-#############################################################################
-# Makefile for building libppms.so.1.0.0
-# Generated by tmake at 15:17, 2004/05/08
-#     Project: ppmsCodec.zpro
-#    Template: lib
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -fPIC -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -fPIC -DNO_DEBUG
-INCPATH	=	-IZREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	-shared -Wl,-soname,libppms.so.1
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lreader_codec -lqte
-AR	=	arm-linux-ar cqs
-RANLIB	=	
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	Aportis.h
-SOURCES =	ppm_expander.cpp \
-		ppm.cpp \
-		arith_d.cpp
-OBJECTS =	ZREADEROBJS/ppm_expander.o \
-		ZREADEROBJS/ppm.o \
-		ZREADEROBJS/arith_d.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	
-OBJMOC	=	
-DIST	=	
-TARGET	=	libppms.so.1.0.0
-TARGETA	=	$(QTDIR)/plugins/reader/codecs/libppms.a
-TARGETD	=	libppms.so.1.0.0
-TARGET0	=	libppms.so
-TARGET1	=	libppms.so.1
-TARGET2	=	libppms.so.1.0
-INTERFACE_DECL_PATH = .
-
-####### 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: $(QTDIR)/plugins/reader/codecs/libppms.so.1.0.0
-
-$(QTDIR)/plugins/reader/codecs/libppms.so.1.0.0: $(OBJECTS) $(OBJMOC) $(SUBLIBS) 
-	-rm -f $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-	$(LINK) $(LFLAGS) -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
-	-ln -s $(TARGET) $(TARGET0)
-	-ln -s $(TARGET) $(TARGET1)
-	-ln -s $(TARGET) $(TARGET2)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET0)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET1)
-	-rm -f $(QTDIR)/plugins/reader/codecs/$(TARGET2)
-	-mv $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/plugins/reader/codecs/
-
-staticlib: $(TARGETA)
-
-$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	-rm -f $(TARGETA)
-	$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)
-
-moc: $(SRCMOC)
-
-tmake: ppmsCodec.zmak
-
-ppmsCodec.zmak: ppmsCodec.zpro
-	tmake ppmsCodec.zpro -o ppmsCodec.zmak
-
-dist:
-	$(TAR) ppmsCodec.zpro.tar ppmsCodec.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) ppmsCodec.zpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZREADEROBJS/ppm_expander.o: ppm_expander.cpp \
-		ZREADERINC/static.h \
-		ppm_expander.h \
-		ZREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		utypes.h \
-		ppm.h \
-		arith.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/ppm_expander.o ppm_expander.cpp
-
-ZREADEROBJS/ppm.o: ppm.cpp \
-		arith.h \
-		utypes.h \
-		ppm.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/ppm.o ppm.cpp
-
-ZREADEROBJS/arith_d.o: arith_d.cpp \
-		arith.h \
-		utypes.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/arith_d.o arith_d.cpp
-
diff --git a/noncore/apps/opie-reader/ppmsCodec.zpro b/noncore/apps/opie-reader/ppmsCodec.zpro
deleted file mode 100644
index f758118..0000000
--- a/noncore/apps/opie-reader/ppmsCodec.zpro
+++ b/dev/null
@@ -1,17 +0,0 @@
-TEMPLATE	= lib
-CONFIG		= qt warn_on release dll
-HEADERS		= Aportis.h
-
-SOURCES		= ppm_expander.cpp \
-                  ppm.cpp \
-                  arith_d.cpp
-
-INTERFACES	= 
-DESTDIR		= $(QTDIR)/plugins/reader/codecs
-TARGET		= ppms
-LIBS            += -lreader_codec
-
-OBJECTS_DIR = ZREADEROBJS
-MOC_DIR = ZREADERMOCS
-INCLUDEPATH	+= ZREADERINC
-DEPENDPATH	+= ZREADERINC
diff --git a/noncore/apps/opie-reader/reader.mak b/noncore/apps/opie-reader/reader.mak
deleted file mode 100644
index 4bc2eec..0000000
--- a/noncore/apps/opie-reader/reader.mak
+++ b/dev/null
@@ -1,591 +0,0 @@
-#############################################################################
-# Makefile for building: ../bin/uqtreader
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 08:41:42 2004
-# Project:  reader.pro
-# Template: app
-# Command: $(QMAKE) -o reader.mak reader.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro  -DQT_NO_DEBUG
-CXXFLAGS = -pipe -Wall -W -O2 -fomit-frame-pointer -pipe -march=i586 -mcpu=pentiumpro  -DQT_NO_DEBUG
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQREADERINC -I$(QTDIR)/include -IQREADERMOCS/
-LINK     = g++
-LFLAGS   = 
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(READERDIR)/lib -lreader_codec -lqt-mt -lXext -lX11 -lm
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QREADEROBJS/
-
-####### Files
-
-HEADERS = Aportis.h \
-		Bkmks.h \
-		BuffDoc.h \
-		ButtonPrefs.h \
-		CAnnoEdit.h \
-		CBuffer.h \
-		CDrawBuffer.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		CExpander.h \
-		CFilter.h \
-		CloseDialog.h \
-		Filedata.h \
-		FixedFont.h \
-		FontControl.h \
-		GraphicWin.h \
-		Markups.h \
-		Navigation.h \
-		Palm2QImage.h \
-		Prefs.h \
-		QFloatBar.h \
-		QTReader.h \
-		QTReaderApp.h \
-		QtrListView.h \
-		Queue.h \
-		StyleConsts.h \
-		ToolbarPrefs.h \
-		URLDialog.h \
-		ZText.h \
-		arith.h \
-		cbkmkselector.h \
-		config.h \
-		infowin.h \
-		linktype.h \
-		my_list.h \
-		names.h \
-		QREADERINC/opie.h \
-		pdb.h \
-		plucker.h \
-		plucker_base.h \
-		ppm.h \
-		ppm_expander.h \
-		preferences.h \
-		usenef.h \
-		QREADERINC/useqpe.h \
-		ustring.h \
-		util.h \
-		utypes.h \
-		version.h \
-		ztxt.h
-SOURCES = BuffDoc.cpp \
-		ButtonPrefs.cpp \
-		CAnnoEdit.cpp \
-		CDrawBuffer.cpp \
-		CEncoding.cpp \
-		CEncoding_tables.cpp \
-		CFilter.cpp \
-		CRegExp.cpp \
-		CloseDialog.cpp \
-		FontControl.cpp \
-		GraphicWin.cpp \
-		Prefs.cpp \
-		QTReader.cpp \
-		QTReaderApp.cpp \
-		QtrListView.cpp \
-		ToolbarPrefs.cpp \
-		URLDialog.cpp \
-		infowin.cpp \
-		main.cpp \
-		orkey.cpp \
-		preferences.cpp \
-		util.cpp \
-		version.cpp
-OBJECTS = QREADEROBJS/BuffDoc.o \
-		QREADEROBJS/ButtonPrefs.o \
-		QREADEROBJS/CAnnoEdit.o \
-		QREADEROBJS/CDrawBuffer.o \
-		QREADEROBJS/CEncoding.o \
-		QREADEROBJS/CEncoding_tables.o \
-		QREADEROBJS/CFilter.o \
-		QREADEROBJS/CRegExp.o \
-		QREADEROBJS/CloseDialog.o \
-		QREADEROBJS/FontControl.o \
-		QREADEROBJS/GraphicWin.o \
-		QREADEROBJS/Prefs.o \
-		QREADEROBJS/QTReader.o \
-		QREADEROBJS/QTReaderApp.o \
-		QREADEROBJS/QtrListView.o \
-		QREADEROBJS/ToolbarPrefs.o \
-		QREADEROBJS/URLDialog.o \
-		QREADEROBJS/infowin.o \
-		QREADEROBJS/main.o \
-		QREADEROBJS/orkey.o \
-		QREADEROBJS/preferences.o \
-		QREADEROBJS/util.o \
-		QREADEROBJS/version.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = QREADERMOCS/moc_ButtonPrefs.cpp \
-		QREADERMOCS/moc_CAnnoEdit.cpp \
-		QREADERMOCS/moc_CloseDialog.cpp \
-		QREADERMOCS/moc_GraphicWin.cpp \
-		QREADERMOCS/moc_Prefs.cpp \
-		QREADERMOCS/moc_QFloatBar.cpp \
-		QREADERMOCS/moc_QTReader.cpp \
-		QREADERMOCS/moc_QTReaderApp.cpp \
-		QREADERMOCS/moc_QtrListView.cpp \
-		QREADERMOCS/moc_ToolbarPrefs.cpp \
-		QREADERMOCS/moc_URLDialog.cpp \
-		QREADERMOCS/moc_cbkmkselector.cpp \
-		QREADERMOCS/moc_infowin.cpp
-OBJMOC = QREADEROBJS/moc_ButtonPrefs.o \
-		QREADEROBJS/moc_CAnnoEdit.o \
-		QREADEROBJS/moc_CloseDialog.o \
-		QREADEROBJS/moc_GraphicWin.o \
-		QREADEROBJS/moc_Prefs.o \
-		QREADEROBJS/moc_QFloatBar.o \
-		QREADEROBJS/moc_QTReader.o \
-		QREADEROBJS/moc_QTReaderApp.o \
-		QREADEROBJS/moc_QtrListView.o \
-		QREADEROBJS/moc_ToolbarPrefs.o \
-		QREADEROBJS/moc_URLDialog.o \
-		QREADEROBJS/moc_cbkmkselector.o \
-		QREADEROBJS/moc_infowin.o
-DIST	   = reader.pro
-QMAKE_TARGET = uqtreader
-DESTDIR  = ../bin/
-TARGET   = ../bin/uqtreader
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: reader.mak $(TARGET)
-
-$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC)  
-	test -d ../bin/ || mkdir -p ../bin/
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-reader.mak: reader.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o reader.mak reader.pro
-qmake: 
-	@$(QMAKE) -o reader.mak reader.pro
-
-dist: 
-	@mkdir -p QREADEROBJS/uqtreader && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QREADEROBJS/uqtreader/ && ( cd `dirname QREADEROBJS/uqtreader` && $(TAR) uqtreader.tar uqtreader && $(GZIP) uqtreader.tar ) && $(MOVE) `dirname QREADEROBJS/uqtreader`/uqtreader.tar.gz . && $(DEL_FILE) -r QREADEROBJS/uqtreader
-
-mocclean:
-	-$(DEL_FILE) $(OBJMOC)
-	-$(DEL_FILE) $(SRCMOC)
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean: mocclean
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) ../bin/$(TARGET) $(TARGET)
-
-
-FORCE:
-
-####### Compile
-
-QREADEROBJS/BuffDoc.o: BuffDoc.cpp QREADERINC/static.h \
-		names.h \
-		BuffDoc.h \
-		config.h \
-		CDrawBuffer.h \
-		ZText.h \
-		ebookcodec.h \
-		QREADERINC/useqpe.h \
-		Aportis.h \
-		CHM.h \
-		ppm_expander.h \
-		ztxt.h \
-		plucker.h \
-		iSilo.h \
-		CFilter.h \
-		CExpander.h \
-		StyleConsts.h \
-		CBuffer.h \
-		my_list.h \
-		linktype.h \
-		ustring.h \
-		CEncoding.h \
-		Markups.h \
-		CEncoding_tables.h \
-		pdb.h \
-		chm_lib.h \
-		utypes.h \
-		ppm.h \
-		arith.h \
-		plucker_base.h \
-		Navigation.h \
-		hrule.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/BuffDoc.o BuffDoc.cpp
-
-QREADEROBJS/ButtonPrefs.o: ButtonPrefs.cpp ButtonPrefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/ButtonPrefs.o ButtonPrefs.cpp
-
-QREADEROBJS/CAnnoEdit.o: CAnnoEdit.cpp CAnnoEdit.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CAnnoEdit.o CAnnoEdit.cpp
-
-QREADEROBJS/CDrawBuffer.o: CDrawBuffer.cpp CDrawBuffer.h \
-		FontControl.h \
-		QREADERINC/useqpe.h \
-		QREADERINC/opie.h \
-		StyleConsts.h \
-		CBuffer.h \
-		my_list.h \
-		linktype.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CDrawBuffer.o CDrawBuffer.cpp
-
-QREADEROBJS/CEncoding.o: CEncoding.cpp CEncoding.h \
-		CExpander.h \
-		CEncoding_tables.h \
-		QREADERINC/useqpe.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CEncoding.o CEncoding.cpp
-
-QREADEROBJS/CEncoding_tables.o: CEncoding_tables.cpp CEncoding_tables.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CEncoding_tables.o CEncoding_tables.cpp
-
-QREADEROBJS/CFilter.o: CFilter.cpp QREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		CFilter.h \
-		hrule.h \
-		Bkmks.h \
-		QTReader.h \
-		CRegExp.h \
-		StyleConsts.h \
-		CBuffer.h \
-		my_list.h \
-		linktype.h \
-		config.h \
-		ustring.h \
-		CExpander.h \
-		CEncoding.h \
-		QREADERINC/static.h \
-		Markups.h \
-		names.h \
-		CEncoding_tables.h \
-		Filedata.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h \
-		hash.h \
-		Queue.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CFilter.o CFilter.cpp
-
-QREADEROBJS/CRegExp.o: CRegExp.cpp CRegExp.h \
-		config.h \
-		hash.h \
-		Queue.h \
-		ustring.h \
-		my_list.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CRegExp.o CRegExp.cpp
-
-QREADEROBJS/CloseDialog.o: CloseDialog.cpp CloseDialog.h \
-		QREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/CloseDialog.o CloseDialog.cpp
-
-QREADEROBJS/FontControl.o: FontControl.cpp QREADERINC/opie.h \
-		QREADERINC/useqpe.h \
-		FontControl.h \
-		StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/FontControl.o FontControl.cpp
-
-QREADEROBJS/GraphicWin.o: GraphicWin.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/GraphicWin.o GraphicWin.cpp
-
-QREADEROBJS/Prefs.o: Prefs.cpp Prefs.h \
-		CEncoding_tables.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/Prefs.o Prefs.cpp
-
-QREADEROBJS/QTReader.o: QTReader.cpp QREADERINC/useqpe.h \
-		config.h \
-		QTReader.h \
-		CDrawBuffer.h \
-		ustring.h \
-		QREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		CFilter.h \
-		CExpander.h \
-		StyleConsts.h \
-		CBuffer.h \
-		linktype.h \
-		CEncoding.h \
-		Markups.h \
-		names.h \
-		CEncoding_tables.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/QTReader.o QTReader.cpp
-
-QREADEROBJS/QTReaderApp.o: QTReaderApp.cpp QREADERINC/useqpe.h \
-		QTReader.h \
-		GraphicWin.h \
-		Bkmks.h \
-		cbkmkselector.h \
-		infowin.h \
-		ToolbarPrefs.h \
-		Prefs.h \
-		CAnnoEdit.h \
-		QFloatBar.h \
-		FixedFont.h \
-		URLDialog.h \
-		util.h \
-		QREADERINC/opie.h \
-		fileBrowser.h \
-		QTReaderApp.h \
-		CDrawBuffer.h \
-		Filedata.h \
-		names.h \
-		CEncoding_tables.h \
-		CloseDialog.h \
-		ButtonPrefs.h \
-		QREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		CFilter.h \
-		CExpander.h \
-		StyleConsts.h \
-		CBuffer.h \
-		linktype.h \
-		config.h \
-		ustring.h \
-		CEncoding.h \
-		Markups.h \
-		Navigation.h \
-		preferences.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/QTReaderApp.o QTReaderApp.cpp
-
-QREADEROBJS/QtrListView.o: QtrListView.cpp QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/QtrListView.o QtrListView.cpp
-
-QREADEROBJS/ToolbarPrefs.o: ToolbarPrefs.cpp QREADERINC/useqpe.h \
-		ToolbarPrefs.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/ToolbarPrefs.o ToolbarPrefs.cpp
-
-QREADEROBJS/URLDialog.o: URLDialog.cpp URLDialog.h \
-		QREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/URLDialog.o URLDialog.cpp
-
-QREADEROBJS/infowin.o: infowin.cpp infowin.h \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/infowin.o infowin.cpp
-
-QREADEROBJS/main.o: main.cpp QREADERINC/useqpe.h \
-		QTReaderApp.h \
-		CExpander.h \
-		CEncoding.h \
-		orkey.h \
-		BGType.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/main.o main.cpp
-
-QREADEROBJS/orkey.o: orkey.cpp orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/orkey.o orkey.cpp
-
-QREADEROBJS/preferences.o: preferences.cpp QREADERINC/useqpe.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/preferences.o preferences.cpp
-
-QREADEROBJS/util.o: util.cpp util.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/util.o util.cpp
-
-QREADEROBJS/version.o: version.cpp version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/version.o version.cpp
-
-QREADEROBJS/moc_ButtonPrefs.o: QREADERMOCS/moc_ButtonPrefs.cpp ButtonPrefs.h orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_ButtonPrefs.o QREADERMOCS/moc_ButtonPrefs.cpp
-
-QREADEROBJS/moc_CAnnoEdit.o: QREADERMOCS/moc_CAnnoEdit.cpp CAnnoEdit.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_CAnnoEdit.o QREADERMOCS/moc_CAnnoEdit.cpp
-
-QREADEROBJS/moc_CloseDialog.o: QREADERMOCS/moc_CloseDialog.cpp CloseDialog.h QREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_CloseDialog.o QREADERMOCS/moc_CloseDialog.cpp
-
-QREADEROBJS/moc_GraphicWin.o: QREADERMOCS/moc_GraphicWin.cpp GraphicWin.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_GraphicWin.o QREADERMOCS/moc_GraphicWin.cpp
-
-QREADEROBJS/moc_Prefs.o: QREADERMOCS/moc_Prefs.cpp Prefs.h orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_Prefs.o QREADERMOCS/moc_Prefs.cpp
-
-QREADEROBJS/moc_QFloatBar.o: QREADERMOCS/moc_QFloatBar.cpp QFloatBar.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_QFloatBar.o QREADERMOCS/moc_QFloatBar.cpp
-
-QREADEROBJS/moc_QTReader.o: QREADERMOCS/moc_QTReader.cpp QTReader.h QREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		QREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		CFilter.h \
-		CExpander.h \
-		StyleConsts.h \
-		CBuffer.h \
-		linktype.h \
-		config.h \
-		ustring.h \
-		CEncoding.h \
-		Markups.h \
-		names.h \
-		CEncoding_tables.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_QTReader.o QREADERMOCS/moc_QTReader.cpp
-
-QREADEROBJS/moc_QTReaderApp.o: QREADERMOCS/moc_QTReaderApp.cpp QTReaderApp.h QREADERINC/useqpe.h \
-		CExpander.h \
-		CEncoding.h \
-		orkey.h \
-		BGType.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_QTReaderApp.o QREADERMOCS/moc_QTReaderApp.cpp
-
-QREADEROBJS/moc_QtrListView.o: QREADERMOCS/moc_QtrListView.cpp QtrListView.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_QtrListView.o QREADERMOCS/moc_QtrListView.cpp
-
-QREADEROBJS/moc_ToolbarPrefs.o: QREADERMOCS/moc_ToolbarPrefs.cpp ToolbarPrefs.h QREADERINC/useqpe.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_ToolbarPrefs.o QREADERMOCS/moc_ToolbarPrefs.cpp
-
-QREADEROBJS/moc_URLDialog.o: QREADERMOCS/moc_URLDialog.cpp URLDialog.h QREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_URLDialog.o QREADERMOCS/moc_URLDialog.cpp
-
-QREADEROBJS/moc_cbkmkselector.o: QREADERMOCS/moc_cbkmkselector.cpp cbkmkselector.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_cbkmkselector.o QREADERMOCS/moc_cbkmkselector.cpp
-
-QREADEROBJS/moc_infowin.o: QREADERMOCS/moc_infowin.cpp infowin.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QREADEROBJS/moc_infowin.o QREADERMOCS/moc_infowin.cpp
-
-QREADERMOCS/moc_ButtonPrefs.cpp: $(MOC) ButtonPrefs.h
-	$(MOC) ButtonPrefs.h -o QREADERMOCS/moc_ButtonPrefs.cpp
-
-QREADERMOCS/moc_CAnnoEdit.cpp: $(MOC) CAnnoEdit.h
-	$(MOC) CAnnoEdit.h -o QREADERMOCS/moc_CAnnoEdit.cpp
-
-QREADERMOCS/moc_CloseDialog.cpp: $(MOC) CloseDialog.h
-	$(MOC) CloseDialog.h -o QREADERMOCS/moc_CloseDialog.cpp
-
-QREADERMOCS/moc_GraphicWin.cpp: $(MOC) GraphicWin.h
-	$(MOC) GraphicWin.h -o QREADERMOCS/moc_GraphicWin.cpp
-
-QREADERMOCS/moc_Prefs.cpp: $(MOC) Prefs.h
-	$(MOC) Prefs.h -o QREADERMOCS/moc_Prefs.cpp
-
-QREADERMOCS/moc_QFloatBar.cpp: $(MOC) QFloatBar.h
-	$(MOC) QFloatBar.h -o QREADERMOCS/moc_QFloatBar.cpp
-
-QREADERMOCS/moc_QTReader.cpp: $(MOC) QTReader.h
-	$(MOC) QTReader.h -o QREADERMOCS/moc_QTReader.cpp
-
-QREADERMOCS/moc_QTReaderApp.cpp: $(MOC) QTReaderApp.h
-	$(MOC) QTReaderApp.h -o QREADERMOCS/moc_QTReaderApp.cpp
-
-QREADERMOCS/moc_QtrListView.cpp: $(MOC) QtrListView.h
-	$(MOC) QtrListView.h -o QREADERMOCS/moc_QtrListView.cpp
-
-QREADERMOCS/moc_ToolbarPrefs.cpp: $(MOC) ToolbarPrefs.h
-	$(MOC) ToolbarPrefs.h -o QREADERMOCS/moc_ToolbarPrefs.cpp
-
-QREADERMOCS/moc_URLDialog.cpp: $(MOC) URLDialog.h
-	$(MOC) URLDialog.h -o QREADERMOCS/moc_URLDialog.cpp
-
-QREADERMOCS/moc_cbkmkselector.cpp: $(MOC) cbkmkselector.h
-	$(MOC) cbkmkselector.h -o QREADERMOCS/moc_cbkmkselector.cpp
-
-QREADERMOCS/moc_infowin.cpp: $(MOC) infowin.h
-	$(MOC) infowin.h -o QREADERMOCS/moc_infowin.cpp
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/reader.omak b/noncore/apps/opie-reader/reader.omak
deleted file mode 100644
index e4553ee..0000000
--- a/noncore/apps/opie-reader/reader.omak
+++ b/dev/null
@@ -1,605 +0,0 @@
-#############################################################################
-# Makefile for building $(QPEDIR)/bin/reader
-# Generated by tmake at 15:14, 2004/05/08
-#     Project: reader.opro
-#    Template: app
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O3 -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O3 -DNO_DEBUG
-INCPATH	=	-IOREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqpe -lreader_codec -lpng12 -ljpeg -lz -lqte
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	Aportis.h \
-		Bkmks.h \
-		BuffDoc.h \
-		ButtonPrefs.h \
-		CAnnoEdit.h \
-		CBuffer.h \
-		CDrawBuffer.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		CExpander.h \
-		CFilter.h \
-		CloseDialog.h \
-		Coder.h \
-		CSource.h \
-		Filedata.h \
-		FixedFont.h \
-		FontControl.h \
-		GraphicWin.h \
-		Markups.h \
-		Navigation.h \
-		Palm2QImage.h \
-		Prefs.h \
-		PPMd.h \
-		PPMdType.h \
-		QFloatBar.h \
-		QTReader.h \
-		QTReaderApp.h \
-		QtrListView.h \
-		Queue.h \
-		StateData.h \
-		StyleConsts.h \
-		SubAlloc.h \
-		ToolbarPrefs.h \
-		URLDialog.h \
-		ZText.h \
-		arith.h \
-		arrierego.h \
-		cbkmkselector.h \
-		config.h \
-		fileBrowser.h \
-		infowin.h \
-		linktype.h \
-		my_list.h \
-		names.h \
-		nef.h \
-		OREADERINC/opie.h \
-		pdb.h \
-		plucker.h \
-		plucker_base.h \
-		ppm.h \
-		ppm_expander.h \
-		usenef.h \
-		OREADERINC/useqpe.h \
-		ustring.h \
-		util.h \
-		utypes.h \
-		version.h \
-		ztxt.h
-SOURCES =	BuffDoc.cpp \
-		ButtonPrefs.cpp \
-		CAnnoEdit.cpp \
-		CDrawBuffer.cpp \
-		CEncoding.cpp \
-		CEncoding_tables.cpp \
-		CFilter.cpp \
-		CRegExp.cpp \
-		CloseDialog.cpp \
-		FontControl.cpp \
-		Prefs.cpp \
-		QTReader.cpp \
-		QTReaderApp.cpp \
-		QtrListView.cpp \
-		ToolbarPrefs.cpp \
-		URLDialog.cpp \
-		fileBrowser.cpp \
-		infowin.cpp \
-		main.cpp \
-		orkey.cpp \
-		util.cpp \
-		version.cpp
-OBJECTS =	OREADEROBJS/BuffDoc.o \
-		OREADEROBJS/ButtonPrefs.o \
-		OREADEROBJS/CAnnoEdit.o \
-		OREADEROBJS/CDrawBuffer.o \
-		OREADEROBJS/CEncoding.o \
-		OREADEROBJS/CEncoding_tables.o \
-		OREADEROBJS/CFilter.o \
-		OREADEROBJS/CRegExp.o \
-		OREADEROBJS/CloseDialog.o \
-		OREADEROBJS/FontControl.o \
-		OREADEROBJS/Prefs.o \
-		OREADEROBJS/QTReader.o \
-		OREADEROBJS/QTReaderApp.o \
-		OREADEROBJS/QtrListView.o \
-		OREADEROBJS/ToolbarPrefs.o \
-		OREADEROBJS/URLDialog.o \
-		OREADEROBJS/fileBrowser.o \
-		OREADEROBJS/infowin.o \
-		OREADEROBJS/main.o \
-		OREADEROBJS/orkey.o \
-		OREADEROBJS/util.o \
-		OREADEROBJS/version.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	OREADERMOCS/moc_ButtonPrefs.cpp \
-		OREADERMOCS/moc_CAnnoEdit.cpp \
-		OREADERMOCS/moc_CloseDialog.cpp \
-		OREADERMOCS/moc_GraphicWin.cpp \
-		OREADERMOCS/moc_Prefs.cpp \
-		OREADERMOCS/moc_QFloatBar.cpp \
-		OREADERMOCS/moc_QTReader.cpp \
-		OREADERMOCS/moc_QTReaderApp.cpp \
-		OREADERMOCS/moc_QtrListView.cpp \
-		OREADERMOCS/moc_ToolbarPrefs.cpp \
-		OREADERMOCS/moc_URLDialog.cpp \
-		OREADERMOCS/moc_cbkmkselector.cpp \
-		OREADERMOCS/moc_fileBrowser.cpp \
-		OREADERMOCS/moc_infowin.cpp
-OBJMOC	=	OREADEROBJS/moc_ButtonPrefs.o \
-		OREADEROBJS/moc_CAnnoEdit.o \
-		OREADEROBJS/moc_CloseDialog.o \
-		OREADEROBJS/moc_GraphicWin.o \
-		OREADEROBJS/moc_Prefs.o \
-		OREADEROBJS/moc_QFloatBar.o \
-		OREADEROBJS/moc_QTReader.o \
-		OREADEROBJS/moc_QTReaderApp.o \
-		OREADEROBJS/moc_QtrListView.o \
-		OREADEROBJS/moc_ToolbarPrefs.o \
-		OREADEROBJS/moc_URLDialog.o \
-		OREADEROBJS/moc_cbkmkselector.o \
-		OREADEROBJS/moc_fileBrowser.o \
-		OREADEROBJS/moc_infowin.o
-DIST	=	
-TARGET	=	$(QPEDIR)/bin/reader
-INTERFACE_DECL_PATH = .
-
-####### 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: $(TARGET)
-
-$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
-
-moc: $(SRCMOC)
-
-tmake: reader.omak
-
-reader.omak: reader.opro
-	tmake reader.opro -o reader.omak
-
-dist:
-	$(TAR) reader.opro.tar reader.opro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) reader.opro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-OREADEROBJS/BuffDoc.o: BuffDoc.cpp \
-		OREADERINC/static.h \
-		names.h \
-		BuffDoc.h \
-		OREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		ZText.h \
-		ebookcodec.h \
-		Aportis.h \
-		pdb.h \
-		CHM.h \
-		chm_lib.h \
-		ppm_expander.h \
-		utypes.h \
-		ppm.h \
-		arith.h \
-		ztxt.h \
-		plucker.h \
-		plucker_base.h \
-		Navigation.h \
-		hrule.h \
-		nef.h \
-		usenef.h \
-		arrierego.h \
-		iSilo.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/BuffDoc.o BuffDoc.cpp
-
-OREADEROBJS/ButtonPrefs.o: ButtonPrefs.cpp \
-		ButtonPrefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/ButtonPrefs.o ButtonPrefs.cpp
-
-OREADEROBJS/CAnnoEdit.o: CAnnoEdit.cpp \
-		CAnnoEdit.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CAnnoEdit.o CAnnoEdit.cpp
-
-OREADEROBJS/CDrawBuffer.o: CDrawBuffer.cpp \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		FontControl.h \
-		OREADERINC/useqpe.h \
-		OREADERINC/opie.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CDrawBuffer.o CDrawBuffer.cpp
-
-OREADEROBJS/CEncoding.o: CEncoding.cpp \
-		CEncoding.h \
-		CExpander.h \
-		OREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CEncoding.o CEncoding.cpp
-
-OREADEROBJS/CEncoding_tables.o: CEncoding_tables.cpp \
-		CEncoding_tables.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CEncoding_tables.o CEncoding_tables.cpp
-
-OREADEROBJS/CFilter.o: CFilter.cpp \
-		OREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		OREADERINC/static.h \
-		hrule.h \
-		Bkmks.h \
-		Filedata.h \
-		QTReader.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h \
-		CRegExp.h \
-		hash.h \
-		Queue.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CFilter.o CFilter.cpp
-
-OREADEROBJS/CRegExp.o: CRegExp.cpp \
-		CRegExp.h \
-		config.h \
-		ustring.h \
-		hash.h \
-		Queue.h \
-		my_list.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CRegExp.o CRegExp.cpp
-
-OREADEROBJS/CloseDialog.o: CloseDialog.cpp \
-		CloseDialog.h \
-		OREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/CloseDialog.o CloseDialog.cpp
-
-OREADEROBJS/FontControl.o: FontControl.cpp \
-		OREADERINC/opie.h \
-		OREADERINC/useqpe.h \
-		FontControl.h \
-		StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/FontControl.o FontControl.cpp
-
-OREADEROBJS/Prefs.o: Prefs.cpp \
-		Prefs.h \
-		orkey.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/Prefs.o Prefs.cpp
-
-OREADEROBJS/QTReader.o: QTReader.cpp \
-		OREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		QTReader.h \
-		OREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/QTReader.o QTReader.cpp
-
-OREADEROBJS/QTReaderApp.o: QTReaderApp.cpp \
-		OREADERINC/useqpe.h \
-		QTReader.h \
-		OREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h \
-		GraphicWin.h \
-		Bkmks.h \
-		Filedata.h \
-		cbkmkselector.h \
-		infowin.h \
-		ToolbarPrefs.h \
-		preferences.h \
-		Prefs.h \
-		orkey.h \
-		CAnnoEdit.h \
-		QFloatBar.h \
-		FixedFont.h \
-		URLDialog.h \
-		util.h \
-		fileBrowser.h \
-		QTReaderApp.h \
-		CloseDialog.h \
-		ButtonPrefs.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/QTReaderApp.o QTReaderApp.cpp
-
-OREADEROBJS/QtrListView.o: QtrListView.cpp \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/QtrListView.o QtrListView.cpp
-
-OREADEROBJS/ToolbarPrefs.o: ToolbarPrefs.cpp \
-		OREADERINC/useqpe.h \
-		ToolbarPrefs.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/ToolbarPrefs.o ToolbarPrefs.cpp
-
-OREADEROBJS/URLDialog.o: URLDialog.cpp \
-		URLDialog.h \
-		OREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/URLDialog.o URLDialog.cpp
-
-OREADEROBJS/fileBrowser.o: fileBrowser.cpp \
-		fileBrowser.h \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/fileBrowser.o fileBrowser.cpp
-
-OREADEROBJS/infowin.o: infowin.cpp \
-		infowin.h \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/infowin.o infowin.cpp
-
-OREADEROBJS/main.o: main.cpp \
-		OREADERINC/useqpe.h \
-		QTReaderApp.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		orkey.h \
-		BGType.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/main.o main.cpp
-
-OREADEROBJS/orkey.o: orkey.cpp \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/orkey.o orkey.cpp
-
-OREADEROBJS/util.o: util.cpp \
-		util.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/util.o util.cpp
-
-OREADEROBJS/version.o: version.cpp \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/version.o version.cpp
-
-OREADEROBJS/moc_ButtonPrefs.o: OREADERMOCS/moc_ButtonPrefs.cpp \
-		ButtonPrefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_ButtonPrefs.o OREADERMOCS/moc_ButtonPrefs.cpp
-
-OREADEROBJS/moc_CAnnoEdit.o: OREADERMOCS/moc_CAnnoEdit.cpp \
-		CAnnoEdit.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_CAnnoEdit.o OREADERMOCS/moc_CAnnoEdit.cpp
-
-OREADEROBJS/moc_CloseDialog.o: OREADERMOCS/moc_CloseDialog.cpp \
-		CloseDialog.h \
-		OREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_CloseDialog.o OREADERMOCS/moc_CloseDialog.cpp
-
-OREADEROBJS/moc_GraphicWin.o: OREADERMOCS/moc_GraphicWin.cpp \
-		GraphicWin.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_GraphicWin.o OREADERMOCS/moc_GraphicWin.cpp
-
-OREADEROBJS/moc_Prefs.o: OREADERMOCS/moc_Prefs.cpp \
-		Prefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_Prefs.o OREADERMOCS/moc_Prefs.cpp
-
-OREADEROBJS/moc_QFloatBar.o: OREADERMOCS/moc_QFloatBar.cpp \
-		QFloatBar.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_QFloatBar.o OREADERMOCS/moc_QFloatBar.cpp
-
-OREADEROBJS/moc_QTReader.o: OREADERMOCS/moc_QTReader.cpp \
-		QTReader.h \
-		OREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		OREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_QTReader.o OREADERMOCS/moc_QTReader.cpp
-
-OREADEROBJS/moc_QTReaderApp.o: OREADERMOCS/moc_QTReaderApp.cpp \
-		QTReaderApp.h \
-		OREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		orkey.h \
-		BGType.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_QTReaderApp.o OREADERMOCS/moc_QTReaderApp.cpp
-
-OREADEROBJS/moc_QtrListView.o: OREADERMOCS/moc_QtrListView.cpp \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_QtrListView.o OREADERMOCS/moc_QtrListView.cpp
-
-OREADEROBJS/moc_ToolbarPrefs.o: OREADERMOCS/moc_ToolbarPrefs.cpp \
-		ToolbarPrefs.h \
-		OREADERINC/useqpe.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_ToolbarPrefs.o OREADERMOCS/moc_ToolbarPrefs.cpp
-
-OREADEROBJS/moc_URLDialog.o: OREADERMOCS/moc_URLDialog.cpp \
-		URLDialog.h \
-		OREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_URLDialog.o OREADERMOCS/moc_URLDialog.cpp
-
-OREADEROBJS/moc_cbkmkselector.o: OREADERMOCS/moc_cbkmkselector.cpp \
-		cbkmkselector.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_cbkmkselector.o OREADERMOCS/moc_cbkmkselector.cpp
-
-OREADEROBJS/moc_fileBrowser.o: OREADERMOCS/moc_fileBrowser.cpp \
-		fileBrowser.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_fileBrowser.o OREADERMOCS/moc_fileBrowser.cpp
-
-OREADEROBJS/moc_infowin.o: OREADERMOCS/moc_infowin.cpp \
-		infowin.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o OREADEROBJS/moc_infowin.o OREADERMOCS/moc_infowin.cpp
-
-OREADERMOCS/moc_ButtonPrefs.cpp: ButtonPrefs.h
-	$(MOC) ButtonPrefs.h -o OREADERMOCS/moc_ButtonPrefs.cpp
-
-OREADERMOCS/moc_CAnnoEdit.cpp: CAnnoEdit.h
-	$(MOC) CAnnoEdit.h -o OREADERMOCS/moc_CAnnoEdit.cpp
-
-OREADERMOCS/moc_CloseDialog.cpp: CloseDialog.h
-	$(MOC) CloseDialog.h -o OREADERMOCS/moc_CloseDialog.cpp
-
-OREADERMOCS/moc_GraphicWin.cpp: GraphicWin.h
-	$(MOC) GraphicWin.h -o OREADERMOCS/moc_GraphicWin.cpp
-
-OREADERMOCS/moc_Prefs.cpp: Prefs.h
-	$(MOC) Prefs.h -o OREADERMOCS/moc_Prefs.cpp
-
-OREADERMOCS/moc_QFloatBar.cpp: QFloatBar.h
-	$(MOC) QFloatBar.h -o OREADERMOCS/moc_QFloatBar.cpp
-
-OREADERMOCS/moc_QTReader.cpp: QTReader.h
-	$(MOC) QTReader.h -o OREADERMOCS/moc_QTReader.cpp
-
-OREADERMOCS/moc_QTReaderApp.cpp: QTReaderApp.h
-	$(MOC) QTReaderApp.h -o OREADERMOCS/moc_QTReaderApp.cpp
-
-OREADERMOCS/moc_QtrListView.cpp: QtrListView.h
-	$(MOC) QtrListView.h -o OREADERMOCS/moc_QtrListView.cpp
-
-OREADERMOCS/moc_ToolbarPrefs.cpp: ToolbarPrefs.h
-	$(MOC) ToolbarPrefs.h -o OREADERMOCS/moc_ToolbarPrefs.cpp
-
-OREADERMOCS/moc_URLDialog.cpp: URLDialog.h
-	$(MOC) URLDialog.h -o OREADERMOCS/moc_URLDialog.cpp
-
-OREADERMOCS/moc_cbkmkselector.cpp: cbkmkselector.h
-	$(MOC) cbkmkselector.h -o OREADERMOCS/moc_cbkmkselector.cpp
-
-OREADERMOCS/moc_fileBrowser.cpp: fileBrowser.h
-	$(MOC) fileBrowser.h -o OREADERMOCS/moc_fileBrowser.cpp
-
-OREADERMOCS/moc_infowin.cpp: infowin.h
-	$(MOC) infowin.h -o OREADERMOCS/moc_infowin.cpp
-
diff --git a/noncore/apps/opie-reader/reader.staticmak b/noncore/apps/opie-reader/reader.staticmak
deleted file mode 100644
index eab8857..0000000
--- a/noncore/apps/opie-reader/reader.staticmak
+++ b/dev/null
@@ -1,846 +0,0 @@
-#############################################################################
-# Makefile for building: QSTATICREADEROBJS/uqtreader
-# Generated by qmake (1.06c) (Qt 3.2.3) on: Sun Jul 25 09:15:20 2004
-# Project:  reader.staticpro
-# Template: app
-# Command: $(QMAKE) -o reader.staticmak reader.staticpro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC       = gcc
-CXX      = g++
-LEX      = flex
-YACC     = yacc
-CFLAGS   = -pipe -w -g  
-CXXFLAGS = -pipe -w -g  
-LEXFLAGS = 
-YACCFLAGS= -d
-INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -IQSTATICREADERINC -I$(QTDIR)/include -IQSTATICREADERMOCS/
-LINK     = g++
-LFLAGS   = 
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm
-AR       = ar cqs
-RANLIB   = 
-MOC      = $(QTDIR)/bin/moc
-UIC      = $(QTDIR)/bin/uic
-QMAKE    = qmake
-TAR      = tar -cf
-GZIP     = gzip -9f
-COPY     = cp -f
-COPY_FILE= $(COPY)
-COPY_DIR = $(COPY) -r
-DEL_FILE = rm -f
-SYMLINK  = ln -sf
-DEL_DIR  = rmdir
-MOVE     = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = QSTATICREADEROBJS/
-
-####### Files
-
-HEADERS = Aportis.h \
-		Bkmks.h \
-		BuffDoc.h \
-		ButtonPrefs.h \
-		CAnnoEdit.h \
-		CBuffer.h \
-		CDrawBuffer.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		CExpander.h \
-		CFilter.h \
-		CloseDialog.h \
-		Filedata.h \
-		FixedFont.h \
-		FontControl.h \
-		GraphicWin.h \
-		Markups.h \
-		Navigation.h \
-		Palm2QImage.h \
-		Prefs.h \
-		QFloatBar.h \
-		QTReader.h \
-		QTReaderApp.h \
-		QtrListView.h \
-		Queue.h \
-		StyleConsts.h \
-		ToolbarPrefs.h \
-		URLDialog.h \
-		ZText.h \
-		arith.h \
-		cbkmkselector.h \
-		config.h \
-		fileBrowser.h \
-		infowin.h \
-		linktype.h \
-		my_list.h \
-		names.h \
-		QSTATICREADERINC/opie.h \
-		pdb.h \
-		plucker_base.h \
-		plucker.h \
-		ppm.h \
-		ppm_expander.h \
-		preferences.h \
-		QSTATICREADERINC/static.h \
-		usenef.h \
-		QSTATICREADERINC/useqpe.h \
-		ustring.h \
-		utypes.h \
-		version.h \
-		ztxt.h
-SOURCES = Aportis.cpp \
-		Bkmks.cpp \
-		BuffDoc.cpp \
-		ButtonPrefs.cpp \
-		CAnnoEdit.cpp \
-		CBuffer.cpp \
-		CDrawBuffer.cpp \
-		CEncoding.cpp \
-		CEncoding_tables.cpp \
-		CExpander.cpp \
-		CFilter.cpp \
-		CHM.cpp \
-		CRegExp.cpp \
-		CloseDialog.cpp \
-		FontControl.cpp \
-		GraphicWin.cpp \
-		Navigation.cpp \
-		Palm2QImage.cpp \
-		Prefs.cpp \
-		QTReader.cpp \
-		QTReaderApp.cpp \
-		QtrListView.cpp \
-		StyleConsts.cpp \
-		ToolbarPrefs.cpp \
-		URLDialog.cpp \
-		arith_d.cpp \
-		chm_lib.c \
-		fileBrowser.cpp \
-		hrule.cpp \
-		infowin.cpp \
-		iSilo.cpp \
-		lzx.c \
-		main.cpp \
-		orkey.cpp \
-		pdb.cpp \
-		plucker.cpp \
-		plucker_base.cpp \
-		ppm.cpp \
-		ppm_expander.cpp \
-		preferences.cpp \
-		striphtml.cpp \
-		util.cpp \
-		version.cpp \
-		ztxt.cpp
-OBJECTS = QSTATICREADEROBJS/Aportis.o \
-		QSTATICREADEROBJS/Bkmks.o \
-		QSTATICREADEROBJS/BuffDoc.o \
-		QSTATICREADEROBJS/ButtonPrefs.o \
-		QSTATICREADEROBJS/CAnnoEdit.o \
-		QSTATICREADEROBJS/CBuffer.o \
-		QSTATICREADEROBJS/CDrawBuffer.o \
-		QSTATICREADEROBJS/CEncoding.o \
-		QSTATICREADEROBJS/CEncoding_tables.o \
-		QSTATICREADEROBJS/CExpander.o \
-		QSTATICREADEROBJS/CFilter.o \
-		QSTATICREADEROBJS/CHM.o \
-		QSTATICREADEROBJS/CRegExp.o \
-		QSTATICREADEROBJS/CloseDialog.o \
-		QSTATICREADEROBJS/FontControl.o \
-		QSTATICREADEROBJS/GraphicWin.o \
-		QSTATICREADEROBJS/Navigation.o \
-		QSTATICREADEROBJS/Palm2QImage.o \
-		QSTATICREADEROBJS/Prefs.o \
-		QSTATICREADEROBJS/QTReader.o \
-		QSTATICREADEROBJS/QTReaderApp.o \
-		QSTATICREADEROBJS/QtrListView.o \
-		QSTATICREADEROBJS/StyleConsts.o \
-		QSTATICREADEROBJS/ToolbarPrefs.o \
-		QSTATICREADEROBJS/URLDialog.o \
-		QSTATICREADEROBJS/arith_d.o \
-		QSTATICREADEROBJS/chm_lib.o \
-		QSTATICREADEROBJS/fileBrowser.o \
-		QSTATICREADEROBJS/hrule.o \
-		QSTATICREADEROBJS/infowin.o \
-		QSTATICREADEROBJS/iSilo.o \
-		QSTATICREADEROBJS/lzx.o \
-		QSTATICREADEROBJS/main.o \
-		QSTATICREADEROBJS/orkey.o \
-		QSTATICREADEROBJS/pdb.o \
-		QSTATICREADEROBJS/plucker.o \
-		QSTATICREADEROBJS/plucker_base.o \
-		QSTATICREADEROBJS/ppm.o \
-		QSTATICREADEROBJS/ppm_expander.o \
-		QSTATICREADEROBJS/preferences.o \
-		QSTATICREADEROBJS/striphtml.o \
-		QSTATICREADEROBJS/util.o \
-		QSTATICREADEROBJS/version.o \
-		QSTATICREADEROBJS/ztxt.o
-FORMS = 
-UICDECLS = 
-UICIMPLS = 
-SRCMOC   = QSTATICREADERMOCS/moc_ButtonPrefs.cpp \
-		QSTATICREADERMOCS/moc_CAnnoEdit.cpp \
-		QSTATICREADERMOCS/moc_CloseDialog.cpp \
-		QSTATICREADERMOCS/moc_GraphicWin.cpp \
-		QSTATICREADERMOCS/moc_Prefs.cpp \
-		QSTATICREADERMOCS/moc_QFloatBar.cpp \
-		QSTATICREADERMOCS/moc_QTReader.cpp \
-		QSTATICREADERMOCS/moc_QTReaderApp.cpp \
-		QSTATICREADERMOCS/moc_QtrListView.cpp \
-		QSTATICREADERMOCS/moc_ToolbarPrefs.cpp \
-		QSTATICREADERMOCS/moc_URLDialog.cpp \
-		QSTATICREADERMOCS/moc_cbkmkselector.cpp \
-		QSTATICREADERMOCS/moc_fileBrowser.cpp \
-		QSTATICREADERMOCS/moc_infowin.cpp
-OBJMOC = QSTATICREADEROBJS/moc_ButtonPrefs.o \
-		QSTATICREADEROBJS/moc_CAnnoEdit.o \
-		QSTATICREADEROBJS/moc_CloseDialog.o \
-		QSTATICREADEROBJS/moc_GraphicWin.o \
-		QSTATICREADEROBJS/moc_Prefs.o \
-		QSTATICREADEROBJS/moc_QFloatBar.o \
-		QSTATICREADEROBJS/moc_QTReader.o \
-		QSTATICREADEROBJS/moc_QTReaderApp.o \
-		QSTATICREADEROBJS/moc_QtrListView.o \
-		QSTATICREADEROBJS/moc_ToolbarPrefs.o \
-		QSTATICREADEROBJS/moc_URLDialog.o \
-		QSTATICREADEROBJS/moc_cbkmkselector.o \
-		QSTATICREADEROBJS/moc_fileBrowser.o \
-		QSTATICREADEROBJS/moc_infowin.o
-DIST	   = reader.staticpro
-QMAKE_TARGET = uqtreader
-DESTDIR  = QSTATICREADEROBJS/
-TARGET   = QSTATICREADEROBJS/uqtreader
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .c .o .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-all: reader.staticmak $(TARGET)
-
-$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC)  
-	test -d QSTATICREADEROBJS/ || mkdir -p QSTATICREADEROBJS/
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-
-mocables: $(SRCMOC)
-uicables: $(UICDECLS) $(UICIMPLS)
-
-$(MOC): 
-	( cd $(QTDIR)/src/moc ; $(MAKE) )
-
-reader.staticmak: reader.staticpro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o reader.staticmak reader.staticpro
-qmake: 
-	@$(QMAKE) -o reader.staticmak reader.staticpro
-
-dist: 
-	@mkdir -p QSTATICREADEROBJS/uqtreader && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) QSTATICREADEROBJS/uqtreader/ && ( cd `dirname QSTATICREADEROBJS/uqtreader` && $(TAR) uqtreader.tar uqtreader && $(GZIP) uqtreader.tar ) && $(MOVE) `dirname QSTATICREADEROBJS/uqtreader`/uqtreader.tar.gz . && $(DEL_FILE) -r QSTATICREADEROBJS/uqtreader
-
-mocclean:
-	-$(DEL_FILE) $(OBJMOC)
-	-$(DEL_FILE) $(SRCMOC)
-
-uiclean:
-
-yaccclean:
-lexclean:
-clean: mocclean
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) QSTATICREADEROBJS/$(TARGET) $(TARGET)
-
-
-FORCE:
-
-####### Compile
-
-QSTATICREADEROBJS/Aportis.o: Aportis.cpp Aportis.h \
-		my_list.h \
-		Bkmks.h \
-		QSTATICREADERINC/static.h \
-		CExpander.h \
-		pdb.h \
-		QSTATICREADERINC/useqpe.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h \
-		Filedata.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/Aportis.o Aportis.cpp
-
-QSTATICREADEROBJS/Bkmks.o: Bkmks.cpp Bkmks.h \
-		StyleConsts.h \
-		Markups.h \
-		my_list.h \
-		version.h \
-		names.h \
-		config.h \
-		Filedata.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/Bkmks.o Bkmks.cpp
-
-QSTATICREADEROBJS/BuffDoc.o: BuffDoc.cpp QSTATICREADERINC/static.h \
-		names.h \
-		QSTATICREADERINC/useqpe.h \
-		usenef.h \
-		BuffDoc.h \
-		config.h \
-		CDrawBuffer.h \
-		ZText.h \
-		ebookcodec.h \
-		Aportis.h \
-		CHM.h \
-		ppm_expander.h \
-		ztxt.h \
-		plucker.h \
-		iSilo.h \
-		CFilter.h \
-		CExpander.h \
-		StyleConsts.h \
-		CBuffer.h \
-		my_list.h \
-		linktype.h \
-		ustring.h \
-		CEncoding.h \
-		Markups.h \
-		CEncoding_tables.h \
-		pdb.h \
-		chm_lib.h \
-		utypes.h \
-		ppm.h \
-		arith.h \
-		plucker_base.h \
-		Navigation.h \
-		hrule.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/BuffDoc.o BuffDoc.cpp
-
-QSTATICREADEROBJS/ButtonPrefs.o: ButtonPrefs.cpp ButtonPrefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/ButtonPrefs.o ButtonPrefs.cpp
-
-QSTATICREADEROBJS/CAnnoEdit.o: CAnnoEdit.cpp CAnnoEdit.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CAnnoEdit.o CAnnoEdit.cpp
-
-QSTATICREADEROBJS/CBuffer.o: CBuffer.cpp CBuffer.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CBuffer.o CBuffer.cpp
-
-QSTATICREADEROBJS/CDrawBuffer.o: CDrawBuffer.cpp CDrawBuffer.h \
-		FontControl.h \
-		QSTATICREADERINC/useqpe.h \
-		QSTATICREADERINC/opie.h \
-		StyleConsts.h \
-		CBuffer.h \
-		my_list.h \
-		linktype.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CDrawBuffer.o CDrawBuffer.cpp
-
-QSTATICREADEROBJS/CEncoding.o: CEncoding.cpp CEncoding.h \
-		CExpander.h \
-		CEncoding_tables.h \
-		QSTATICREADERINC/useqpe.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CEncoding.o CEncoding.cpp
-
-QSTATICREADEROBJS/CEncoding_tables.o: CEncoding_tables.cpp CEncoding_tables.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CEncoding_tables.o CEncoding_tables.cpp
-
-QSTATICREADEROBJS/CExpander.o: CExpander.cpp CExpander.h \
-		QSTATICREADERINC/useqpe.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CExpander.o CExpander.cpp
-
-QSTATICREADEROBJS/CFilter.o: CFilter.cpp QSTATICREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		CFilter.h \
-		hrule.h \
-		Bkmks.h \
-		QTReader.h \
-		CRegExp.h \
-		StyleConsts.h \
-		CBuffer.h \
-		my_list.h \
-		linktype.h \
-		config.h \
-		ustring.h \
-		CExpander.h \
-		CEncoding.h \
-		QSTATICREADERINC/static.h \
-		Markups.h \
-		names.h \
-		CEncoding_tables.h \
-		Filedata.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h \
-		hash.h \
-		Queue.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CFilter.o CFilter.cpp
-
-QSTATICREADEROBJS/CHM.o: CHM.cpp CHM.h \
-		chm_lib.h \
-		QSTATICREADERINC/static.h \
-		QSTATICREADERINC/useqpe.h \
-		CExpander.h \
-		my_list.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CHM.o CHM.cpp
-
-QSTATICREADEROBJS/CRegExp.o: CRegExp.cpp CRegExp.h \
-		config.h \
-		hash.h \
-		Queue.h \
-		ustring.h \
-		my_list.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CRegExp.o CRegExp.cpp
-
-QSTATICREADEROBJS/CloseDialog.o: CloseDialog.cpp CloseDialog.h \
-		QSTATICREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/CloseDialog.o CloseDialog.cpp
-
-QSTATICREADEROBJS/FontControl.o: FontControl.cpp QSTATICREADERINC/opie.h \
-		QSTATICREADERINC/useqpe.h \
-		FontControl.h \
-		StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/FontControl.o FontControl.cpp
-
-QSTATICREADEROBJS/GraphicWin.o: GraphicWin.cpp GraphicWin.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/GraphicWin.o GraphicWin.cpp
-
-QSTATICREADEROBJS/Navigation.o: Navigation.cpp Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/Navigation.o Navigation.cpp
-
-QSTATICREADEROBJS/Palm2QImage.o: Palm2QImage.cpp QSTATICREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/Palm2QImage.o Palm2QImage.cpp
-
-QSTATICREADEROBJS/Prefs.o: Prefs.cpp Prefs.h \
-		CEncoding_tables.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/Prefs.o Prefs.cpp
-
-QSTATICREADEROBJS/QTReader.o: QTReader.cpp QSTATICREADERINC/useqpe.h \
-		config.h \
-		QTReader.h \
-		CDrawBuffer.h \
-		ustring.h \
-		QSTATICREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		CFilter.h \
-		CExpander.h \
-		StyleConsts.h \
-		CBuffer.h \
-		linktype.h \
-		CEncoding.h \
-		Markups.h \
-		names.h \
-		CEncoding_tables.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/QTReader.o QTReader.cpp
-
-QSTATICREADEROBJS/QTReaderApp.o: QTReaderApp.cpp QSTATICREADERINC/useqpe.h \
-		QTReader.h \
-		GraphicWin.h \
-		Bkmks.h \
-		cbkmkselector.h \
-		infowin.h \
-		ToolbarPrefs.h \
-		Prefs.h \
-		CAnnoEdit.h \
-		QFloatBar.h \
-		FixedFont.h \
-		URLDialog.h \
-		util.h \
-		QSTATICREADERINC/opie.h \
-		fileBrowser.h \
-		QTReaderApp.h \
-		CDrawBuffer.h \
-		Filedata.h \
-		names.h \
-		CEncoding_tables.h \
-		CloseDialog.h \
-		ButtonPrefs.h \
-		QSTATICREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		CFilter.h \
-		CExpander.h \
-		StyleConsts.h \
-		CBuffer.h \
-		linktype.h \
-		config.h \
-		ustring.h \
-		CEncoding.h \
-		Markups.h \
-		Navigation.h \
-		preferences.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/QTReaderApp.o QTReaderApp.cpp
-
-QSTATICREADEROBJS/QtrListView.o: QtrListView.cpp QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/QtrListView.o QtrListView.cpp
-
-QSTATICREADEROBJS/StyleConsts.o: StyleConsts.cpp StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/StyleConsts.o StyleConsts.cpp
-
-QSTATICREADEROBJS/ToolbarPrefs.o: ToolbarPrefs.cpp QSTATICREADERINC/useqpe.h \
-		ToolbarPrefs.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/ToolbarPrefs.o ToolbarPrefs.cpp
-
-QSTATICREADEROBJS/URLDialog.o: URLDialog.cpp URLDialog.h \
-		QSTATICREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/URLDialog.o URLDialog.cpp
-
-QSTATICREADEROBJS/arith_d.o: arith_d.cpp arith.h \
-		utypes.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/arith_d.o arith_d.cpp
-
-QSTATICREADEROBJS/chm_lib.o: chm_lib.c chm_lib.h \
-		lzx.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o QSTATICREADEROBJS/chm_lib.o chm_lib.c
-
-QSTATICREADEROBJS/fileBrowser.o: fileBrowser.cpp fileBrowser.h \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/fileBrowser.o fileBrowser.cpp
-
-QSTATICREADEROBJS/hrule.o: hrule.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/hrule.o hrule.cpp
-
-QSTATICREADEROBJS/infowin.o: infowin.cpp infowin.h \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/infowin.o infowin.cpp
-
-QSTATICREADEROBJS/iSilo.o: iSilo.cpp iSilo.h \
-		pdb.h \
-		QSTATICREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/iSilo.o iSilo.cpp
-
-QSTATICREADEROBJS/lzx.o: lzx.c lzx.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o QSTATICREADEROBJS/lzx.o lzx.c
-
-QSTATICREADEROBJS/main.o: main.cpp QSTATICREADERINC/useqpe.h \
-		QTReaderApp.h \
-		CExpander.h \
-		CEncoding.h \
-		orkey.h \
-		BGType.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/main.o main.cpp
-
-QSTATICREADEROBJS/orkey.o: orkey.cpp orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/orkey.o orkey.cpp
-
-QSTATICREADEROBJS/pdb.o: pdb.cpp pdb.h \
-		QSTATICREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/pdb.o pdb.cpp
-
-QSTATICREADEROBJS/plucker.o: plucker.cpp QSTATICREADERINC/useqpe.h \
-		plucker.h \
-		Aportis.h \
-		Palm2QImage.h \
-		QSTATICREADERINC/static.h \
-		plucker_base.h \
-		CExpander.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		hrule.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/plucker.o plucker.cpp
-
-QSTATICREADEROBJS/plucker_base.o: plucker_base.cpp QSTATICREADERINC/useqpe.h \
-		usenef.h \
-		QSTATICREADERINC/static.h \
-		plucker_base.h \
-		Aportis.h \
-		hrule.h \
-		CExpander.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/plucker_base.o plucker_base.cpp
-
-QSTATICREADEROBJS/ppm.o: ppm.cpp arith.h \
-		ppm.h \
-		utypes.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/ppm.o ppm.cpp
-
-QSTATICREADEROBJS/ppm_expander.o: ppm_expander.cpp QSTATICREADERINC/static.h \
-		ppm_expander.h \
-		QSTATICREADERINC/useqpe.h \
-		CExpander.h \
-		utypes.h \
-		ppm.h \
-		arith.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/ppm_expander.o ppm_expander.cpp
-
-QSTATICREADEROBJS/preferences.o: preferences.cpp QSTATICREADERINC/useqpe.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/preferences.o preferences.cpp
-
-QSTATICREADEROBJS/striphtml.o: striphtml.cpp QSTATICREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		striphtml.h \
-		hrule.h \
-		StyleConsts.h \
-		CBuffer.h \
-		my_list.h \
-		linktype.h \
-		config.h \
-		ustring.h \
-		CFilter.h \
-		Navigation.h \
-		CExpander.h \
-		CEncoding.h \
-		QSTATICREADERINC/static.h \
-		Markups.h \
-		names.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/striphtml.o striphtml.cpp
-
-QSTATICREADEROBJS/util.o: util.cpp util.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/util.o util.cpp
-
-QSTATICREADEROBJS/version.o: version.cpp version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/version.o version.cpp
-
-QSTATICREADEROBJS/ztxt.o: ztxt.cpp ztxt.h \
-		my_list.h \
-		Bkmks.h \
-		QSTATICREADERINC/static.h \
-		CExpander.h \
-		pdb.h \
-		QSTATICREADERINC/useqpe.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h \
-		Filedata.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/ztxt.o ztxt.cpp
-
-QSTATICREADEROBJS/moc_ButtonPrefs.o: QSTATICREADERMOCS/moc_ButtonPrefs.cpp ButtonPrefs.h orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_ButtonPrefs.o QSTATICREADERMOCS/moc_ButtonPrefs.cpp
-
-QSTATICREADEROBJS/moc_CAnnoEdit.o: QSTATICREADERMOCS/moc_CAnnoEdit.cpp CAnnoEdit.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_CAnnoEdit.o QSTATICREADERMOCS/moc_CAnnoEdit.cpp
-
-QSTATICREADEROBJS/moc_CloseDialog.o: QSTATICREADERMOCS/moc_CloseDialog.cpp CloseDialog.h QSTATICREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_CloseDialog.o QSTATICREADERMOCS/moc_CloseDialog.cpp
-
-QSTATICREADEROBJS/moc_GraphicWin.o: QSTATICREADERMOCS/moc_GraphicWin.cpp GraphicWin.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_GraphicWin.o QSTATICREADERMOCS/moc_GraphicWin.cpp
-
-QSTATICREADEROBJS/moc_Prefs.o: QSTATICREADERMOCS/moc_Prefs.cpp Prefs.h orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_Prefs.o QSTATICREADERMOCS/moc_Prefs.cpp
-
-QSTATICREADEROBJS/moc_QFloatBar.o: QSTATICREADERMOCS/moc_QFloatBar.cpp QFloatBar.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_QFloatBar.o QSTATICREADERMOCS/moc_QFloatBar.cpp
-
-QSTATICREADEROBJS/moc_QTReader.o: QSTATICREADERMOCS/moc_QTReader.cpp QTReader.h QSTATICREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		QSTATICREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		CFilter.h \
-		CExpander.h \
-		StyleConsts.h \
-		CBuffer.h \
-		linktype.h \
-		config.h \
-		ustring.h \
-		CEncoding.h \
-		Markups.h \
-		names.h \
-		CEncoding_tables.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_QTReader.o QSTATICREADERMOCS/moc_QTReader.cpp
-
-QSTATICREADEROBJS/moc_QTReaderApp.o: QSTATICREADERMOCS/moc_QTReaderApp.cpp QTReaderApp.h QSTATICREADERINC/useqpe.h \
-		CExpander.h \
-		CEncoding.h \
-		orkey.h \
-		BGType.h \
-		config.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ustring.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_QTReaderApp.o QSTATICREADERMOCS/moc_QTReaderApp.cpp
-
-QSTATICREADEROBJS/moc_QtrListView.o: QSTATICREADERMOCS/moc_QtrListView.cpp QtrListView.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_QtrListView.o QSTATICREADERMOCS/moc_QtrListView.cpp
-
-QSTATICREADEROBJS/moc_ToolbarPrefs.o: QSTATICREADERMOCS/moc_ToolbarPrefs.cpp ToolbarPrefs.h QSTATICREADERINC/useqpe.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_ToolbarPrefs.o QSTATICREADERMOCS/moc_ToolbarPrefs.cpp
-
-QSTATICREADEROBJS/moc_URLDialog.o: QSTATICREADERMOCS/moc_URLDialog.cpp URLDialog.h QSTATICREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_URLDialog.o QSTATICREADERMOCS/moc_URLDialog.cpp
-
-QSTATICREADEROBJS/moc_cbkmkselector.o: QSTATICREADERMOCS/moc_cbkmkselector.cpp cbkmkselector.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_cbkmkselector.o QSTATICREADERMOCS/moc_cbkmkselector.cpp
-
-QSTATICREADEROBJS/moc_fileBrowser.o: QSTATICREADERMOCS/moc_fileBrowser.cpp fileBrowser.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_fileBrowser.o QSTATICREADERMOCS/moc_fileBrowser.cpp
-
-QSTATICREADEROBJS/moc_infowin.o: QSTATICREADERMOCS/moc_infowin.cpp infowin.h 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o QSTATICREADEROBJS/moc_infowin.o QSTATICREADERMOCS/moc_infowin.cpp
-
-QSTATICREADERMOCS/moc_ButtonPrefs.cpp: $(MOC) ButtonPrefs.h
-	$(MOC) ButtonPrefs.h -o QSTATICREADERMOCS/moc_ButtonPrefs.cpp
-
-QSTATICREADERMOCS/moc_CAnnoEdit.cpp: $(MOC) CAnnoEdit.h
-	$(MOC) CAnnoEdit.h -o QSTATICREADERMOCS/moc_CAnnoEdit.cpp
-
-QSTATICREADERMOCS/moc_CloseDialog.cpp: $(MOC) CloseDialog.h
-	$(MOC) CloseDialog.h -o QSTATICREADERMOCS/moc_CloseDialog.cpp
-
-QSTATICREADERMOCS/moc_GraphicWin.cpp: $(MOC) GraphicWin.h
-	$(MOC) GraphicWin.h -o QSTATICREADERMOCS/moc_GraphicWin.cpp
-
-QSTATICREADERMOCS/moc_Prefs.cpp: $(MOC) Prefs.h
-	$(MOC) Prefs.h -o QSTATICREADERMOCS/moc_Prefs.cpp
-
-QSTATICREADERMOCS/moc_QFloatBar.cpp: $(MOC) QFloatBar.h
-	$(MOC) QFloatBar.h -o QSTATICREADERMOCS/moc_QFloatBar.cpp
-
-QSTATICREADERMOCS/moc_QTReader.cpp: $(MOC) QTReader.h
-	$(MOC) QTReader.h -o QSTATICREADERMOCS/moc_QTReader.cpp
-
-QSTATICREADERMOCS/moc_QTReaderApp.cpp: $(MOC) QTReaderApp.h
-	$(MOC) QTReaderApp.h -o QSTATICREADERMOCS/moc_QTReaderApp.cpp
-
-QSTATICREADERMOCS/moc_QtrListView.cpp: $(MOC) QtrListView.h
-	$(MOC) QtrListView.h -o QSTATICREADERMOCS/moc_QtrListView.cpp
-
-QSTATICREADERMOCS/moc_ToolbarPrefs.cpp: $(MOC) ToolbarPrefs.h
-	$(MOC) ToolbarPrefs.h -o QSTATICREADERMOCS/moc_ToolbarPrefs.cpp
-
-QSTATICREADERMOCS/moc_URLDialog.cpp: $(MOC) URLDialog.h
-	$(MOC) URLDialog.h -o QSTATICREADERMOCS/moc_URLDialog.cpp
-
-QSTATICREADERMOCS/moc_cbkmkselector.cpp: $(MOC) cbkmkselector.h
-	$(MOC) cbkmkselector.h -o QSTATICREADERMOCS/moc_cbkmkselector.cpp
-
-QSTATICREADERMOCS/moc_fileBrowser.cpp: $(MOC) fileBrowser.h
-	$(MOC) fileBrowser.h -o QSTATICREADERMOCS/moc_fileBrowser.cpp
-
-QSTATICREADERMOCS/moc_infowin.cpp: $(MOC) infowin.h
-	$(MOC) infowin.h -o QSTATICREADERMOCS/moc_infowin.cpp
-
-####### Install
-
-install: all  
-
-uninstall:  
-
diff --git a/noncore/apps/opie-reader/reader.staticzmak b/noncore/apps/opie-reader/reader.staticzmak
deleted file mode 100644
index f9315c1..0000000
--- a/noncore/apps/opie-reader/reader.staticzmak
+++ b/dev/null
@@ -1,862 +0,0 @@
-#############################################################################
-# Makefile for building ZSTATICREADEROBJS/uqtreader
-# Generated by tmake at 09:24, 2004/07/25
-#     Project: reader.staticzpro
-#    Template: app
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -DNO_DEBUG
-INCPATH	=	-IZSTATICREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqpe -lqte
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	Aportis.h \
-		Bkmks.h \
-		BuffDoc.h \
-		ButtonPrefs.h \
-		CAnnoEdit.h \
-		CBuffer.h \
-		CDrawBuffer.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		CExpander.h \
-		CFilter.h \
-		CloseDialog.h \
-		Filedata.h \
-		FixedFont.h \
-		FontControl.h \
-		GraphicWin.h \
-		Markups.h \
-		Navigation.h \
-		Palm2QImage.h \
-		Prefs.h \
-		QFloatBar.h \
-		QTReader.h \
-		QTReaderApp.h \
-		QtrListView.h \
-		Queue.h \
-		StateData.h \
-		StyleConsts.h \
-		ToolbarPrefs.h \
-		URLDialog.h \
-		ZText.h \
-		arith.h \
-		cbkmkselector.h \
-		config.h \
-		fileBrowser.h \
-		infowin.h \
-		linktype.h \
-		my_list.h \
-		names.h \
-		ZSTATICREADERINC/opie.h \
-		pdb.h \
-		plucker_base.h \
-		plucker.h \
-		ppm.h \
-		ppm_expander.h \
-		preferences.h \
-		ZSTATICREADERINC/static.h \
-		usenef.h \
-		ZSTATICREADERINC/useqpe.h \
-		ustring.h \
-		utypes.h \
-		version.h \
-		ztxt.h
-SOURCES =	Aportis.cpp \
-		Bkmks.cpp \
-		BuffDoc.cpp \
-		ButtonPrefs.cpp \
-		CAnnoEdit.cpp \
-		CBuffer.cpp \
-		CDrawBuffer.cpp \
-		CEncoding.cpp \
-		CEncoding_tables.cpp \
-		CExpander.cpp \
-		CFilter.cpp \
-		CHM.cpp \
-		CRegExp.cpp \
-		CloseDialog.cpp \
-		FontControl.cpp \
-		GraphicWin.cpp \
-		Navigation.cpp \
-		Palm2QImage.cpp \
-		Prefs.cpp \
-		QTReader.cpp \
-		QTReaderApp.cpp \
-		QtrListView.cpp \
-		StyleConsts.cpp \
-		ToolbarPrefs.cpp \
-		URLDialog.cpp \
-		arith_d.cpp \
-		chm_lib.c \
-		fileBrowser.cpp \
-		hrule.cpp \
-		infowin.cpp \
-		iSilo.cpp \
-		lzx.c \
-		main.cpp \
-		orkey.cpp \
-		pdb.cpp \
-		plucker.cpp \
-		plucker_base.cpp \
-		ppm.cpp \
-		ppm_expander.cpp \
-		striphtml.cpp \
-		util.cpp \
-		version.cpp \
-		ztxt.cpp
-OBJECTS =	ZSTATICREADEROBJS/Aportis.o \
-		ZSTATICREADEROBJS/Bkmks.o \
-		ZSTATICREADEROBJS/BuffDoc.o \
-		ZSTATICREADEROBJS/ButtonPrefs.o \
-		ZSTATICREADEROBJS/CAnnoEdit.o \
-		ZSTATICREADEROBJS/CBuffer.o \
-		ZSTATICREADEROBJS/CDrawBuffer.o \
-		ZSTATICREADEROBJS/CEncoding.o \
-		ZSTATICREADEROBJS/CEncoding_tables.o \
-		ZSTATICREADEROBJS/CExpander.o \
-		ZSTATICREADEROBJS/CFilter.o \
-		ZSTATICREADEROBJS/CHM.o \
-		ZSTATICREADEROBJS/CRegExp.o \
-		ZSTATICREADEROBJS/CloseDialog.o \
-		ZSTATICREADEROBJS/FontControl.o \
-		ZSTATICREADEROBJS/GraphicWin.o \
-		ZSTATICREADEROBJS/Navigation.o \
-		ZSTATICREADEROBJS/Palm2QImage.o \
-		ZSTATICREADEROBJS/Prefs.o \
-		ZSTATICREADEROBJS/QTReader.o \
-		ZSTATICREADEROBJS/QTReaderApp.o \
-		ZSTATICREADEROBJS/QtrListView.o \
-		ZSTATICREADEROBJS/StyleConsts.o \
-		ZSTATICREADEROBJS/ToolbarPrefs.o \
-		ZSTATICREADEROBJS/URLDialog.o \
-		ZSTATICREADEROBJS/arith_d.o \
-		ZSTATICREADEROBJS/chm_lib.o \
-		ZSTATICREADEROBJS/fileBrowser.o \
-		ZSTATICREADEROBJS/hrule.o \
-		ZSTATICREADEROBJS/infowin.o \
-		ZSTATICREADEROBJS/iSilo.o \
-		ZSTATICREADEROBJS/lzx.o \
-		ZSTATICREADEROBJS/main.o \
-		ZSTATICREADEROBJS/orkey.o \
-		ZSTATICREADEROBJS/pdb.o \
-		ZSTATICREADEROBJS/plucker.o \
-		ZSTATICREADEROBJS/plucker_base.o \
-		ZSTATICREADEROBJS/ppm.o \
-		ZSTATICREADEROBJS/ppm_expander.o \
-		ZSTATICREADEROBJS/striphtml.o \
-		ZSTATICREADEROBJS/util.o \
-		ZSTATICREADEROBJS/version.o \
-		ZSTATICREADEROBJS/ztxt.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	ZSTATICREADERMOCS/moc_ButtonPrefs.cpp \
-		ZSTATICREADERMOCS/moc_CAnnoEdit.cpp \
-		ZSTATICREADERMOCS/moc_CloseDialog.cpp \
-		ZSTATICREADERMOCS/moc_GraphicWin.cpp \
-		ZSTATICREADERMOCS/moc_Prefs.cpp \
-		ZSTATICREADERMOCS/moc_QFloatBar.cpp \
-		ZSTATICREADERMOCS/moc_QTReader.cpp \
-		ZSTATICREADERMOCS/moc_QTReaderApp.cpp \
-		ZSTATICREADERMOCS/moc_QtrListView.cpp \
-		ZSTATICREADERMOCS/moc_ToolbarPrefs.cpp \
-		ZSTATICREADERMOCS/moc_URLDialog.cpp \
-		ZSTATICREADERMOCS/moc_cbkmkselector.cpp \
-		ZSTATICREADERMOCS/moc_fileBrowser.cpp \
-		ZSTATICREADERMOCS/moc_infowin.cpp
-OBJMOC	=	ZSTATICREADEROBJS/moc_ButtonPrefs.o \
-		ZSTATICREADEROBJS/moc_CAnnoEdit.o \
-		ZSTATICREADEROBJS/moc_CloseDialog.o \
-		ZSTATICREADEROBJS/moc_GraphicWin.o \
-		ZSTATICREADEROBJS/moc_Prefs.o \
-		ZSTATICREADEROBJS/moc_QFloatBar.o \
-		ZSTATICREADEROBJS/moc_QTReader.o \
-		ZSTATICREADEROBJS/moc_QTReaderApp.o \
-		ZSTATICREADEROBJS/moc_QtrListView.o \
-		ZSTATICREADEROBJS/moc_ToolbarPrefs.o \
-		ZSTATICREADEROBJS/moc_URLDialog.o \
-		ZSTATICREADEROBJS/moc_cbkmkselector.o \
-		ZSTATICREADEROBJS/moc_fileBrowser.o \
-		ZSTATICREADEROBJS/moc_infowin.o
-DIST	=	
-TARGET	=	ZSTATICREADEROBJS/uqtreader
-INTERFACE_DECL_PATH = .
-
-####### 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: $(TARGET)
-
-$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
-
-moc: $(SRCMOC)
-
-tmake: reader.staticzmak
-
-reader.staticzmak: reader.staticzpro
-	tmake reader.staticzpro -o reader.staticzmak
-
-dist:
-	$(TAR) reader.staticzpro.tar reader.staticzpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) reader.staticzpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZSTATICREADEROBJS/Aportis.o: Aportis.cpp \
-		Aportis.h \
-		CExpander.h \
-		ZSTATICREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		pdb.h \
-		my_list.h \
-		Bkmks.h \
-		Filedata.h \
-		ZSTATICREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/Aportis.o Aportis.cpp
-
-ZSTATICREADEROBJS/Bkmks.o: Bkmks.cpp \
-		Bkmks.h \
-		config.h \
-		ustring.h \
-		Filedata.h \
-		StyleConsts.h \
-		Markups.h \
-		my_list.h \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/Bkmks.o Bkmks.cpp
-
-ZSTATICREADEROBJS/BuffDoc.o: BuffDoc.cpp \
-		ZSTATICREADERINC/static.h \
-		names.h \
-		ZSTATICREADERINC/useqpe.h \
-		usenef.h \
-		BuffDoc.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		ZText.h \
-		ebookcodec.h \
-		Aportis.h \
-		pdb.h \
-		CHM.h \
-		chm_lib.h \
-		ppm_expander.h \
-		utypes.h \
-		ppm.h \
-		arith.h \
-		ztxt.h \
-		plucker.h \
-		plucker_base.h \
-		Navigation.h \
-		hrule.h \
-		iSilo.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/BuffDoc.o BuffDoc.cpp
-
-ZSTATICREADEROBJS/ButtonPrefs.o: ButtonPrefs.cpp \
-		ButtonPrefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/ButtonPrefs.o ButtonPrefs.cpp
-
-ZSTATICREADEROBJS/CAnnoEdit.o: CAnnoEdit.cpp \
-		CAnnoEdit.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CAnnoEdit.o CAnnoEdit.cpp
-
-ZSTATICREADEROBJS/CBuffer.o: CBuffer.cpp \
-		CBuffer.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CBuffer.o CBuffer.cpp
-
-ZSTATICREADEROBJS/CDrawBuffer.o: CDrawBuffer.cpp \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		FontControl.h \
-		ZSTATICREADERINC/useqpe.h \
-		ZSTATICREADERINC/opie.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CDrawBuffer.o CDrawBuffer.cpp
-
-ZSTATICREADEROBJS/CEncoding.o: CEncoding.cpp \
-		CEncoding.h \
-		CExpander.h \
-		ZSTATICREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CEncoding.o CEncoding.cpp
-
-ZSTATICREADEROBJS/CEncoding_tables.o: CEncoding_tables.cpp \
-		CEncoding_tables.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CEncoding_tables.o CEncoding_tables.cpp
-
-ZSTATICREADEROBJS/CExpander.o: CExpander.cpp \
-		CExpander.h \
-		ZSTATICREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CExpander.o CExpander.cpp
-
-ZSTATICREADEROBJS/CFilter.o: CFilter.cpp \
-		ZSTATICREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		ZSTATICREADERINC/static.h \
-		hrule.h \
-		Bkmks.h \
-		Filedata.h \
-		QTReader.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h \
-		CRegExp.h \
-		hash.h \
-		Queue.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CFilter.o CFilter.cpp
-
-ZSTATICREADEROBJS/CHM.o: CHM.cpp \
-		CHM.h \
-		ZSTATICREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		chm_lib.h \
-		my_list.h \
-		ZSTATICREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CHM.o CHM.cpp
-
-ZSTATICREADEROBJS/CRegExp.o: CRegExp.cpp \
-		CRegExp.h \
-		config.h \
-		ustring.h \
-		hash.h \
-		Queue.h \
-		my_list.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CRegExp.o CRegExp.cpp
-
-ZSTATICREADEROBJS/CloseDialog.o: CloseDialog.cpp \
-		CloseDialog.h \
-		ZSTATICREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/CloseDialog.o CloseDialog.cpp
-
-ZSTATICREADEROBJS/FontControl.o: FontControl.cpp \
-		ZSTATICREADERINC/opie.h \
-		ZSTATICREADERINC/useqpe.h \
-		FontControl.h \
-		StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/FontControl.o FontControl.cpp
-
-ZSTATICREADEROBJS/GraphicWin.o: GraphicWin.cpp \
-		GraphicWin.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/GraphicWin.o GraphicWin.cpp
-
-ZSTATICREADEROBJS/Navigation.o: Navigation.cpp \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/Navigation.o Navigation.cpp
-
-ZSTATICREADEROBJS/Palm2QImage.o: Palm2QImage.cpp \
-		ZSTATICREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/Palm2QImage.o Palm2QImage.cpp
-
-ZSTATICREADEROBJS/Prefs.o: Prefs.cpp \
-		Prefs.h \
-		orkey.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/Prefs.o Prefs.cpp
-
-ZSTATICREADEROBJS/QTReader.o: QTReader.cpp \
-		ZSTATICREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		QTReader.h \
-		ZSTATICREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/QTReader.o QTReader.cpp
-
-ZSTATICREADEROBJS/QTReaderApp.o: QTReaderApp.cpp \
-		ZSTATICREADERINC/useqpe.h \
-		QTReader.h \
-		ZSTATICREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h \
-		GraphicWin.h \
-		Bkmks.h \
-		Filedata.h \
-		cbkmkselector.h \
-		infowin.h \
-		ToolbarPrefs.h \
-		preferences.h \
-		Prefs.h \
-		orkey.h \
-		CAnnoEdit.h \
-		QFloatBar.h \
-		FixedFont.h \
-		URLDialog.h \
-		util.h \
-		ZSTATICREADERINC/opie.h \
-		fileBrowser.h \
-		QTReaderApp.h \
-		CloseDialog.h \
-		ButtonPrefs.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/QTReaderApp.o QTReaderApp.cpp
-
-ZSTATICREADEROBJS/QtrListView.o: QtrListView.cpp \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/QtrListView.o QtrListView.cpp
-
-ZSTATICREADEROBJS/StyleConsts.o: StyleConsts.cpp \
-		StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/StyleConsts.o StyleConsts.cpp
-
-ZSTATICREADEROBJS/ToolbarPrefs.o: ToolbarPrefs.cpp \
-		ZSTATICREADERINC/useqpe.h \
-		ToolbarPrefs.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/ToolbarPrefs.o ToolbarPrefs.cpp
-
-ZSTATICREADEROBJS/URLDialog.o: URLDialog.cpp \
-		URLDialog.h \
-		ZSTATICREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/URLDialog.o URLDialog.cpp
-
-ZSTATICREADEROBJS/arith_d.o: arith_d.cpp \
-		arith.h \
-		utypes.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/arith_d.o arith_d.cpp
-
-ZSTATICREADEROBJS/chm_lib.o: chm_lib.c \
-		chm_lib.h \
-		lzx.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/chm_lib.o chm_lib.c
-
-ZSTATICREADEROBJS/fileBrowser.o: fileBrowser.cpp \
-		fileBrowser.h \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/fileBrowser.o fileBrowser.cpp
-
-ZSTATICREADEROBJS/hrule.o: hrule.cpp
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/hrule.o hrule.cpp
-
-ZSTATICREADEROBJS/infowin.o: infowin.cpp \
-		infowin.h \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/infowin.o infowin.cpp
-
-ZSTATICREADEROBJS/iSilo.o: iSilo.cpp \
-		iSilo.h \
-		pdb.h \
-		ZSTATICREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/iSilo.o iSilo.cpp
-
-ZSTATICREADEROBJS/lzx.o: lzx.c \
-		lzx.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/lzx.o lzx.c
-
-ZSTATICREADEROBJS/main.o: main.cpp \
-		ZSTATICREADERINC/useqpe.h \
-		QTReaderApp.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		orkey.h \
-		BGType.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/main.o main.cpp
-
-ZSTATICREADEROBJS/orkey.o: orkey.cpp \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/orkey.o orkey.cpp
-
-ZSTATICREADEROBJS/pdb.o: pdb.cpp \
-		pdb.h \
-		ZSTATICREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/pdb.o pdb.cpp
-
-ZSTATICREADEROBJS/plucker.o: plucker.cpp \
-		ZSTATICREADERINC/useqpe.h \
-		plucker.h \
-		plucker_base.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		hrule.h \
-		Aportis.h \
-		Palm2QImage.h \
-		ZSTATICREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/plucker.o plucker.cpp
-
-ZSTATICREADEROBJS/plucker_base.o: plucker_base.cpp \
-		ZSTATICREADERINC/useqpe.h \
-		usenef.h \
-		ZSTATICREADERINC/static.h \
-		plucker_base.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		ztxt.h \
-		pdb.h \
-		CBuffer.h \
-		my_list.h \
-		Navigation.h \
-		hrule.h \
-		Aportis.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/plucker_base.o plucker_base.cpp
-
-ZSTATICREADEROBJS/ppm.o: ppm.cpp \
-		arith.h \
-		utypes.h \
-		ppm.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/ppm.o ppm.cpp
-
-ZSTATICREADEROBJS/ppm_expander.o: ppm_expander.cpp \
-		ZSTATICREADERINC/static.h \
-		ppm_expander.h \
-		ZSTATICREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		utypes.h \
-		ppm.h \
-		arith.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/ppm_expander.o ppm_expander.cpp
-
-ZSTATICREADEROBJS/striphtml.o: striphtml.cpp \
-		ZSTATICREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		striphtml.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		ZSTATICREADERINC/static.h \
-		Navigation.h \
-		hrule.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/striphtml.o striphtml.cpp
-
-ZSTATICREADEROBJS/util.o: util.cpp \
-		util.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/util.o util.cpp
-
-ZSTATICREADEROBJS/version.o: version.cpp \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/version.o version.cpp
-
-ZSTATICREADEROBJS/ztxt.o: ztxt.cpp \
-		ztxt.h \
-		CExpander.h \
-		ZSTATICREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		pdb.h \
-		my_list.h \
-		Bkmks.h \
-		Filedata.h \
-		ZSTATICREADERINC/static.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/ztxt.o ztxt.cpp
-
-ZSTATICREADEROBJS/moc_ButtonPrefs.o: ZSTATICREADERMOCS/moc_ButtonPrefs.cpp \
-		ButtonPrefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_ButtonPrefs.o ZSTATICREADERMOCS/moc_ButtonPrefs.cpp
-
-ZSTATICREADEROBJS/moc_CAnnoEdit.o: ZSTATICREADERMOCS/moc_CAnnoEdit.cpp \
-		CAnnoEdit.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_CAnnoEdit.o ZSTATICREADERMOCS/moc_CAnnoEdit.cpp
-
-ZSTATICREADEROBJS/moc_CloseDialog.o: ZSTATICREADERMOCS/moc_CloseDialog.cpp \
-		CloseDialog.h \
-		ZSTATICREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_CloseDialog.o ZSTATICREADERMOCS/moc_CloseDialog.cpp
-
-ZSTATICREADEROBJS/moc_GraphicWin.o: ZSTATICREADERMOCS/moc_GraphicWin.cpp \
-		GraphicWin.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_GraphicWin.o ZSTATICREADERMOCS/moc_GraphicWin.cpp
-
-ZSTATICREADEROBJS/moc_Prefs.o: ZSTATICREADERMOCS/moc_Prefs.cpp \
-		Prefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_Prefs.o ZSTATICREADERMOCS/moc_Prefs.cpp
-
-ZSTATICREADEROBJS/moc_QFloatBar.o: ZSTATICREADERMOCS/moc_QFloatBar.cpp \
-		QFloatBar.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_QFloatBar.o ZSTATICREADERMOCS/moc_QFloatBar.cpp
-
-ZSTATICREADEROBJS/moc_QTReader.o: ZSTATICREADERMOCS/moc_QTReader.cpp \
-		QTReader.h \
-		ZSTATICREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		ZSTATICREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_QTReader.o ZSTATICREADERMOCS/moc_QTReader.cpp
-
-ZSTATICREADEROBJS/moc_QTReaderApp.o: ZSTATICREADERMOCS/moc_QTReaderApp.cpp \
-		QTReaderApp.h \
-		ZSTATICREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		orkey.h \
-		BGType.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_QTReaderApp.o ZSTATICREADERMOCS/moc_QTReaderApp.cpp
-
-ZSTATICREADEROBJS/moc_QtrListView.o: ZSTATICREADERMOCS/moc_QtrListView.cpp \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_QtrListView.o ZSTATICREADERMOCS/moc_QtrListView.cpp
-
-ZSTATICREADEROBJS/moc_ToolbarPrefs.o: ZSTATICREADERMOCS/moc_ToolbarPrefs.cpp \
-		ToolbarPrefs.h \
-		ZSTATICREADERINC/useqpe.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_ToolbarPrefs.o ZSTATICREADERMOCS/moc_ToolbarPrefs.cpp
-
-ZSTATICREADEROBJS/moc_URLDialog.o: ZSTATICREADERMOCS/moc_URLDialog.cpp \
-		URLDialog.h \
-		ZSTATICREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_URLDialog.o ZSTATICREADERMOCS/moc_URLDialog.cpp
-
-ZSTATICREADEROBJS/moc_cbkmkselector.o: ZSTATICREADERMOCS/moc_cbkmkselector.cpp \
-		cbkmkselector.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_cbkmkselector.o ZSTATICREADERMOCS/moc_cbkmkselector.cpp
-
-ZSTATICREADEROBJS/moc_fileBrowser.o: ZSTATICREADERMOCS/moc_fileBrowser.cpp \
-		fileBrowser.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_fileBrowser.o ZSTATICREADERMOCS/moc_fileBrowser.cpp
-
-ZSTATICREADEROBJS/moc_infowin.o: ZSTATICREADERMOCS/moc_infowin.cpp \
-		infowin.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZSTATICREADEROBJS/moc_infowin.o ZSTATICREADERMOCS/moc_infowin.cpp
-
-ZSTATICREADERMOCS/moc_ButtonPrefs.cpp: ButtonPrefs.h
-	$(MOC) ButtonPrefs.h -o ZSTATICREADERMOCS/moc_ButtonPrefs.cpp
-
-ZSTATICREADERMOCS/moc_CAnnoEdit.cpp: CAnnoEdit.h
-	$(MOC) CAnnoEdit.h -o ZSTATICREADERMOCS/moc_CAnnoEdit.cpp
-
-ZSTATICREADERMOCS/moc_CloseDialog.cpp: CloseDialog.h
-	$(MOC) CloseDialog.h -o ZSTATICREADERMOCS/moc_CloseDialog.cpp
-
-ZSTATICREADERMOCS/moc_GraphicWin.cpp: GraphicWin.h
-	$(MOC) GraphicWin.h -o ZSTATICREADERMOCS/moc_GraphicWin.cpp
-
-ZSTATICREADERMOCS/moc_Prefs.cpp: Prefs.h
-	$(MOC) Prefs.h -o ZSTATICREADERMOCS/moc_Prefs.cpp
-
-ZSTATICREADERMOCS/moc_QFloatBar.cpp: QFloatBar.h
-	$(MOC) QFloatBar.h -o ZSTATICREADERMOCS/moc_QFloatBar.cpp
-
-ZSTATICREADERMOCS/moc_QTReader.cpp: QTReader.h
-	$(MOC) QTReader.h -o ZSTATICREADERMOCS/moc_QTReader.cpp
-
-ZSTATICREADERMOCS/moc_QTReaderApp.cpp: QTReaderApp.h
-	$(MOC) QTReaderApp.h -o ZSTATICREADERMOCS/moc_QTReaderApp.cpp
-
-ZSTATICREADERMOCS/moc_QtrListView.cpp: QtrListView.h
-	$(MOC) QtrListView.h -o ZSTATICREADERMOCS/moc_QtrListView.cpp
-
-ZSTATICREADERMOCS/moc_ToolbarPrefs.cpp: ToolbarPrefs.h
-	$(MOC) ToolbarPrefs.h -o ZSTATICREADERMOCS/moc_ToolbarPrefs.cpp
-
-ZSTATICREADERMOCS/moc_URLDialog.cpp: URLDialog.h
-	$(MOC) URLDialog.h -o ZSTATICREADERMOCS/moc_URLDialog.cpp
-
-ZSTATICREADERMOCS/moc_cbkmkselector.cpp: cbkmkselector.h
-	$(MOC) cbkmkselector.h -o ZSTATICREADERMOCS/moc_cbkmkselector.cpp
-
-ZSTATICREADERMOCS/moc_fileBrowser.cpp: fileBrowser.h
-	$(MOC) fileBrowser.h -o ZSTATICREADERMOCS/moc_fileBrowser.cpp
-
-ZSTATICREADERMOCS/moc_infowin.cpp: infowin.h
-	$(MOC) infowin.h -o ZSTATICREADERMOCS/moc_infowin.cpp
-
diff --git a/noncore/apps/opie-reader/reader.wmak b/noncore/apps/opie-reader/reader.wmak
deleted file mode 100644
index dda01c1..0000000
--- a/noncore/apps/opie-reader/reader.wmak
+++ b/dev/null
@@ -1,604 +0,0 @@
-#############################################################################
-# Makefile for building $(QPEDIR)/bin/uqtreader
-# Generated by tmake at 23:23, 2004/03/09
-#     Project: reader.wpro
-#    Template: app
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	gcc-2.96
-CXX	=	g++-2.96
-CFLAGS	=	-pipe -Wall -W -O2 -DNO_DEBUG
-CXXFLAGS=	-pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -DNO_DEBUG
-INCPATH	=	-IWSREADERINC -I$(QTDIR)/include
-LINK	=	g++-2.96
-LFLAGS	=	
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqpe -lreader_codec -lqte
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	Aportis.h \
-		Bkmks.h \
-		BuffDoc.h \
-		ButtonPrefs.h \
-		CAnnoEdit.h \
-		CBuffer.h \
-		CDrawBuffer.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		CExpander.h \
-		CFilter.h \
-		CloseDialog.h \
-		Coder.h \
-		CSource.h \
-		Filedata.h \
-		FixedFont.h \
-		FontControl.h \
-		GraphicWin.h \
-		Markups.h \
-		Navigation.h \
-		Palm2QImage.h \
-		Prefs.h \
-		PPMd.h \
-		PPMdType.h \
-		QFloatBar.h \
-		QTReader.h \
-		QTReaderApp.h \
-		QtrListView.h \
-		Queue.h \
-		StateData.h \
-		StyleConsts.h \
-		SubAlloc.h \
-		ToolbarPrefs.h \
-		URLDialog.h \
-		ZText.h \
-		arith.h \
-		arrierego.h \
-		cbkmkselector.h \
-		config.h \
-		fileBrowser.h \
-		infowin.h \
-		linktype.h \
-		my_list.h \
-		names.h \
-		nef.h \
-		WSREADERINC/opie.h \
-		pdb.h \
-		plucker.h \
-		plucker_base.h \
-		ppm.h \
-		ppm_expander.h \
-		usenef.h \
-		WSREADERINC/useqpe.h \
-		ustring.h \
-		utypes.h \
-		version.h \
-		ztxt.h
-SOURCES =	BuffDoc.cpp \
-		ButtonPrefs.cpp \
-		CAnnoEdit.cpp \
-		CDrawBuffer.cpp \
-		CEncoding.cpp \
-		CEncoding_tables.cpp \
-		CFilter.cpp \
-		CRegExp.cpp \
-		CloseDialog.cpp \
-		FontControl.cpp \
-		Prefs.cpp \
-		QTReader.cpp \
-		QTReaderApp.cpp \
-		QtrListView.cpp \
-		ToolbarPrefs.cpp \
-		URLDialog.cpp \
-		fileBrowser.cpp \
-		infowin.cpp \
-		main.cpp \
-		orkey.cpp \
-		util.cpp \
-		version.cpp
-OBJECTS =	WSREADEROBJS/BuffDoc.o \
-		WSREADEROBJS/ButtonPrefs.o \
-		WSREADEROBJS/CAnnoEdit.o \
-		WSREADEROBJS/CDrawBuffer.o \
-		WSREADEROBJS/CEncoding.o \
-		WSREADEROBJS/CEncoding_tables.o \
-		WSREADEROBJS/CFilter.o \
-		WSREADEROBJS/CRegExp.o \
-		WSREADEROBJS/CloseDialog.o \
-		WSREADEROBJS/FontControl.o \
-		WSREADEROBJS/Prefs.o \
-		WSREADEROBJS/QTReader.o \
-		WSREADEROBJS/QTReaderApp.o \
-		WSREADEROBJS/QtrListView.o \
-		WSREADEROBJS/ToolbarPrefs.o \
-		WSREADEROBJS/URLDialog.o \
-		WSREADEROBJS/fileBrowser.o \
-		WSREADEROBJS/infowin.o \
-		WSREADEROBJS/main.o \
-		WSREADEROBJS/orkey.o \
-		WSREADEROBJS/util.o \
-		WSREADEROBJS/version.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	WSREADERMOCS/moc_ButtonPrefs.cpp \
-		WSREADERMOCS/moc_CAnnoEdit.cpp \
-		WSREADERMOCS/moc_CloseDialog.cpp \
-		WSREADERMOCS/moc_GraphicWin.cpp \
-		WSREADERMOCS/moc_Prefs.cpp \
-		WSREADERMOCS/moc_QFloatBar.cpp \
-		WSREADERMOCS/moc_QTReader.cpp \
-		WSREADERMOCS/moc_QTReaderApp.cpp \
-		WSREADERMOCS/moc_QtrListView.cpp \
-		WSREADERMOCS/moc_ToolbarPrefs.cpp \
-		WSREADERMOCS/moc_URLDialog.cpp \
-		WSREADERMOCS/moc_cbkmkselector.cpp \
-		WSREADERMOCS/moc_fileBrowser.cpp \
-		WSREADERMOCS/moc_infowin.cpp
-OBJMOC	=	WSREADEROBJS/moc_ButtonPrefs.o \
-		WSREADEROBJS/moc_CAnnoEdit.o \
-		WSREADEROBJS/moc_CloseDialog.o \
-		WSREADEROBJS/moc_GraphicWin.o \
-		WSREADEROBJS/moc_Prefs.o \
-		WSREADEROBJS/moc_QFloatBar.o \
-		WSREADEROBJS/moc_QTReader.o \
-		WSREADEROBJS/moc_QTReaderApp.o \
-		WSREADEROBJS/moc_QtrListView.o \
-		WSREADEROBJS/moc_ToolbarPrefs.o \
-		WSREADEROBJS/moc_URLDialog.o \
-		WSREADEROBJS/moc_cbkmkselector.o \
-		WSREADEROBJS/moc_fileBrowser.o \
-		WSREADEROBJS/moc_infowin.o
-DIST	=	
-TARGET	=	$(QPEDIR)/bin/uqtreader
-INTERFACE_DECL_PATH = .
-
-####### 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: $(TARGET)
-
-$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
-
-moc: $(SRCMOC)
-
-tmake: reader.wmak
-
-reader.wmak: reader.wpro
-	tmake reader.wpro -o reader.wmak
-
-dist:
-	$(TAR) reader.wpro.tar reader.wpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) reader.wpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-WSREADEROBJS/BuffDoc.o: BuffDoc.cpp \
-		WSREADERINC/static.h \
-		names.h \
-		BuffDoc.h \
-		WSREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		ZText.h \
-		ebookcodec.h \
-		Aportis.h \
-		pdb.h \
-		CHM.h \
-		chm_lib.h \
-		ppm_expander.h \
-		utypes.h \
-		ppm.h \
-		arith.h \
-		ztxt.h \
-		plucker.h \
-		plucker_base.h \
-		Navigation.h \
-		hrule.h \
-		nef.h \
-		usenef.h \
-		arrierego.h \
-		iSilo.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/BuffDoc.o BuffDoc.cpp
-
-WSREADEROBJS/ButtonPrefs.o: ButtonPrefs.cpp \
-		ButtonPrefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/ButtonPrefs.o ButtonPrefs.cpp
-
-WSREADEROBJS/CAnnoEdit.o: CAnnoEdit.cpp \
-		CAnnoEdit.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CAnnoEdit.o CAnnoEdit.cpp
-
-WSREADEROBJS/CDrawBuffer.o: CDrawBuffer.cpp \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		FontControl.h \
-		WSREADERINC/useqpe.h \
-		WSREADERINC/opie.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CDrawBuffer.o CDrawBuffer.cpp
-
-WSREADEROBJS/CEncoding.o: CEncoding.cpp \
-		CEncoding.h \
-		CExpander.h \
-		WSREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CEncoding.o CEncoding.cpp
-
-WSREADEROBJS/CEncoding_tables.o: CEncoding_tables.cpp \
-		CEncoding_tables.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CEncoding_tables.o CEncoding_tables.cpp
-
-WSREADEROBJS/CFilter.o: CFilter.cpp \
-		WSREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		WSREADERINC/static.h \
-		hrule.h \
-		Bkmks.h \
-		Filedata.h \
-		QTReader.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h \
-		CRegExp.h \
-		hash.h \
-		Queue.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CFilter.o CFilter.cpp
-
-WSREADEROBJS/CRegExp.o: CRegExp.cpp \
-		CRegExp.h \
-		config.h \
-		ustring.h \
-		hash.h \
-		Queue.h \
-		my_list.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CRegExp.o CRegExp.cpp
-
-WSREADEROBJS/CloseDialog.o: CloseDialog.cpp \
-		CloseDialog.h \
-		WSREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/CloseDialog.o CloseDialog.cpp
-
-WSREADEROBJS/FontControl.o: FontControl.cpp \
-		WSREADERINC/opie.h \
-		WSREADERINC/useqpe.h \
-		FontControl.h \
-		StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/FontControl.o FontControl.cpp
-
-WSREADEROBJS/Prefs.o: Prefs.cpp \
-		Prefs.h \
-		orkey.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/Prefs.o Prefs.cpp
-
-WSREADEROBJS/QTReader.o: QTReader.cpp \
-		WSREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		QTReader.h \
-		WSREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/QTReader.o QTReader.cpp
-
-WSREADEROBJS/QTReaderApp.o: QTReaderApp.cpp \
-		WSREADERINC/useqpe.h \
-		QTReader.h \
-		WSREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h \
-		GraphicWin.h \
-		Bkmks.h \
-		Filedata.h \
-		cbkmkselector.h \
-		infowin.h \
-		ToolbarPrefs.h \
-		preferences.h \
-		Prefs.h \
-		orkey.h \
-		CAnnoEdit.h \
-		QFloatBar.h \
-		FixedFont.h \
-		URLDialog.h \
-		util.h \
-		fileBrowser.h \
-		QTReaderApp.h \
-		CloseDialog.h \
-		ButtonPrefs.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/QTReaderApp.o QTReaderApp.cpp
-
-WSREADEROBJS/QtrListView.o: QtrListView.cpp \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/QtrListView.o QtrListView.cpp
-
-WSREADEROBJS/ToolbarPrefs.o: ToolbarPrefs.cpp \
-		WSREADERINC/useqpe.h \
-		ToolbarPrefs.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/ToolbarPrefs.o ToolbarPrefs.cpp
-
-WSREADEROBJS/URLDialog.o: URLDialog.cpp \
-		URLDialog.h \
-		WSREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/URLDialog.o URLDialog.cpp
-
-WSREADEROBJS/fileBrowser.o: fileBrowser.cpp \
-		fileBrowser.h \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/fileBrowser.o fileBrowser.cpp
-
-WSREADEROBJS/infowin.o: infowin.cpp \
-		infowin.h \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/infowin.o infowin.cpp
-
-WSREADEROBJS/main.o: main.cpp \
-		WSREADERINC/useqpe.h \
-		QTReaderApp.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		orkey.h \
-		BGType.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/main.o main.cpp
-
-WSREADEROBJS/orkey.o: orkey.cpp \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/orkey.o orkey.cpp
-
-WSREADEROBJS/util.o: util.cpp \
-		util.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/util.o util.cpp
-
-WSREADEROBJS/version.o: version.cpp \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/version.o version.cpp
-
-WSREADEROBJS/moc_ButtonPrefs.o: WSREADERMOCS/moc_ButtonPrefs.cpp \
-		ButtonPrefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_ButtonPrefs.o WSREADERMOCS/moc_ButtonPrefs.cpp
-
-WSREADEROBJS/moc_CAnnoEdit.o: WSREADERMOCS/moc_CAnnoEdit.cpp \
-		CAnnoEdit.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_CAnnoEdit.o WSREADERMOCS/moc_CAnnoEdit.cpp
-
-WSREADEROBJS/moc_CloseDialog.o: WSREADERMOCS/moc_CloseDialog.cpp \
-		CloseDialog.h \
-		WSREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_CloseDialog.o WSREADERMOCS/moc_CloseDialog.cpp
-
-WSREADEROBJS/moc_GraphicWin.o: WSREADERMOCS/moc_GraphicWin.cpp \
-		GraphicWin.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_GraphicWin.o WSREADERMOCS/moc_GraphicWin.cpp
-
-WSREADEROBJS/moc_Prefs.o: WSREADERMOCS/moc_Prefs.cpp \
-		Prefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_Prefs.o WSREADERMOCS/moc_Prefs.cpp
-
-WSREADEROBJS/moc_QFloatBar.o: WSREADERMOCS/moc_QFloatBar.cpp \
-		QFloatBar.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_QFloatBar.o WSREADERMOCS/moc_QFloatBar.cpp
-
-WSREADEROBJS/moc_QTReader.o: WSREADERMOCS/moc_QTReader.cpp \
-		QTReader.h \
-		WSREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		WSREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_QTReader.o WSREADERMOCS/moc_QTReader.cpp
-
-WSREADEROBJS/moc_QTReaderApp.o: WSREADERMOCS/moc_QTReaderApp.cpp \
-		QTReaderApp.h \
-		WSREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		orkey.h \
-		BGType.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_QTReaderApp.o WSREADERMOCS/moc_QTReaderApp.cpp
-
-WSREADEROBJS/moc_QtrListView.o: WSREADERMOCS/moc_QtrListView.cpp \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_QtrListView.o WSREADERMOCS/moc_QtrListView.cpp
-
-WSREADEROBJS/moc_ToolbarPrefs.o: WSREADERMOCS/moc_ToolbarPrefs.cpp \
-		ToolbarPrefs.h \
-		WSREADERINC/useqpe.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_ToolbarPrefs.o WSREADERMOCS/moc_ToolbarPrefs.cpp
-
-WSREADEROBJS/moc_URLDialog.o: WSREADERMOCS/moc_URLDialog.cpp \
-		URLDialog.h \
-		WSREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_URLDialog.o WSREADERMOCS/moc_URLDialog.cpp
-
-WSREADEROBJS/moc_cbkmkselector.o: WSREADERMOCS/moc_cbkmkselector.cpp \
-		cbkmkselector.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_cbkmkselector.o WSREADERMOCS/moc_cbkmkselector.cpp
-
-WSREADEROBJS/moc_fileBrowser.o: WSREADERMOCS/moc_fileBrowser.cpp \
-		fileBrowser.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_fileBrowser.o WSREADERMOCS/moc_fileBrowser.cpp
-
-WSREADEROBJS/moc_infowin.o: WSREADERMOCS/moc_infowin.cpp \
-		infowin.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WSREADEROBJS/moc_infowin.o WSREADERMOCS/moc_infowin.cpp
-
-WSREADERMOCS/moc_ButtonPrefs.cpp: ButtonPrefs.h
-	$(MOC) ButtonPrefs.h -o WSREADERMOCS/moc_ButtonPrefs.cpp
-
-WSREADERMOCS/moc_CAnnoEdit.cpp: CAnnoEdit.h
-	$(MOC) CAnnoEdit.h -o WSREADERMOCS/moc_CAnnoEdit.cpp
-
-WSREADERMOCS/moc_CloseDialog.cpp: CloseDialog.h
-	$(MOC) CloseDialog.h -o WSREADERMOCS/moc_CloseDialog.cpp
-
-WSREADERMOCS/moc_GraphicWin.cpp: GraphicWin.h
-	$(MOC) GraphicWin.h -o WSREADERMOCS/moc_GraphicWin.cpp
-
-WSREADERMOCS/moc_Prefs.cpp: Prefs.h
-	$(MOC) Prefs.h -o WSREADERMOCS/moc_Prefs.cpp
-
-WSREADERMOCS/moc_QFloatBar.cpp: QFloatBar.h
-	$(MOC) QFloatBar.h -o WSREADERMOCS/moc_QFloatBar.cpp
-
-WSREADERMOCS/moc_QTReader.cpp: QTReader.h
-	$(MOC) QTReader.h -o WSREADERMOCS/moc_QTReader.cpp
-
-WSREADERMOCS/moc_QTReaderApp.cpp: QTReaderApp.h
-	$(MOC) QTReaderApp.h -o WSREADERMOCS/moc_QTReaderApp.cpp
-
-WSREADERMOCS/moc_QtrListView.cpp: QtrListView.h
-	$(MOC) QtrListView.h -o WSREADERMOCS/moc_QtrListView.cpp
-
-WSREADERMOCS/moc_ToolbarPrefs.cpp: ToolbarPrefs.h
-	$(MOC) ToolbarPrefs.h -o WSREADERMOCS/moc_ToolbarPrefs.cpp
-
-WSREADERMOCS/moc_URLDialog.cpp: URLDialog.h
-	$(MOC) URLDialog.h -o WSREADERMOCS/moc_URLDialog.cpp
-
-WSREADERMOCS/moc_cbkmkselector.cpp: cbkmkselector.h
-	$(MOC) cbkmkselector.h -o WSREADERMOCS/moc_cbkmkselector.cpp
-
-WSREADERMOCS/moc_fileBrowser.cpp: fileBrowser.h
-	$(MOC) fileBrowser.h -o WSREADERMOCS/moc_fileBrowser.cpp
-
-WSREADERMOCS/moc_infowin.cpp: infowin.h
-	$(MOC) infowin.h -o WSREADERMOCS/moc_infowin.cpp
-
diff --git a/noncore/apps/opie-reader/reader.wpro b/noncore/apps/opie-reader/reader.wpro
deleted file mode 100644
index 3e4f345..0000000
--- a/noncore/apps/opie-reader/reader.wpro
+++ b/dev/null
@@ -1,93 +0,0 @@
-TEMPLATE	= app
-CONFIG		= qt warn_on release
-HEADERS		= Aportis.h \
-                  Bkmks.h \
-                  BuffDoc.h \
-		  ButtonPrefs.h \
-                  CAnnoEdit.h \
-                  CBuffer.h \
-                  CDrawBuffer.h \
-                  CEncoding.h \
-                  CEncoding_tables.h \
-                  CExpander.h \
-                  CFilter.h \
-                  CloseDialog.h \
-                  Coder.h \
-                  CSource.h \
-                  Filedata.h \
-                  FixedFont.h \
-                  FontControl.h \
-                  GraphicWin.h \
-                  Markups.h \
-                  Navigation.h \
-                  Palm2QImage.h \
-                  Prefs.h \
-                  PPMd.h \
-                  PPMdType.h \
-                  QFloatBar.h \
-                  QTReader.h \
-                  QTReaderApp.h \
-                  QtrListView.h \
-                  Queue.h \
-                  StateData.h \
-                  StyleConsts.h \
-                  SubAlloc.h \
-                  ToolbarPrefs.h \
-                  URLDialog.h \
-                  ZText.h \
-                  arith.h \
-                  arrierego.h \
-                  cbkmkselector.h \
-                  config.h \
-                  fileBrowser.h \
-                  infowin.h \
-                  linktype.h \
-                  my_list.h \
-                  names.h \
-                  nef.h \
-                  WSREADERINC/opie.h \
-                  pdb.h \
-                  plucker.h \
-                  plucker_base.h \
-                  ppm.h \
-                  ppm_expander.h \
-                  usenef.h \
-                  WSREADERINC/useqpe.h \
-                  ustring.h \
-                  utypes.h \
-                  version.h \
-                  ztxt.h
-
-SOURCES		= BuffDoc.cpp \
-                  ButtonPrefs.cpp \
-                  CAnnoEdit.cpp \
-                  CDrawBuffer.cpp \
-                  CEncoding.cpp \
-                  CEncoding_tables.cpp \
-                  CFilter.cpp \
-		  CRegExp.cpp \
-                  CloseDialog.cpp \
-                  FontControl.cpp \
-                  Prefs.cpp \
-                  QTReader.cpp \
-                  QTReaderApp.cpp \
-                  QtrListView.cpp \
-                  ToolbarPrefs.cpp \
-                  URLDialog.cpp \
-                  fileBrowser.cpp \
-                  infowin.cpp \
-                  main.cpp \
-		  orkey.cpp \
-		  util.cpp \
-                  version.cpp
-
-
-INTERFACES	= 
-DESTDIR		= $(QPEDIR)/bin
-INCLUDEPATH	+= WSREADERINC
-DEPENDPATH	+= WSREADERINC
-TARGET		= uqtreader
-LIBS		+= -lqpe -lreader_codec
-
-OBJECTS_DIR = WSREADEROBJS
-MOC_DIR = WSREADERMOCS
diff --git a/noncore/apps/opie-reader/reader.zmak b/noncore/apps/opie-reader/reader.zmak
deleted file mode 100644
index bb697f4..0000000
--- a/noncore/apps/opie-reader/reader.zmak
+++ b/dev/null
@@ -1,605 +0,0 @@
-#############################################################################
-# Makefile for building $(QPEDIR)/bin/uqtreader
-# Generated by tmake at 15:17, 2004/05/08
-#     Project: reader.zpro
-#    Template: app
-#############################################################################
-
-####### Compiler, tools and options
-
-CC	=	arm-linux-gcc
-CXX	=	arm-linux-g++
-CFLAGS	=	-pipe -Wall -W -O2 -DNO_DEBUG
-CXXFLAGS=	-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -DNO_DEBUG
-INCPATH	=	-IZREADERINC -I$(QTDIR)/include
-LINK	=	arm-linux-gcc
-LFLAGS	=	
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -lqpe -lreader_codec -lqte
-MOC	=	$(QTDIR)/bin/moc
-UIC	=	$(QTDIR)/bin/uic
-
-TAR	=	tar -cf
-GZIP	=	gzip -9f
-
-####### Files
-
-HEADERS =	Aportis.h \
-		Bkmks.h \
-		BuffDoc.h \
-		ButtonPrefs.h \
-		CAnnoEdit.h \
-		CBuffer.h \
-		CDrawBuffer.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		CExpander.h \
-		CFilter.h \
-		CloseDialog.h \
-		Coder.h \
-		CSource.h \
-		Filedata.h \
-		FixedFont.h \
-		FontControl.h \
-		GraphicWin.h \
-		Markups.h \
-		Navigation.h \
-		Palm2QImage.h \
-		Prefs.h \
-		PPMd.h \
-		PPMdType.h \
-		QFloatBar.h \
-		QTReader.h \
-		QTReaderApp.h \
-		QtrListView.h \
-		Queue.h \
-		StateData.h \
-		StyleConsts.h \
-		SubAlloc.h \
-		ToolbarPrefs.h \
-		URLDialog.h \
-		ZText.h \
-		arith.h \
-		arrierego.h \
-		cbkmkselector.h \
-		config.h \
-		fileBrowser.h \
-		infowin.h \
-		linktype.h \
-		my_list.h \
-		names.h \
-		nef.h \
-		ZREADERINC/opie.h \
-		pdb.h \
-		plucker.h \
-		plucker_base.h \
-		ppm.h \
-		ppm_expander.h \
-		usenef.h \
-		ZREADERINC/useqpe.h \
-		ustring.h \
-		util.h \
-		utypes.h \
-		version.h \
-		ztxt.h
-SOURCES =	BuffDoc.cpp \
-		ButtonPrefs.cpp \
-		CAnnoEdit.cpp \
-		CDrawBuffer.cpp \
-		CEncoding.cpp \
-		CEncoding_tables.cpp \
-		CFilter.cpp \
-		CRegExp.cpp \
-		CloseDialog.cpp \
-		FontControl.cpp \
-		Prefs.cpp \
-		QTReader.cpp \
-		QTReaderApp.cpp \
-		QtrListView.cpp \
-		ToolbarPrefs.cpp \
-		URLDialog.cpp \
-		fileBrowser.cpp \
-		infowin.cpp \
-		main.cpp \
-		orkey.cpp \
-		util.cpp \
-		version.cpp
-OBJECTS =	ZREADEROBJS/BuffDoc.o \
-		ZREADEROBJS/ButtonPrefs.o \
-		ZREADEROBJS/CAnnoEdit.o \
-		ZREADEROBJS/CDrawBuffer.o \
-		ZREADEROBJS/CEncoding.o \
-		ZREADEROBJS/CEncoding_tables.o \
-		ZREADEROBJS/CFilter.o \
-		ZREADEROBJS/CRegExp.o \
-		ZREADEROBJS/CloseDialog.o \
-		ZREADEROBJS/FontControl.o \
-		ZREADEROBJS/Prefs.o \
-		ZREADEROBJS/QTReader.o \
-		ZREADEROBJS/QTReaderApp.o \
-		ZREADEROBJS/QtrListView.o \
-		ZREADEROBJS/ToolbarPrefs.o \
-		ZREADEROBJS/URLDialog.o \
-		ZREADEROBJS/fileBrowser.o \
-		ZREADEROBJS/infowin.o \
-		ZREADEROBJS/main.o \
-		ZREADEROBJS/orkey.o \
-		ZREADEROBJS/util.o \
-		ZREADEROBJS/version.o
-INTERFACES =	
-UICDECLS =	
-UICIMPLS =	
-SRCMOC	=	ZREADERMOCS/moc_ButtonPrefs.cpp \
-		ZREADERMOCS/moc_CAnnoEdit.cpp \
-		ZREADERMOCS/moc_CloseDialog.cpp \
-		ZREADERMOCS/moc_GraphicWin.cpp \
-		ZREADERMOCS/moc_Prefs.cpp \
-		ZREADERMOCS/moc_QFloatBar.cpp \
-		ZREADERMOCS/moc_QTReader.cpp \
-		ZREADERMOCS/moc_QTReaderApp.cpp \
-		ZREADERMOCS/moc_QtrListView.cpp \
-		ZREADERMOCS/moc_ToolbarPrefs.cpp \
-		ZREADERMOCS/moc_URLDialog.cpp \
-		ZREADERMOCS/moc_cbkmkselector.cpp \
-		ZREADERMOCS/moc_fileBrowser.cpp \
-		ZREADERMOCS/moc_infowin.cpp
-OBJMOC	=	ZREADEROBJS/moc_ButtonPrefs.o \
-		ZREADEROBJS/moc_CAnnoEdit.o \
-		ZREADEROBJS/moc_CloseDialog.o \
-		ZREADEROBJS/moc_GraphicWin.o \
-		ZREADEROBJS/moc_Prefs.o \
-		ZREADEROBJS/moc_QFloatBar.o \
-		ZREADEROBJS/moc_QTReader.o \
-		ZREADEROBJS/moc_QTReaderApp.o \
-		ZREADEROBJS/moc_QtrListView.o \
-		ZREADEROBJS/moc_ToolbarPrefs.o \
-		ZREADEROBJS/moc_URLDialog.o \
-		ZREADEROBJS/moc_cbkmkselector.o \
-		ZREADEROBJS/moc_fileBrowser.o \
-		ZREADEROBJS/moc_infowin.o
-DIST	=	
-TARGET	=	$(QPEDIR)/bin/uqtreader
-INTERFACE_DECL_PATH = .
-
-####### 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: $(TARGET)
-
-$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
-
-moc: $(SRCMOC)
-
-tmake: reader.zmak
-
-reader.zmak: reader.zpro
-	tmake reader.zpro -o reader.zmak
-
-dist:
-	$(TAR) reader.zpro.tar reader.zpro.pro $(SOURCES) $(HEADERS) $(INTERFACES) $(DIST)
-	$(GZIP) reader.zpro.tar
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) $(TARGET)
-	-rm -f *~ core
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-####### Compile
-
-ZREADEROBJS/BuffDoc.o: BuffDoc.cpp \
-		ZREADERINC/static.h \
-		names.h \
-		BuffDoc.h \
-		ZREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		ZText.h \
-		ebookcodec.h \
-		Aportis.h \
-		pdb.h \
-		CHM.h \
-		chm_lib.h \
-		ppm_expander.h \
-		utypes.h \
-		ppm.h \
-		arith.h \
-		ztxt.h \
-		plucker.h \
-		plucker_base.h \
-		Navigation.h \
-		hrule.h \
-		nef.h \
-		usenef.h \
-		arrierego.h \
-		iSilo.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/BuffDoc.o BuffDoc.cpp
-
-ZREADEROBJS/ButtonPrefs.o: ButtonPrefs.cpp \
-		ButtonPrefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/ButtonPrefs.o ButtonPrefs.cpp
-
-ZREADEROBJS/CAnnoEdit.o: CAnnoEdit.cpp \
-		CAnnoEdit.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CAnnoEdit.o CAnnoEdit.cpp
-
-ZREADEROBJS/CDrawBuffer.o: CDrawBuffer.cpp \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		FontControl.h \
-		ZREADERINC/useqpe.h \
-		ZREADERINC/opie.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CDrawBuffer.o CDrawBuffer.cpp
-
-ZREADEROBJS/CEncoding.o: CEncoding.cpp \
-		CEncoding.h \
-		CExpander.h \
-		ZREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CEncoding.o CEncoding.cpp
-
-ZREADEROBJS/CEncoding_tables.o: CEncoding_tables.cpp \
-		CEncoding_tables.h \
-		config.h \
-		ustring.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CEncoding_tables.o CEncoding_tables.cpp
-
-ZREADEROBJS/CFilter.o: CFilter.cpp \
-		ZREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		my_list.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		ZREADERINC/static.h \
-		hrule.h \
-		Bkmks.h \
-		Filedata.h \
-		QTReader.h \
-		BuffDoc.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h \
-		CRegExp.h \
-		hash.h \
-		Queue.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CFilter.o CFilter.cpp
-
-ZREADEROBJS/CRegExp.o: CRegExp.cpp \
-		CRegExp.h \
-		config.h \
-		ustring.h \
-		hash.h \
-		Queue.h \
-		my_list.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CRegExp.o CRegExp.cpp
-
-ZREADEROBJS/CloseDialog.o: CloseDialog.cpp \
-		CloseDialog.h \
-		ZREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/CloseDialog.o CloseDialog.cpp
-
-ZREADEROBJS/FontControl.o: FontControl.cpp \
-		ZREADERINC/opie.h \
-		ZREADERINC/useqpe.h \
-		FontControl.h \
-		StyleConsts.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/FontControl.o FontControl.cpp
-
-ZREADEROBJS/Prefs.o: Prefs.cpp \
-		Prefs.h \
-		orkey.h \
-		CEncoding_tables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/Prefs.o Prefs.cpp
-
-ZREADEROBJS/QTReader.o: QTReader.cpp \
-		ZREADERINC/useqpe.h \
-		config.h \
-		ustring.h \
-		QTReader.h \
-		ZREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/QTReader.o QTReader.cpp
-
-ZREADEROBJS/QTReaderApp.o: QTReaderApp.cpp \
-		ZREADERINC/useqpe.h \
-		QTReader.h \
-		ZREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h \
-		GraphicWin.h \
-		Bkmks.h \
-		Filedata.h \
-		cbkmkselector.h \
-		infowin.h \
-		ToolbarPrefs.h \
-		preferences.h \
-		Prefs.h \
-		orkey.h \
-		CAnnoEdit.h \
-		QFloatBar.h \
-		FixedFont.h \
-		URLDialog.h \
-		util.h \
-		fileBrowser.h \
-		QTReaderApp.h \
-		CloseDialog.h \
-		ButtonPrefs.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/QTReaderApp.o QTReaderApp.cpp
-
-ZREADEROBJS/QtrListView.o: QtrListView.cpp \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/QtrListView.o QtrListView.cpp
-
-ZREADEROBJS/ToolbarPrefs.o: ToolbarPrefs.cpp \
-		ZREADERINC/useqpe.h \
-		ToolbarPrefs.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/ToolbarPrefs.o ToolbarPrefs.cpp
-
-ZREADEROBJS/URLDialog.o: URLDialog.cpp \
-		URLDialog.h \
-		ZREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/URLDialog.o URLDialog.cpp
-
-ZREADEROBJS/fileBrowser.o: fileBrowser.cpp \
-		fileBrowser.h \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/fileBrowser.o fileBrowser.cpp
-
-ZREADEROBJS/infowin.o: infowin.cpp \
-		infowin.h \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/infowin.o infowin.cpp
-
-ZREADEROBJS/main.o: main.cpp \
-		ZREADERINC/useqpe.h \
-		QTReaderApp.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		orkey.h \
-		BGType.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/main.o main.cpp
-
-ZREADEROBJS/orkey.o: orkey.cpp \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/orkey.o orkey.cpp
-
-ZREADEROBJS/util.o: util.cpp \
-		util.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/util.o util.cpp
-
-ZREADEROBJS/version.o: version.cpp \
-		version.h \
-		names.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/version.o version.cpp
-
-ZREADEROBJS/moc_ButtonPrefs.o: ZREADERMOCS/moc_ButtonPrefs.cpp \
-		ButtonPrefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_ButtonPrefs.o ZREADERMOCS/moc_ButtonPrefs.cpp
-
-ZREADEROBJS/moc_CAnnoEdit.o: ZREADERMOCS/moc_CAnnoEdit.cpp \
-		CAnnoEdit.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_CAnnoEdit.o ZREADERMOCS/moc_CAnnoEdit.cpp
-
-ZREADEROBJS/moc_CloseDialog.o: ZREADERMOCS/moc_CloseDialog.cpp \
-		CloseDialog.h \
-		ZREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_CloseDialog.o ZREADERMOCS/moc_CloseDialog.cpp
-
-ZREADEROBJS/moc_GraphicWin.o: ZREADERMOCS/moc_GraphicWin.cpp \
-		GraphicWin.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_GraphicWin.o ZREADERMOCS/moc_GraphicWin.cpp
-
-ZREADEROBJS/moc_Prefs.o: ZREADERMOCS/moc_Prefs.cpp \
-		Prefs.h \
-		orkey.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_Prefs.o ZREADERMOCS/moc_Prefs.cpp
-
-ZREADEROBJS/moc_QFloatBar.o: ZREADERMOCS/moc_QFloatBar.cpp \
-		QFloatBar.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_QFloatBar.o ZREADERMOCS/moc_QFloatBar.cpp
-
-ZREADEROBJS/moc_QTReader.o: ZREADERMOCS/moc_QTReader.cpp \
-		QTReader.h \
-		ZREADERINC/static.h \
-		my_list.h \
-		BuffDoc.h \
-		ZREADERINC/useqpe.h \
-		CDrawBuffer.h \
-		StyleConsts.h \
-		CBuffer.h \
-		config.h \
-		ustring.h \
-		linktype.h \
-		CFilter.h \
-		CExpander.h \
-		Markups.h \
-		names.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		FontControl.h \
-		BGType.h \
-		striphtml.h \
-		Navigation.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_QTReader.o ZREADERMOCS/moc_QTReader.cpp
-
-ZREADEROBJS/moc_QTReaderApp.o: ZREADERMOCS/moc_QTReaderApp.cpp \
-		QTReaderApp.h \
-		ZREADERINC/useqpe.h \
-		CExpander.h \
-		config.h \
-		ustring.h \
-		StyleConsts.h \
-		Markups.h \
-		names.h \
-		linktype.h \
-		CEncoding.h \
-		CEncoding_tables.h \
-		orkey.h \
-		BGType.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_QTReaderApp.o ZREADERMOCS/moc_QTReaderApp.cpp
-
-ZREADEROBJS/moc_QtrListView.o: ZREADERMOCS/moc_QtrListView.cpp \
-		QtrListView.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_QtrListView.o ZREADERMOCS/moc_QtrListView.cpp
-
-ZREADEROBJS/moc_ToolbarPrefs.o: ZREADERMOCS/moc_ToolbarPrefs.cpp \
-		ToolbarPrefs.h \
-		ZREADERINC/useqpe.h \
-		preferences.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_ToolbarPrefs.o ZREADERMOCS/moc_ToolbarPrefs.cpp
-
-ZREADEROBJS/moc_URLDialog.o: ZREADERMOCS/moc_URLDialog.cpp \
-		URLDialog.h \
-		ZREADERINC/useqpe.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_URLDialog.o ZREADERMOCS/moc_URLDialog.cpp
-
-ZREADEROBJS/moc_cbkmkselector.o: ZREADERMOCS/moc_cbkmkselector.cpp \
-		cbkmkselector.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_cbkmkselector.o ZREADERMOCS/moc_cbkmkselector.cpp
-
-ZREADEROBJS/moc_fileBrowser.o: ZREADERMOCS/moc_fileBrowser.cpp \
-		fileBrowser.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_fileBrowser.o ZREADERMOCS/moc_fileBrowser.cpp
-
-ZREADEROBJS/moc_infowin.o: ZREADERMOCS/moc_infowin.cpp \
-		infowin.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ZREADEROBJS/moc_infowin.o ZREADERMOCS/moc_infowin.cpp
-
-ZREADERMOCS/moc_ButtonPrefs.cpp: ButtonPrefs.h
-	$(MOC) ButtonPrefs.h -o ZREADERMOCS/moc_ButtonPrefs.cpp
-
-ZREADERMOCS/moc_CAnnoEdit.cpp: CAnnoEdit.h
-	$(MOC) CAnnoEdit.h -o ZREADERMOCS/moc_CAnnoEdit.cpp
-
-ZREADERMOCS/moc_CloseDialog.cpp: CloseDialog.h
-	$(MOC) CloseDialog.h -o ZREADERMOCS/moc_CloseDialog.cpp
-
-ZREADERMOCS/moc_GraphicWin.cpp: GraphicWin.h
-	$(MOC) GraphicWin.h -o ZREADERMOCS/moc_GraphicWin.cpp
-
-ZREADERMOCS/moc_Prefs.cpp: Prefs.h
-	$(MOC) Prefs.h -o ZREADERMOCS/moc_Prefs.cpp
-
-ZREADERMOCS/moc_QFloatBar.cpp: QFloatBar.h
-	$(MOC) QFloatBar.h -o ZREADERMOCS/moc_QFloatBar.cpp
-
-ZREADERMOCS/moc_QTReader.cpp: QTReader.h
-	$(MOC) QTReader.h -o ZREADERMOCS/moc_QTReader.cpp
-
-ZREADERMOCS/moc_QTReaderApp.cpp: QTReaderApp.h
-	$(MOC) QTReaderApp.h -o ZREADERMOCS/moc_QTReaderApp.cpp
-
-ZREADERMOCS/moc_QtrListView.cpp: QtrListView.h
-	$(MOC) QtrListView.h -o ZREADERMOCS/moc_QtrListView.cpp
-
-ZREADERMOCS/moc_ToolbarPrefs.cpp: ToolbarPrefs.h
-	$(MOC) ToolbarPrefs.h -o ZREADERMOCS/moc_ToolbarPrefs.cpp
-
-ZREADERMOCS/moc_URLDialog.cpp: URLDialog.h
-	$(MOC) URLDialog.h -o ZREADERMOCS/moc_URLDialog.cpp
-
-ZREADERMOCS/moc_cbkmkselector.cpp: cbkmkselector.h
-	$(MOC) cbkmkselector.h -o ZREADERMOCS/moc_cbkmkselector.cpp
-
-ZREADERMOCS/moc_fileBrowser.cpp: fileBrowser.h
-	$(MOC) fileBrowser.h -o ZREADERMOCS/moc_fileBrowser.cpp
-
-ZREADERMOCS/moc_infowin.cpp: infowin.h
-	$(MOC) infowin.h -o ZREADERMOCS/moc_infowin.cpp
-
diff --git a/noncore/apps/opie-reader/reader.zpro b/noncore/apps/opie-reader/reader.zpro
deleted file mode 100644
index 32deb2b..0000000
--- a/noncore/apps/opie-reader/reader.zpro
+++ b/dev/null
@@ -1,95 +0,0 @@
-TEMPLATE	= app
-CONFIG		= qt warn_on release
-HEADERS		= Aportis.h \
-                  Bkmks.h \
-                  BuffDoc.h \
-                  ButtonPrefs.h \
-                  CAnnoEdit.h \
-                  CBuffer.h \
-                  CDrawBuffer.h \
-                  CEncoding.h \
-                  CEncoding_tables.h \
-                  CExpander.h \
-                  CFilter.h \
-                  CloseDialog.h \
-                  Coder.h \
-                  CSource.h \
-                  Filedata.h \
-                  FixedFont.h \
-                  FontControl.h \
-                  GraphicWin.h \
-                  Markups.h \
-                  Navigation.h \
-                  Palm2QImage.h \
-                  Prefs.h \
-                  PPMd.h \
-                  PPMdType.h \
-                  QFloatBar.h \
-                  QTReader.h \
-                  QTReaderApp.h \
-                  QtrListView.h \
-                  Queue.h \
-                  StateData.h \
-                  StyleConsts.h \
-                  SubAlloc.h \
-                  ToolbarPrefs.h \
-                  URLDialog.h \
-                  ZText.h \
-                  arith.h \
-                  arrierego.h \
-                  cbkmkselector.h \
-                  config.h \
-                  fileBrowser.h \
-                  infowin.h \
-                  linktype.h \
-                  my_list.h \
-                  names.h \
-                  nef.h \
-                  ZREADERINC/opie.h \
-                  pdb.h \
-                  plucker.h \
-                  plucker_base.h \
-                  ppm.h \
-                  ppm_expander.h \
-                  usenef.h \
-                  ZREADERINC/useqpe.h \
-                  ustring.h \
-		  util.h \
-                  utypes.h \
-                  version.h \
-                  ztxt.h
-
-SOURCES		= BuffDoc.cpp \
-                  ButtonPrefs.cpp \
-                  CAnnoEdit.cpp \
-                  CDrawBuffer.cpp \
-                  CEncoding.cpp \
-                  CEncoding_tables.cpp \
-                  CFilter.cpp \
-		  CRegExp.cpp \
-                  CloseDialog.cpp \
-                  FontControl.cpp \
-		  GraphicWin.cpp \
-                  Prefs.cpp \
-                  QTReader.cpp \
-                  QTReaderApp.cpp \
-                  QtrListView.cpp \
-                  ToolbarPrefs.cpp \
-                  URLDialog.cpp \
-                  fileBrowser.cpp \
-                  infowin.cpp \
-                  main.cpp \
-		  orkey.cpp \
-		  util.cpp \
-                  version.cpp
-
-
-INTERFACES	= 
-DESTDIR		= $(QPEDIR)/bin
-INCLUDEPATH	+= ZREADERINC
-DEPENDPATH	+= ZREADERINC
-TARGET		= uqtreader
-LIBS		+= -lqpe -lreader_codec
-
-OBJECTS_DIR = ZREADEROBJS
-MOC_DIR = ZREADERMOCS
diff --git a/noncore/apps/opie-reader/reader/reader.pro b/noncore/apps/opie-reader/reader/reader.pro
index 3f56da9..33975ee 100644
--- a/noncore/apps/opie-reader/reader/reader.pro
+++ b/noncore/apps/opie-reader/reader/reader.pro
@@ -1,91 +1,87 @@
 DEFINES += OPIE USEQPE
 VPATH = ..
 TEMPLATE	= app
 CONFIG		= qt warn_on release
 HEADERS		= Aportis.h \
                   Bkmks.h \
                   BuffDoc.h \
                   ButtonPrefs.h \
                   CAnnoEdit.h \
                   CBuffer.h \
                   CDrawBuffer.h \
                   CEncoding.h \
                   CEncoding_tables.h \
                   CExpander.h \
                   CFilter.h \
                   CloseDialog.h \
                   Filedata.h \
                   FixedFont.h \
                   FontControl.h \
                   GraphicWin.h \
                   Markups.h \
                   Navigation.h \
                   Palm2QImage.h \
                   Prefs.h \
                   PPMd.h \
                   PPMdType.h \
                   QFloatBar.h \
                   QTReader.h \
                   QTReaderApp.h \
                   QtrListView.h \
                   Queue.h \
                   StyleConsts.h \
                   ToolbarPrefs.h \
                   URLDialog.h \
                   ZText.h \
                   arith.h \
                   cbkmkselector.h \
                   config.h \
                   fileBrowser.h \
                   infowin.h \
                   linktype.h \
                   my_list.h \
                   names.h \
-                  ../OREADERINC/opie.h \
                   pdb.h \
                   plucker.h \
                   plucker_base.h \
                   ppm.h \
                   ppm_expander.h \
                   usenef.h \
-                  ../OREADERINC/useqpe.h \
                   ustring.h \
 		  util.h \
                   utypes.h \
                   version.h \
                   ztxt.h
 
 SOURCES		= BuffDoc.cpp \
                   ButtonPrefs.cpp \
                   CAnnoEdit.cpp \
                   CDrawBuffer.cpp \
                   CEncoding.cpp \
                   CEncoding_tables.cpp \
                   CFilter.cpp \
 		  CRegExp.cpp \
                   CloseDialog.cpp \
                   FontControl.cpp \
 		  GraphicWin.cpp \
                   Prefs.cpp \
                   QTReader.cpp \
                   QTReaderApp.cpp \
                   QtrListView.cpp \
                   ToolbarPrefs.cpp \
                   URLDialog.cpp \
                   fileBrowser.cpp \
                   infowin.cpp \
                   main.cpp \
 		  orkey.cpp \
 		  util.cpp \
                   version.cpp
 
 INTERFACES	= 
 DESTDIR		= $(OPIEDIR)/bin
-INCLUDEPATH	+= ../OREADERINC $(OPIEDIR)/include
-DEPENDPATH	+= ../OREADERINC $(OPIEDIR)/include
-TARGET		= reader
-LIBS		+= -lopieui2 -lqpe -lreader_codec
-
-DEPENDPATH += ../OREADERINC
+INCLUDEPATH	+= $(OPIEDIR)/include
+DEPENDPATH	+= $(OPIEDIR)/include
+TARGET		= opie-reader
+LIBS		+= -lopiecore2 -lopieui2 -lqpe -lreader_codec
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-reader/static.h b/noncore/apps/opie-reader/static.h
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/noncore/apps/opie-reader/static.h
diff --git a/noncore/apps/opie-reader/useqpe.h b/noncore/apps/opie-reader/useqpe.h
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/noncore/apps/opie-reader/useqpe.h