summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xconfigure12
-rw-r--r--core/applets/batteryapplet/Makefile.in2
-rw-r--r--core/applets/batteryapplet/batteryapplet.pro4
-rw-r--r--core/applets/clipboardapplet/clipboardapplet.pro4
-rw-r--r--core/applets/clockapplet/Makefile.in2
-rw-r--r--core/applets/clockapplet/clockapplet.pro4
-rw-r--r--core/applets/volumeapplet/Makefile.in2
-rw-r--r--core/applets/volumeapplet/volumeapplet.pro4
-rw-r--r--core/apps/embeddedkonsole/Makefile.in15
-rwxr-xr-xcore/apps/embeddedkonsole/embeddedkonsole.pro6
-rw-r--r--core/apps/helpbrowser/Makefile.in16
-rw-r--r--core/apps/helpbrowser/helpbrowser.pro6
-rw-r--r--core/apps/qcop/Makefile.in4
-rw-r--r--core/apps/qcop/qcop.pro4
-rw-r--r--core/apps/textedit/Makefile.in28
-rw-r--r--core/apps/textedit/textedit.pro6
-rw-r--r--core/launcher/Makefile.in821
-rw-r--r--core/launcher/launcher.pro104
-rw-r--r--core/launcher/main.cpp2
-rw-r--r--core/multimedia/opieplayer/Makefile.in92
-rw-r--r--core/multimedia/opieplayer/libflash/libflash.pro4
-rw-r--r--core/multimedia/opieplayer/libmad/Makefile.in6
-rw-r--r--core/multimedia/opieplayer/libmad/libmad.pro4
-rw-r--r--core/multimedia/opieplayer/libmpeg3/Makefile.in6
-rw-r--r--core/multimedia/opieplayer/libmpeg3/libmpeg3.pro4
-rw-r--r--core/multimedia/opieplayer/mpegplayer.pro10
-rw-r--r--core/multimedia/opieplayer/wavplugin/Makefile.in6
-rw-r--r--core/multimedia/opieplayer/wavplugin/wavplugin.pro4
-rw-r--r--core/pim/addressbook/Makefile.in102
-rw-r--r--core/pim/addressbook/addressbook.pro6
-rw-r--r--core/pim/datebook/Makefile.in155
-rw-r--r--core/pim/datebook/datebook.pro6
-rw-r--r--core/pim/todo/Makefile.in78
-rw-r--r--core/pim/todo/todo.pro6
-rw-r--r--core/settings/citytime/Makefile.in24
-rw-r--r--core/settings/citytime/citytime.pro6
-rw-r--r--core/settings/light-and-power/Makefile.in2
-rw-r--r--core/settings/light-and-power/light-and-power.pro4
-rw-r--r--core/settings/security/Makefile.in2
-rw-r--r--core/settings/security/security.pro4
-rw-r--r--docs/qcop.doc2
-rw-r--r--docs/start.doc12
-rwxr-xr-xetc/init.d/qpe8
-rw-r--r--example/example.pro4
-rw-r--r--freetype/freetype.pro6
-rw-r--r--inputmethods/handwriting/Makefile.in2
-rw-r--r--inputmethods/handwriting/handwriting.pro4
-rw-r--r--inputmethods/keyboard/Makefile.in2
-rw-r--r--inputmethods/keyboard/keyboard.pro4
-rw-r--r--inputmethods/pickboard/Makefile.in2
-rw-r--r--inputmethods/pickboard/pickboard.pro4
-rw-r--r--inputmethods/unikeyboard/Makefile.in2
-rw-r--r--inputmethods/unikeyboard/unikeyboard.pro4
-rw-r--r--library/Makefile.in26
-rw-r--r--library/global.cpp2
-rw-r--r--library/library.pro4
-rw-r--r--library/qpeapplication.cpp4
-rwxr-xr-xmkipks18
-rw-r--r--noncore/apps/dictionary/dictionary.pro4
-rw-r--r--noncore/apps/tableviewer/tableviewer.pro4
-rw-r--r--noncore/comm/keypebble/Makefile.in20
-rw-r--r--noncore/comm/keypebble/keypebble.pro4
-rw-r--r--noncore/games/chess/chess.pro4
-rw-r--r--noncore/games/fifteen/Makefile.in12
-rw-r--r--noncore/games/fifteen/fifteen.pro4
-rw-r--r--noncore/games/go/Makefile.in12
-rw-r--r--noncore/games/go/go.pro4
-rw-r--r--noncore/games/mindbreaker/Makefile.in12
-rw-r--r--noncore/games/mindbreaker/mindbreaker.pro6
-rw-r--r--noncore/games/minesweep/Makefile.in16
-rw-r--r--noncore/games/minesweep/minesweep.pro6
-rw-r--r--noncore/games/parashoot/Makefile.in42
-rw-r--r--noncore/games/parashoot/parashoot.pro6
-rw-r--r--noncore/games/qasteroids/Makefile.in12
-rw-r--r--noncore/games/qasteroids/qasteroids.pro6
-rw-r--r--noncore/games/snake/Makefile.in16
-rw-r--r--noncore/games/snake/snake.pro6
-rw-r--r--noncore/games/solitaire/Makefile.in36
-rwxr-xr-xnoncore/games/solitaire/solitaire.pro6
-rw-r--r--noncore/games/tetrix/Makefile.in6
-rw-r--r--noncore/games/tetrix/tetrix.pro4
-rw-r--r--noncore/games/wordgame/Makefile.in28
-rw-r--r--noncore/games/wordgame/wordgame.pro6
-rw-r--r--noncore/multimedia/showimg/Makefile.in16
-rw-r--r--noncore/multimedia/showimg/showimg.pro6
-rw-r--r--noncore/settings/language/Makefile.in2
-rw-r--r--noncore/settings/language/language.pro4
-rw-r--r--noncore/settings/sound/Makefile.in2
-rw-r--r--noncore/settings/sound/sound.pro4
-rw-r--r--noncore/settings/sysinfo/Makefile.in12
-rw-r--r--noncore/settings/sysinfo/sysinfo.pro6
-rw-r--r--noncore/tools/calc2/binary/binary.pro8
-rw-r--r--noncore/tools/calc2/calc.pro4
-rw-r--r--noncore/tools/calc2/simple/simple.pro8
-rw-r--r--noncore/tools/calculator/Makefile.in14
-rw-r--r--noncore/tools/calculator/calculator.pro6
-rw-r--r--noncore/tools/clock/Makefile.in14
-rw-r--r--noncore/tools/clock/clock.pro6
-rw-r--r--noncore/unsupported/filebrowser/Makefile.in20
-rw-r--r--noncore/unsupported/filebrowser/filebrowser.pro6
-rw-r--r--noncore/unsupported/oipkg/Makefile.in18
-rw-r--r--noncore/unsupported/oipkg/qipkg.pro6
-rwxr-xr-xscripts/q_functions12
103 files changed, 1088 insertions, 1055 deletions
diff --git a/configure b/configure
index d36fd44..7824e36 100755
--- a/configure
+++ b/configure
@@ -12,15 +12,15 @@ QCONFIGARG=
touch .test.qpe.
-if [ '!' -f ${QPEDIR}/.test.qpe. ];
+if [ '!' -f ${OPIEDIR}/.test.qpe. ];
then
rm .test.qpe.
echo
echo
- echo ' The environment variable $QPEDIR is not set correctly. It is currently'
- echo ' set to "'$QPEDIR'", but it should be set to this directory,'
+ 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 $QPEDIR'
- echo ' correctly. If you have set $QPEDIR in your .profile or .login, you '
+ 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
@@ -155,5 +155,5 @@ for a in $TOMAKE ; do
tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \
-t $H/qt/tmake/propagate.t $f.pro |
- sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$QPEDIR|\$(QPEDIR)|g" >Makefile.in;
+ sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in;
)
echo -n "."
diff --git a/core/applets/batteryapplet/Makefile.in b/core/applets/batteryapplet/Makefile.in
index 0493fd6..ccf997b 100644
--- a/core/applets/batteryapplet/Makefile.in
+++ b/core/applets/batteryapplet/Makefile.in
@@ -7,5 +7,5 @@ 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)
diff --git a/core/applets/batteryapplet/batteryapplet.pro b/core/applets/batteryapplet/batteryapplet.pro
index fa0fca8..dcb606d 100644
--- a/core/applets/batteryapplet/batteryapplet.pro
+++ b/core/applets/batteryapplet/batteryapplet.pro
@@ -5,6 +5,6 @@ SOURCES = battery.cpp batterystatus.cpp batteryappletimpl.cpp
TARGET = batteryapplet
DESTDIR = ../../plugins/applets
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += ../$(QPEDIR)/include ..
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += ../$(OPIEDIR)/include ..
LIBS += -lqpe
VERSION = 1.0.0
diff --git a/core/applets/clipboardapplet/clipboardapplet.pro b/core/applets/clipboardapplet/clipboardapplet.pro
index b0624ef..9832984 100644
--- a/core/applets/clipboardapplet/clipboardapplet.pro
+++ b/core/applets/clipboardapplet/clipboardapplet.pro
@@ -5,6 +5,6 @@ SOURCES = clipboard.cpp clipboardappletimpl.cpp
TARGET = clipboardapplet
DESTDIR = ../../plugins/applets
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += ../$(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += ../$(OPIEDIR)/include
LIBS += -lqpe
VERSION = 1.0.0
diff --git a/core/applets/clockapplet/Makefile.in b/core/applets/clockapplet/Makefile.in
index fcf737e..742f25f 100644
--- a/core/applets/clockapplet/Makefile.in
+++ b/core/applets/clockapplet/Makefile.in
@@ -7,5 +7,5 @@ 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)
diff --git a/core/applets/clockapplet/clockapplet.pro b/core/applets/clockapplet/clockapplet.pro
index 29a4e8b..1392680 100644
--- a/core/applets/clockapplet/clockapplet.pro
+++ b/core/applets/clockapplet/clockapplet.pro
@@ -5,6 +5,6 @@ SOURCES = clock.cpp clockappletimpl.cpp
TARGET = clockapplet
DESTDIR = ../../plugins/applets
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += ../$(QPEDIR)/include ..
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += ../$(OPIEDIR)/include ..
LIBS += -lqpe
VERSION = 1.0.0
diff --git a/core/applets/volumeapplet/Makefile.in b/core/applets/volumeapplet/Makefile.in
index 7020cb7..49acf38 100644
--- a/core/applets/volumeapplet/Makefile.in
+++ b/core/applets/volumeapplet/Makefile.in
@@ -7,5 +7,5 @@ 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)
diff --git a/core/applets/volumeapplet/volumeapplet.pro b/core/applets/volumeapplet/volumeapplet.pro
index a33cf81..fedaed7 100644
--- a/core/applets/volumeapplet/volumeapplet.pro
+++ b/core/applets/volumeapplet/volumeapplet.pro
@@ -5,6 +5,6 @@ SOURCES = volume.cpp volumeappletimpl.cpp
TARGET = volumeapplet
DESTDIR = ../../plugins/applets
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += ../$(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += ../$(OPIEDIR)/include
LIBS += -lqpe
VERSION = 1.0.0
diff --git a/core/apps/embeddedkonsole/Makefile.in b/core/apps/embeddedkonsole/Makefile.in
index b858cd4..8a69557 100644
--- a/core/apps/embeddedkonsole/Makefile.in
+++ b/core/apps/embeddedkonsole/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC)
####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
@@ -184,11 +184,12 @@ session.o: session.cpp \
keytrans.o: keytrans.cpp \
keytrans.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
default.keytab.h
konsole.o: konsole.cpp \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/qpetoolbar.h \
- $(QPEDIR)/include/qpe/qpemenubar.h \
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/qpetoolbar.h \
+ $(OPIEDIR)/include/qpe/qpemenubar.h \
+ $(OPIEDIR)/include/qpe/config.h \
konsole.h \
MyPty.h \
@@ -213,5 +214,5 @@ main.o: main.cpp \
keytrans.h \
session.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h
MyPty.o: MyPty.cpp \
diff --git a/core/apps/embeddedkonsole/embeddedkonsole.pro b/core/apps/embeddedkonsole/embeddedkonsole.pro
index b757ea5..3452014 100755
--- a/core/apps/embeddedkonsole/embeddedkonsole.pro
+++ b/core/apps/embeddedkonsole/embeddedkonsole.pro
@@ -3,5 +3,5 @@ TEMPLATE = app
CONFIG += qt warn_on release
-DESTDIR = $(QPEDIR)/bin
+DESTDIR = $(OPIEDIR)/bin
HEADERS = TEWidget.h \
@@ -29,7 +29,7 @@ SOURCES = TEScreen.cpp \
TARGET = embeddedkonsole
-INCLUDEPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
diff --git a/core/apps/helpbrowser/Makefile.in b/core/apps/helpbrowser/Makefile.in
index 8f0ce0e..ed3ea03 100644
--- a/core/apps/helpbrowser/Makefile.in
+++ b/core/apps/helpbrowser/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC)
####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
@@ -101,13 +101,13 @@ REQUIRES=
helpbrowser.o: helpbrowser.cpp \
helpbrowser.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/global.h \
- $(QPEDIR)/include/qpe/qpemenubar.h \
- $(QPEDIR)/include/qpe/qpetoolbar.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/global.h \
+ $(OPIEDIR)/include/qpe/qpemenubar.h \
+ $(OPIEDIR)/include/qpe/qpetoolbar.h
main.o: main.cpp \
helpbrowser.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h
moc_helpbrowser.o: moc_helpbrowser.cpp \
diff --git a/core/apps/helpbrowser/helpbrowser.pro b/core/apps/helpbrowser/helpbrowser.pro
index 43230f1..f6ede8b 100644
--- a/core/apps/helpbrowser/helpbrowser.pro
+++ b/core/apps/helpbrowser/helpbrowser.pro
@@ -1,10 +1,10 @@
TEMPLATE = app
CONFIG = qt warn_on release
-DESTDIR = $(QPEDIR)/bin
+DESTDIR = $(OPIEDIR)/bin
HEADERS = helpbrowser.h
SOURCES = helpbrowser.cpp \
main.cpp
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
INTERFACES =
diff --git a/core/apps/qcop/Makefile.in b/core/apps/qcop/Makefile.in
index 0a12320..fd543f5 100644
--- a/core/apps/qcop/Makefile.in
+++ b/core/apps/qcop/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -98,5 +98,5 @@ REQUIRES=
main.o: main.cpp \
- $(QPEDIR)/include/qpe/qcopenvelope_qws.h
+ $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
diff --git a/core/apps/qcop/qcop.pro b/core/apps/qcop/qcop.pro
index b52bfd8..3ffe796 100644
--- a/core/apps/qcop/qcop.pro
+++ b/core/apps/qcop/qcop.pro
@@ -4,6 +4,6 @@ DESTDIR = ../bin
HEADERS =
SOURCES = main.cpp
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
INTERFACES =
diff --git a/core/apps/textedit/Makefile.in b/core/apps/textedit/Makefile.in
index 84542bb..997f2a4 100644
--- a/core/apps/textedit/Makefile.in
+++ b/core/apps/textedit/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC)
####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
@@ -101,22 +101,22 @@ REQUIRES=
main.o: main.cpp \
textedit.h \
- $(QPEDIR)/include/qpe/filemanager.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/filemanager.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h
textedit.o: textedit.cpp \
textedit.h \
- $(QPEDIR)/include/qpe/filemanager.h \
- $(QPEDIR)/include/qpe/global.h \
- $(QPEDIR)/include/qpe/fileselector.h \
- $(QPEDIR)/include/qpe/applnk.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/qpemenubar.h \
- $(QPEDIR)/include/qpe/qpetoolbar.h
+ $(OPIEDIR)/include/qpe/filemanager.h \
+ $(OPIEDIR)/include/qpe/global.h \
+ $(OPIEDIR)/include/qpe/fileselector.h \
+ $(OPIEDIR)/include/qpe/applnk.h \
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/qpemenubar.h \
+ $(OPIEDIR)/include/qpe/qpetoolbar.h
moc_textedit.o: moc_textedit.cpp \
textedit.h \
- $(QPEDIR)/include/qpe/filemanager.h
+ $(OPIEDIR)/include/qpe/filemanager.h
moc_textedit.cpp: textedit.h
diff --git a/core/apps/textedit/textedit.pro b/core/apps/textedit/textedit.pro
index 3f5473e..23b8d8d 100644
--- a/core/apps/textedit/textedit.pro
+++ b/core/apps/textedit/textedit.pro
@@ -2,5 +2,5 @@ TEMPLATE = app
CONFIG += qt warn_on release
-DESTDIR = $(QPEDIR)/bin
+DESTDIR = $(OPIEDIR)/bin
HEADERS = textedit.h
@@ -8,6 +8,6 @@ HEADERS = textedit.h
SOURCES = main.cpp textedit.cpp
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
diff --git a/core/launcher/Makefile.in b/core/launcher/Makefile.in
index e129fca..5e2dbe5 100644
--- a/core/launcher/Makefile.in
+++ b/core/launcher/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-INCPATH = -I$(QPEDIR)/include -I$(QPEDIR)/calibrate -I$(QPEDIR)/rsync
+INCPATH = -I$(OPIEDIR)/include -I$(OPIEDIR)/calibrate -I$(OPIEDIR)/rsync
LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
LIBS = $(SUBLIBS) -lqpe -lcrypt $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC)
####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
@@ -44,22 +44,22 @@ HEADERS = background.h \
packageslave.h \
irserver.h \
- $(QPEDIR)/rsync/buf.h \
- $(QPEDIR)/rsync/checksum.h \
- $(QPEDIR)/rsync/command.h \
- $(QPEDIR)/rsync/emit.h \
- $(QPEDIR)/rsync/job.h \
- $(QPEDIR)/rsync/netint.h \
- $(QPEDIR)/rsync/protocol.h \
- $(QPEDIR)/rsync/prototab.h \
- $(QPEDIR)/rsync/rsync.h \
- $(QPEDIR)/rsync/search.h \
- $(QPEDIR)/rsync/stream.h \
- $(QPEDIR)/rsync/sumset.h \
- $(QPEDIR)/rsync/trace.h \
- $(QPEDIR)/rsync/types.h \
- $(QPEDIR)/rsync/util.h \
- $(QPEDIR)/rsync/whole.h \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/qrsync.h
+ $(OPIEDIR)/rsync/buf.h \
+ $(OPIEDIR)/rsync/checksum.h \
+ $(OPIEDIR)/rsync/command.h \
+ $(OPIEDIR)/rsync/emit.h \
+ $(OPIEDIR)/rsync/job.h \
+ $(OPIEDIR)/rsync/netint.h \
+ $(OPIEDIR)/rsync/protocol.h \
+ $(OPIEDIR)/rsync/prototab.h \
+ $(OPIEDIR)/rsync/rsync.h \
+ $(OPIEDIR)/rsync/search.h \
+ $(OPIEDIR)/rsync/stream.h \
+ $(OPIEDIR)/rsync/sumset.h \
+ $(OPIEDIR)/rsync/trace.h \
+ $(OPIEDIR)/rsync/types.h \
+ $(OPIEDIR)/rsync/util.h \
+ $(OPIEDIR)/rsync/whole.h \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/qrsync.h
SOURCES = background.cpp \
desktop.cpp \
@@ -76,5 +76,5 @@ SOURCES = background.cpp \
launcher.cpp \
launcherview.cpp \
- $(QPEDIR)/calibrate/calibrate.cpp \
+ $(OPIEDIR)/calibrate/calibrate.cpp \
transferserver.cpp \
packageslave.cpp \
@@ -83,30 +83,30 @@ SOURCES = background.cpp \
startmenu.cpp \
main.cpp \
- $(QPEDIR)/rsync/base64.c \
- $(QPEDIR)/rsync/buf.c \
- $(QPEDIR)/rsync/checksum.c \
- $(QPEDIR)/rsync/command.c \
- $(QPEDIR)/rsync/delta.c \
- $(QPEDIR)/rsync/emit.c \
- $(QPEDIR)/rsync/hex.c \
- $(QPEDIR)/rsync/job.c \
- $(QPEDIR)/rsync/mdfour.c \
- $(QPEDIR)/rsync/mksum.c \
- $(QPEDIR)/rsync/msg.c \
- $(QPEDIR)/rsync/netint.c \
- $(QPEDIR)/rsync/patch.c \
- $(QPEDIR)/rsync/prototab.c \
- $(QPEDIR)/rsync/readsums.c \
- $(QPEDIR)/rsync/scoop.c \
- $(QPEDIR)/rsync/search.c \
- $(QPEDIR)/rsync/stats.c \
- $(QPEDIR)/rsync/stream.c \
- $(QPEDIR)/rsync/sumset.c \
- $(QPEDIR)/rsync/trace.c \
- $(QPEDIR)/rsync/tube.c \
- $(QPEDIR)/rsync/util.c \
- $(QPEDIR)/rsync/version.c \
- $(QPEDIR)/rsync/whole.c \
- $(QPEDIR)/rsync/qrsync.cpp
+ $(OPIEDIR)/rsync/base64.c \
+ $(OPIEDIR)/rsync/buf.c \
+ $(OPIEDIR)/rsync/checksum.c \
+ $(OPIEDIR)/rsync/command.c \
+ $(OPIEDIR)/rsync/delta.c \
+ $(OPIEDIR)/rsync/emit.c \
+ $(OPIEDIR)/rsync/hex.c \
+ $(OPIEDIR)/rsync/job.c \
+ $(OPIEDIR)/rsync/mdfour.c \
+ $(OPIEDIR)/rsync/mksum.c \
+ $(OPIEDIR)/rsync/msg.c \
+ $(OPIEDIR)/rsync/netint.c \
+ $(OPIEDIR)/rsync/patch.c \
+ $(OPIEDIR)/rsync/prototab.c \
+ $(OPIEDIR)/rsync/readsums.c \
+ $(OPIEDIR)/rsync/scoop.c \
+ $(OPIEDIR)/rsync/search.c \
+ $(OPIEDIR)/rsync/stats.c \
+ $(OPIEDIR)/rsync/stream.c \
+ $(OPIEDIR)/rsync/sumset.c \
+ $(OPIEDIR)/rsync/trace.c \
+ $(OPIEDIR)/rsync/tube.c \
+ $(OPIEDIR)/rsync/util.c \
+ $(OPIEDIR)/rsync/version.c \
+ $(OPIEDIR)/rsync/whole.c \
+ $(OPIEDIR)/rsync/qrsync.cpp
OBJECTS = background.o \
desktop.o \
@@ -123,5 +123,5 @@ OBJECTS = background.o \
launcher.o \
launcherview.o \
- $(QPEDIR)/calibrate/calibrate.o \
+ $(OPIEDIR)/calibrate/calibrate.o \
transferserver.o \
packageslave.o \
@@ -130,30 +130,30 @@ OBJECTS = background.o \
startmenu.o \
main.o \
- $(QPEDIR)/rsync/base64.o \
- $(QPEDIR)/rsync/buf.o \
- $(QPEDIR)/rsync/checksum.o \
- $(QPEDIR)/rsync/command.o \
- $(QPEDIR)/rsync/delta.o \
- $(QPEDIR)/rsync/emit.o \
- $(QPEDIR)/rsync/hex.o \
- $(QPEDIR)/rsync/job.o \
- $(QPEDIR)/rsync/mdfour.o \
- $(QPEDIR)/rsync/mksum.o \
- $(QPEDIR)/rsync/msg.o \
- $(QPEDIR)/rsync/netint.o \
- $(QPEDIR)/rsync/patch.o \
- $(QPEDIR)/rsync/prototab.o \
- $(QPEDIR)/rsync/readsums.o \
- $(QPEDIR)/rsync/scoop.o \
- $(QPEDIR)/rsync/search.o \
- $(QPEDIR)/rsync/stats.o \
- $(QPEDIR)/rsync/stream.o \
- $(QPEDIR)/rsync/sumset.o \
- $(QPEDIR)/rsync/trace.o \
- $(QPEDIR)/rsync/tube.o \
- $(QPEDIR)/rsync/util.o \
- $(QPEDIR)/rsync/version.o \
- $(QPEDIR)/rsync/whole.o \
- $(QPEDIR)/rsync/qrsync.o \
+ $(OPIEDIR)/rsync/base64.o \
+ $(OPIEDIR)/rsync/buf.o \
+ $(OPIEDIR)/rsync/checksum.o \
+ $(OPIEDIR)/rsync/command.o \
+ $(OPIEDIR)/rsync/delta.o \
+ $(OPIEDIR)/rsync/emit.o \
+ $(OPIEDIR)/rsync/hex.o \
+ $(OPIEDIR)/rsync/job.o \
+ $(OPIEDIR)/rsync/mdfour.o \
+ $(OPIEDIR)/rsync/mksum.o \
+ $(OPIEDIR)/rsync/msg.o \
+ $(OPIEDIR)/rsync/netint.o \
+ $(OPIEDIR)/rsync/patch.o \
+ $(OPIEDIR)/rsync/prototab.o \
+ $(OPIEDIR)/rsync/readsums.o \
+ $(OPIEDIR)/rsync/scoop.o \
+ $(OPIEDIR)/rsync/search.o \
+ $(OPIEDIR)/rsync/stats.o \
+ $(OPIEDIR)/rsync/stream.o \
+ $(OPIEDIR)/rsync/sumset.o \
+ $(OPIEDIR)/rsync/trace.o \
+ $(OPIEDIR)/rsync/tube.o \
+ $(OPIEDIR)/rsync/util.o \
+ $(OPIEDIR)/rsync/version.o \
+ $(OPIEDIR)/rsync/whole.o \
+ $(OPIEDIR)/rsync/qrsync.o \
shutdown.o \
syncdialog.o
@@ -273,6 +273,6 @@ background.o: background.cpp \
shutdownimpl.h \
shutdown.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/resource.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/resource.h
desktop.o: desktop.cpp \
@@ -280,25 +280,25 @@ desktop.o: desktop.cpp \
shutdownimpl.h \
shutdown.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
info.h \
background.h \
launcher.h \
launcherview.h \
- $(QPEDIR)/include/qpe/storage.h \
+ $(OPIEDIR)/include/qpe/storage.h \
mrulist.h \
- $(QPEDIR)/include/qpe/applnk.h \
+ $(OPIEDIR)/include/qpe/applnk.h \
qcopbridge.h \
startmenu.h \
taskbar.h \
- $(QPEDIR)/include/qpe/custom.h \
+ $(OPIEDIR)/include/qpe/custom.h \
transferserver.h \
irserver.h \
packageslave.h \
- $(QPEDIR)/include/qpe/mimetype.h \
- $(QPEDIR)/include/qpe/password.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/power.h \
- $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
- $(QPEDIR)/include/qpe/global.h
+ $(OPIEDIR)/include/qpe/mimetype.h \
+ $(OPIEDIR)/include/qpe/password.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/power.h \
+ $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
+ $(OPIEDIR)/include/qpe/global.h
info.o: info.cpp \
@@ -308,45 +308,47 @@ info.o: info.cpp \
shutdownimpl.h \
shutdown.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/version.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/version.h
appicons.o: appicons.cpp \
appicons.moc \
appicons.h \
- $(QPEDIR)/include/qpe/qcopenvelope_qws.h
+ $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
taskbar.o: taskbar.cpp \
startmenu.h \
inputmethods.h \
- $(QPEDIR)/include/qpe/inputmethodinterface.h \
- $(QPEDIR)/include/qpe/qcom.h \
- $(QPEDIR)/include/qpe/quuid.h \
+ $(OPIEDIR)/include/qpe/inputmethodinterface.h \
+ $(OPIEDIR)/include/qpe/qcom.h \
+ $(OPIEDIR)/include/qpe/quuid.h \
mrulist.h \
- $(QPEDIR)/include/qpe/applnk.h \
+ $(OPIEDIR)/include/qpe/applnk.h \
systray.h \
- $(QPEDIR)/include/qpe/taskbarappletinterface.h \
- $(QPEDIR)/calibrate/calibrate.h \
+ $(OPIEDIR)/include/qpe/taskbarappletinterface.h \
+ $(OPIEDIR)/calibrate/calibrate.h \
wait.h \
- $(QPEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/resource.h \
appicons.h \
taskbar.h \
- $(QPEDIR)/include/qpe/custom.h \
+ $(OPIEDIR)/include/qpe/custom.h \
desktop.h \
shutdownimpl.h \
shutdown.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
- $(QPEDIR)/include/qpe/global.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
+ $(OPIEDIR)/include/qpe/global.h \
../taskbar/apps.h \
../addressbook/addressbook.h \
../datebook/datebook.h \
- $(QPEDIR)/include/qpe/datebookdb.h \
- $(QPEDIR)/include/qpe/event.h \
- $(QPEDIR)/include/qpe/palmtoprecord.h \
+ $(OPIEDIR)/include/qpe/datebookdb.h \
+ $(OPIEDIR)/include/qpe/event.h \
+ $(OPIEDIR)/include/qpe/palmtoprecord.h \
+ $(OPIEDIR)/include/qpe/timeconversion.h \
+ $(OPIEDIR)/include/qpe/qpcglobal.h \
../helpbrowser/helpbrowser.h \
../minesweep/minesweep.h \
../textedit/textedit.h \
- $(QPEDIR)/include/qpe/filemanager.h \
+ $(OPIEDIR)/include/qpe/filemanager.h \
../todo/mainwindow.h \
../citytime/citytime.h \
@@ -356,112 +358,120 @@ taskbar.o: taskbar.cpp \
../settings/appearance/settings.h \
../settings/systemtime/settime.h \
- $(QPEDIR)/include/qpe/timestring.h \
+ $(OPIEDIR)/include/qpe/timestring.h \
../filebrowser/filebrowser.h \
../solitaire/canvascardwindow.h \
../snake/interface.h \
../parashoot/interface.h \
- $(QPEDIR)/include/qpe/sound.h \
+ $(OPIEDIR)/include/qpe/sound.h \
../mpegplayer/mediaplayer.h \
- $(QPEDIR)/include/qpe/qlibrary.h \
+ $(OPIEDIR)/include/qpe/qlibrary.h \
../embeddedkonsole/konsole.h \
../wordgame/wordgame.h \
- $(QPEDIR)/include/qpe/qdawg.h
+ $(OPIEDIR)/include/qpe/qdawg.h
sidething.o: sidething.cpp \
sidething.h \
startmenu.h \
- $(QPEDIR)/include/qpe/resource.h
+ $(OPIEDIR)/include/qpe/resource.h
mrulist.o: mrulist.cpp \
mrulist.h \
- $(QPEDIR)/include/qpe/applnk.h \
- $(QPEDIR)/include/qpe/global.h \
- $(QPEDIR)/include/qpe/resource.h
+ $(OPIEDIR)/include/qpe/applnk.h \
+ $(OPIEDIR)/include/qpe/global.h \
+ $(OPIEDIR)/include/qpe/resource.h
stabmon.o: stabmon.cpp \
stabmon.h \
- $(QPEDIR)/include/qpe/qcopenvelope_qws.h
+ $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
inputmethods.o: inputmethods.cpp \
inputmethods.h \
- $(QPEDIR)/include/qpe/inputmethodinterface.h \
- $(QPEDIR)/include/qpe/qcom.h \
- $(QPEDIR)/include/qpe/quuid.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/qlibrary.h
+ $(OPIEDIR)/include/qpe/inputmethodinterface.h \
+ $(OPIEDIR)/include/qpe/qcom.h \
+ $(OPIEDIR)/include/qpe/quuid.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/qlibrary.h
systray.o: systray.cpp \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/qlibrary.h \
- $(QPEDIR)/include/qpe/qcom.h \
- $(QPEDIR)/include/qpe/quuid.h \
- $(QPEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/qlibrary.h \
+ $(OPIEDIR)/include/qpe/qcom.h \
+ $(OPIEDIR)/include/qpe/quuid.h \
+ $(OPIEDIR)/include/qpe/config.h \
quicklauncher.h \
systray.h \
- $(QPEDIR)/include/qpe/taskbarappletinterface.h
+ $(OPIEDIR)/include/qpe/taskbarappletinterface.h
wait.o: wait.cpp \
wait.h \
- $(QPEDIR)/include/qpe/resource.h
+ $(OPIEDIR)/include/qpe/resource.h
shutdownimpl.o: shutdownimpl.cpp \
shutdownimpl.h \
shutdown.h \
- $(QPEDIR)/include/qpe/global.h
+ $(OPIEDIR)/include/qpe/global.h
launcher.o: launcher.cpp \
- $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/applnk.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/global.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/mimetype.h \
- $(QPEDIR)/include/qpe/storage.h \
+ $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/applnk.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/global.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/mimetype.h \
+ $(OPIEDIR)/include/qpe/storage.h \
+ $(OPIEDIR)/include/qpe/palmtoprecord.h \
launcherview.h \
launcher.h \
- $(QPEDIR)/include/qpe/lnkproperties.h \
+ syncdialog.h \
+ desktop.h \
+ shutdownimpl.h \
+ shutdown.h \
+ $(OPIEDIR)/include/qpe/lnkproperties.h \
mrulist.h \
- $(QPEDIR)/rsync/qrsync.h
+ $(OPIEDIR)/rsync/qrsync.h
launcherview.o: launcherview.cpp \
launcherview.h \
- $(QPEDIR)/include/qpe/storage.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/applnk.h \
- $(QPEDIR)/include/qpe/qpedebug.h \
- $(QPEDIR)/include/qpe/categories.h \
- $(QPEDIR)/include/qpe/categoryselect.h \
- $(QPEDIR)/include/qpe/menubutton.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/qpetoolbar.h
-
-$(QPEDIR)/calibrate/calibrate.o: $(QPEDIR)/calibrate/calibrate.cpp \
- $(QPEDIR)/calibrate/calibrate.h \
- $(QPEDIR)/include/qpe/resource.h
+ $(OPIEDIR)/include/qpe/storage.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/applnk.h \
+ $(OPIEDIR)/include/qpe/qpedebug.h \
+ $(OPIEDIR)/include/qpe/categories.h \
+ $(OPIEDIR)/include/qpe/categoryselect.h \
+ $(OPIEDIR)/include/qpe/menubutton.h \
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/qpetoolbar.h
+
+$(OPIEDIR)/calibrate/calibrate.o: $(OPIEDIR)/calibrate/calibrate.cpp \
+ $(OPIEDIR)/calibrate/calibrate.h \
+ $(OPIEDIR)/include/qpe/resource.h
transferserver.o: transferserver.cpp \
- $(QPEDIR)/include/qpe/qprocess.h \
- $(QPEDIR)/include/qpe/process.h \
+ $(OPIEDIR)/include/qpe/qprocess.h \
+ $(OPIEDIR)/include/qpe/process.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
transferserver.h
packageslave.o: packageslave.cpp \
packageslave.h \
- $(QPEDIR)/include/qpe/process.h \
- $(QPEDIR)/include/qpe/qcopenvelope_qws.h
+ $(OPIEDIR)/include/qpe/process.h \
+ $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
irserver.o: irserver.cpp \
irserver.h \
- $(QPEDIR)/include/qpe/qlibrary.h \
- $(QPEDIR)/include/qpe/qcom.h \
- $(QPEDIR)/include/qpe/quuid.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/qlibrary.h \
+ $(OPIEDIR)/include/qpe/qcom.h \
+ $(OPIEDIR)/include/qpe/quuid.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
obexinterface.h
qcopbridge.o: qcopbridge.cpp \
qcopbridge.h \
- $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ transferserver.h \
+ $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h
startmenu.o: startmenu.cpp \
@@ -469,11 +479,11 @@ startmenu.o: startmenu.cpp \
sidething.h \
mrulist.h \
- $(QPEDIR)/include/qpe/applnk.h \
+ $(OPIEDIR)/include/qpe/applnk.h \
info.h \
background.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/global.h \
- $(QPEDIR)/include/qpe/resource.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/global.h \
+ $(OPIEDIR)/include/qpe/resource.h
main.o: main.cpp \
@@ -481,235 +491,235 @@ main.o: main.cpp \
shutdownimpl.h \
shutdown.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
taskbar.h \
- $(QPEDIR)/include/qpe/custom.h \
+ $(OPIEDIR)/include/qpe/custom.h \
stabmon.h \
- $(QPEDIR)/include/qpe/network.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
- $(QPEDIR)/include/qpe/alarmserver.h \
+ $(OPIEDIR)/include/qpe/network.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
+ $(OPIEDIR)/include/qpe/alarmserver.h \
../calibrate/calibrate.h \
../login/qdmdialogimpl.h \
- $(QPEDIR)/include/qpe/global.h
-
-$(QPEDIR)/rsync/base64.o: $(QPEDIR)/rsync/base64.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h
-
-$(QPEDIR)/rsync/buf.o: $(QPEDIR)/rsync/buf.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h \
- $(QPEDIR)/rsync/trace.h \
- $(QPEDIR)/rsync/buf.h \
- $(QPEDIR)/rsync/util.h
-
-$(QPEDIR)/rsync/checksum.o: $(QPEDIR)/rsync/checksum.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h \
- $(QPEDIR)/rsync/checksum.h
-
-$(QPEDIR)/rsync/command.o: $(QPEDIR)/rsync/command.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h \
- $(QPEDIR)/rsync/command.h
-
-$(QPEDIR)/rsync/delta.o: $(QPEDIR)/rsync/delta.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h \
- $(QPEDIR)/rsync/emit.h \
- $(QPEDIR)/rsync/stream.h \
- $(QPEDIR)/rsync/util.h \
- $(QPEDIR)/rsync/sumset.h \
- $(QPEDIR)/rsync/job.h \
- $(QPEDIR)/rsync/trace.h \
- $(QPEDIR)/rsync/checksum.h \
- $(QPEDIR)/rsync/search.h \
- $(QPEDIR)/rsync/types.h
-
-$(QPEDIR)/rsync/emit.o: $(QPEDIR)/rsync/emit.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h \
- $(QPEDIR)/rsync/command.h \
- $(QPEDIR)/rsync/protocol.h \
- $(QPEDIR)/rsync/trace.h \
- $(QPEDIR)/rsync/emit.h \
- $(QPEDIR)/rsync/prototab.h \
- $(QPEDIR)/rsync/netint.h \
- $(QPEDIR)/rsync/sumset.h \
- $(QPEDIR)/rsync/job.h
-
-$(QPEDIR)/rsync/hex.o: $(QPEDIR)/rsync/hex.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h
-
-$(QPEDIR)/rsync/job.o: $(QPEDIR)/rsync/job.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h \
- $(QPEDIR)/rsync/stream.h \
- $(QPEDIR)/rsync/util.h \
- $(QPEDIR)/rsync/sumset.h \
- $(QPEDIR)/rsync/job.h \
- $(QPEDIR)/rsync/trace.h
-
-$(QPEDIR)/rsync/mdfour.o: $(QPEDIR)/rsync/mdfour.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h \
- $(QPEDIR)/rsync/trace.h \
- $(QPEDIR)/rsync/types.h
-
-$(QPEDIR)/rsync/mksum.o: $(QPEDIR)/rsync/mksum.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h \
- $(QPEDIR)/rsync/stream.h \
- $(QPEDIR)/rsync/util.h \
- $(QPEDIR)/rsync/sumset.h \
- $(QPEDIR)/rsync/job.h \
- $(QPEDIR)/rsync/protocol.h \
- $(QPEDIR)/rsync/netint.h \
- $(QPEDIR)/rsync/trace.h \
- $(QPEDIR)/rsync/checksum.h
-
-$(QPEDIR)/rsync/msg.o: $(QPEDIR)/rsync/msg.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h
-
-$(QPEDIR)/rsync/netint.o: $(QPEDIR)/rsync/netint.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h \
- $(QPEDIR)/rsync/job.h \
- $(QPEDIR)/rsync/netint.h \
- $(QPEDIR)/rsync/trace.h \
- $(QPEDIR)/rsync/stream.h
-
-$(QPEDIR)/rsync/patch.o: $(QPEDIR)/rsync/patch.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h \
- $(QPEDIR)/rsync/util.h \
- $(QPEDIR)/rsync/trace.h \
- $(QPEDIR)/rsync/protocol.h \
- $(QPEDIR)/rsync/netint.h \
- $(QPEDIR)/rsync/command.h \
- $(QPEDIR)/rsync/sumset.h \
- $(QPEDIR)/rsync/prototab.h \
- $(QPEDIR)/rsync/stream.h \
- $(QPEDIR)/rsync/job.h
-
-$(QPEDIR)/rsync/prototab.o: $(QPEDIR)/rsync/prototab.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h \
- $(QPEDIR)/rsync/protocol.h \
- $(QPEDIR)/rsync/command.h \
- $(QPEDIR)/rsync/prototab.h
-
-$(QPEDIR)/rsync/readsums.o: $(QPEDIR)/rsync/readsums.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h \
- $(QPEDIR)/rsync/sumset.h \
- $(QPEDIR)/rsync/job.h \
- $(QPEDIR)/rsync/trace.h \
- $(QPEDIR)/rsync/netint.h \
- $(QPEDIR)/rsync/protocol.h \
- $(QPEDIR)/rsync/util.h \
- $(QPEDIR)/rsync/stream.h
-
-$(QPEDIR)/rsync/scoop.o: $(QPEDIR)/rsync/scoop.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h \
- $(QPEDIR)/rsync/job.h \
- $(QPEDIR)/rsync/stream.h \
- $(QPEDIR)/rsync/trace.h \
- $(QPEDIR)/rsync/util.h
-
-$(QPEDIR)/rsync/search.o: $(QPEDIR)/rsync/search.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h \
- $(QPEDIR)/rsync/trace.h \
- $(QPEDIR)/rsync/util.h \
- $(QPEDIR)/rsync/sumset.h \
- $(QPEDIR)/rsync/search.h \
- $(QPEDIR)/rsync/checksum.h
-
-$(QPEDIR)/rsync/stats.o: $(QPEDIR)/rsync/stats.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h \
- $(QPEDIR)/rsync/trace.h
-
-$(QPEDIR)/rsync/stream.o: $(QPEDIR)/rsync/stream.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h \
- $(QPEDIR)/rsync/stream.h \
- $(QPEDIR)/rsync/util.h \
- $(QPEDIR)/rsync/trace.h
-
-$(QPEDIR)/rsync/sumset.o: $(QPEDIR)/rsync/sumset.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h \
- $(QPEDIR)/rsync/sumset.h \
- $(QPEDIR)/rsync/util.h \
- $(QPEDIR)/rsync/trace.h
-
-$(QPEDIR)/rsync/trace.o: $(QPEDIR)/rsync/trace.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h \
- $(QPEDIR)/rsync/util.h \
- $(QPEDIR)/rsync/trace.h
-
-$(QPEDIR)/rsync/tube.o: $(QPEDIR)/rsync/tube.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h \
- $(QPEDIR)/rsync/trace.h \
- $(QPEDIR)/rsync/util.h \
- $(QPEDIR)/rsync/job.h \
- $(QPEDIR)/rsync/stream.h
-
-$(QPEDIR)/rsync/util.o: $(QPEDIR)/rsync/util.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/util.h \
- $(QPEDIR)/rsync/rsync.h \
- $(QPEDIR)/rsync/trace.h
-
-$(QPEDIR)/rsync/version.o: $(QPEDIR)/rsync/version.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h
-
-$(QPEDIR)/rsync/whole.o: $(QPEDIR)/rsync/whole.c \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/config_linux.h \
- $(QPEDIR)/rsync/rsync.h \
- $(QPEDIR)/rsync/trace.h \
- $(QPEDIR)/rsync/fileutil.h \
- $(QPEDIR)/rsync/sumset.h \
- $(QPEDIR)/rsync/job.h \
- $(QPEDIR)/rsync/buf.h \
- $(QPEDIR)/rsync/whole.h \
- $(QPEDIR)/rsync/util.h
-
-$(QPEDIR)/rsync/qrsync.o: $(QPEDIR)/rsync/qrsync.cpp \
- $(QPEDIR)/rsync/qrsync.h \
- $(QPEDIR)/rsync/rsync.h
+ $(OPIEDIR)/include/qpe/global.h
+
+$(OPIEDIR)/rsync/base64.o: $(OPIEDIR)/rsync/base64.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h
+
+$(OPIEDIR)/rsync/buf.o: $(OPIEDIR)/rsync/buf.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h \
+ $(OPIEDIR)/rsync/trace.h \
+ $(OPIEDIR)/rsync/buf.h \
+ $(OPIEDIR)/rsync/util.h
+
+$(OPIEDIR)/rsync/checksum.o: $(OPIEDIR)/rsync/checksum.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h \
+ $(OPIEDIR)/rsync/checksum.h
+
+$(OPIEDIR)/rsync/command.o: $(OPIEDIR)/rsync/command.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h \
+ $(OPIEDIR)/rsync/command.h
+
+$(OPIEDIR)/rsync/delta.o: $(OPIEDIR)/rsync/delta.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h \
+ $(OPIEDIR)/rsync/emit.h \
+ $(OPIEDIR)/rsync/stream.h \
+ $(OPIEDIR)/rsync/util.h \
+ $(OPIEDIR)/rsync/sumset.h \
+ $(OPIEDIR)/rsync/job.h \
+ $(OPIEDIR)/rsync/trace.h \
+ $(OPIEDIR)/rsync/checksum.h \
+ $(OPIEDIR)/rsync/search.h \
+ $(OPIEDIR)/rsync/types.h
+
+$(OPIEDIR)/rsync/emit.o: $(OPIEDIR)/rsync/emit.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h \
+ $(OPIEDIR)/rsync/command.h \
+ $(OPIEDIR)/rsync/protocol.h \
+ $(OPIEDIR)/rsync/trace.h \
+ $(OPIEDIR)/rsync/emit.h \
+ $(OPIEDIR)/rsync/prototab.h \
+ $(OPIEDIR)/rsync/netint.h \
+ $(OPIEDIR)/rsync/sumset.h \
+ $(OPIEDIR)/rsync/job.h
+
+$(OPIEDIR)/rsync/hex.o: $(OPIEDIR)/rsync/hex.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h
+
+$(OPIEDIR)/rsync/job.o: $(OPIEDIR)/rsync/job.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h \
+ $(OPIEDIR)/rsync/stream.h \
+ $(OPIEDIR)/rsync/util.h \
+ $(OPIEDIR)/rsync/sumset.h \
+ $(OPIEDIR)/rsync/job.h \
+ $(OPIEDIR)/rsync/trace.h
+
+$(OPIEDIR)/rsync/mdfour.o: $(OPIEDIR)/rsync/mdfour.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h \
+ $(OPIEDIR)/rsync/trace.h \
+ $(OPIEDIR)/rsync/types.h
+
+$(OPIEDIR)/rsync/mksum.o: $(OPIEDIR)/rsync/mksum.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h \
+ $(OPIEDIR)/rsync/stream.h \
+ $(OPIEDIR)/rsync/util.h \
+ $(OPIEDIR)/rsync/sumset.h \
+ $(OPIEDIR)/rsync/job.h \
+ $(OPIEDIR)/rsync/protocol.h \
+ $(OPIEDIR)/rsync/netint.h \
+ $(OPIEDIR)/rsync/trace.h \
+ $(OPIEDIR)/rsync/checksum.h
+
+$(OPIEDIR)/rsync/msg.o: $(OPIEDIR)/rsync/msg.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h
+
+$(OPIEDIR)/rsync/netint.o: $(OPIEDIR)/rsync/netint.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h \
+ $(OPIEDIR)/rsync/job.h \
+ $(OPIEDIR)/rsync/netint.h \
+ $(OPIEDIR)/rsync/trace.h \
+ $(OPIEDIR)/rsync/stream.h
+
+$(OPIEDIR)/rsync/patch.o: $(OPIEDIR)/rsync/patch.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h \
+ $(OPIEDIR)/rsync/util.h \
+ $(OPIEDIR)/rsync/trace.h \
+ $(OPIEDIR)/rsync/protocol.h \
+ $(OPIEDIR)/rsync/netint.h \
+ $(OPIEDIR)/rsync/command.h \
+ $(OPIEDIR)/rsync/sumset.h \
+ $(OPIEDIR)/rsync/prototab.h \
+ $(OPIEDIR)/rsync/stream.h \
+ $(OPIEDIR)/rsync/job.h
+
+$(OPIEDIR)/rsync/prototab.o: $(OPIEDIR)/rsync/prototab.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h \
+ $(OPIEDIR)/rsync/protocol.h \
+ $(OPIEDIR)/rsync/command.h \
+ $(OPIEDIR)/rsync/prototab.h
+
+$(OPIEDIR)/rsync/readsums.o: $(OPIEDIR)/rsync/readsums.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h \
+ $(OPIEDIR)/rsync/sumset.h \
+ $(OPIEDIR)/rsync/job.h \
+ $(OPIEDIR)/rsync/trace.h \
+ $(OPIEDIR)/rsync/netint.h \
+ $(OPIEDIR)/rsync/protocol.h \
+ $(OPIEDIR)/rsync/util.h \
+ $(OPIEDIR)/rsync/stream.h
+
+$(OPIEDIR)/rsync/scoop.o: $(OPIEDIR)/rsync/scoop.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h \
+ $(OPIEDIR)/rsync/job.h \
+ $(OPIEDIR)/rsync/stream.h \
+ $(OPIEDIR)/rsync/trace.h \
+ $(OPIEDIR)/rsync/util.h
+
+$(OPIEDIR)/rsync/search.o: $(OPIEDIR)/rsync/search.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h \
+ $(OPIEDIR)/rsync/trace.h \
+ $(OPIEDIR)/rsync/util.h \
+ $(OPIEDIR)/rsync/sumset.h \
+ $(OPIEDIR)/rsync/search.h \
+ $(OPIEDIR)/rsync/checksum.h
+
+$(OPIEDIR)/rsync/stats.o: $(OPIEDIR)/rsync/stats.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h \
+ $(OPIEDIR)/rsync/trace.h
+
+$(OPIEDIR)/rsync/stream.o: $(OPIEDIR)/rsync/stream.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h \
+ $(OPIEDIR)/rsync/stream.h \
+ $(OPIEDIR)/rsync/util.h \
+ $(OPIEDIR)/rsync/trace.h
+
+$(OPIEDIR)/rsync/sumset.o: $(OPIEDIR)/rsync/sumset.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h \
+ $(OPIEDIR)/rsync/sumset.h \
+ $(OPIEDIR)/rsync/util.h \
+ $(OPIEDIR)/rsync/trace.h
+
+$(OPIEDIR)/rsync/trace.o: $(OPIEDIR)/rsync/trace.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h \
+ $(OPIEDIR)/rsync/util.h \
+ $(OPIEDIR)/rsync/trace.h
+
+$(OPIEDIR)/rsync/tube.o: $(OPIEDIR)/rsync/tube.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h \
+ $(OPIEDIR)/rsync/trace.h \
+ $(OPIEDIR)/rsync/util.h \
+ $(OPIEDIR)/rsync/job.h \
+ $(OPIEDIR)/rsync/stream.h
+
+$(OPIEDIR)/rsync/util.o: $(OPIEDIR)/rsync/util.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/util.h \
+ $(OPIEDIR)/rsync/rsync.h \
+ $(OPIEDIR)/rsync/trace.h
+
+$(OPIEDIR)/rsync/version.o: $(OPIEDIR)/rsync/version.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h
+
+$(OPIEDIR)/rsync/whole.o: $(OPIEDIR)/rsync/whole.c \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/config_linux.h \
+ $(OPIEDIR)/rsync/rsync.h \
+ $(OPIEDIR)/rsync/trace.h \
+ $(OPIEDIR)/rsync/fileutil.h \
+ $(OPIEDIR)/rsync/sumset.h \
+ $(OPIEDIR)/rsync/job.h \
+ $(OPIEDIR)/rsync/buf.h \
+ $(OPIEDIR)/rsync/whole.h \
+ $(OPIEDIR)/rsync/util.h
+
+$(OPIEDIR)/rsync/qrsync.o: $(OPIEDIR)/rsync/qrsync.cpp \
+ $(OPIEDIR)/rsync/qrsync.h \
+ $(OPIEDIR)/rsync/rsync.h
shutdown.h: shutdown.ui
@@ -725,6 +735,5 @@ syncdialog.cpp: syncdialog.ui
$(UIC) syncdialog.ui -i syncdialog.h -o syncdialog.cpp
-shutdown.o: shutdown.cpp \
- shutdown.h
+shutdown.o: shutdown.cpp
syncdialog.o: syncdialog.cpp
@@ -737,5 +746,5 @@ moc_desktop.o: moc_desktop.cpp \
shutdownimpl.h \
shutdown.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h
moc_info.o: moc_info.cpp \
@@ -748,5 +757,5 @@ moc_appicons.o: moc_appicons.cpp \
moc_taskbar.o: moc_taskbar.cpp \
taskbar.h \
- $(QPEDIR)/include/qpe/custom.h
+ $(OPIEDIR)/include/qpe/custom.h
moc_sidething.o: moc_sidething.cpp \
@@ -756,13 +765,13 @@ moc_sidething.o: moc_sidething.cpp \
moc_inputmethods.o: moc_inputmethods.cpp \
inputmethods.h \
- $(QPEDIR)/include/qpe/inputmethodinterface.h \
- $(QPEDIR)/include/qpe/qcom.h \
- $(QPEDIR)/include/qpe/quuid.h
+ $(OPIEDIR)/include/qpe/inputmethodinterface.h \
+ $(OPIEDIR)/include/qpe/qcom.h \
+ $(OPIEDIR)/include/qpe/quuid.h
moc_systray.o: moc_systray.cpp \
systray.h \
- $(QPEDIR)/include/qpe/taskbarappletinterface.h \
- $(QPEDIR)/include/qpe/qcom.h \
- $(QPEDIR)/include/qpe/quuid.h
+ $(OPIEDIR)/include/qpe/taskbarappletinterface.h \
+ $(OPIEDIR)/include/qpe/qcom.h \
+ $(OPIEDIR)/include/qpe/quuid.h
moc_shutdownimpl.o: moc_shutdownimpl.cpp \
@@ -773,9 +782,9 @@ moc_launcher.o: moc_launcher.cpp \
launcher.h \
launcherview.h \
- $(QPEDIR)/include/qpe/storage.h
+ $(OPIEDIR)/include/qpe/storage.h
moc_launcherview.o: moc_launcherview.cpp \
launcherview.h \
- $(QPEDIR)/include/qpe/storage.h
+ $(OPIEDIR)/include/qpe/storage.h
../calibrate/moc_calibrate.o: ../calibrate/moc_calibrate.cpp \
@@ -800,5 +809,5 @@ moc_shutdown.o: appicons.moc \
appicons.cpp \
appicons.h \
- $(QPEDIR)/include/qpe/qcopenvelope_qws.h
+ $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
moc_syncdialog.o: moc_shutdown.cpp \
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro
index 7d7c9ac..0078faf 100644
--- a/core/launcher/launcher.pro
+++ b/core/launcher/launcher.pro
@@ -3,5 +3,5 @@ TEMPLATE = app
CONFIG = qt warn_on release
-DESTDIR = $(QPEDIR)/bin
+DESTDIR = $(OPIEDIR)/bin
HEADERS = background.h \
@@ -25,22 +25,22 @@ HEADERS = background.h \
packageslave.h \
irserver.h \
- $(QPEDIR)/rsync/buf.h \
- $(QPEDIR)/rsync/checksum.h \
- $(QPEDIR)/rsync/command.h \
- $(QPEDIR)/rsync/emit.h \
- $(QPEDIR)/rsync/job.h \
- $(QPEDIR)/rsync/netint.h \
- $(QPEDIR)/rsync/protocol.h \
- $(QPEDIR)/rsync/prototab.h \
- $(QPEDIR)/rsync/rsync.h \
- $(QPEDIR)/rsync/search.h \
- $(QPEDIR)/rsync/stream.h \
- $(QPEDIR)/rsync/sumset.h \
- $(QPEDIR)/rsync/trace.h \
- $(QPEDIR)/rsync/types.h \
- $(QPEDIR)/rsync/util.h \
- $(QPEDIR)/rsync/whole.h \
- $(QPEDIR)/rsync/config_rsync.h \
- $(QPEDIR)/rsync/qrsync.h
+ $(OPIEDIR)/rsync/buf.h \
+ $(OPIEDIR)/rsync/checksum.h \
+ $(OPIEDIR)/rsync/command.h \
+ $(OPIEDIR)/rsync/emit.h \
+ $(OPIEDIR)/rsync/job.h \
+ $(OPIEDIR)/rsync/netint.h \
+ $(OPIEDIR)/rsync/protocol.h \
+ $(OPIEDIR)/rsync/prototab.h \
+ $(OPIEDIR)/rsync/rsync.h \
+ $(OPIEDIR)/rsync/search.h \
+ $(OPIEDIR)/rsync/stream.h \
+ $(OPIEDIR)/rsync/sumset.h \
+ $(OPIEDIR)/rsync/trace.h \
+ $(OPIEDIR)/rsync/types.h \
+ $(OPIEDIR)/rsync/util.h \
+ $(OPIEDIR)/rsync/whole.h \
+ $(OPIEDIR)/rsync/config_rsync.h \
+ $(OPIEDIR)/rsync/qrsync.h
# quicklauncher.h \
@@ -59,5 +59,5 @@ SOURCES = background.cpp \
launcher.cpp \
launcherview.cpp \
- $(QPEDIR)/calibrate/calibrate.cpp \
+ $(OPIEDIR)/calibrate/calibrate.cpp \
transferserver.cpp \
packageslave.cpp \
@@ -66,41 +66,41 @@ SOURCES = background.cpp \
startmenu.cpp \
main.cpp \
- $(QPEDIR)/rsync/base64.c \
- $(QPEDIR)/rsync/buf.c \
- $(QPEDIR)/rsync/checksum.c \
- $(QPEDIR)/rsync/command.c \
- $(QPEDIR)/rsync/delta.c \
- $(QPEDIR)/rsync/emit.c \
- $(QPEDIR)/rsync/hex.c \
- $(QPEDIR)/rsync/job.c \
- $(QPEDIR)/rsync/mdfour.c \
- $(QPEDIR)/rsync/mksum.c \
- $(QPEDIR)/rsync/msg.c \
- $(QPEDIR)/rsync/netint.c \
- $(QPEDIR)/rsync/patch.c \
- $(QPEDIR)/rsync/prototab.c \
- $(QPEDIR)/rsync/readsums.c \
- $(QPEDIR)/rsync/scoop.c \
- $(QPEDIR)/rsync/search.c \
- $(QPEDIR)/rsync/stats.c \
- $(QPEDIR)/rsync/stream.c \
- $(QPEDIR)/rsync/sumset.c \
- $(QPEDIR)/rsync/trace.c \
- $(QPEDIR)/rsync/tube.c \
- $(QPEDIR)/rsync/util.c \
- $(QPEDIR)/rsync/version.c \
- $(QPEDIR)/rsync/whole.c \
- $(QPEDIR)/rsync/qrsync.cpp
+ $(OPIEDIR)/rsync/base64.c \
+ $(OPIEDIR)/rsync/buf.c \
+ $(OPIEDIR)/rsync/checksum.c \
+ $(OPIEDIR)/rsync/command.c \
+ $(OPIEDIR)/rsync/delta.c \
+ $(OPIEDIR)/rsync/emit.c \
+ $(OPIEDIR)/rsync/hex.c \
+ $(OPIEDIR)/rsync/job.c \
+ $(OPIEDIR)/rsync/mdfour.c \
+ $(OPIEDIR)/rsync/mksum.c \
+ $(OPIEDIR)/rsync/msg.c \
+ $(OPIEDIR)/rsync/netint.c \
+ $(OPIEDIR)/rsync/patch.c \
+ $(OPIEDIR)/rsync/prototab.c \
+ $(OPIEDIR)/rsync/readsums.c \
+ $(OPIEDIR)/rsync/scoop.c \
+ $(OPIEDIR)/rsync/search.c \
+ $(OPIEDIR)/rsync/stats.c \
+ $(OPIEDIR)/rsync/stream.c \
+ $(OPIEDIR)/rsync/sumset.c \
+ $(OPIEDIR)/rsync/trace.c \
+ $(OPIEDIR)/rsync/tube.c \
+ $(OPIEDIR)/rsync/util.c \
+ $(OPIEDIR)/rsync/version.c \
+ $(OPIEDIR)/rsync/whole.c \
+ $(OPIEDIR)/rsync/qrsync.cpp
INTERFACES = shutdown.ui syncdialog.ui
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include .
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include .
-INCLUDEPATH += $(QPEDIR)/calibrate
-DEPENDPATH += $(QPEDIR)/calibrate
+INCLUDEPATH += $(OPIEDIR)/calibrate
+DEPENDPATH += $(OPIEDIR)/calibrate
-INCLUDEPATH += $(QPEDIR)/rsync
-DEPENDPATH += $(QPEDIR)/rsync
+INCLUDEPATH += $(OPIEDIR)/rsync
+DEPENDPATH += $(OPIEDIR)/rsync
TARGET = qpe
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 024f9cc..12c2a7c 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -86,5 +86,5 @@ void initCassiopeia()
}
setenv( "QTDIR", "/", 1 );
- setenv( "QPEDIR", "/", 1 );
+ setenv( "OPIEDIR", "/", 1 );
setenv( "HOME", "/home", 1 );
mkdir( "/home/Documents", 0755 );
diff --git a/core/multimedia/opieplayer/Makefile.in b/core/multimedia/opieplayer/Makefile.in
index 5fca66e..6e007ec 100644
--- a/core/multimedia/opieplayer/Makefile.in
+++ b/core/multimedia/opieplayer/Makefile.in
@@ -4,8 +4,8 @@
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 -lpthread $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC)
####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
@@ -136,39 +136,39 @@ REQUIRES=
main.o: main.cpp \
- $(QPEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
mediaplayerstate.h \
playlistwidget.h \
- $(QPEDIR)/include/qpe/applnk.h \
+ $(OPIEDIR)/include/qpe/applnk.h \
audiowidget.h \
videowidget.h \
loopcontrol.h \
mediaplayer.h \
- $(QPEDIR)/include/qpe/qlibrary.h \
- $(QPEDIR)/include/qpe/qcom.h \
- $(QPEDIR)/include/qpe/quuid.h \
+ $(OPIEDIR)/include/qpe/qlibrary.h \
+ $(OPIEDIR)/include/qpe/qcom.h \
+ $(OPIEDIR)/include/qpe/quuid.h \
mediaplayerplugininterface.h
loopcontrol.o: loopcontrol.cpp \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
loopcontrol.h \
videowidget.h \
audiodevice.h \
mediaplayerplugininterface.h \
- $(QPEDIR)/include/qpe/qcom.h \
- $(QPEDIR)/include/qpe/quuid.h \
+ $(OPIEDIR)/include/qpe/qcom.h \
+ $(OPIEDIR)/include/qpe/quuid.h \
mediaplayerstate.h
playlistselection.o: playlistselection.cpp \
- $(QPEDIR)/include/qpe/applnk.h \
- $(QPEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/applnk.h \
+ $(OPIEDIR)/include/qpe/resource.h \
playlistselection.h
mediaplayerstate.o: mediaplayerstate.cpp \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/qlibrary.h \
- $(QPEDIR)/include/qpe/qcom.h \
- $(QPEDIR)/include/qpe/quuid.h \
- $(QPEDIR)/include/qpe/config.h \
+ $(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 \
@@ -178,24 +178,24 @@ mediaplayerstate.o: mediaplayerstate.cpp \
videowidget.o: videowidget.cpp \
- $(QPEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/resource.h \
videowidget.h \
mediaplayerplugininterface.h \
- $(QPEDIR)/include/qpe/qcom.h \
- $(QPEDIR)/include/qpe/quuid.h \
+ $(OPIEDIR)/include/qpe/qcom.h \
+ $(OPIEDIR)/include/qpe/quuid.h \
mediaplayerstate.h
audiowidget.o: audiowidget.cpp \
- $(QPEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/resource.h \
audiowidget.h \
mediaplayerstate.h
playlistwidget.o: playlistwidget.cpp \
- $(QPEDIR)/include/qpe/qpemenubar.h \
- $(QPEDIR)/include/qpe/qpetoolbar.h \
- $(QPEDIR)/include/qpe/fileselector.h \
- $(QPEDIR)/include/qpe/applnk.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/global.h \
- $(QPEDIR)/include/qpe/resource.h \
+ $(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 \
@@ -203,14 +203,14 @@ playlistwidget.o: playlistwidget.cpp \
mediaplayer.o: mediaplayer.cpp \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/qlibrary.h \
- $(QPEDIR)/include/qpe/qcom.h \
- $(QPEDIR)/include/qpe/quuid.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/config.h \
+ $(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 \
- $(QPEDIR)/include/qpe/applnk.h \
+ $(OPIEDIR)/include/qpe/applnk.h \
audiowidget.h \
loopcontrol.h \
@@ -219,8 +219,8 @@ mediaplayer.o: mediaplayer.cpp \
audiodevice.o: audiodevice.cpp \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/config.h \
audiodevice.h \
- $(QPEDIR)/include/qpe/qcopenvelope_qws.h
+ $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
moc_loopcontrol.o: moc_loopcontrol.cpp \
@@ -229,5 +229,5 @@ moc_loopcontrol.o: moc_loopcontrol.cpp \
moc_playlistselection.o: moc_playlistselection.cpp \
playlistselection.h \
- $(QPEDIR)/include/qpe/applnk.h
+ $(OPIEDIR)/include/qpe/applnk.h
moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \
@@ -242,11 +242,11 @@ moc_audiowidget.o: moc_audiowidget.cpp \
moc_playlistwidget.o: moc_playlistwidget.cpp \
playlistwidget.h \
- $(QPEDIR)/include/qpe/applnk.h
+ $(OPIEDIR)/include/qpe/applnk.h
moc_mediaplayer.o: moc_mediaplayer.cpp \
mediaplayer.h \
- $(QPEDIR)/include/qpe/qlibrary.h \
- $(QPEDIR)/include/qpe/qcom.h \
- $(QPEDIR)/include/qpe/quuid.h \
+ $(OPIEDIR)/include/qpe/qlibrary.h \
+ $(OPIEDIR)/include/qpe/qcom.h \
+ $(OPIEDIR)/include/qpe/quuid.h \
mediaplayerplugininterface.h
diff --git a/core/multimedia/opieplayer/libflash/libflash.pro b/core/multimedia/opieplayer/libflash/libflash.pro
index d144f0b..bf97fbf 100644
--- a/core/multimedia/opieplayer/libflash/libflash.pro
+++ b/core/multimedia/opieplayer/libflash/libflash.pro
@@ -9,6 +9,6 @@ SOURCES = libflashplugin.cpp libflashpluginimpl.cpp \
TARGET = flashplugin
DESTDIR = ../../plugins/codecs
-INCLUDEPATH += $(QPEDIR)/include ..
-DEPENDPATH += ../$(QPEDIR)/include ..
+INCLUDEPATH += $(OPIEDIR)/include ..
+DEPENDPATH += ../$(OPIEDIR)/include ..
LIBS += -lqpe
VERSION = 1.0.0
diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in
index 9e17769..19ded26 100644
--- a/core/multimedia/opieplayer/libmad/Makefile.in
+++ b/core/multimedia/opieplayer/libmad/Makefile.in
@@ -4,8 +4,8 @@
CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
-CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\"
+CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
CC = $(SYSCONF_CC) $(QT_C_MT)
-CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\"
-INCPATH = -I$(QPEDIR)/include -I..
+CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
+INCPATH = -I$(OPIEDIR)/include -I..
LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
LIBS = $(SUBLIBS) -lqpe -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro
index e3f75b7..6c40a15 100644
--- a/core/multimedia/opieplayer/libmad/libmad.pro
+++ b/core/multimedia/opieplayer/libmad/libmad.pro
@@ -7,6 +7,6 @@ SOURCES = version.c fixed.c bit.c timer.c stream.c frame.c synth.c dec
TARGET = madplugin
DESTDIR = ../../plugins/codecs
-INCLUDEPATH += $(QPEDIR)/include ..
-DEPENDPATH += ../$(QPEDIR)/include ..
+INCLUDEPATH += $(OPIEDIR)/include ..
+DEPENDPATH += ../$(OPIEDIR)/include ..
LIBS += -lqpe -lm
VERSION = 1.0.0
diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in
index 1817902..9881815 100644
--- a/core/multimedia/opieplayer/libmpeg3/Makefile.in
+++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in
@@ -4,8 +4,8 @@
CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
-CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\"
+CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
CC = $(SYSCONF_CC) $(QT_C_MT)
-CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\"
-INCPATH = -I$(QPEDIR)/include -I..
+CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
+INCPATH = -I$(OPIEDIR)/include -I..
LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
LIBS = $(SUBLIBS) -lqpe -lpthread -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
index e2c35d3..b1426d1 100644
--- a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
+++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
@@ -37,6 +37,6 @@ SOURCES = libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \
TARGET = mpeg3plugin
DESTDIR = ../../plugins/codecs
-INCLUDEPATH += $(QPEDIR)/include ..
-DEPENDPATH += ../$(QPEDIR)/include ..
+INCLUDEPATH += $(OPIEDIR)/include ..
+DEPENDPATH += ../$(OPIEDIR)/include ..
LIBS += -lqpe -lpthread -lm
VERSION = 1.0.0
diff --git a/core/multimedia/opieplayer/mpegplayer.pro b/core/multimedia/opieplayer/mpegplayer.pro
index d6952f8..3b8d4b0 100644
--- a/core/multimedia/opieplayer/mpegplayer.pro
+++ b/core/multimedia/opieplayer/mpegplayer.pro
@@ -1,5 +1,5 @@
TEMPLATE = app
CONFIG = qt warn_on release
-DESTDIR = $(QPEDIR)/bin
+DESTDIR = $(OPIEDIR)/bin
HEADERS = loopcontrol.h mediaplayerplugininterface.h playlistselection.h mediaplayerstate.h \
videowidget.h audiowidget.h playlistwidget.h mediaplayer.h audiodevice.h
@@ -8,14 +8,14 @@ SOURCES = main.cpp \
videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp audiodevice.cpp
TARGET = mpegplayer
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lpthread
# INTERFACES =
-# INCLUDEPATH += $(QPEDIR)/include
+# INCLUDEPATH += $(OPIEDIR)/include
# CONFIG+=static
# TMAKE_CXXFLAGS += -DQPIM_STANDALONE
# LIBS += libmpeg3/libmpeg3.a -lpthread
-# LIBS += $(QPEDIR)/plugins/codecs/liblibmadplugin.so
+# LIBS += $(OPIEDIR)/plugins/codecs/liblibmadplugin.so
TRANSLATIONS = ../i18n/de/mpegplayer.ts
diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in
index c9203f8..e9fec6c 100644
--- a/core/multimedia/opieplayer/wavplugin/Makefile.in
+++ b/core/multimedia/opieplayer/wavplugin/Makefile.in
@@ -4,8 +4,8 @@
CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
-CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\"
+CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
CC = $(SYSCONF_CC) $(QT_C_MT)
-CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\"
-INCPATH = -I$(QPEDIR)/include -I..
+CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
+INCPATH = -I$(OPIEDIR)/include -I..
LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.pro b/core/multimedia/opieplayer/wavplugin/wavplugin.pro
index 4663813..2160431 100644
--- a/core/multimedia/opieplayer/wavplugin/wavplugin.pro
+++ b/core/multimedia/opieplayer/wavplugin/wavplugin.pro
@@ -5,6 +5,6 @@ SOURCES = wavplugin.cpp wavpluginimpl.cpp
TARGET = wavplugin
DESTDIR = ../../plugins/codecs
-INCLUDEPATH += $(QPEDIR)/include ..
-DEPENDPATH += ../$(QPEDIR)/include ..
+INCLUDEPATH += $(OPIEDIR)/include ..
+DEPENDPATH += ../$(OPIEDIR)/include ..
LIBS += -lqpe
VERSION = 1.0.0
diff --git a/core/pim/addressbook/Makefile.in b/core/pim/addressbook/Makefile.in
index 93c73c3..c46d0e5 100644
--- a/core/pim/addressbook/Makefile.in
+++ b/core/pim/addressbook/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC)
####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
@@ -89,5 +89,5 @@ moc: $(SRCMOC)
tmake:
- tmake p4addressbook.pro
+ tmake addressbook.pro
clean:
@@ -124,64 +124,64 @@ REQUIRES=
main.o: main.cpp \
addressbook.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/qcopenvelope_qws.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
addressbook.o: addressbook.cpp \
abeditor.h \
- $(QPEDIR)/include/qpe/contact.h \
- $(QPEDIR)/include/qpe/palmtoprecord.h \
- $(QPEDIR)/include/qpe/recordfields.h \
+ $(OPIEDIR)/include/qpe/contact.h \
+ $(OPIEDIR)/include/qpe/palmtoprecord.h \
+ $(OPIEDIR)/include/qpe/recordfields.h \
ablabel.h \
abtable.h \
- $(QPEDIR)/include/qpe/categories.h \
+ $(OPIEDIR)/include/qpe/categories.h \
addresssettings.h \
addresssettingsbase.h \
addressbook.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/finddialog.h \
- $(QPEDIR)/include/qpe/global.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/ir.h \
- $(QPEDIR)/include/qpe/qpemessagebox.h \
- $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
- $(QPEDIR)/include/qpe/qpemenubar.h \
- $(QPEDIR)/include/qpe/qpetoolbar.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/finddialog.h \
+ $(OPIEDIR)/include/qpe/global.h \
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/ir.h \
+ $(OPIEDIR)/include/qpe/qpemessagebox.h \
+ $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
+ $(OPIEDIR)/include/qpe/qpemenubar.h \
+ $(OPIEDIR)/include/qpe/qpetoolbar.h
abeditor.o: abeditor.cpp \
abeditor.h \
- $(QPEDIR)/include/qpe/contact.h \
- $(QPEDIR)/include/qpe/palmtoprecord.h \
- $(QPEDIR)/include/qpe/recordfields.h \
+ $(OPIEDIR)/include/qpe/contact.h \
+ $(OPIEDIR)/include/qpe/palmtoprecord.h \
+ $(OPIEDIR)/include/qpe/recordfields.h \
addresspicker.h \
- $(QPEDIR)/include/qpe/categoryselect.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/qpedialog.h
+ $(OPIEDIR)/include/qpe/categoryselect.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/qpedialog.h
ablabel.o: ablabel.cpp \
ablabel.h \
- $(QPEDIR)/include/qpe/contact.h \
- $(QPEDIR)/include/qpe/palmtoprecord.h \
- $(QPEDIR)/include/qpe/recordfields.h \
- $(QPEDIR)/include/qpe/stringutil.h
+ $(OPIEDIR)/include/qpe/contact.h \
+ $(OPIEDIR)/include/qpe/palmtoprecord.h \
+ $(OPIEDIR)/include/qpe/recordfields.h \
+ $(OPIEDIR)/include/qpe/stringutil.h
abtable.o: abtable.cpp \
- $(QPEDIR)/include/qpe/categoryselect.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/stringutil.h \
- $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
+ $(OPIEDIR)/include/qpe/categoryselect.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/stringutil.h \
+ $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
abtable.h \
- $(QPEDIR)/include/qpe/categories.h \
- $(QPEDIR)/include/qpe/contact.h \
- $(QPEDIR)/include/qpe/palmtoprecord.h \
- $(QPEDIR)/include/qpe/recordfields.h
+ $(OPIEDIR)/include/qpe/categories.h \
+ $(OPIEDIR)/include/qpe/contact.h \
+ $(OPIEDIR)/include/qpe/palmtoprecord.h \
+ $(OPIEDIR)/include/qpe/recordfields.h
addresssettings.o: addresssettings.cpp \
addresssettings.h \
addresssettingsbase.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/contact.h \
- $(QPEDIR)/include/qpe/palmtoprecord.h \
- $(QPEDIR)/include/qpe/recordfields.h
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/contact.h \
+ $(OPIEDIR)/include/qpe/palmtoprecord.h \
+ $(OPIEDIR)/include/qpe/recordfields.h
addresssettingsbase.h: addresssettingsbase.ui
@@ -200,20 +200,20 @@ moc_addressbook.o: moc_addressbook.cpp \
moc_abeditor.o: moc_abeditor.cpp \
abeditor.h \
- $(QPEDIR)/include/qpe/contact.h \
- $(QPEDIR)/include/qpe/palmtoprecord.h \
- $(QPEDIR)/include/qpe/recordfields.h
+ $(OPIEDIR)/include/qpe/contact.h \
+ $(OPIEDIR)/include/qpe/palmtoprecord.h \
+ $(OPIEDIR)/include/qpe/recordfields.h
moc_ablabel.o: moc_ablabel.cpp \
ablabel.h \
- $(QPEDIR)/include/qpe/contact.h \
- $(QPEDIR)/include/qpe/palmtoprecord.h \
- $(QPEDIR)/include/qpe/recordfields.h
+ $(OPIEDIR)/include/qpe/contact.h \
+ $(OPIEDIR)/include/qpe/palmtoprecord.h \
+ $(OPIEDIR)/include/qpe/recordfields.h
moc_abtable.o: moc_abtable.cpp \
abtable.h \
- $(QPEDIR)/include/qpe/categories.h \
- $(QPEDIR)/include/qpe/contact.h \
- $(QPEDIR)/include/qpe/palmtoprecord.h \
- $(QPEDIR)/include/qpe/recordfields.h
+ $(OPIEDIR)/include/qpe/categories.h \
+ $(OPIEDIR)/include/qpe/contact.h \
+ $(OPIEDIR)/include/qpe/palmtoprecord.h \
+ $(OPIEDIR)/include/qpe/recordfields.h
moc_addresssettings.o: moc_addresssettings.cpp \
diff --git a/core/pim/addressbook/addressbook.pro b/core/pim/addressbook/addressbook.pro
index 8d3401d..32e21a2 100644
--- a/core/pim/addressbook/addressbook.pro
+++ b/core/pim/addressbook/addressbook.pro
@@ -1,5 +1,5 @@
TEMPLATE = app
CONFIG = qt warn_on release
-DESTDIR = $(QPEDIR)/bin
+DESTDIR = $(OPIEDIR)/bin
HEADERS = addressbook.h \
abeditor.h \
@@ -16,6 +16,6 @@ INTERFACES = addresssettingsbase.ui
TARGET = addressbook
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
diff --git a/core/pim/datebook/Makefile.in b/core/pim/datebook/Makefile.in
index bdc69dc..0c3282e 100644
--- a/core/pim/datebook/Makefile.in
+++ b/core/pim/datebook/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC)
####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
@@ -161,26 +161,32 @@ REQUIRES=
main.o: main.cpp \
datebook.h \
- $(QPEDIR)/include/qpe/datebookdb.h \
- $(QPEDIR)/include/qpe/event.h \
- $(QPEDIR)/include/qpe/palmtoprecord.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/datebookdb.h \
+ $(OPIEDIR)/include/qpe/event.h \
+ $(OPIEDIR)/include/qpe/palmtoprecord.h \
+ $(OPIEDIR)/include/qpe/timeconversion.h \
+ $(OPIEDIR)/include/qpe/qpcglobal.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h
datebookday.o: datebookday.cpp \
datebookday.h \
- $(QPEDIR)/include/qpe/event.h \
- $(QPEDIR)/include/qpe/palmtoprecord.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 \
- $(QPEDIR)/include/qpe/datebookdb.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/timestring.h \
- $(QPEDIR)/include/qpe/qpedebug.h
+ $(OPIEDIR)/include/qpe/datebookdb.h \
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/timestring.h \
+ $(OPIEDIR)/include/qpe/qpedebug.h
datebook.o: datebook.cpp \
datebook.h \
- $(QPEDIR)/include/qpe/datebookdb.h \
- $(QPEDIR)/include/qpe/event.h \
- $(QPEDIR)/include/qpe/palmtoprecord.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 \
@@ -189,57 +195,62 @@ datebook.o: datebook.cpp \
dateentryimpl.h \
dateentry.h \
- $(QPEDIR)/include/qpe/datebookmonth.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/qpedebug.h \
- $(QPEDIR)/include/qpe/finddialog.h \
- $(QPEDIR)/include/qpe/ir.h \
- $(QPEDIR)/include/qpe/qpemenubar.h \
- $(QPEDIR)/include/qpe/qpemessagebox.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/sound.h \
- $(QPEDIR)/include/qpe/timestring.h \
- $(QPEDIR)/include/qpe/qpetoolbar.h \
- $(QPEDIR)/include/qpe/tzselect.h \
- $(QPEDIR)/include/qpe/xmlreader.h
+ $(OPIEDIR)/include/qpe/datebookmonth.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/qpedebug.h \
+ $(OPIEDIR)/include/qpe/finddialog.h \
+ $(OPIEDIR)/include/qpe/ir.h \
+ $(OPIEDIR)/include/qpe/qpemenubar.h \
+ $(OPIEDIR)/include/qpe/qpemessagebox.h \
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/sound.h \
+ $(OPIEDIR)/include/qpe/timestring.h \
+ $(OPIEDIR)/include/qpe/qpetoolbar.h \
+ $(OPIEDIR)/include/qpe/tzselect.h \
+ $(OPIEDIR)/include/qpe/xmlreader.h
dateentryimpl.o: dateentryimpl.cpp \
dateentryimpl.h \
dateentry.h \
- $(QPEDIR)/include/qpe/event.h \
- $(QPEDIR)/include/qpe/palmtoprecord.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 \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/categoryselect.h \
- $(QPEDIR)/include/qpe/datebookmonth.h \
- $(QPEDIR)/include/qpe/global.h \
- $(QPEDIR)/include/qpe/timeconversion.h \
- $(QPEDIR)/include/qpe/timestring.h \
- $(QPEDIR)/include/qpe/tzselect.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/categoryselect.h \
+ $(OPIEDIR)/include/qpe/datebookmonth.h \
+ $(OPIEDIR)/include/qpe/global.h \
+ $(OPIEDIR)/include/qpe/timestring.h \
+ $(OPIEDIR)/include/qpe/tzselect.h
datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \
datebookdayheaderimpl.h \
datebookdayheader.h \
- $(QPEDIR)/include/qpe/datebookmonth.h \
- $(QPEDIR)/include/qpe/event.h \
- $(QPEDIR)/include/qpe/palmtoprecord.h \
- $(QPEDIR)/include/qpe/timestring.h
+ $(OPIEDIR)/include/qpe/datebookmonth.h \
+ $(OPIEDIR)/include/qpe/event.h \
+ $(OPIEDIR)/include/qpe/palmtoprecord.h \
+ $(OPIEDIR)/include/qpe/timeconversion.h \
+ $(OPIEDIR)/include/qpe/qpcglobal.h \
+ $(OPIEDIR)/include/qpe/timestring.h
datebooksettings.o: datebooksettings.cpp \
datebooksettings.h \
datebooksettingsbase.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h
datebookweek.o: datebookweek.cpp \
datebookweek.h \
- $(QPEDIR)/include/qpe/event.h \
- $(QPEDIR)/include/qpe/palmtoprecord.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 \
- $(QPEDIR)/include/qpe/calendar.h \
- $(QPEDIR)/include/qpe/datebookdb.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/timestring.h
+ $(OPIEDIR)/include/qpe/calendar.h \
+ $(OPIEDIR)/include/qpe/datebookdb.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/timestring.h
datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \
@@ -250,9 +261,11 @@ repeatentry.o: repeatentry.cpp \
repeatentry.h \
repeatentrybase.h \
- $(QPEDIR)/include/qpe/event.h \
- $(QPEDIR)/include/qpe/palmtoprecord.h \
- $(QPEDIR)/include/qpe/datebookmonth.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/timestring.h
+ $(OPIEDIR)/include/qpe/event.h \
+ $(OPIEDIR)/include/qpe/palmtoprecord.h \
+ $(OPIEDIR)/include/qpe/timeconversion.h \
+ $(OPIEDIR)/include/qpe/qpcglobal.h \
+ $(OPIEDIR)/include/qpe/datebookmonth.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/timestring.h
dateentry.h: dateentry.ui
@@ -298,18 +311,24 @@ repeatentrybase.o: repeatentrybase.cpp
moc_datebookday.o: moc_datebookday.cpp \
datebookday.h \
- $(QPEDIR)/include/qpe/event.h \
- $(QPEDIR)/include/qpe/palmtoprecord.h
+ $(OPIEDIR)/include/qpe/event.h \
+ $(OPIEDIR)/include/qpe/palmtoprecord.h \
+ $(OPIEDIR)/include/qpe/timeconversion.h \
+ $(OPIEDIR)/include/qpe/qpcglobal.h
moc_datebook.o: moc_datebook.cpp \
datebook.h \
- $(QPEDIR)/include/qpe/datebookdb.h \
- $(QPEDIR)/include/qpe/event.h \
- $(QPEDIR)/include/qpe/palmtoprecord.h
+ $(OPIEDIR)/include/qpe/datebookdb.h \
+ $(OPIEDIR)/include/qpe/event.h \
+ $(OPIEDIR)/include/qpe/palmtoprecord.h \
+ $(OPIEDIR)/include/qpe/timeconversion.h \
+ $(OPIEDIR)/include/qpe/qpcglobal.h
moc_dateentryimpl.o: moc_dateentryimpl.cpp \
dateentryimpl.h \
dateentry.h \
- $(QPEDIR)/include/qpe/event.h \
- $(QPEDIR)/include/qpe/palmtoprecord.h
+ $(OPIEDIR)/include/qpe/event.h \
+ $(OPIEDIR)/include/qpe/palmtoprecord.h \
+ $(OPIEDIR)/include/qpe/timeconversion.h \
+ $(OPIEDIR)/include/qpe/qpcglobal.h
moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \
@@ -319,6 +338,8 @@ moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \
moc_datebookweek.o: moc_datebookweek.cpp \
datebookweek.h \
- $(QPEDIR)/include/qpe/event.h \
- $(QPEDIR)/include/qpe/palmtoprecord.h
+ $(OPIEDIR)/include/qpe/event.h \
+ $(OPIEDIR)/include/qpe/palmtoprecord.h \
+ $(OPIEDIR)/include/qpe/timeconversion.h \
+ $(OPIEDIR)/include/qpe/qpcglobal.h
moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \
@@ -329,6 +350,8 @@ moc_repeatentry.o: moc_repeatentry.cpp \
repeatentry.h \
repeatentrybase.h \
- $(QPEDIR)/include/qpe/event.h \
- $(QPEDIR)/include/qpe/palmtoprecord.h
+ $(OPIEDIR)/include/qpe/event.h \
+ $(OPIEDIR)/include/qpe/palmtoprecord.h \
+ $(OPIEDIR)/include/qpe/timeconversion.h \
+ $(OPIEDIR)/include/qpe/qpcglobal.h
moc_dateentry.o: moc_dateentry.cpp \
diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro
index 17c02ec..fae5d2b 100644
--- a/core/pim/datebook/datebook.pro
+++ b/core/pim/datebook/datebook.pro
@@ -1,5 +1,5 @@
TEMPLATE = app
CONFIG += qt warn_on release
-DESTDIR = $(QPEDIR)/bin
+DESTDIR = $(OPIEDIR)/bin
HEADERS = datebookday.h \
@@ -28,6 +28,6 @@ INTERFACES = dateentry.ui \
repeatentrybase.ui
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
diff --git a/core/pim/todo/Makefile.in b/core/pim/todo/Makefile.in
index f3c5f0e..efe6a35 100644
--- a/core/pim/todo/Makefile.in
+++ b/core/pim/todo/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC)
####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
@@ -114,5 +114,5 @@ REQUIRES=
main.o: main.cpp \
mainwindow.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h
mainwindow.o: mainwindow.cpp \
@@ -120,40 +120,42 @@ mainwindow.o: mainwindow.cpp \
todoentryimpl.h \
todoentry.h \
- $(QPEDIR)/include/qpe/task.h \
- $(QPEDIR)/include/qpe/palmtoprecord.h \
- $(QPEDIR)/include/qpe/stringutil.h \
+ $(OPIEDIR)/include/qpe/task.h \
+ $(OPIEDIR)/include/qpe/palmtoprecord.h \
+ $(OPIEDIR)/include/qpe/stringutil.h \
todotable.h \
- $(QPEDIR)/include/qpe/categories.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/finddialog.h \
- $(QPEDIR)/include/qpe/global.h \
- $(QPEDIR)/include/qpe/ir.h \
- $(QPEDIR)/include/qpe/qpemenubar.h \
- $(QPEDIR)/include/qpe/qpemessagebox.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/qpetoolbar.h
+ $(OPIEDIR)/include/qpe/categories.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/finddialog.h \
+ $(OPIEDIR)/include/qpe/global.h \
+ $(OPIEDIR)/include/qpe/ir.h \
+ $(OPIEDIR)/include/qpe/qpemenubar.h \
+ $(OPIEDIR)/include/qpe/qpemessagebox.h \
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/qpetoolbar.h
todotable.o: todotable.cpp \
todotable.h \
- $(QPEDIR)/include/qpe/categories.h \
- $(QPEDIR)/include/qpe/task.h \
- $(QPEDIR)/include/qpe/palmtoprecord.h \
- $(QPEDIR)/include/qpe/stringutil.h \
- $(QPEDIR)/include/qpe/categoryselect.h \
- $(QPEDIR)/include/qpe/xmlreader.h
+ $(OPIEDIR)/include/qpe/categories.h \
+ $(OPIEDIR)/include/qpe/stringutil.h \
+ $(OPIEDIR)/include/qpe/task.h \
+ $(OPIEDIR)/include/qpe/palmtoprecord.h \
+ $(OPIEDIR)/include/qpe/categoryselect.h \
+ $(OPIEDIR)/include/qpe/xmlreader.h
todoentryimpl.o: todoentryimpl.cpp \
todoentryimpl.h \
todoentry.h \
- $(QPEDIR)/include/qpe/task.h \
- $(QPEDIR)/include/qpe/palmtoprecord.h \
- $(QPEDIR)/include/qpe/stringutil.h \
- $(QPEDIR)/include/qpe/categoryselect.h \
- $(QPEDIR)/include/qpe/datebookmonth.h \
- $(QPEDIR)/include/qpe/event.h \
- $(QPEDIR)/include/qpe/global.h \
- $(QPEDIR)/include/qpe/imageedit.h \
- $(QPEDIR)/include/qpe/timestring.h
+ $(OPIEDIR)/include/qpe/task.h \
+ $(OPIEDIR)/include/qpe/palmtoprecord.h \
+ $(OPIEDIR)/include/qpe/stringutil.h \
+ $(OPIEDIR)/include/qpe/categoryselect.h \
+ $(OPIEDIR)/include/qpe/datebookmonth.h \
+ $(OPIEDIR)/include/qpe/event.h \
+ $(OPIEDIR)/include/qpe/timeconversion.h \
+ $(OPIEDIR)/include/qpe/qpcglobal.h \
+ $(OPIEDIR)/include/qpe/global.h \
+ $(OPIEDIR)/include/qpe/imageedit.h \
+ $(OPIEDIR)/include/qpe/timestring.h
todoentry.h: todoentry.ui
@@ -172,15 +174,15 @@ moc_mainwindow.o: moc_mainwindow.cpp \
moc_todotable.o: moc_todotable.cpp \
todotable.h \
- $(QPEDIR)/include/qpe/categories.h \
- $(QPEDIR)/include/qpe/task.h \
- $(QPEDIR)/include/qpe/palmtoprecord.h \
- $(QPEDIR)/include/qpe/stringutil.h
+ $(OPIEDIR)/include/qpe/categories.h \
+ $(OPIEDIR)/include/qpe/stringutil.h \
+ $(OPIEDIR)/include/qpe/task.h \
+ $(OPIEDIR)/include/qpe/palmtoprecord.h
moc_todoentryimpl.o: moc_todoentryimpl.cpp \
todoentryimpl.h \
todoentry.h \
- $(QPEDIR)/include/qpe/task.h \
- $(QPEDIR)/include/qpe/palmtoprecord.h \
- $(QPEDIR)/include/qpe/stringutil.h
+ $(OPIEDIR)/include/qpe/task.h \
+ $(OPIEDIR)/include/qpe/palmtoprecord.h \
+ $(OPIEDIR)/include/qpe/stringutil.h
moc_todoentry.o: moc_todoentry.cpp \
diff --git a/core/pim/todo/todo.pro b/core/pim/todo/todo.pro
index e28ea1c..5eb02a2 100644
--- a/core/pim/todo/todo.pro
+++ b/core/pim/todo/todo.pro
@@ -1,5 +1,5 @@
TEMPLATE = app
CONFIG = qt warn_on release
-DESTDIR = $(QPEDIR)/bin
+DESTDIR = $(OPIEDIR)/bin
HEADERS = mainwindow.h \
todotable.h \
@@ -13,6 +13,6 @@ INTERFACES = todoentry.ui
TARGET = todolist
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
diff --git a/core/settings/citytime/Makefile.in b/core/settings/citytime/Makefile.in
index b058021..4112a68 100644
--- a/core/settings/citytime/Makefile.in
+++ b/core/settings/citytime/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC)
####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
@@ -120,9 +120,9 @@ citytime.o: citytime.cpp \
citytime.h \
citytimebase.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/timestring.h \
- $(QPEDIR)/include/qpe/tzselect.h \
- $(QPEDIR)/include/qpe/qcopenvelope_qws.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/timestring.h \
+ $(OPIEDIR)/include/qpe/tzselect.h \
+ $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
zonemap.o: zonemap.cpp \
@@ -130,16 +130,16 @@ zonemap.o: zonemap.cpp \
zonemap.h \
stylusnormalizer.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/timestring.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/timestring.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h
main.o: main.cpp \
citytime.h \
citytimebase.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h
sun.o: sun.c \
sun.h \
- $(QPEDIR)/include/qpe/qmath.h
+ $(OPIEDIR)/include/qpe/qmath.h
stylusnormalizer.o: stylusnormalizer.cpp \
diff --git a/core/settings/citytime/citytime.pro b/core/settings/citytime/citytime.pro
index d988b48..3420499 100644
--- a/core/settings/citytime/citytime.pro
+++ b/core/settings/citytime/citytime.pro
@@ -2,11 +2,11 @@
CONFIG += qt warn_on release
TEMPLATE = app
-DESTDIR = $(QPEDIR)/bin
+DESTDIR = $(OPIEDIR)/bin
INTERFACES = citytimebase.ui
HEADERS = citytime.h zonemap.h sun.h stylusnormalizer.h
SOURCES = citytime.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp
TARGET = citytime
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
diff --git a/core/settings/light-and-power/Makefile.in b/core/settings/light-and-power/Makefile.in
index 8236ed0..5caa249 100644
--- a/core/settings/light-and-power/Makefile.in
+++ b/core/settings/light-and-power/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro
index 87bb111..35b51a7 100644
--- a/core/settings/light-and-power/light-and-power.pro
+++ b/core/settings/light-and-power/light-and-power.pro
@@ -5,6 +5,6 @@ HEADERS = settings.h
SOURCES = light.cpp main.cpp
INTERFACES = lightsettingsbase.ui
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += ../$(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += ../$(OPIEDIR)/include
LIBS += -lqpe
TARGET = light-and-power
diff --git a/core/settings/security/Makefile.in b/core/settings/security/Makefile.in
index 803edc5..f190e79 100644
--- a/core/settings/security/Makefile.in
+++ b/core/settings/security/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro
index 282127e..f22e7a6 100644
--- a/core/settings/security/security.pro
+++ b/core/settings/security/security.pro
@@ -5,6 +5,6 @@ HEADERS = security.h
SOURCES = security.cpp main.cpp
INTERFACES = securitybase.ui
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += ../$(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += ../$(OPIEDIR)/include
LIBS += -lqpe
TARGET = security
diff --git a/docs/qcop.doc b/docs/qcop.doc
index 6fe4c71..e62f91d 100644
--- a/docs/qcop.doc
+++ b/docs/qcop.doc
@@ -168,5 +168,5 @@ Such messages in the base Qtopia applications are:
<br>Send this message to have the Help Browser show a file.
The <i>file</i> may be an absolute filename or relative
- to the system HTML documentation directory ($QPEDIR/help/html).
+ to the system HTML documentation directory ($OPIEDIR/help/html).
</ul>
<dt><b>QPE/Application/datebook</b>
diff --git a/docs/start.doc b/docs/start.doc
index 9745d9a..01b6ab1 100644
--- a/docs/start.doc
+++ b/docs/start.doc
@@ -59,5 +59,5 @@ To compile the example program for running on the Linux desktop:
<p>
<pre>
- export QPEDIR=/opt/Qtopia
+ export OPIEDIR=/opt/Qtopia
export QTDIR=/opt/Qtopia
export PATH=$QTDIR/bin:$PATH
@@ -70,5 +70,5 @@ To compile the example program for running on the Linux desktop:
<pre>
cd somewhere
- cp -r $QPEDIR/example .
+ cp -r $OPIEDIR/example .
cd example
</pre>
@@ -90,7 +90,7 @@ To compile the example program for running on the Linux desktop:
<pre>
su # root privileges required to install
- cp example.desktop $QPEDIR/apps/Applications
- cp Example.png $QPEDIR/pics
- cp example $QPEDIR/bin
+ cp example.desktop $OPIEDIR/apps/Applications
+ cp Example.png $OPIEDIR/pics
+ cp example $OPIEDIR/bin
exit # no need to be root anymore
</pre>
@@ -136,5 +136,5 @@ on the desktop, the process is similar:
<p>
<pre>
- export QPEDIR=/opt/Qtopia/sharp
+ export OPIEDIR=/opt/Qtopia/sharp
export QTDIR=/opt/Qtopia/sharp
export PATH=$QTDIR/bin:/usr/local/arm/bin:$PATH
diff --git a/etc/init.d/qpe b/etc/init.d/qpe
index 12bb1df..8791e73 100755
--- a/etc/init.d/qpe
+++ b/etc/init.d/qpe
@@ -6,8 +6,8 @@ export HOME=/$LOGNAME
export QWS_DISPLAY=Transformed:Rot270:0
export QTDIR=/usr
-export QPEDIR=/opt/QtPalmtop
-if [ ! -x $QPEDIR/bin/qpe ] ; then exit 0 ; fi
+export OPIEDIR=/opt/QtPalmtop
+if [ ! -x $OPIEDIR/bin/qpe ] ; then exit 0 ; fi
-$QPEDIR/bin/qpe-reorgfiles
+$OPIEDIR/bin/qpe-reorgfiles
. /etc/profile
@@ -26,5 +26,5 @@ case $1 in
rm -f /etc/rc2.d/S99x # Can't have both running!
- $QPEDIR/bin/qpe 2>/dev/null >/dev/null &
+ $OPIEDIR/bin/qpe 2>/dev/null >/dev/null &
;;
diff --git a/example/example.pro b/example/example.pro
index 2d89311..d150b1c 100644
--- a/example/example.pro
+++ b/example/example.pro
@@ -4,6 +4,6 @@ CONFIG = qt warn_on release
HEADERS = example.h
SOURCES = main.cpp example.cpp
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
INTERFACES = examplebase.ui
diff --git a/freetype/freetype.pro b/freetype/freetype.pro
index 841f6d4..f63a087 100644
--- a/freetype/freetype.pro
+++ b/freetype/freetype.pro
@@ -6,7 +6,7 @@ qt2:HEADERS += qfontdata_p.h
TARGET = freetypefactory
DESTDIR = ../plugins/fontfactories
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
-#INCLUDEPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
+#INCLUDEPATH += $(OPIEDIR)/include
#DEPENDPATH += /usr/local/include/freetype2
LIBS += -lqpe -lfreetype
diff --git a/inputmethods/handwriting/Makefile.in b/inputmethods/handwriting/Makefile.in
index aabb5aa..cd2b47c 100644
--- a/inputmethods/handwriting/Makefile.in
+++ b/inputmethods/handwriting/Makefile.in
@@ -7,5 +7,5 @@ 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)
diff --git a/inputmethods/handwriting/handwriting.pro b/inputmethods/handwriting/handwriting.pro
index 999552b..9bccbb9 100644
--- a/inputmethods/handwriting/handwriting.pro
+++ b/inputmethods/handwriting/handwriting.pro
@@ -26,6 +26,6 @@ INTERFACES = qimpenprefbase.ui
TARGET = qhandwriting
DESTDIR = ../../plugins/inputmethods
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += ../$(QPEDIR)/include ../../taskbar
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar
LIBS += -lqpe
VERSION = 1.0.0
diff --git a/inputmethods/keyboard/Makefile.in b/inputmethods/keyboard/Makefile.in
index 3631807..16fdcb7 100644
--- a/inputmethods/keyboard/Makefile.in
+++ b/inputmethods/keyboard/Makefile.in
@@ -7,5 +7,5 @@ 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)
diff --git a/inputmethods/keyboard/keyboard.pro b/inputmethods/keyboard/keyboard.pro
index 87c838e..6e9df79 100644
--- a/inputmethods/keyboard/keyboard.pro
+++ b/inputmethods/keyboard/keyboard.pro
@@ -11,6 +11,6 @@ SOURCES = keyboard.cpp \
TARGET = qkeyboard
DESTDIR = ../../plugins/inputmethods
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += ../$(QPEDIR)/include ../../taskbar
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar
LIBS += -lqpe
VERSION = 1.0.0
diff --git a/inputmethods/pickboard/Makefile.in b/inputmethods/pickboard/Makefile.in
index d72e82d..44310a4 100644
--- a/inputmethods/pickboard/Makefile.in
+++ b/inputmethods/pickboard/Makefile.in
@@ -7,5 +7,5 @@ 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)
diff --git a/inputmethods/pickboard/pickboard.pro b/inputmethods/pickboard/pickboard.pro
index 50bc342..ad86370 100644
--- a/inputmethods/pickboard/pickboard.pro
+++ b/inputmethods/pickboard/pickboard.pro
@@ -5,6 +5,6 @@ SOURCES = pickboard.cpp pickboardcfg.cpp pickboardimpl.cpp pickboardpicks.cpp
TARGET = qpickboard
DESTDIR = ../../plugins/inputmethods
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += ../$(QPEDIR)/include ../../taskbar
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar
LIBS += -lqpe
VERSION = 1.0.0
diff --git a/inputmethods/unikeyboard/Makefile.in b/inputmethods/unikeyboard/Makefile.in
index ebbab50..f64d6c8 100644
--- a/inputmethods/unikeyboard/Makefile.in
+++ b/inputmethods/unikeyboard/Makefile.in
@@ -7,5 +7,5 @@ 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)
diff --git a/inputmethods/unikeyboard/unikeyboard.pro b/inputmethods/unikeyboard/unikeyboard.pro
index c0aad42..509db07 100644
--- a/inputmethods/unikeyboard/unikeyboard.pro
+++ b/inputmethods/unikeyboard/unikeyboard.pro
@@ -5,6 +5,6 @@ SOURCES = unikeyboard.cpp unikeyboardimpl.cpp
TARGET = qunikeyboard
DESTDIR = ../../plugins/inputmethods
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += ../$(QPEDIR)/include ../../taskbar
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar
LIBS += -lqpe
VERSION = 1.0.0
diff --git a/library/Makefile.in b/library/Makefile.in
index c89390f..b74b818 100644
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -7,5 +7,5 @@ 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 -Ibackend
+INCPATH = -I$(OPIEDIR)/include -Ibackend
LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
LIBS = $(SUBLIBS) -ldl -lcrypt -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
@@ -458,5 +458,6 @@ qpeapplication.o: qpeapplication.cpp \
power.h \
alarmserver.h \
- applnk.h
+ applnk.h \
+ qpemenubar.h
qpestyle.o: qpestyle.cpp \
@@ -534,5 +535,6 @@ fontdatabase.o: fontdatabase.cpp \
power.o: power.cpp \
- power.h
+ power.h \
+ custom.h
storage.o: storage.cpp
@@ -611,5 +613,6 @@ ir.o: ir.cpp \
backend/vcc_yacc.o: backend/vcc_yacc.cpp \
- backend/vobject_p.h
+ backend/vobject_p.h \
+ backend/qfiledirect_p.h
backend/vobject.o: backend/vobject.cpp \
@@ -680,18 +683,13 @@ lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui
$(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp
-passwordbase_p.o: passwordbase_p.cpp \
- passwordbase_p.h
+passwordbase_p.o: passwordbase_p.cpp
-proxiesbase_p.o: proxiesbase_p.cpp \
- proxiesbase_p.h
+proxiesbase_p.o: proxiesbase_p.cpp
-categoryeditbase_p.o: categoryeditbase_p.cpp \
- categoryeditbase_p.h
+categoryeditbase_p.o: categoryeditbase_p.cpp
-findwidgetbase_p.o: findwidgetbase_p.cpp \
- findwidgetbase_p.h
+findwidgetbase_p.o: findwidgetbase_p.cpp
-lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp \
- lnkpropertiesbase_p.h
+lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp
moc_menubutton.o: moc_menubutton.cpp \
diff --git a/library/global.cpp b/library/global.cpp
index e1bbf3e..e5fc2b3 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -135,5 +135,5 @@ static QDict<QDawg> *named_dawg = 0;
static QString qpeDir()
{
- QString dir = getenv("QPEDIR");
+ QString dir = getenv("OPIEDIR");
if ( dir.isEmpty() ) dir = "..";
return dir;
diff --git a/library/library.pro b/library/library.pro
index 06dfc8f..058d216 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -120,5 +120,5 @@ qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \
qprocess_unix.cpp
-INCLUDEPATH += $(QPEDIR)/include backend
+INCLUDEPATH += $(OPIEDIR)/include backend
LIBS += -ldl -lcrypt -lm
@@ -127,5 +127,5 @@ INTERFACES = passwordbase_p.ui proxiesbase_p.ui categoryeditbase_p.ui findwidget
TARGET = qpe
DESTDIR = $(QTDIR)/lib$(PROJMAK)
-# This is set by configure$(QPEDIR).
+# This is set by configure$(OPIEDIR).
VERSION = 1.5.0
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index f0a68cf..70ffec1 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -791,9 +791,9 @@ QPEApplication::~QPEApplication()
/*!
- Returns <tt>$QPEDIR/</tt>.
+ Returns <tt>$OPIEDIR/</tt>.
*/
QString QPEApplication::qpeDir()
{
- const char *base = getenv( "QPEDIR" );
+ const char *base = getenv( "OPIEDIR" );
if ( base )
return QString( base ) + "/";
diff --git a/mkipks b/mkipks
index 947b19e..45f2fb2 100755
--- a/mkipks
+++ b/mkipks
@@ -9,8 +9,8 @@ rm -f etc/rc2.d/S98qpe
ln -s ../init.d/qpe etc/rc2.d/S98qpe
-VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$QPEDIR/include/qpe/version.h)
-VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$QPEDIR/include/qpe/version.h)
-VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$QPEDIR/include/qpe/version.h)
-if grep -q 'QPE_VERSION .*snapshot' $QPEDIR/include/qpe/version.h
+VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
+VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
+VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h)
+if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h
then
VERSION_CVS="_$(date +%Y%m%d)"
@@ -48,7 +48,7 @@ do
mkdir -p $IMAGEDIR
;; -rpm)
- if [ "$QPEDIR" != "/opt/Qtopia" ]
+ if [ "$OPIEDIR" != "/opt/Qtopia" ]
then
- echo >&2 '$QPEDIR is not the standard /usr/Qtopia directory.'
+ echo >&2 '$OPIEDIR is not the standard /usr/Qtopia directory.'
sleep 1
#exit 1
@@ -71,9 +71,9 @@ done
if [ -z "$FILES" ]
then
- FILES=`find $QPEDIR -name "*.control" -print`
+ FILES=`find $OPIEDIR -name "*.control" -print`
fi
RDIR=$PWD
-cd $QPEDIR
+cd $OPIEDIR
for i in $FILES
@@ -141,5 +141,5 @@ do
case "$ff" in
/*) RPMFILES="$RPMFILES $ff"
- ;; *) RPMFILES="$RPMFILES $QPEDIR/$ff"
+ ;; *) RPMFILES="$RPMFILES $OPIEDIR/$ff"
esac
else
diff --git a/noncore/apps/dictionary/dictionary.pro b/noncore/apps/dictionary/dictionary.pro
index e829e68..fc89411 100644
--- a/noncore/apps/dictionary/dictionary.pro
+++ b/noncore/apps/dictionary/dictionary.pro
@@ -8,6 +8,6 @@ SOURCES = dicttool.cpp main.cpp
INTERFACES = dicttoolbase.ui
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
diff --git a/noncore/apps/tableviewer/tableviewer.pro b/noncore/apps/tableviewer/tableviewer.pro
index edd41c5..c9d068e 100644
--- a/noncore/apps/tableviewer/tableviewer.pro
+++ b/noncore/apps/tableviewer/tableviewer.pro
@@ -32,5 +32,5 @@ SOURCES = main.cpp \
INTERFACES = ui/tvkeyedit_gen.ui
TARGET = tableviewer
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
diff --git a/noncore/comm/keypebble/Makefile.in b/noncore/comm/keypebble/Makefile.in
index 1dbd5d2..18c43e8 100644
--- a/noncore/comm/keypebble/Makefile.in
+++ b/noncore/comm/keypebble/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -166,5 +166,5 @@ krfbcanvas.o: krfbcanvas.cpp \
krfboptions.h \
krfbbuffer.h \
- $(QPEDIR)/include/qpe/config.h
+ $(OPIEDIR)/include/qpe/config.h
krfbconnection.o: krfbconnection.cpp \
@@ -181,5 +181,5 @@ krfbdecoder.o: krfbdecoder.cpp \
krfbdecoder.h \
krfbbuffer.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h
krfblogin.o: krfblogin.cpp \
@@ -189,13 +189,13 @@ krfblogin.o: krfblogin.cpp \
krfboptions.o: krfboptions.cpp \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
krfboptions.h
kvnc.o: kvnc.cpp \
- $(QPEDIR)/include/qpe/qpemenubar.h \
- $(QPEDIR)/include/qpe/qpetoolbar.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/global.h \
+ $(OPIEDIR)/include/qpe/qpemenubar.h \
+ $(OPIEDIR)/include/qpe/qpetoolbar.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/global.h \
kvnc.h \
krfbcanvas.h \
@@ -216,5 +216,5 @@ kvncoptionsdlg.o: kvncoptionsdlg.cpp \
main.o: main.cpp \
- $(QPEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
kvnc.h
diff --git a/noncore/comm/keypebble/keypebble.pro b/noncore/comm/keypebble/keypebble.pro
index 6b11801..c0efc4f 100644
--- a/noncore/comm/keypebble/keypebble.pro
+++ b/noncore/comm/keypebble/keypebble.pro
@@ -33,6 +33,6 @@ INTERFACES = vncoptionsbase.ui
TARGET = keypebble
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
diff --git a/noncore/games/chess/chess.pro b/noncore/games/chess/chess.pro
index f6650a0..9053809 100644
--- a/noncore/games/chess/chess.pro
+++ b/noncore/games/chess/chess.pro
@@ -3,10 +3,10 @@ HEADERS += chess.h
DESTDIR = ../bin
TARGET = chess
-DEPENDPATH += $(QPEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
INTERFACES = mainwindow.ui
IMAGES = images/new.png images/repeat.png images/txt.png images/back.png
TEMPLATE =app
CONFIG += qt warn_on release
-INCLUDEPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
LIBS += -lqpe
DBFILE = chess.db
diff --git a/noncore/games/fifteen/Makefile.in b/noncore/games/fifteen/Makefile.in
index 23c7334..1cae722 100644
--- a/noncore/games/fifteen/Makefile.in
+++ b/noncore/games/fifteen/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -101,12 +101,12 @@ REQUIRES=
fifteen.o: fifteen.cpp \
fifteen.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/qpetoolbar.h \
- $(QPEDIR)/include/qpe/qpemenubar.h
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/qpetoolbar.h \
+ $(OPIEDIR)/include/qpe/qpemenubar.h
main.o: main.cpp \
fifteen.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h
moc_fifteen.o: moc_fifteen.cpp \
diff --git a/noncore/games/fifteen/fifteen.pro b/noncore/games/fifteen/fifteen.pro
index 167f4f8..92072ab 100644
--- a/noncore/games/fifteen/fifteen.pro
+++ b/noncore/games/fifteen/fifteen.pro
@@ -5,6 +5,6 @@ HEADERS = fifteen.h
SOURCES = fifteen.cpp \
main.cpp
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
TARGET = fifteen
diff --git a/noncore/games/go/Makefile.in b/noncore/games/go/Makefile.in
index 27304f1..985eff0 100644
--- a/noncore/games/go/Makefile.in
+++ b/noncore/games/go/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -135,8 +135,8 @@ gowidget.o: gowidget.cpp \
go.h \
goplayutils.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/qpetoolbar.h \
- $(QPEDIR)/include/qpe/qpemenubar.h
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/qpetoolbar.h \
+ $(OPIEDIR)/include/qpe/qpemenubar.h
main.o: main.cpp \
@@ -145,5 +145,5 @@ main.o: main.cpp \
go.h \
goplayutils.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h
moc_gowidget.o: moc_gowidget.cpp \
diff --git a/noncore/games/go/go.pro b/noncore/games/go/go.pro
index deb90c5..b39b5b4 100644
--- a/noncore/games/go/go.pro
+++ b/noncore/games/go/go.pro
@@ -12,6 +12,6 @@ SOURCES = amigo.c \
gowidget.cpp \
main.cpp
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
TARGET = go
diff --git a/noncore/games/mindbreaker/Makefile.in b/noncore/games/mindbreaker/Makefile.in
index 88f6fb1..ff29d19 100644
--- a/noncore/games/mindbreaker/Makefile.in
+++ b/noncore/games/mindbreaker/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC)
####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
@@ -101,11 +101,11 @@ REQUIRES=
main.o: main.cpp \
mindbreaker.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h
mindbreaker.o: mindbreaker.cpp \
mindbreaker.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/qpetoolbar.h
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/qpetoolbar.h
moc_mindbreaker.o: moc_mindbreaker.cpp \
diff --git a/noncore/games/mindbreaker/mindbreaker.pro b/noncore/games/mindbreaker/mindbreaker.pro
index 12944d1..fa7dc0c 100644
--- a/noncore/games/mindbreaker/mindbreaker.pro
+++ b/noncore/games/mindbreaker/mindbreaker.pro
@@ -1,11 +1,11 @@
TEMPLATE = app
CONFIG += qt warn_on release
-DESTDIR = $(QPEDIR)/bin
+DESTDIR = $(OPIEDIR)/bin
HEADERS = mindbreaker.h
SOURCES = main.cpp \
mindbreaker.cpp
TARGET = mindbreaker
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
diff --git a/noncore/games/minesweep/Makefile.in b/noncore/games/minesweep/Makefile.in
index 9ed6234..67ea94c 100644
--- a/noncore/games/minesweep/Makefile.in
+++ b/noncore/games/minesweep/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC)
####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
@@ -106,17 +106,17 @@ REQUIRES=
main.o: main.cpp \
minesweep.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h
minefield.o: minefield.cpp \
minefield.h \
- $(QPEDIR)/include/qpe/config.h
+ $(OPIEDIR)/include/qpe/config.h
minesweep.o: minesweep.cpp \
minesweep.h \
minefield.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/qpetoolbar.h \
- $(QPEDIR)/include/qpe/qpemenubar.h
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/qpetoolbar.h \
+ $(OPIEDIR)/include/qpe/qpemenubar.h
moc_minefield.o: moc_minefield.cpp \
diff --git a/noncore/games/minesweep/minesweep.pro b/noncore/games/minesweep/minesweep.pro
index 87484bc..85f626a 100644
--- a/noncore/games/minesweep/minesweep.pro
+++ b/noncore/games/minesweep/minesweep.pro
@@ -1,5 +1,5 @@
TEMPLATE = app
CONFIG = qt warn_on release
-DESTDIR = $(QPEDIR)/bin
+DESTDIR = $(OPIEDIR)/bin
HEADERS = minefield.h \
minesweep.h
@@ -7,6 +7,6 @@ SOURCES = main.cpp \
minefield.cpp \
minesweep.cpp
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
INTERFACES =
diff --git a/noncore/games/parashoot/Makefile.in b/noncore/games/parashoot/Makefile.in
index ff7397e..254bcd2 100644
--- a/noncore/games/parashoot/Makefile.in
+++ b/noncore/games/parashoot/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC)
####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
@@ -122,8 +122,8 @@ main.o: main.cpp \
cannon.h \
bullet.h \
- $(QPEDIR)/include/qpe/sound.h \
+ $(OPIEDIR)/include/qpe/sound.h \
base.h \
helicopter.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h
interface.o: interface.cpp \
@@ -131,47 +131,47 @@ interface.o: interface.cpp \
cannon.h \
bullet.h \
- $(QPEDIR)/include/qpe/sound.h \
+ $(OPIEDIR)/include/qpe/sound.h \
base.h \
helicopter.h \
man.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/qpetoolbar.h
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/qpetoolbar.h
man.o: man.cpp \
codes.h \
man.h \
- $(QPEDIR)/include/qpe/sound.h \
+ $(OPIEDIR)/include/qpe/sound.h \
base.h \
- $(QPEDIR)/include/qpe/resource.h
+ $(OPIEDIR)/include/qpe/resource.h
cannon.o: cannon.cpp \
- $(QPEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/resource.h \
codes.h \
cannon.h \
bullet.h \
- $(QPEDIR)/include/qpe/sound.h
+ $(OPIEDIR)/include/qpe/sound.h
base.o: base.cpp \
codes.h \
base.h \
- $(QPEDIR)/include/qpe/sound.h \
+ $(OPIEDIR)/include/qpe/sound.h \
man.h \
- $(QPEDIR)/include/qpe/resource.h
+ $(OPIEDIR)/include/qpe/resource.h
bullet.o: bullet.cpp \
codes.h \
bullet.h \
- $(QPEDIR)/include/qpe/sound.h \
+ $(OPIEDIR)/include/qpe/sound.h \
man.h \
helicopter.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/qmath.h
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/qmath.h
helicopter.o: helicopter.cpp \
helicopter.h \
- $(QPEDIR)/include/qpe/sound.h \
+ $(OPIEDIR)/include/qpe/sound.h \
man.h \
codes.h \
- $(QPEDIR)/include/qpe/resource.h
+ $(OPIEDIR)/include/qpe/resource.h
moc_interface.o: moc_interface.cpp \
@@ -179,5 +179,5 @@ moc_interface.o: moc_interface.cpp \
cannon.h \
bullet.h \
- $(QPEDIR)/include/qpe/sound.h \
+ $(OPIEDIR)/include/qpe/sound.h \
base.h \
helicopter.h
@@ -186,9 +186,9 @@ moc_cannon.o: moc_cannon.cpp \
cannon.h \
bullet.h \
- $(QPEDIR)/include/qpe/sound.h
+ $(OPIEDIR)/include/qpe/sound.h
moc_bullet.o: moc_bullet.cpp \
bullet.h \
- $(QPEDIR)/include/qpe/sound.h
+ $(OPIEDIR)/include/qpe/sound.h
moc_interface.cpp: interface.h
diff --git a/noncore/games/parashoot/parashoot.pro b/noncore/games/parashoot/parashoot.pro
index 631560b..a7a01b2 100644
--- a/noncore/games/parashoot/parashoot.pro
+++ b/noncore/games/parashoot/parashoot.pro
@@ -1,10 +1,10 @@
TEMPLATE = app
CONFIG += qt warn_on release
-DESTDIR = $(QPEDIR)/bin
+DESTDIR = $(OPIEDIR)/bin
HEADERS = interface.h man.h cannon.h base.h bullet.h helicopter.h
SOURCES = main.cpp interface.cpp man.cpp cannon.cpp base.cpp bullet.cpp helicopter.cpp
TARGET = parashoot
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
diff --git a/noncore/games/qasteroids/Makefile.in b/noncore/games/qasteroids/Makefile.in
index 7312743..0dbd9bc 100644
--- a/noncore/games/qasteroids/Makefile.in
+++ b/noncore/games/qasteroids/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC)
####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
@@ -118,11 +118,11 @@ toplevel.o: toplevel.cpp \
sprites.h \
ledmeter.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/resource.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/resource.h
view.o: view.cpp \
view.h \
sprites.h \
- $(QPEDIR)/include/qpe/resource.h
+ $(OPIEDIR)/include/qpe/resource.h
main.o: main.cpp \
@@ -130,5 +130,5 @@ main.o: main.cpp \
view.h \
sprites.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h
moc_ledmeter.o: moc_ledmeter.cpp \
diff --git a/noncore/games/qasteroids/qasteroids.pro b/noncore/games/qasteroids/qasteroids.pro
index 14a0901..2f5b2e4 100644
--- a/noncore/games/qasteroids/qasteroids.pro
+++ b/noncore/games/qasteroids/qasteroids.pro
@@ -1,10 +1,10 @@
TEMPLATE = app
CONFIG += qt warn_on release
-DESTDIR = $(QPEDIR)/bin
+DESTDIR = $(OPIEDIR)/bin
HEADERS = ledmeter.h sprites.h toplevel.h view.h
SOURCES = ledmeter.cpp toplevel.cpp view.cpp main.cpp
TARGET = qasteroids
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
diff --git a/noncore/games/snake/Makefile.in b/noncore/games/snake/Makefile.in
index 8179b6f..0801db3 100644
--- a/noncore/games/snake/Makefile.in
+++ b/noncore/games/snake/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC)
####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
@@ -115,15 +115,15 @@ snake.o: snake.cpp \
target.h \
codes.h \
- $(QPEDIR)/include/qpe/resource.h
+ $(OPIEDIR)/include/qpe/resource.h
target.o: target.cpp \
target.h \
codes.h \
- $(QPEDIR)/include/qpe/resource.h
+ $(OPIEDIR)/include/qpe/resource.h
obstacle.o: obstacle.cpp \
obstacle.h \
codes.h \
- $(QPEDIR)/include/qpe/resource.h
+ $(OPIEDIR)/include/qpe/resource.h
interface.o: interface.cpp \
@@ -132,6 +132,6 @@ interface.o: interface.cpp \
target.h \
obstacle.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/qpetoolbar.h
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/qpetoolbar.h
main.o: main.cpp \
@@ -140,5 +140,5 @@ main.o: main.cpp \
target.h \
obstacle.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h
moc_snake.o: moc_snake.cpp \
diff --git a/noncore/games/snake/snake.pro b/noncore/games/snake/snake.pro
index 6dacdbd..38b4023 100644
--- a/noncore/games/snake/snake.pro
+++ b/noncore/games/snake/snake.pro
@@ -1,10 +1,10 @@
TEMPLATE = app
CONFIG += qt warn_on release
-DESTDIR = $(QPEDIR)/bin
+DESTDIR = $(OPIEDIR)/bin
HEADERS = snake.h target.h obstacle.h interface.h codes.h
SOURCES = snake.cpp target.cpp obstacle.cpp interface.cpp main.cpp
TARGET = snake
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
diff --git a/noncore/games/solitaire/Makefile.in b/noncore/games/solitaire/Makefile.in
index 3c50345..a0a64fb 100644
--- a/noncore/games/solitaire/Makefile.in
+++ b/noncore/games/solitaire/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC)
####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
@@ -136,5 +136,5 @@ canvascard.o: canvascard.cpp \
cardgamelayout.h \
canvascard.h \
- $(QPEDIR)/include/qpe/resource.h
+ $(OPIEDIR)/include/qpe/resource.h
canvasshapes.o: canvasshapes.cpp \
@@ -155,9 +155,9 @@ cardpile.o: cardpile.cpp \
cardpile.h \
card.h \
- $(QPEDIR)/include/qpe/config.h
+ $(OPIEDIR)/include/qpe/config.h
card.o: card.cpp \
card.h \
- $(QPEDIR)/include/qpe/config.h
+ $(OPIEDIR)/include/qpe/config.h
carddeck.o: carddeck.cpp \
@@ -174,7 +174,7 @@ canvascardgame.o: canvascardgame.cpp \
canvascard.h \
canvascardgame.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/qpemenubar.h
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/qpemenubar.h
freecellcardgame.o: freecellcardgame.cpp \
@@ -189,7 +189,7 @@ freecellcardgame.o: freecellcardgame.cpp \
canvasshapes.h \
canvascard.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/qpemenubar.h
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/qpemenubar.h
patiencecardgame.o: patiencecardgame.cpp \
@@ -203,7 +203,7 @@ patiencecardgame.o: patiencecardgame.cpp \
canvasshapes.h \
canvascard.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/qpemenubar.h
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/qpemenubar.h
canvascardwindow.o: canvascardwindow.cpp \
@@ -218,12 +218,12 @@ canvascardwindow.o: canvascardwindow.cpp \
canvasshapes.h \
canvascard.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/qpemenubar.h \
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/qpemenubar.h \
freecellcardgame.h
main.o: main.cpp \
canvascardwindow.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h
moc_canvascardwindow.o: moc_canvascardwindow.cpp \
diff --git a/noncore/games/solitaire/solitaire.pro b/noncore/games/solitaire/solitaire.pro
index 8617cab..1c90c94 100755
--- a/noncore/games/solitaire/solitaire.pro
+++ b/noncore/games/solitaire/solitaire.pro
@@ -2,5 +2,5 @@ TEMPLATE = app
CONFIG += qt warn_on release
-DESTDIR = $(QPEDIR)/bin
+DESTDIR = $(OPIEDIR)/bin
HEADERS = canvascard.h canvasshapes.h cardgame.h cardgamelayout.h cardpile.h card.h carddeck.h canvascardgame.h freecellcardgame.h patiencecardgame.h canvascardwindow.h
@@ -10,6 +10,6 @@ SOURCES = canvascard.cpp canvasshapes.cpp cardgame.cpp cardgamelayout.cpp cardp
TARGET = patience
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
diff --git a/noncore/games/tetrix/Makefile.in b/noncore/games/tetrix/Makefile.in
index 3a74fdc..59e172c 100644
--- a/noncore/games/tetrix/Makefile.in
+++ b/noncore/games/tetrix/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -116,5 +116,5 @@ main.o: main.cpp \
gtetrix.h \
tpiece.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h
gtetrix.o: gtetrix.cpp \
@@ -127,5 +127,5 @@ qtetrix.o: qtetrix.cpp \
gtetrix.h \
tpiece.h \
- $(QPEDIR)/include/qpe/resource.h
+ $(OPIEDIR)/include/qpe/resource.h
qtetrixb.o: qtetrixb.cpp \
diff --git a/noncore/games/tetrix/tetrix.pro b/noncore/games/tetrix/tetrix.pro
index 1160585..533fab0 100644
--- a/noncore/games/tetrix/tetrix.pro
+++ b/noncore/games/tetrix/tetrix.pro
@@ -12,6 +12,6 @@ SOURCES = main.cpp \
qtetrixb.cpp \
tpiece.cpp
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
INTERFACES =
diff --git a/noncore/games/wordgame/Makefile.in b/noncore/games/wordgame/Makefile.in
index 5627414..2e0a47c 100644
--- a/noncore/games/wordgame/Makefile.in
+++ b/noncore/games/wordgame/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC)
####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
@@ -112,7 +112,7 @@ main.o: main.cpp \
newgamebase.h \
rulesbase.h \
- $(QPEDIR)/include/qpe/qdawg.h \
- $(QPEDIR)/include/qpe/applnk.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/qdawg.h \
+ $(OPIEDIR)/include/qpe/applnk.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h
wordgame.o: wordgame.cpp \
@@ -120,11 +120,11 @@ wordgame.o: wordgame.cpp \
newgamebase.h \
rulesbase.h \
- $(QPEDIR)/include/qpe/qdawg.h \
- $(QPEDIR)/include/qpe/applnk.h \
- $(QPEDIR)/include/qpe/global.h \
- $(QPEDIR)/include/qpe/filemanager.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/qpetoolbar.h
+ $(OPIEDIR)/include/qpe/qdawg.h \
+ $(OPIEDIR)/include/qpe/applnk.h \
+ $(OPIEDIR)/include/qpe/global.h \
+ $(OPIEDIR)/include/qpe/filemanager.h \
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/qpetoolbar.h
newgamebase.h: newgamebase.ui
@@ -148,6 +148,6 @@ moc_wordgame.o: moc_wordgame.cpp \
newgamebase.h \
rulesbase.h \
- $(QPEDIR)/include/qpe/qdawg.h \
- $(QPEDIR)/include/qpe/applnk.h
+ $(OPIEDIR)/include/qpe/qdawg.h \
+ $(OPIEDIR)/include/qpe/applnk.h
moc_newgamebase.o: moc_newgamebase.cpp \
diff --git a/noncore/games/wordgame/wordgame.pro b/noncore/games/wordgame/wordgame.pro
index 7feacf9..64f4832 100644
--- a/noncore/games/wordgame/wordgame.pro
+++ b/noncore/games/wordgame/wordgame.pro
@@ -1,5 +1,5 @@
TEMPLATE = app
CONFIG = qt warn_on release
-DESTDIR = $(QPEDIR)/bin
+DESTDIR = $(OPIEDIR)/bin
HEADERS = wordgame.h
SOURCES = main.cpp \
@@ -7,6 +7,6 @@ SOURCES = main.cpp \
INTERFACES = newgamebase.ui rulesbase.ui
TARGET = wordgame
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
diff --git a/noncore/multimedia/showimg/Makefile.in b/noncore/multimedia/showimg/Makefile.in
index 9255b2d..7c58da1 100644
--- a/noncore/multimedia/showimg/Makefile.in
+++ b/noncore/multimedia/showimg/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC)
####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
@@ -101,13 +101,13 @@ REQUIRES=showimg
main.o: main.cpp \
showimg.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h
showimg.o: showimg.cpp \
showimg.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/fileselector.h \
- $(QPEDIR)/include/qpe/applnk.h \
- $(QPEDIR)/include/qpe/qpemenubar.h \
- $(QPEDIR)/include/qpe/qpetoolbar.h
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/fileselector.h \
+ $(OPIEDIR)/include/qpe/applnk.h \
+ $(OPIEDIR)/include/qpe/qpemenubar.h \
+ $(OPIEDIR)/include/qpe/qpetoolbar.h
moc_showimg.o: moc_showimg.cpp \
diff --git a/noncore/multimedia/showimg/showimg.pro b/noncore/multimedia/showimg/showimg.pro
index a372f62..29da458 100644
--- a/noncore/multimedia/showimg/showimg.pro
+++ b/noncore/multimedia/showimg/showimg.pro
@@ -2,5 +2,5 @@ TEMPLATE = app
CONFIG += qt warn_on release
-DESTDIR = $(QPEDIR)/bin
+DESTDIR = $(OPIEDIR)/bin
HEADERS = showimg.h
@@ -11,6 +11,6 @@ SOURCES = main.cpp \
TARGET = showimg
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
diff --git a/noncore/settings/language/Makefile.in b/noncore/settings/language/Makefile.in
index 2babf6e..d1a602d 100644
--- a/noncore/settings/language/Makefile.in
+++ b/noncore/settings/language/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
diff --git a/noncore/settings/language/language.pro b/noncore/settings/language/language.pro
index d1f1bf0..c01ffc8 100644
--- a/noncore/settings/language/language.pro
+++ b/noncore/settings/language/language.pro
@@ -5,6 +5,6 @@ HEADERS = settings.h
SOURCES = language.cpp main.cpp
INTERFACES = languagesettingsbase.ui
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += ../$(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += ../$(OPIEDIR)/include
LIBS += -lqpe
TARGET = language
diff --git a/noncore/settings/sound/Makefile.in b/noncore/settings/sound/Makefile.in
index 1772e12..b42f2e9 100644
--- a/noncore/settings/sound/Makefile.in
+++ b/noncore/settings/sound/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro
index 9028a44..44eff44 100644
--- a/noncore/settings/sound/sound.pro
+++ b/noncore/settings/sound/sound.pro
@@ -5,6 +5,6 @@ HEADERS = soundsettings.h
SOURCES = soundsettings.cpp main.cpp
INTERFACES = soundsettingsbase.ui
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += ../$(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += ../$(OPIEDIR)/include
LIBS += -lqpe
TARGET = sound
diff --git a/noncore/settings/sysinfo/Makefile.in b/noncore/settings/sysinfo/Makefile.in
index 1149304..fb9d15e 100644
--- a/noncore/settings/sysinfo/Makefile.in
+++ b/noncore/settings/sysinfo/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC)
####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
@@ -126,5 +126,5 @@ REQUIRES=
main.o: main.cpp \
sysinfo.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h
memory.o: memory.cpp \
@@ -143,6 +143,6 @@ storage.o: storage.cpp \
versioninfo.o: versioninfo.cpp \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/version.h \
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/version.h \
versioninfo.h
@@ -153,5 +153,5 @@ sysinfo.o: sysinfo.cpp \
versioninfo.h \
sysinfo.h \
- $(QPEDIR)/include/qpe/resource.h
+ $(OPIEDIR)/include/qpe/resource.h
moc_memory.o: moc_memory.cpp \
diff --git a/noncore/settings/sysinfo/sysinfo.pro b/noncore/settings/sysinfo/sysinfo.pro
index 0c7d907..3393a12 100644
--- a/noncore/settings/sysinfo/sysinfo.pro
+++ b/noncore/settings/sysinfo/sysinfo.pro
@@ -1,5 +1,5 @@
TEMPLATE = app
CONFIG = qt warn_on release
-DESTDIR = $(QPEDIR)/bin
+DESTDIR = $(OPIEDIR)/bin
HEADERS = memory.h \
graph.h \
@@ -17,6 +17,6 @@ SOURCES = main.cpp \
INTERFACES =
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
diff --git a/noncore/tools/calc2/binary/binary.pro b/noncore/tools/calc2/binary/binary.pro
index 01ba6a4..2e9ed78 100644
--- a/noncore/tools/calc2/binary/binary.pro
+++ b/noncore/tools/calc2/binary/binary.pro
@@ -10,7 +10,7 @@ SOURCES = binaryimpl.cpp \
binaryfactory.cpp
-INCLUDEPATH += $(QPEDIR)/include \
- $(QPEDIR)/calc2
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include \
+ $(OPIEDIR)/calc2
+DEPENDPATH += $(OPIEDIR)/include
-DESTDIR = $(QPEDIR)/plugins/calculator
+DESTDIR = $(OPIEDIR)/plugins/calculator
diff --git a/noncore/tools/calc2/calc.pro b/noncore/tools/calc2/calc.pro
index c10232a..00e13b7 100644
--- a/noncore/tools/calc2/calc.pro
+++ b/noncore/tools/calc2/calc.pro
@@ -6,6 +6,6 @@ HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h
SOURCES += calc.cpp main.cpp engine.cpp
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -Wl,-export-dynamic
diff --git a/noncore/tools/calc2/simple/simple.pro b/noncore/tools/calc2/simple/simple.pro
index 92378a6..9e5d4e0 100644
--- a/noncore/tools/calc2/simple/simple.pro
+++ b/noncore/tools/calc2/simple/simple.pro
@@ -8,7 +8,7 @@ HEADERS = simpleimpl.h simplefactory.h stdinstructions.h
SOURCES = simpleimpl.cpp simplefactory.cpp
-INCLUDEPATH += $(QPEDIR)/include \
- $(QPEDIR)/calc2
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include \
+ $(OPIEDIR)/calc2
+DEPENDPATH += $(OPIEDIR)/include
-DESTDIR = $(QPEDIR)/plugins/calculator
+DESTDIR = $(OPIEDIR)/plugins/calculator
diff --git a/noncore/tools/calculator/Makefile.in b/noncore/tools/calculator/Makefile.in
index d62b046..ba78df5 100644
--- a/noncore/tools/calculator/Makefile.in
+++ b/noncore/tools/calculator/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC)
####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
@@ -105,15 +105,15 @@ calculatorimpl.o: calculatorimpl.cpp \
calculatorimpl.h \
calculator.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/qmath.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/qmath.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h
main.o: main.cpp \
calculatorimpl.h \
calculator.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h
calculator.h: calculator.ui
- $(UIC) calculator.ui -o calculator.h
+ $(UIC) calculator.ui -o $(INTERFACE_DECL_PATH)/calculator.h
calculator.cpp: calculator.ui
diff --git a/noncore/tools/calculator/calculator.pro b/noncore/tools/calculator/calculator.pro
index 1281fd5..9554d2a 100644
--- a/noncore/tools/calculator/calculator.pro
+++ b/noncore/tools/calculator/calculator.pro
@@ -1,3 +1,3 @@
-DESTDIR = $(QPEDIR)/bin
+DESTDIR = $(OPIEDIR)/bin
TEMPLATE = app
CONFIG = qt warn_on release
@@ -5,6 +5,6 @@ HEADERS = calculatorimpl.h
SOURCES = calculatorimpl.cpp \
main.cpp
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
INTERFACES = calculator.ui
diff --git a/noncore/tools/clock/Makefile.in b/noncore/tools/clock/Makefile.in
index adda9e6..efa7808 100644
--- a/noncore/tools/clock/Makefile.in
+++ b/noncore/tools/clock/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC)
####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
@@ -101,12 +101,12 @@ REQUIRES=
clock.o: clock.cpp \
clock.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/timestring.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/timestring.h
main.o: main.cpp \
clock.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h
moc_clock.o: moc_clock.cpp \
diff --git a/noncore/tools/clock/clock.pro b/noncore/tools/clock/clock.pro
index 97f4d2c..ec27adc 100644
--- a/noncore/tools/clock/clock.pro
+++ b/noncore/tools/clock/clock.pro
@@ -1,10 +1,10 @@
TEMPLATE = app
CONFIG = qt warn_on release
-DESTDIR = $(QPEDIR)/bin
+DESTDIR = $(OPIEDIR)/bin
HEADERS = clock.h
SOURCES = clock.cpp \
main.cpp
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
INTERFACES =
diff --git a/noncore/unsupported/filebrowser/Makefile.in b/noncore/unsupported/filebrowser/Makefile.in
index c7238ea..c00d0f5 100644
--- a/noncore/unsupported/filebrowser/Makefile.in
+++ b/noncore/unsupported/filebrowser/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC)
####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
@@ -107,10 +107,10 @@ filebrowser.o: filebrowser.cpp \
inlineedit.h \
filebrowser.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/global.h \
- $(QPEDIR)/include/qpe/mimetype.h \
- $(QPEDIR)/include/qpe/applnk.h \
- $(QPEDIR)/include/qpe/qpetoolbar.h \
- $(QPEDIR)/include/qpe/qpemenubar.h
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/global.h \
+ $(OPIEDIR)/include/qpe/mimetype.h \
+ $(OPIEDIR)/include/qpe/applnk.h \
+ $(OPIEDIR)/include/qpe/qpetoolbar.h \
+ $(OPIEDIR)/include/qpe/qpemenubar.h
inlineedit.o: inlineedit.cpp \
@@ -119,6 +119,6 @@ inlineedit.o: inlineedit.cpp \
main.o: main.cpp \
filebrowser.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/mimetype.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/mimetype.h
moc_inlineedit.o: moc_inlineedit.cpp \
diff --git a/noncore/unsupported/filebrowser/filebrowser.pro b/noncore/unsupported/filebrowser/filebrowser.pro
index 34df79a..5d8f140 100644
--- a/noncore/unsupported/filebrowser/filebrowser.pro
+++ b/noncore/unsupported/filebrowser/filebrowser.pro
@@ -1,5 +1,5 @@
TEMPLATE = app
CONFIG = qt warn_on release
-DESTDIR = $(QPEDIR)/bin
+DESTDIR = $(OPIEDIR)/bin
HEADERS = inlineedit.h \
filebrowser.h
@@ -7,6 +7,6 @@ SOURCES = filebrowser.cpp \
inlineedit.cpp \
main.cpp
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
INTERFACES =
diff --git a/noncore/unsupported/oipkg/Makefile.in b/noncore/unsupported/oipkg/Makefile.in
index 8dd7edb..a7e22ef 100644
--- a/noncore/unsupported/oipkg/Makefile.in
+++ b/noncore/unsupported/oipkg/Makefile.in
@@ -7,5 +7,5 @@ CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS)
-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) $(SYSCONF_LIBS_QTAPP)
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC)
####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
@@ -126,15 +126,15 @@ packagemanager.o: packagemanager.cpp \
pkfind.h \
pksettings.h \
- $(QPEDIR)/include/qpe/process.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/stringutil.h \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
- $(QPEDIR)/include/qpe/applnk.h
+ $(OPIEDIR)/include/qpe/process.h \
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/stringutil.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
+ $(OPIEDIR)/include/qpe/applnk.h
main.o: main.cpp \
packagemanager.h \
packagemanagerbase.h \
- $(QPEDIR)/include/qpe/qpeapplication.h
+ $(OPIEDIR)/include/qpe/qpeapplication.h
packagemanagerbase.h: packagemanagerbase.ui
diff --git a/noncore/unsupported/oipkg/qipkg.pro b/noncore/unsupported/oipkg/qipkg.pro
index 90d8703..22a37ee 100644
--- a/noncore/unsupported/oipkg/qipkg.pro
+++ b/noncore/unsupported/oipkg/qipkg.pro
@@ -1,3 +1,3 @@
-DESTDIR = $(QPEDIR)/bin
+DESTDIR = $(OPIEDIR)/bin
TEMPLATE = app
CONFIG = qt warn_on release
@@ -5,6 +5,6 @@ HEADERS = packagemanager.h
SOURCES = packagemanager.cpp \
main.cpp
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
INTERFACES = packagemanagerbase.ui pkdesc.ui pkfind.ui pksettings.ui
diff --git a/scripts/q_functions b/scripts/q_functions
index cf2c2e1..0705cc2 100755
--- a/scripts/q_functions
+++ b/scripts/q_functions
@@ -140,14 +140,14 @@ function print_install_file
cat << END
#!/bin/sh
-if [ a\$QPEDIR = a ]
+if [ a\$OPIEDIR = a ]
then
-echo QPEDIR must be set
+echo OPIEDIR must be set
exit
fi
-[ -f \$QPEDIR/pics/$NEW_APP_ICON_FILE ] || cp $NEW_APP_ICON_FILE \$QPEDIR/pics/
-[ -f \$QPEDIR/apps/$NEW_APP_DESKTOP_FILE ] || cp $NEW_APP_DESKTOP_FILE \$QPEDIR/apps/
-mv \$QPEDIR/Makefile \$QPEDIR/Makefile.orig
+[ -f \$OPIEDIR/pics/$NEW_APP_ICON_FILE ] || cp $NEW_APP_ICON_FILE \$OPIEDIR/pics/
+[ -f \$OPIEDIR/apps/$NEW_APP_DESKTOP_FILE ] || cp $NEW_APP_DESKTOP_FILE \$OPIEDIR/apps/
+mv \$OPIEDIR/Makefile \$OPIEDIR/Makefile.orig
sed "s/APPS=/&$NEW_APP_NAME \\\\\\\\ \\\\
- /" \$QPEDIR/Makefile.orig >> \$QPEDIR/Makefile
+ /" \$OPIEDIR/Makefile.orig >> \$OPIEDIR/Makefile
echo You may wish to move the desktop file in to
echo an appropriate subdirectory of the menus.