summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xconfigure19
-rw-r--r--core/applets/clipboardapplet/Makefile.in8
-rw-r--r--core/apps/embeddedkonsole/Makefile.in14
-rw-r--r--core/launcher/launcher.pro2
-rw-r--r--core/launcher/launcherview.cpp27
-rw-r--r--core/multimedia/opieplayer/Makefile.in64
-rw-r--r--core/multimedia/opieplayer/libflash/Makefile.in9
-rw-r--r--core/multimedia/opieplayer/libmad/Makefile.in11
-rw-r--r--core/multimedia/opieplayer/libmpeg3/Makefile.in13
-rw-r--r--core/multimedia/opieplayer/wavplugin/Makefile.in13
-rw-r--r--core/pim/datebook/Makefile.in119
-rw-r--r--docs/start.doc51
-rw-r--r--library/Makefile.in125
-rw-r--r--library/global.cpp2
-rw-r--r--library/library.pro10
-rw-r--r--noncore/games/chess/Makefile.in16
-rw-r--r--noncore/games/go/Makefile.in15
17 files changed, 159 insertions, 359 deletions
diff --git a/configure b/configure
index 7824e36..3b474c6 100755
--- a/configure
+++ b/configure
@@ -1,49 +1,46 @@
#!/bin/sh
#
# Configures to build the Qtopia Environment
#
# Copyright 1999-2000 Trolltech AS. All rights reserved.
#
-PLATFORM=linux-generic-g++
+PLATFORM=generic
SHARING=shared
DEBUG=
QCONFIGARG=
touch .test.qpe.
if [ '!' -f ${OPIEDIR}/.test.qpe. ];
then
rm .test.qpe.
echo
echo
echo ' The environment variable $OPIEDIR is not set correctly. It is currently'
echo ' set to "'$OPIEDIR'", but it should be set to this directory,'
echo ' which is "'`pwd`'".'
echo
echo ' Please read the INSTALL file for instructions on how to set $OPIEDIR'
echo ' correctly. If you have set $OPIEDIR in your .profile or .login, you '
echo ' will need to log out and log in again to make the setting effective.'
echo
echo
exit 1
fi
rm .test.qpe.
-mkdir -p include/qpe
-( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; )
-
-VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\.[0-9]*\.[0-9]*.*".*/\1/p' <include/qpe/version.h)
-VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.\([0-9]\)\.[0-9]*.*".*/\1/p' <include/qpe/version.h)
-VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.[0-9]*\.\([0-9]*\).*".*/\1/p' <include/qpe/version.h)
+VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\.[0-9]*\.[0-9]*.*".*/\1/p' <library/version.h)
+VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.\([0-9]\)\.[0-9]*.*".*/\1/p' <library/version.h)
+VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.[0-9]*\.\([0-9]*\).*".*/\1/p' <library/version.h)
TOMAKE=
if grep -q 'VERSION_STR.*"3' $QTDIR/include/qglobal.h
then
QT3=yes
else
QT3=no
fi
# Parse the arguments, setting things to "yes" or "no".
@@ -108,24 +105,32 @@ each option:
-debug ............. Compile and link Qt with debugging turned on.
* -shared ............ Create and use a shared Qt library (libqt.so)
-static ............ Create and use a static Qt library (libqt.a)
-qt3 ............... Configure for use with Qt 3.x
-platform target ... The platform you are building on ($PLATFORM)
EOF
exit 0;
fi
+if [ -f library/custom-$PLATFORM.h ]
+then
+ rm -f library/custom.h
+ ln -s custom-$PLATFORM.h library/custom.h
+fi
+
+mkdir -p include/qpe
+( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; )
echo Creating makefiles...
sed -e 's/^\(VERSION.*= \).*/\1'$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT/ <library/library.pro >library/library.pro-v
mv library/library.pro-v library/library.pro
if [ "$QT3" = yes ]
then
VCONFIG="CONFIG+=qt3"
else
VCONFIG="CONFIG+=qt2"
fi
diff --git a/core/applets/clipboardapplet/Makefile.in b/core/applets/clipboardapplet/Makefile.in
index 2ddeb42..c42404e 100644
--- a/core/applets/clipboardapplet/Makefile.in
+++ b/core/applets/clipboardapplet/Makefile.in
@@ -1,21 +1,21 @@
#############################################################################
####### Compiler, tools and options
CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-INCPATH = -I$(QPEDIR)/include
+INCPATH = -I$(OPIEDIR)/include
LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
MOC = $(SYSCONF_MOC)
UIC = $(SYSCONF_UIC)
####### Target
DESTDIR = ../../plugins/applets/
VER_MAJ = 1
VER_MIN = 0
VER_PATCH = 0
TARGET = clipboardapplet
@@ -56,26 +56,28 @@ OBJMOC = moc_clipboard.o
$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
####### Build rules
all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
$(SYSCONF_LINK_LIB)
moc: $(SRCMOC)
-tmake:
- tmake clipboardapplet.pro
+tmake: Makefile.in
+
+Makefile.in: clipboardapplet.pro
+ tmake clipboardapplet.pro -o Makefile.in
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
-rm -f *~ core
-rm -f allmoc.cpp
####### Extension Modules
listpromodules:
@echo
listallmodules:
diff --git a/core/apps/embeddedkonsole/Makefile.in b/core/apps/embeddedkonsole/Makefile.in
index 8a69557..0da49d7 100644
--- a/core/apps/embeddedkonsole/Makefile.in
+++ b/core/apps/embeddedkonsole/Makefile.in
@@ -90,26 +90,28 @@ OBJMOC = moc_TEWidget.o \
$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
####### Build rules
all: $(DESTDIR)$(TARGET)
$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
moc: $(SRCMOC)
-tmake:
- tmake embeddedkonsole.pro
+tmake: Makefile.in
+
+Makefile.in: embeddedkonsole.pro
+ tmake embeddedkonsole.pro -o Makefile.in
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
-rm -f *~ core
-rm -f allmoc.cpp
####### Extension Modules
listpromodules:
@echo
listallmodules:
@@ -174,55 +176,49 @@ session.o: session.cpp \
session.h \
MyPty.h \
TEWidget.h \
TECommon.h \
TEmuVt102.h \
TEScreen.h \
TEHistory.h \
TEmulation.h \
keytrans.h
keytrans.o: keytrans.cpp \
keytrans.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
default.keytab.h
konsole.o: konsole.cpp \
- $(OPIEDIR)/include/qpe/resource.h \
- $(OPIEDIR)/include/qpe/qpetoolbar.h \
- $(OPIEDIR)/include/qpe/qpemenubar.h \
- $(OPIEDIR)/include/qpe/config.h \
konsole.h \
MyPty.h \
TEWidget.h \
TECommon.h \
TEmuVt102.h \
TEScreen.h \
TEHistory.h \
TEmulation.h \
keytrans.h \
session.h
main.o: main.cpp \
konsole.h \
MyPty.h \
TEWidget.h \
TECommon.h \
TEmuVt102.h \
TEScreen.h \
TEHistory.h \
TEmulation.h \
keytrans.h \
- session.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h
+ session.h
MyPty.o: MyPty.cpp \
MyPty.h
moc_TEWidget.o: moc_TEWidget.cpp \
TEWidget.h \
TECommon.h
moc_TEmulation.o: moc_TEmulation.cpp \
TEmulation.h \
TEWidget.h \
TECommon.h \
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro
index 0078faf..32cb95f 100644
--- a/core/launcher/launcher.pro
+++ b/core/launcher/launcher.pro
@@ -1,20 +1,21 @@
TEMPLATE = app
CONFIG = qt warn_on release
DESTDIR = $(OPIEDIR)/bin
HEADERS = background.h \
desktop.h \
+ qprocess.h \
info.h \
appicons.h \
taskbar.h \
sidething.h \
mrulist.h \
stabmon.h \
inputmethods.h \
systray.h \
wait.h \
shutdownimpl.h \
launcher.h \
launcherview.h \
@@ -37,24 +38,25 @@ HEADERS = background.h \
$(OPIEDIR)/rsync/stream.h \
$(OPIEDIR)/rsync/sumset.h \
$(OPIEDIR)/rsync/trace.h \
$(OPIEDIR)/rsync/types.h \
$(OPIEDIR)/rsync/util.h \
$(OPIEDIR)/rsync/whole.h \
$(OPIEDIR)/rsync/config_rsync.h \
$(OPIEDIR)/rsync/qrsync.h
# quicklauncher.h \
SOURCES = background.cpp \
desktop.cpp \
+ qprocess.cpp qprocess_unix.cpp \
info.cpp \
appicons.cpp \
taskbar.cpp \
sidething.cpp \
mrulist.cpp \
stabmon.cpp \
inputmethods.cpp \
systray.cpp \
wait.cpp \
shutdownimpl.cpp \
launcher.cpp \
launcherview.cpp \
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index ed39720..e8741a2 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -203,28 +203,26 @@ public:
if ( sortmeth != m ) {
sortmeth = m;
sort();
}
}
int compare(const AppLnk* a, const AppLnk* b)
{
switch (sortmeth) {
case Name:
return a->name().compare(b->name());
case Date: {
- QFileInfo fa(a->linkFile());
- if ( !fa.exists() ) fa.setFile(a->file());
- QFileInfo fb(b->linkFile());
- if ( !fb.exists() ) fb.setFile(b->file());
+ QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file());
+ QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file());
return fa.lastModified().secsTo(fb.lastModified());
}
case Type:
return a->type().compare(b->type());
}
return 0;
}
protected:
void styleChange( QStyle &old )
{
@@ -353,55 +351,64 @@ void LauncherIconView::updateCategoriesAndMimeTypes()
void LauncherIconView::hideOrShowItems(bool resort)
{
hidden.setAutoDelete(FALSE);
QList<AppLnk> links=hidden;
hidden.clear();
hidden.setAutoDelete(TRUE);
LauncherItem* item = (LauncherItem*)firstItem();
while (item) {
links.append(item->takeAppLnk());
item = (LauncherItem*)item->nextItem();
}
+ bool oldAutoArrange = autoArrange();
+ setAutoArrange( FALSE );
clear();
QListIterator<AppLnk> it(links);
AppLnk* l;
while ((l=it.current())) {
addItem(l,FALSE);
++it;
}
if ( resort )
sort();
+ setAutoArrange( oldAutoArrange );
}
bool LauncherIconView::removeLink(const QString& linkfile)
{
LauncherItem* item = (LauncherItem*)firstItem();
+ AppLnk* l;
+ bool did = FALSE;
+ DocLnk dl(linkfile);
while (item) {
- if ( item->appLnk()->linkFile() == linkfile ) {
+ l = item->appLnk();
+ if ( l->linkFileKnown() && l->linkFile() == linkfile || l->file() == linkfile
+ || dl.isValid() && dl.file() == l->file() ) {
delete item;
- return TRUE;
+ did = TRUE;
}
item = (LauncherItem*)item->nextItem();
}
QListIterator<AppLnk> it(hidden);
- AppLnk* l;
while ((l=it.current())) {
++it;
- if ( l->linkFile() == linkfile ) {
+ if ( l->linkFileKnown() && l->linkFile() == linkfile
+ || l->file() == linkfile
+ || dl.isValid() && dl.file() == l->file() ) {
hidden.removeRef(l);
- return TRUE;
+ did = TRUE;
}
}
- return FALSE;
+ return did;
}
LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl )
: QVBox( parent, name, fl )
{
icons = new LauncherIconView( this );
setFocusProxy(icons);
QPEApplication::setStylusOperation( icons->viewport(), QPEApplication::RightOnHold );
int dw = QApplication::desktop()->width();
icons->setItemsMovable( FALSE );
icons->setAutoArrange( TRUE );
diff --git a/core/multimedia/opieplayer/Makefile.in b/core/multimedia/opieplayer/Makefile.in
index 6e007ec..3e1f9fc 100644
--- a/core/multimedia/opieplayer/Makefile.in
+++ b/core/multimedia/opieplayer/Makefile.in
@@ -91,26 +91,28 @@ OBJMOC = moc_loopcontrol.o \
$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
####### Build rules
all: $(DESTDIR)$(TARGET)
$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
moc: $(SRCMOC)
-tmake:
- tmake mpegplayer.pro
+tmake: Makefile.in
+
+Makefile.in: mpegplayer.pro
+ tmake mpegplayer.pro -o Makefile.in
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
-rm -f *~ core
-rm -f allmoc.cpp
####### Extension Modules
listpromodules:
@echo
listallmodules:
@@ -126,138 +128,90 @@ listaddonentmodules:
REQUIRES=
####### Sub-libraries
###### Combined headers
####### Compile
main.o: main.cpp \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
mediaplayerstate.h \
playlistwidget.h \
- $(OPIEDIR)/include/qpe/applnk.h \
audiowidget.h \
videowidget.h \
loopcontrol.h \
- mediaplayer.h \
- $(OPIEDIR)/include/qpe/qlibrary.h \
- $(OPIEDIR)/include/qpe/qcom.h \
- $(OPIEDIR)/include/qpe/quuid.h \
- mediaplayerplugininterface.h
+ mediaplayer.h
loopcontrol.o: loopcontrol.cpp \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
- $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
loopcontrol.h \
videowidget.h \
audiodevice.h \
- mediaplayerplugininterface.h \
- $(OPIEDIR)/include/qpe/qcom.h \
- $(OPIEDIR)/include/qpe/quuid.h \
mediaplayerstate.h
playlistselection.o: playlistselection.cpp \
- $(OPIEDIR)/include/qpe/applnk.h \
- $(OPIEDIR)/include/qpe/resource.h \
playlistselection.h
mediaplayerstate.o: mediaplayerstate.cpp \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
- $(OPIEDIR)/include/qpe/qlibrary.h \
- $(OPIEDIR)/include/qpe/qcom.h \
- $(OPIEDIR)/include/qpe/quuid.h \
- $(OPIEDIR)/include/qpe/config.h \
- mediaplayerplugininterface.h \
mediaplayerstate.h \
libmad/libmadpluginimpl.h \
libmpeg3/libmpeg3pluginimpl.h \
wavplugin/wavpluginimpl.h
videowidget.o: videowidget.cpp \
- $(OPIEDIR)/include/qpe/resource.h \
videowidget.h \
- mediaplayerplugininterface.h \
- $(OPIEDIR)/include/qpe/qcom.h \
- $(OPIEDIR)/include/qpe/quuid.h \
mediaplayerstate.h
audiowidget.o: audiowidget.cpp \
- $(OPIEDIR)/include/qpe/resource.h \
audiowidget.h \
mediaplayerstate.h
playlistwidget.o: playlistwidget.cpp \
- $(OPIEDIR)/include/qpe/qpemenubar.h \
- $(OPIEDIR)/include/qpe/qpetoolbar.h \
- $(OPIEDIR)/include/qpe/fileselector.h \
- $(OPIEDIR)/include/qpe/applnk.h \
- $(OPIEDIR)/include/qpe/config.h \
- $(OPIEDIR)/include/qpe/global.h \
- $(OPIEDIR)/include/qpe/resource.h \
playlistselection.h \
playlistwidget.h \
mediaplayerstate.h
mediaplayer.o: mediaplayer.cpp \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
- $(OPIEDIR)/include/qpe/qlibrary.h \
- $(OPIEDIR)/include/qpe/qcom.h \
- $(OPIEDIR)/include/qpe/quuid.h \
- $(OPIEDIR)/include/qpe/resource.h \
- $(OPIEDIR)/include/qpe/config.h \
mediaplayer.h \
- mediaplayerplugininterface.h \
playlistwidget.h \
- $(OPIEDIR)/include/qpe/applnk.h \
audiowidget.h \
loopcontrol.h \
audiodevice.h \
mediaplayerstate.h
audiodevice.o: audiodevice.cpp \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
- $(OPIEDIR)/include/qpe/config.h \
- audiodevice.h \
- $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
+ audiodevice.h
moc_loopcontrol.o: moc_loopcontrol.cpp \
loopcontrol.h
moc_playlistselection.o: moc_playlistselection.cpp \
- playlistselection.h \
- $(OPIEDIR)/include/qpe/applnk.h
+ playlistselection.h
moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \
mediaplayerstate.h
moc_videowidget.o: moc_videowidget.cpp \
videowidget.h
moc_audiowidget.o: moc_audiowidget.cpp \
audiowidget.h
moc_playlistwidget.o: moc_playlistwidget.cpp \
- playlistwidget.h \
- $(OPIEDIR)/include/qpe/applnk.h
+ playlistwidget.h
moc_mediaplayer.o: moc_mediaplayer.cpp \
- mediaplayer.h \
- $(OPIEDIR)/include/qpe/qlibrary.h \
- $(OPIEDIR)/include/qpe/qcom.h \
- $(OPIEDIR)/include/qpe/quuid.h \
- mediaplayerplugininterface.h
+ mediaplayer.h
moc_audiodevice.o: moc_audiodevice.cpp \
audiodevice.h
moc_loopcontrol.cpp: loopcontrol.h
$(MOC) loopcontrol.h -o moc_loopcontrol.cpp
moc_playlistselection.cpp: playlistselection.h
$(MOC) playlistselection.h -o moc_playlistselection.cpp
moc_mediaplayerstate.cpp: mediaplayerstate.h
$(MOC) mediaplayerstate.h -o moc_mediaplayerstate.cpp
diff --git a/core/multimedia/opieplayer/libflash/Makefile.in b/core/multimedia/opieplayer/libflash/Makefile.in
index 52c8557..0947454 100644
--- a/core/multimedia/opieplayer/libflash/Makefile.in
+++ b/core/multimedia/opieplayer/libflash/Makefile.in
@@ -1,21 +1,21 @@
#############################################################################
####### Compiler, tools and options
CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
-INCPATH = -I$(QPEDIR)/include
+INCPATH = -I$(OPIEDIR)/include -I..
LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
MOC = $(SYSCONF_MOC)
UIC = $(SYSCONF_UIC)
####### Target
DESTDIR = ../../plugins/codecs/
VER_MAJ = 1
VER_MIN = 0
VER_PATCH = 0
TARGET = flashplugin
@@ -136,33 +136,30 @@ REQUIRES=
####### Sub-libraries
###### Combined headers
####### Compile
libflashplugin.o: libflashplugin.cpp \
libflashplugin.h \
- flash.h \
- ../mediaplayerplugininterface.h
+ flash.h
libflashpluginimpl.o: libflashpluginimpl.cpp \
libflashplugin.h \
flash.h \
- ../mediaplayerplugininterface.h \
- libflashpluginimpl.h \
- ../mediaplayerplugininterface.h
+ libflashpluginimpl.h
adpcm.o: adpcm.cc \
swf.h \
flash.h \
matrix.h \
cxform.h \
rect.h \
jpeglib.h \
jconfig.h \
jmorecfg.h \
jerror.h \
graphic.h \
diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in
index 19ded26..d2e1cda 100644
--- a/core/multimedia/opieplayer/libmad/Makefile.in
+++ b/core/multimedia/opieplayer/libmad/Makefile.in
@@ -91,26 +91,28 @@ OBJMOC =
$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
####### Build rules
all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
$(SYSCONF_LINK_LIB)
moc: $(SRCMOC)
-tmake:
- tmake libmad.pro
+tmake: Makefile.in
+
+Makefile.in: libmad.pro
+ tmake libmad.pro -o Makefile.in
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
-rm -f *~ core
-rm -f allmoc.cpp
####### Extension Modules
listpromodules:
@echo
listallmodules:
@@ -205,22 +207,19 @@ layer3.o: layer3.c \
timer.h \
huffman.h \
layer3.h \
rq_table.dat \
imdct_s.dat
huffman.o: huffman.c \
libmad_global.h \
huffman.h
libmadplugin.o: libmadplugin.cpp \
libmadplugin.h \
- ../mediaplayerplugininterface.h \
mad.h
libmadpluginimpl.o: libmadpluginimpl.cpp \
libmadplugin.h \
- ../mediaplayerplugininterface.h \
- libmadpluginimpl.h \
- ../mediaplayerplugininterface.h
+ libmadpluginimpl.h
diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in
index 9881815..4ccdb8c 100644
--- a/core/multimedia/opieplayer/libmpeg3/Makefile.in
+++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in
@@ -120,26 +120,28 @@ OBJMOC =
$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
####### Build rules
all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
$(SYSCONF_LINK_LIB)
moc: $(SRCMOC)
-tmake:
- tmake libmpeg3.pro
+tmake: Makefile.in
+
+Makefile.in: libmpeg3.pro
+ tmake libmpeg3.pro -o Makefile.in
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
-rm -f *~ core
-rm -f allmoc.cpp
####### Extension Modules
listpromodules:
@echo
listallmodules:
@@ -167,44 +169,41 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \
libmpeg3plugin.h \
libmpeg3.h \
mpeg3private.h \
mpeg3atrack.h \
mpeg3demux.h \
mpeg3title.h \
mpeg3io.h \
mpeg3css.h \
mpeg3private.inc \
audio/mpeg3audio.h \
mpeg3vtrack.h \
video/mpeg3video.h \
- mpeg3protos.h \
- ../mediaplayerplugininterface.h
+ mpeg3protos.h
libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
libmpeg3plugin.h \
libmpeg3.h \
mpeg3private.h \
mpeg3atrack.h \
mpeg3demux.h \
mpeg3title.h \
mpeg3io.h \
mpeg3css.h \
mpeg3private.inc \
audio/mpeg3audio.h \
mpeg3vtrack.h \
video/mpeg3video.h \
mpeg3protos.h \
- ../mediaplayerplugininterface.h \
- libmpeg3pluginimpl.h \
- ../mediaplayerplugininterface.h
+ libmpeg3pluginimpl.h
bitstream.o: bitstream.c \
mpeg3private.h \
mpeg3atrack.h \
mpeg3demux.h \
mpeg3title.h \
mpeg3io.h \
mpeg3css.h \
mpeg3private.inc \
audio/mpeg3audio.h \
mpeg3vtrack.h \
video/mpeg3video.h \
diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in
index e9fec6c..560534e 100644
--- a/core/multimedia/opieplayer/wavplugin/Makefile.in
+++ b/core/multimedia/opieplayer/wavplugin/Makefile.in
@@ -56,26 +56,28 @@ OBJMOC =
$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
####### Build rules
all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
$(SYSCONF_LINK_LIB)
moc: $(SRCMOC)
-tmake:
- tmake wavplugin.pro
+tmake: Makefile.in
+
+Makefile.in: wavplugin.pro
+ tmake wavplugin.pro -o Makefile.in
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
-rm -f *~ core
-rm -f allmoc.cpp
####### Extension Modules
listpromodules:
@echo
listallmodules:
@@ -91,22 +93,19 @@ listaddonentmodules:
REQUIRES=
####### Sub-libraries
###### Combined headers
####### Compile
wavplugin.o: wavplugin.cpp \
- wavplugin.h \
- ../mediaplayerplugininterface.h
+ wavplugin.h
wavpluginimpl.o: wavpluginimpl.cpp \
wavplugin.h \
- ../mediaplayerplugininterface.h \
- wavpluginimpl.h \
- ../mediaplayerplugininterface.h
+ wavpluginimpl.h
diff --git a/core/pim/datebook/Makefile.in b/core/pim/datebook/Makefile.in
index 0c3282e..cc31efe 100644
--- a/core/pim/datebook/Makefile.in
+++ b/core/pim/datebook/Makefile.in
@@ -115,26 +115,28 @@ OBJMOC = moc_datebookday.o \
$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
####### Build rules
all: $(DESTDIR)$(TARGET)
$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
moc: $(SRCMOC)
-tmake:
- tmake datebook.pro
+tmake: Makefile.in
+
+Makefile.in: datebook.pro
+ tmake datebook.pro -o Makefile.in
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
-rm -f *~ core
-rm -f allmoc.cpp
####### Extension Modules
listpromodules:
@echo
listallmodules:
@@ -150,132 +152,66 @@ listaddonentmodules:
REQUIRES=
####### Sub-libraries
###### Combined headers
####### Compile
main.o: main.cpp \
- datebook.h \
- $(OPIEDIR)/include/qpe/datebookdb.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h
+ datebook.h
datebookday.o: datebookday.cpp \
datebookday.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h \
datebookdayheaderimpl.h \
- datebookdayheader.h \
- $(OPIEDIR)/include/qpe/datebookdb.h \
- $(OPIEDIR)/include/qpe/resource.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
- $(OPIEDIR)/include/qpe/timestring.h \
- $(OPIEDIR)/include/qpe/qpedebug.h
+ datebookdayheader.h
datebook.o: datebook.cpp \
datebook.h \
- $(OPIEDIR)/include/qpe/datebookdb.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h \
datebookday.h \
datebooksettings.h \
datebooksettingsbase.h \
datebookweek.h \
dateentryimpl.h \
- dateentry.h \
- $(OPIEDIR)/include/qpe/datebookmonth.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
- $(OPIEDIR)/include/qpe/config.h \
- $(OPIEDIR)/include/qpe/qpedebug.h \
- $(OPIEDIR)/include/qpe/finddialog.h \
- $(OPIEDIR)/include/qpe/ir.h \
- $(OPIEDIR)/include/qpe/qpemenubar.h \
- $(OPIEDIR)/include/qpe/qpemessagebox.h \
- $(OPIEDIR)/include/qpe/resource.h \
- $(OPIEDIR)/include/qpe/sound.h \
- $(OPIEDIR)/include/qpe/timestring.h \
- $(OPIEDIR)/include/qpe/qpetoolbar.h \
- $(OPIEDIR)/include/qpe/tzselect.h \
- $(OPIEDIR)/include/qpe/xmlreader.h
+ dateentry.h
dateentryimpl.o: dateentryimpl.cpp \
dateentryimpl.h \
dateentry.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h \
repeatentry.h \
- repeatentrybase.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
- $(OPIEDIR)/include/qpe/categoryselect.h \
- $(OPIEDIR)/include/qpe/datebookmonth.h \
- $(OPIEDIR)/include/qpe/global.h \
- $(OPIEDIR)/include/qpe/timestring.h \
- $(OPIEDIR)/include/qpe/tzselect.h
+ repeatentrybase.h
datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \
datebookdayheaderimpl.h \
- datebookdayheader.h \
- $(OPIEDIR)/include/qpe/datebookmonth.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h \
- $(OPIEDIR)/include/qpe/timestring.h
+ datebookdayheader.h
datebooksettings.o: datebooksettings.cpp \
datebooksettings.h \
- datebooksettingsbase.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h
+ datebooksettingsbase.h
datebookweek.o: datebookweek.cpp \
datebookweek.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h \
datebookweekheaderimpl.h \
- datebookweekheader.h \
- $(OPIEDIR)/include/qpe/calendar.h \
- $(OPIEDIR)/include/qpe/datebookdb.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
- $(OPIEDIR)/include/qpe/timestring.h
+ datebookweekheader.h
datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \
datebookweekheaderimpl.h \
datebookweekheader.h
repeatentry.o: repeatentry.cpp \
repeatentry.h \
- repeatentrybase.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h \
- $(OPIEDIR)/include/qpe/datebookmonth.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h \
- $(OPIEDIR)/include/qpe/timestring.h
+ repeatentrybase.h
dateentry.h: dateentry.ui
$(UIC) dateentry.ui -o $(INTERFACE_DECL_PATH)/dateentry.h
dateentry.cpp: dateentry.ui
$(UIC) dateentry.ui -i dateentry.h -o dateentry.cpp
datebookdayheader.h: datebookdayheader.ui
$(UIC) datebookdayheader.ui -o $(INTERFACE_DECL_PATH)/datebookdayheader.h
datebookdayheader.cpp: datebookdayheader.ui
$(UIC) datebookdayheader.ui -i datebookdayheader.h -o datebookdayheader.cpp
@@ -300,68 +236,47 @@ repeatentrybase.cpp: repeatentrybase.ui
dateentry.o: dateentry.cpp
datebookdayheader.o: datebookdayheader.cpp
datebooksettingsbase.o: datebooksettingsbase.cpp
datebookweekheader.o: datebookweekheader.cpp
repeatentrybase.o: repeatentrybase.cpp
moc_datebookday.o: moc_datebookday.cpp \
- datebookday.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h
+ datebookday.h
moc_datebook.o: moc_datebook.cpp \
- datebook.h \
- $(OPIEDIR)/include/qpe/datebookdb.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h
+ datebook.h
moc_dateentryimpl.o: moc_dateentryimpl.cpp \
dateentryimpl.h \
- dateentry.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h
+ dateentry.h
moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \
datebookdayheaderimpl.h \
datebookdayheader.h
moc_datebookweek.o: moc_datebookweek.cpp \
- datebookweek.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h
+ datebookweek.h
moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \
datebookweekheaderimpl.h \
datebookweekheader.h
moc_repeatentry.o: moc_repeatentry.cpp \
repeatentry.h \
- repeatentrybase.h \
- $(OPIEDIR)/include/qpe/event.h \
- $(OPIEDIR)/include/qpe/palmtoprecord.h \
- $(OPIEDIR)/include/qpe/timeconversion.h \
- $(OPIEDIR)/include/qpe/qpcglobal.h
+ repeatentrybase.h
moc_dateentry.o: moc_dateentry.cpp \
dateentry.h
moc_datebookdayheader.o: moc_datebookdayheader.cpp \
datebookdayheader.h
moc_datebooksettingsbase.o: moc_datebooksettingsbase.cpp \
datebooksettingsbase.h
moc_datebookweekheader.o: moc_datebookweekheader.cpp \
datebookweekheader.h
diff --git a/docs/start.doc b/docs/start.doc
index 01b6ab1..53a4e36 100644
--- a/docs/start.doc
+++ b/docs/start.doc
@@ -49,58 +49,58 @@ run this example to learn how things work, before tackling your own
projects.
<p>
To compile the example program for running on the Linux desktop:
<ol>
<li>
<p>
Check the environment is correct:
<p>
<pre>
- export OPIEDIR=/opt/Qtopia
- export QTDIR=/opt/Qtopia
- export PATH=$QTDIR/bin:$PATH
- export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++
- export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
+ export QPEDIR=/opt/Qtopia
+ export QTDIR=/opt/Qtopia
+ export PATH=$QTDIR/bin:$PATH
+ export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++
+ export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
</pre>
<li> Take a copy of the example:
<pre>
cd somewhere
- cp -r $OPIEDIR/example .
+ cp -r $QPEDIR/example .
cd example
</pre>
<li> Generate a Makefile:
<pre>
tmake -o Makefile example.pro
</pre>
<li> Build the example:
<pre>
make
</pre>
<li> Install it:
<pre>
su # root privileges required to install
- cp example.desktop $OPIEDIR/apps/Applications
- cp Example.png $OPIEDIR/pics
- cp example $OPIEDIR/bin
+ cp example.desktop $QPEDIR/apps/Applications
+ cp Example.png $QPEDIR/pics
+ cp example $QPEDIR/bin
exit # no need to be root anymore
</pre>
<li> To run it, first run the Qt Virtual Framebuffer:
<pre>
qvfb &amp;
</pre>
<li> Then run the <i>Qtopia</i> environment:
<pre>
@@ -126,42 +126,57 @@ to your project file (e.g. <tt>example.pro</tt>) and rerun the
<p>
To build you application for the SHARP SL5000 rather than just running
on the desktop, the process is similar:
<ol>
<li>
<p>
Check the environment is correctly set for the SHARP SL5000:
<p>
<pre>
- export OPIEDIR=/opt/Qtopia/sharp
- export QTDIR=/opt/Qtopia/sharp
- export PATH=$QTDIR/bin:/usr/local/arm/bin:$PATH
- export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++
+ export QPEDIR=/opt/Qtopia/sharp
+ export QTDIR=/opt/Qtopia/sharp
+ export PATH=$QTDIR/bin:/usr/local/arm/bin:$PATH
+ export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++
</pre>
- <li> Build and install exactly the same as you did for the desktop
- (note that the generated Makefile is different):
+ <li> Rebuild the makefile ($TMAKEPATH has changed) above:
<pre>
make clean
tmake -o Makefile example.pro
- ... <i>etc.</i>
</pre>
- <li> To install it on a device, build an ipk package file (you should be root
- to do this, since then it will strip the executable for you):
+ <li> Build it:
<pre>
+ make
+</pre>
+
+ <li> Install it (note that this is now going into the /opt/Qtopia/sharp/ directory):
+<pre>
+ su # root privileges required to install
+ cp example.desktop $QPEDIR/apps/Applications
+ cp Example.png $QPEDIR/pics
+ cp example $QPEDIR/bin
+ exit # no need to be root anymore
+</pre>
+
+</pre>
+
+ <li> To install it on a device, build an ipk package file:
+<pre>
+ su # root privileges required to strip the executable
mkipks example.control
+ exit # no need to be root anymore
</pre>
<p>
The resulting <tt>example-1.0.0.ipk</tt> can be installed on the
SL5000 by using <i>Qtopia Desktop</i>.
</p>
</ol>
<h3>Building Your Own Applications</h3>
Once you have built the example, you can proceed with writing
diff --git a/library/Makefile.in b/library/Makefile.in
index b74b818..b8fc1f6 100644
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -22,30 +22,30 @@ TARGET = qpe
TARGET1 = lib$(TARGET).so.$(VER_MAJ)
####### Files
HEADERS = calendar.h \
global.h \
resource.h \
xmlreader.h \
mimetype.h \
menubutton.h \
network.h \
networkinterface.h \
- proxies.h \
filemanager.h \
fontmanager.h \
qdawg.h \
datebookmonth.h \
fileselector.h \
+ fileselector_p.h \
imageedit.h \
qcopenvelope_qws.h \
qpedecoration_qws.h \
qpeapplication.h \
qpestyle.h \
qpedialog.h \
lightstyle.h \
config.h \
applnk.h \
sound.h \
tzselect.h \
qmath.h \
@@ -69,38 +69,32 @@ HEADERS = calendar.h \
backend/palmtoprecord.h \
backend/task.h \
backend/event.h \
backend/contact.h \
categorymenu.h \
categoryedit_p.h \
categoryselect.h \
categorywidget.h \
ir.h \
backend/vobject_p.h \
findwidget_p.h \
finddialog.h \
- lnkproperties.h \
- quuid.h \
- qcom.h \
- qlibrary.h \
- qlibrary_p.h \
- qprocess.h
+ lnkproperties.h
SOURCES = calendar.cpp \
global.cpp \
xmlreader.cpp \
mimetype.cpp \
menubutton.cpp \
network.cpp \
networkinterface.cpp \
- proxies.cpp \
filemanager.cpp \
fontmanager.cpp \
qdawg.cpp \
datebookmonth.cpp \
fileselector.cpp \
imageedit.cpp \
resource.cpp \
qpedecoration_qws.cpp \
qcopenvelope_qws.cpp \
qpeapplication.cpp \
qpestyle.cpp \
qpedialog.cpp \
@@ -130,38 +124,32 @@ SOURCES = calendar.cpp \
backend/task.cpp \
backend/event.cpp \
backend/contact.cpp \
categorymenu.cpp \
categoryedit_p.cpp \
categoryselect.cpp \
categorywidget.cpp \
ir.cpp \
backend/vcc_yacc.cpp \
backend/vobject.cpp \
findwidget_p.cpp \
finddialog.cpp \
- lnkproperties.cpp \
- quuid.cpp \
- qlibrary.cpp \
- qlibrary_unix.cpp \
- qprocess.cpp \
- qprocess_unix.cpp
+ lnkproperties.cpp
OBJECTS = calendar.o \
global.o \
xmlreader.o \
mimetype.o \
menubutton.o \
network.o \
networkinterface.o \
- proxies.o \
filemanager.o \
fontmanager.o \
qdawg.o \
datebookmonth.o \
fileselector.o \
imageedit.o \
resource.o \
qpedecoration_qws.o \
qcopenvelope_qws.o \
qpeapplication.o \
qpestyle.o \
qpedialog.o \
@@ -192,108 +180,92 @@ OBJECTS = calendar.o \
backend/event.o \
backend/contact.o \
categorymenu.o \
categoryedit_p.o \
categoryselect.o \
categorywidget.o \
ir.o \
backend/vcc_yacc.o \
backend/vobject.o \
findwidget_p.o \
finddialog.o \
lnkproperties.o \
- quuid.o \
- qlibrary.o \
- qlibrary_unix.o \
- qprocess.o \
- qprocess_unix.o \
passwordbase_p.o \
- proxiesbase_p.o \
categoryeditbase_p.o \
findwidgetbase_p.o \
lnkpropertiesbase_p.o
INTERFACES = passwordbase_p.ui \
- proxiesbase_p.ui \
categoryeditbase_p.ui \
findwidgetbase_p.ui \
lnkpropertiesbase_p.ui
UICDECLS = passwordbase_p.h \
- proxiesbase_p.h \
categoryeditbase_p.h \
findwidgetbase_p.h \
lnkpropertiesbase_p.h
UICIMPLS = passwordbase_p.cpp \
- proxiesbase_p.cpp \
categoryeditbase_p.cpp \
findwidgetbase_p.cpp \
lnkpropertiesbase_p.cpp
SRCMOC = moc_menubutton.cpp \
- moc_proxies.cpp \
moc_datebookmonth.cpp \
moc_fileselector.cpp \
+ moc_fileselector_p.cpp \
moc_imageedit.cpp \
moc_qpedecoration_qws.cpp \
moc_qpeapplication.cpp \
moc_qpedialog.cpp \
moc_tzselect.cpp \
moc_process.cpp \
moc_storage.cpp \
moc_qpemenubar.cpp \
moc_qpetoolbar.cpp \
backend/moc_categories.cpp \
moc_categorymenu.cpp \
moc_categoryedit_p.cpp \
moc_categoryselect.cpp \
moc_ir.cpp \
moc_findwidget_p.cpp \
moc_finddialog.cpp \
moc_lnkproperties.cpp \
- moc_qlibrary_p.cpp \
- moc_qprocess.cpp \
global.moc \
network.moc \
password.moc \
process_unix.moc \
timestring.moc \
- qprocess_unix.moc \
moc_passwordbase_p.cpp \
- moc_proxiesbase_p.cpp \
moc_categoryeditbase_p.cpp \
moc_findwidgetbase_p.cpp \
moc_lnkpropertiesbase_p.cpp
OBJMOC = moc_menubutton.o \
- moc_proxies.o \
moc_datebookmonth.o \
moc_fileselector.o \
+ moc_fileselector_p.o \
moc_imageedit.o \
moc_qpedecoration_qws.o \
moc_qpeapplication.o \
moc_qpedialog.o \
moc_tzselect.o \
moc_process.o \
moc_storage.o \
moc_qpemenubar.o \
moc_qpetoolbar.o \
backend/moc_categories.o \
moc_categorymenu.o \
moc_categoryedit_p.o \
moc_categoryselect.o \
moc_ir.o \
moc_findwidget_p.o \
moc_finddialog.o \
moc_lnkproperties.o \
- moc_qlibrary_p.o \
- moc_qprocess.o \
moc_passwordbase_p.o \
- moc_proxiesbase_p.o \
moc_categoryeditbase_p.o \
moc_findwidgetbase_p.o \
moc_lnkpropertiesbase_p.o
####### Implicit rules
.SUFFIXES: .cpp .cxx .cc .C .c
.cpp.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
@@ -310,26 +282,28 @@ OBJMOC = moc_menubutton.o \
$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
####### Build rules
all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
$(SYSCONF_LINK_LIB)
moc: $(SRCMOC)
-tmake:
- tmake library.pro
+tmake: Makefile.in
+
+Makefile.in: library.pro
+ tmake library.pro -o Makefile.in
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
-rm -f *~ core
-rm -f allmoc.cpp
####### Extension Modules
listpromodules:
@echo
listallmodules:
@@ -372,53 +346,49 @@ mimetype.o: mimetype.cpp \
menubutton.o: menubutton.cpp \
menubutton.h
network.o: network.cpp \
network.moc
networkinterface.o: networkinterface.cpp \
networkinterface.h \
network.h \
config.h
-proxies.o: proxies.cpp \
- proxies.h \
- config.h \
- proxiesbase_p.h
-
filemanager.o: filemanager.cpp \
filemanager.h \
applnk.h
fontmanager.o: fontmanager.cpp \
fontmanager.h
qdawg.o: qdawg.cpp \
qdawg.h
datebookmonth.o: datebookmonth.cpp \
config.h \
datebookmonth.h \
calendar.h \
timestring.h \
datebookdb.h \
resource.h \
qpeapplication.h \
qpedecoration_qws.h
fileselector.o: fileselector.cpp \
fileselector.h \
filemanager.h \
applnk.h \
+ fileselector_p.h \
global.h \
resource.h \
config.h \
storage.h \
qpemenubar.h \
lnkproperties.h \
qpeapplication.h \
qpedecoration_qws.h \
timestring.h \
categorymenu.h
imageedit.o: imageedit.cpp \
@@ -525,26 +495,25 @@ timestring.o: timestring.cpp \
qpeapplication.h \
qpedecoration_qws.h \
config.h
fontdatabase.o: fontdatabase.cpp \
qpeapplication.h \
qpedecoration_qws.h \
timestring.h \
fontfactoryinterface.h \
fontdatabase.h
power.o: power.cpp \
- power.h \
- custom.h
+ power.h
storage.o: storage.cpp
qpemessagebox.o: qpemessagebox.cpp \
qpemessagebox.h
backend/timeconversion.o: backend/timeconversion.cpp \
backend/timeconversion.h
qpedebug.o: qpedebug.cpp \
qpedebug.h
@@ -624,100 +593,72 @@ findwidget_p.o: findwidget_p.cpp \
findwidgetbase_p.h
finddialog.o: finddialog.cpp \
finddialog.h \
findwidget_p.h \
findwidgetbase_p.h
lnkproperties.o: lnkproperties.cpp \
lnkproperties.h \
lnkpropertiesbase_p.h \
ir.h
-quuid.o: quuid.cpp \
- quuid.h
-
-qlibrary.o: qlibrary.cpp \
- qlibrary_p.h \
- qlibrary.h
-
-qlibrary_unix.o: qlibrary_unix.cpp \
- qlibrary_p.h \
- qlibrary.h
-
-qprocess.o: qprocess.cpp \
- qprocess.h
-
-qprocess_unix.o: qprocess_unix.cpp \
- qprocess_unix.moc \
- qprocess.h \
- qcleanuphandler_p.h
-
passwordbase_p.h: passwordbase_p.ui
$(UIC) passwordbase_p.ui -o $(INTERFACE_DECL_PATH)/passwordbase_p.h
passwordbase_p.cpp: passwordbase_p.ui
$(UIC) passwordbase_p.ui -i passwordbase_p.h -o passwordbase_p.cpp
-proxiesbase_p.h: proxiesbase_p.ui
- $(UIC) proxiesbase_p.ui -o $(INTERFACE_DECL_PATH)/proxiesbase_p.h
-
-proxiesbase_p.cpp: proxiesbase_p.ui
- $(UIC) proxiesbase_p.ui -i proxiesbase_p.h -o proxiesbase_p.cpp
-
categoryeditbase_p.h: categoryeditbase_p.ui
$(UIC) categoryeditbase_p.ui -o $(INTERFACE_DECL_PATH)/categoryeditbase_p.h
categoryeditbase_p.cpp: categoryeditbase_p.ui
$(UIC) categoryeditbase_p.ui -i categoryeditbase_p.h -o categoryeditbase_p.cpp
findwidgetbase_p.h: findwidgetbase_p.ui
$(UIC) findwidgetbase_p.ui -o $(INTERFACE_DECL_PATH)/findwidgetbase_p.h
findwidgetbase_p.cpp: findwidgetbase_p.ui
$(UIC) findwidgetbase_p.ui -i findwidgetbase_p.h -o findwidgetbase_p.cpp
lnkpropertiesbase_p.h: lnkpropertiesbase_p.ui
$(UIC) lnkpropertiesbase_p.ui -o $(INTERFACE_DECL_PATH)/lnkpropertiesbase_p.h
lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui
$(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp
passwordbase_p.o: passwordbase_p.cpp
-proxiesbase_p.o: proxiesbase_p.cpp
-
categoryeditbase_p.o: categoryeditbase_p.cpp
findwidgetbase_p.o: findwidgetbase_p.cpp
lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp
moc_menubutton.o: moc_menubutton.cpp \
menubutton.h
-moc_proxies.o: moc_proxies.cpp \
- proxies.h \
- config.h
-
moc_datebookmonth.o: moc_datebookmonth.cpp \
datebookmonth.h \
calendar.h \
timestring.h
moc_fileselector.o: moc_fileselector.cpp \
fileselector.h \
filemanager.h \
applnk.h
+moc_fileselector_p.o: moc_fileselector_p.cpp \
+ fileselector_p.h
+
moc_imageedit.o: moc_imageedit.cpp \
imageedit.h
moc_qpedecoration_qws.o: moc_qpedecoration_qws.cpp \
qpedecoration_qws.h
moc_qpeapplication.o: moc_qpeapplication.cpp \
qpeapplication.h \
qpedecoration_qws.h \
timestring.h
moc_qpedialog.o: moc_qpedialog.cpp \
@@ -757,68 +698,54 @@ moc_ir.o: moc_ir.cpp \
ir.h
moc_findwidget_p.o: moc_findwidget_p.cpp \
findwidget_p.h \
findwidgetbase_p.h
moc_finddialog.o: moc_finddialog.cpp \
finddialog.h
moc_lnkproperties.o: moc_lnkproperties.cpp \
lnkproperties.h
-moc_qlibrary_p.o: moc_qlibrary_p.cpp \
- qlibrary_p.h \
- qlibrary.h
-
-moc_qprocess.o: moc_qprocess.cpp \
- qprocess.h
-
moc_passwordbase_p.o: global.moc \
global.cpp
-moc_proxiesbase_p.o: network.moc \
+moc_categoryeditbase_p.o: network.moc \
network.cpp
-moc_categoryeditbase_p.o: password.moc \
+moc_findwidgetbase_p.o: password.moc \
password.cpp \
password.h \
config.h \
global.h \
backend/contact.h \
passwordbase_p.h
-moc_findwidgetbase_p.o: process_unix.moc \
+moc_lnkpropertiesbase_p.o: process_unix.moc \
process_unix.cpp \
process.h
-moc_lnkpropertiesbase_p.o: timestring.moc \
- timestring.cpp \
- timestring.h \
- qpeapplication.h \
- qpedecoration_qws.h \
- config.h
-
moc_menubutton.cpp: menubutton.h
$(MOC) menubutton.h -o moc_menubutton.cpp
-moc_proxies.cpp: proxies.h
- $(MOC) proxies.h -o moc_proxies.cpp
-
moc_datebookmonth.cpp: datebookmonth.h
$(MOC) datebookmonth.h -o moc_datebookmonth.cpp
moc_fileselector.cpp: fileselector.h
$(MOC) fileselector.h -o moc_fileselector.cpp
+moc_fileselector_p.cpp: fileselector_p.h
+ $(MOC) fileselector_p.h -o moc_fileselector_p.cpp
+
moc_imageedit.cpp: imageedit.h
$(MOC) imageedit.h -o moc_imageedit.cpp
moc_qpedecoration_qws.cpp: qpedecoration_qws.h
$(MOC) qpedecoration_qws.h -o moc_qpedecoration_qws.cpp
moc_qpeapplication.cpp: qpeapplication.h
$(MOC) qpeapplication.h -o moc_qpeapplication.cpp
moc_qpedialog.cpp: qpedialog.h
$(MOC) qpedialog.h -o moc_qpedialog.cpp
@@ -852,52 +779,40 @@ moc_categoryselect.cpp: categoryselect.h
moc_ir.cpp: ir.h
$(MOC) ir.h -o moc_ir.cpp
moc_findwidget_p.cpp: findwidget_p.h
$(MOC) findwidget_p.h -o moc_findwidget_p.cpp
moc_finddialog.cpp: finddialog.h
$(MOC) finddialog.h -o moc_finddialog.cpp
moc_lnkproperties.cpp: lnkproperties.h
$(MOC) lnkproperties.h -o moc_lnkproperties.cpp
-moc_qlibrary_p.cpp: qlibrary_p.h
- $(MOC) qlibrary_p.h -o moc_qlibrary_p.cpp
-
-moc_qprocess.cpp: qprocess.h
- $(MOC) qprocess.h -o moc_qprocess.cpp
-
global.moc: global.cpp
$(MOC) global.cpp -o global.moc
network.moc: network.cpp
$(MOC) network.cpp -o network.moc
password.moc: password.cpp
$(MOC) password.cpp -o password.moc
process_unix.moc: process_unix.cpp
$(MOC) process_unix.cpp -o process_unix.moc
timestring.moc: timestring.cpp
$(MOC) timestring.cpp -o timestring.moc
-qprocess_unix.moc: qprocess_unix.cpp
- $(MOC) qprocess_unix.cpp -o qprocess_unix.moc
-
moc_passwordbase_p.cpp: passwordbase_p.h
$(MOC) passwordbase_p.h -o moc_passwordbase_p.cpp
-moc_proxiesbase_p.cpp: proxiesbase_p.h
- $(MOC) proxiesbase_p.h -o moc_proxiesbase_p.cpp
-
moc_categoryeditbase_p.cpp: categoryeditbase_p.h
$(MOC) categoryeditbase_p.h -o moc_categoryeditbase_p.cpp
moc_findwidgetbase_p.cpp: findwidgetbase_p.h
$(MOC) findwidgetbase_p.h -o moc_findwidgetbase_p.cpp
moc_lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.h
$(MOC) lnkpropertiesbase_p.h -o moc_lnkpropertiesbase_p.cpp
diff --git a/library/global.cpp b/library/global.cpp
index e5fc2b3..fd7579a 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -496,25 +496,25 @@ void Global::invoke(const QString &c)
qDebug("calling quickexec %s", libexe.latin1() );
quickexecv( libexe.utf8().data(), (const char **)args );
} else
#endif
{
if ( !::vfork() ) {
for ( int fd = 3; fd < 100; fd++ )
::close( fd );
::setpgid( ::getpid(), ::getppid() );
// Try bindir first, so that foo/bar works too
::execv( qpeDir()+"/bin/"+args[0], (char * const *)args );
::execvp( args[0], (char * const *)args );
- exit( -1 );
+ _exit( -1 );
}
}
StartingAppList::add( list[0] );
#endif //QT_NO_QWS_MULTIPROCESS
}
/*!
Executes application identfied by \a c, passing \a document.
Note that you might be better off sending a QCop message to
the application's QPE/Application/<i>appname</i> channel.
*/
diff --git a/library/library.pro b/library/library.pro
index 058d216..e71e5a0 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -1,28 +1,28 @@
TEMPLATE = lib
CONFIG += qt warn_on release
HEADERS = calendar.h \
global.h \
resource.h \
xmlreader.h \
mimetype.h \
menubutton.h \
network.h \
networkinterface.h \
- proxies.h \
filemanager.h \
fontmanager.h \
qdawg.h \
datebookmonth.h \
fileselector.h \
+ fileselector_p.h \
imageedit.h \
qcopenvelope_qws.h \
qpedecoration_qws.h \
qpeapplication.h \
qpestyle.h \
qpedialog.h \
lightstyle.h \
config.h \
applnk.h \
sound.h \
tzselect.h \
qmath.h \
@@ -55,25 +55,24 @@ HEADERS = calendar.h \
backend/vobject_p.h \
findwidget_p.h \
finddialog.h \
lnkproperties.h
SOURCES = calendar.cpp \
global.cpp \
xmlreader.cpp \
mimetype.cpp \
menubutton.cpp \
network.cpp \
networkinterface.cpp \
- proxies.cpp \
filemanager.cpp \
fontmanager.cpp \
qdawg.cpp \
datebookmonth.cpp \
fileselector.cpp \
imageedit.cpp \
resource.cpp \
qpedecoration_qws.cpp \
qcopenvelope_qws.cpp \
qpeapplication.cpp \
qpestyle.cpp \
qpedialog.cpp \
@@ -106,27 +105,26 @@ SOURCES = calendar.cpp \
categorymenu.cpp \
categoryedit_p.cpp \
categoryselect.cpp \
categorywidget.cpp \
ir.cpp \
backend/vcc_yacc.cpp \
backend/vobject.cpp \
findwidget_p.cpp \
finddialog.cpp \
lnkproperties.cpp
# Qt 3 compatibility
-qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h qprocess.h
-qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \
- qprocess_unix.cpp
+qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h
+qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp
INCLUDEPATH += $(OPIEDIR)/include backend
LIBS += -ldl -lcrypt -lm
-INTERFACES = passwordbase_p.ui proxiesbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
+INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
TARGET = qpe
DESTDIR = $(QTDIR)/lib$(PROJMAK)
# This is set by configure$(OPIEDIR).
VERSION = 1.5.0
TRANSLATIONS = ../i18n/de/libqpe.ts
diff --git a/noncore/games/chess/Makefile.in b/noncore/games/chess/Makefile.in
index 7354d76..a1f2cd7 100644
--- a/noncore/games/chess/Makefile.in
+++ b/noncore/games/chess/Makefile.in
@@ -1,21 +1,21 @@
#############################################################################
####### Compiler, tools and options
CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
-CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DQCONFIG=\"qpe\"
+CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
-CFLAGS = $(SYSCONF_CFLAGS) -DQCONFIG=\"qpe\"
-INCPATH = -I$(QPEDIR)/include
+CFLAGS = $(SYSCONF_CFLAGS)
+INCPATH = -I$(OPIEDIR)/include
LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
MOC = $(SYSCONF_MOC)
UIC = $(SYSCONF_UIC)
####### Target
DESTDIR = ../bin/
VER_MAJ = 1
VER_MIN = 0
VER_PATCH = 0
TARGET = chess
@@ -58,26 +58,28 @@ OBJMOC = moc_chess.o \
$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
####### Build rules
all: $(DESTDIR)$(TARGET)
$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
moc: $(SRCMOC)
-tmake:
- tmake chess.pro
+tmake: Makefile.in
+
+Makefile.in: chess.pro
+ tmake chess.pro -o Makefile.in
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
-rm -f *~ core
-rm -f allmoc.cpp
####### Extension Modules
listpromodules:
@echo
listallmodules:
@@ -93,30 +95,28 @@ listaddonentmodules:
REQUIRES=
####### Sub-libraries
###### Combined headers
####### Compile
chess.o: chess.cpp \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/resource.h \
chess.h
main.o: main.cpp \
- mainwindow.h
+ chess.h
mainwindow.h: mainwindow.ui
$(UIC) mainwindow.ui -o $(INTERFACE_DECL_PATH)/mainwindow.h
mainwindow.cpp: mainwindow.ui
$(UIC) mainwindow.ui -i mainwindow.h -o mainwindow.cpp
mainwindow.o: mainwindow.cpp \
mainwindow.h \
mainwindow.ui
moc_chess.o: moc_chess.cpp \
diff --git a/noncore/games/go/Makefile.in b/noncore/games/go/Makefile.in
index 985eff0..0395dff 100644
--- a/noncore/games/go/Makefile.in
+++ b/noncore/games/go/Makefile.in
@@ -66,26 +66,28 @@ OBJMOC = moc_gowidget.o
$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
####### Build rules
all: $(DESTDIR)$(TARGET)
$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
moc: $(SRCMOC)
-tmake:
- tmake go.pro
+tmake: Makefile.in
+
+Makefile.in: go.pro
+ tmake go.pro -o Makefile.in
clean:
-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
-rm -f *~ core
-rm -f allmoc.cpp
####### Extension Modules
listpromodules:
@echo
listallmodules:
@@ -124,35 +126,30 @@ goplayutils.o: goplayutils.c \
amigo.h \
go.h
killable.o: killable.c \
go.h \
goplayutils.h \
amigo.h
gowidget.o: gowidget.cpp \
gowidget.h \
amigo.h \
go.h \
- goplayutils.h \
- $(OPIEDIR)/include/qpe/config.h \
- $(OPIEDIR)/include/qpe/resource.h \
- $(OPIEDIR)/include/qpe/qpetoolbar.h \
- $(OPIEDIR)/include/qpe/qpemenubar.h
+ goplayutils.h
main.o: main.cpp \
gowidget.h \
amigo.h \
go.h \
- goplayutils.h \
- $(OPIEDIR)/include/qpe/qpeapplication.h
+ goplayutils.h
moc_gowidget.o: moc_gowidget.cpp \
gowidget.h \
amigo.h \
go.h \
goplayutils.h
moc_gowidget.cpp: gowidget.h
$(MOC) gowidget.h -o moc_gowidget.cpp