summaryrefslogtreecommitdiff
Unidiff
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
@@ -11,17 +11,17 @@ DEBUG=
11QCONFIGARG= 11QCONFIGARG=
12 12
13touch .test.qpe. 13touch .test.qpe.
14if [ '!' -f ${QPEDIR}/.test.qpe. ]; 14if [ '!' -f ${OPIEDIR}/.test.qpe. ];
15then 15then
16 rm .test.qpe. 16 rm .test.qpe.
17 echo 17 echo
18 echo 18 echo
19 echo ' The environment variable $QPEDIR is not set correctly. It is currently' 19 echo ' The environment variable $OPIEDIR is not set correctly. It is currently'
20 echo ' set to "'$QPEDIR'", but it should be set to this directory,' 20 echo ' set to "'$OPIEDIR'", but it should be set to this directory,'
21 echo ' which is "'`pwd`'".' 21 echo ' which is "'`pwd`'".'
22 echo 22 echo
23 echo ' Please read the INSTALL file for instructions on how to set $QPEDIR' 23 echo ' Please read the INSTALL file for instructions on how to set $OPIEDIR'
24 echo ' correctly. If you have set $QPEDIR in your .profile or .login, you ' 24 echo ' correctly. If you have set $OPIEDIR in your .profile or .login, you '
25 echo ' will need to log out and log in again to make the setting effective.' 25 echo ' will need to log out and log in again to make the setting effective.'
26 echo 26 echo
27 echo 27 echo
@@ -154,7 +154,7 @@ for a in $TOMAKE ; do
154 TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \ 154 TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \
155 tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \ 155 tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \
156 -t $H/qt/tmake/propagate.t $f.pro | 156 -t $H/qt/tmake/propagate.t $f.pro |
157 sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$QPEDIR|\$(QPEDIR)|g" >Makefile.in; 157 sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in;
158 ) 158 )
159 echo -n "." 159 echo -n "."
160 appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'` 160 appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'`
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) 8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
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
@@ -4,8 +4,8 @@ HEADERS = battery.h batterystatus.h batteryappletimpl.h
4 SOURCES= battery.cpp batterystatus.cpp batteryappletimpl.cpp 4 SOURCES= battery.cpp batterystatus.cpp batteryappletimpl.cpp
5 TARGET = batteryapplet 5 TARGET = batteryapplet
6 DESTDIR = ../../plugins/applets 6 DESTDIR = ../../plugins/applets
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += ../$(QPEDIR)/include .. 8DEPENDPATH += ../$(OPIEDIR)/include ..
9LIBS += -lqpe 9LIBS += -lqpe
10 VERSION = 1.0.0 10 VERSION = 1.0.0
11 11
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
@@ -4,7 +4,7 @@ HEADERS = clipboard.h clipboardappletimpl.h
4 SOURCES= clipboard.cpp clipboardappletimpl.cpp 4 SOURCES= clipboard.cpp clipboardappletimpl.cpp
5 TARGET = clipboardapplet 5 TARGET = clipboardapplet
6 DESTDIR = ../../plugins/applets 6 DESTDIR = ../../plugins/applets
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += ../$(QPEDIR)/include 8DEPENDPATH += ../$(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 VERSION = 1.0.0 10 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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) 8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
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
@@ -4,8 +4,8 @@ HEADERS = clock.h clockappletimpl.h
4 SOURCES= clock.cpp clockappletimpl.cpp 4 SOURCES= clock.cpp clockappletimpl.cpp
5 TARGET = clockapplet 5 TARGET = clockapplet
6 DESTDIR = ../../plugins/applets 6 DESTDIR = ../../plugins/applets
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += ../$(QPEDIR)/include .. 8DEPENDPATH += ../$(OPIEDIR)/include ..
9LIBS += -lqpe 9LIBS += -lqpe
10 VERSION = 1.0.0 10 VERSION = 1.0.0
11 11
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) 8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
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
@@ -4,8 +4,8 @@ HEADERS = volume.h volumeappletimpl.h
4 SOURCES= volume.cpp volumeappletimpl.cpp 4 SOURCES= volume.cpp volumeappletimpl.cpp
5 TARGET = volumeapplet 5 TARGET = volumeapplet
6 DESTDIR = ../../plugins/applets 6 DESTDIR = ../../plugins/applets
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += ../$(QPEDIR)/include 8DEPENDPATH += ../$(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 VERSION = 1.0.0 10 VERSION = 1.0.0
11 11
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -14,7 +14,7 @@ UIC = $(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
@@ -183,13 +183,14 @@ session.o: session.cpp \
183 183
184keytrans.o: keytrans.cpp \ 184keytrans.o: keytrans.cpp \
185 keytrans.h \ 185 keytrans.h \
186 $(QPEDIR)/include/qpe/qpeapplication.h \ 186 $(OPIEDIR)/include/qpe/qpeapplication.h \
187 default.keytab.h 187 default.keytab.h
188 188
189konsole.o: konsole.cpp \ 189konsole.o: konsole.cpp \
190 $(QPEDIR)/include/qpe/resource.h \ 190 $(OPIEDIR)/include/qpe/resource.h \
191 $(QPEDIR)/include/qpe/qpetoolbar.h \ 191 $(OPIEDIR)/include/qpe/qpetoolbar.h \
192 $(QPEDIR)/include/qpe/qpemenubar.h \ 192 $(OPIEDIR)/include/qpe/qpemenubar.h \
193 $(OPIEDIR)/include/qpe/config.h \
193 konsole.h \ 194 konsole.h \
194 MyPty.h \ 195 MyPty.h \
195 TEWidget.h \ 196 TEWidget.h \
@@ -212,7 +213,7 @@ main.o: main.cpp \
212 TEmulation.h \ 213 TEmulation.h \
213 keytrans.h \ 214 keytrans.h \
214 session.h \ 215 session.h \
215 $(QPEDIR)/include/qpe/qpeapplication.h 216 $(OPIEDIR)/include/qpe/qpeapplication.h
216 217
217MyPty.o: MyPty.cpp \ 218MyPty.o: MyPty.cpp \
218 MyPty.h 219 MyPty.h
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
@@ -2,7 +2,7 @@ TEMPLATE = app
2 2
3 CONFIG += qt warn_on release 3 CONFIG += qt warn_on release
4 4
5 DESTDIR = $(QPEDIR)/bin 5 DESTDIR = $(OPIEDIR)/bin
6 6
7 HEADERS = TEWidget.h \ 7 HEADERS = TEWidget.h \
8 TEScreen.h \ 8 TEScreen.h \
@@ -28,9 +28,9 @@ SOURCES = TEScreen.cpp \
28 28
29 TARGET = embeddedkonsole 29 TARGET = embeddedkonsole
30 30
31INCLUDEPATH += $(QPEDIR)/include 31INCLUDEPATH += $(OPIEDIR)/include
32 32
33 DEPENDPATH+= $(QPEDIR)/include 33 DEPENDPATH+= $(OPIEDIR)/include
34 34
35LIBS += -lqpe 35LIBS += -lqpe
36 36
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -14,7 +14,7 @@ UIC = $(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
@@ -100,15 +100,15 @@ REQUIRES=
100 100
101helpbrowser.o: helpbrowser.cpp \ 101helpbrowser.o: helpbrowser.cpp \
102 helpbrowser.h \ 102 helpbrowser.h \
103 $(QPEDIR)/include/qpe/qpeapplication.h \ 103 $(OPIEDIR)/include/qpe/qpeapplication.h \
104 $(QPEDIR)/include/qpe/resource.h \ 104 $(OPIEDIR)/include/qpe/resource.h \
105 $(QPEDIR)/include/qpe/global.h \ 105 $(OPIEDIR)/include/qpe/global.h \
106 $(QPEDIR)/include/qpe/qpemenubar.h \ 106 $(OPIEDIR)/include/qpe/qpemenubar.h \
107 $(QPEDIR)/include/qpe/qpetoolbar.h 107 $(OPIEDIR)/include/qpe/qpetoolbar.h
108 108
109main.o: main.cpp \ 109main.o: main.cpp \
110 helpbrowser.h \ 110 helpbrowser.h \
111 $(QPEDIR)/include/qpe/qpeapplication.h 111 $(OPIEDIR)/include/qpe/qpeapplication.h
112 112
113moc_helpbrowser.o: moc_helpbrowser.cpp \ 113moc_helpbrowser.o: moc_helpbrowser.cpp \
114 helpbrowser.h 114 helpbrowser.h
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,11 +1,11 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = helpbrowser.h 4 HEADERS = helpbrowser.h
5 SOURCES = helpbrowser.cpp \ 5 SOURCES = helpbrowser.cpp \
6 main.cpp 6 main.cpp
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(QPEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 INTERFACES= 10 INTERFACES=
11 11
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -97,6 +97,6 @@ REQUIRES=
97####### Compile 97####### Compile
98 98
99main.o: main.cpp \ 99main.o: main.cpp \
100 $(QPEDIR)/include/qpe/qcopenvelope_qws.h 100 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
101 101
102 102
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
@@ -3,8 +3,8 @@ CONFIG = qt warn_on release
3 DESTDIR = ../bin 3 DESTDIR = ../bin
4 HEADERS = 4 HEADERS =
5 SOURCES = main.cpp 5 SOURCES = main.cpp
6INCLUDEPATH += $(QPEDIR)/include 6INCLUDEPATH += $(OPIEDIR)/include
7 DEPENDPATH+= $(QPEDIR)/include 7 DEPENDPATH+= $(OPIEDIR)/include
8LIBS += -lqpe 8LIBS += -lqpe
9 INTERFACES= 9 INTERFACES=
10 TARGET = qcop 10 TARGET = qcop
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -14,7 +14,7 @@ UIC = $(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
@@ -100,24 +100,24 @@ REQUIRES=
100 100
101main.o: main.cpp \ 101main.o: main.cpp \
102 textedit.h \ 102 textedit.h \
103 $(QPEDIR)/include/qpe/filemanager.h \ 103 $(OPIEDIR)/include/qpe/filemanager.h \
104 $(QPEDIR)/include/qpe/qpeapplication.h 104 $(OPIEDIR)/include/qpe/qpeapplication.h
105 105
106textedit.o: textedit.cpp \ 106textedit.o: textedit.cpp \
107 textedit.h \ 107 textedit.h \
108 $(QPEDIR)/include/qpe/filemanager.h \ 108 $(OPIEDIR)/include/qpe/filemanager.h \
109 $(QPEDIR)/include/qpe/global.h \ 109 $(OPIEDIR)/include/qpe/global.h \
110 $(QPEDIR)/include/qpe/fileselector.h \ 110 $(OPIEDIR)/include/qpe/fileselector.h \
111 $(QPEDIR)/include/qpe/applnk.h \ 111 $(OPIEDIR)/include/qpe/applnk.h \
112 $(QPEDIR)/include/qpe/resource.h \ 112 $(OPIEDIR)/include/qpe/resource.h \
113 $(QPEDIR)/include/qpe/config.h \ 113 $(OPIEDIR)/include/qpe/config.h \
114 $(QPEDIR)/include/qpe/qpeapplication.h \ 114 $(OPIEDIR)/include/qpe/qpeapplication.h \
115 $(QPEDIR)/include/qpe/qpemenubar.h \ 115 $(OPIEDIR)/include/qpe/qpemenubar.h \
116 $(QPEDIR)/include/qpe/qpetoolbar.h 116 $(OPIEDIR)/include/qpe/qpetoolbar.h
117 117
118moc_textedit.o: moc_textedit.cpp \ 118moc_textedit.o: moc_textedit.cpp \
119 textedit.h \ 119 textedit.h \
120 $(QPEDIR)/include/qpe/filemanager.h 120 $(OPIEDIR)/include/qpe/filemanager.h
121 121
122moc_textedit.cpp: textedit.h 122moc_textedit.cpp: textedit.h
123 $(MOC) textedit.h -o moc_textedit.cpp 123 $(MOC) textedit.h -o moc_textedit.cpp
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
@@ -1,14 +1,14 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 3
4 DESTDIR = $(QPEDIR)/bin 4 DESTDIR = $(OPIEDIR)/bin
5 5
6 HEADERS= textedit.h 6 HEADERS= textedit.h
7 7
8 SOURCES= main.cpp textedit.cpp 8 SOURCES= main.cpp textedit.cpp
9 9
10INCLUDEPATH += $(QPEDIR)/include 10INCLUDEPATH += $(OPIEDIR)/include
11 DEPENDPATH+= $(QPEDIR)/include 11 DEPENDPATH+= $(OPIEDIR)/include
12LIBS += -lqpe 12LIBS += -lqpe
13 13
14 TARGET = textedit 14 TARGET = textedit
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include -I$(QPEDIR)/calibrate -I$(QPEDIR)/rsync 9 INCPATH =-I$(OPIEDIR)/include -I$(OPIEDIR)/calibrate -I$(OPIEDIR)/rsync
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe -lcrypt $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe -lcrypt $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -14,7 +14,7 @@ UIC = $(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
@@ -43,24 +43,24 @@ HEADERS = background.h \
43 qcopbridge.h \ 43 qcopbridge.h \
44 packageslave.h \ 44 packageslave.h \
45 irserver.h \ 45 irserver.h \
46 $(QPEDIR)/rsync/buf.h \ 46 $(OPIEDIR)/rsync/buf.h \
47 $(QPEDIR)/rsync/checksum.h \ 47 $(OPIEDIR)/rsync/checksum.h \
48 $(QPEDIR)/rsync/command.h \ 48 $(OPIEDIR)/rsync/command.h \
49 $(QPEDIR)/rsync/emit.h \ 49 $(OPIEDIR)/rsync/emit.h \
50 $(QPEDIR)/rsync/job.h \ 50 $(OPIEDIR)/rsync/job.h \
51 $(QPEDIR)/rsync/netint.h \ 51 $(OPIEDIR)/rsync/netint.h \
52 $(QPEDIR)/rsync/protocol.h \ 52 $(OPIEDIR)/rsync/protocol.h \
53 $(QPEDIR)/rsync/prototab.h \ 53 $(OPIEDIR)/rsync/prototab.h \
54 $(QPEDIR)/rsync/rsync.h \ 54 $(OPIEDIR)/rsync/rsync.h \
55 $(QPEDIR)/rsync/search.h \ 55 $(OPIEDIR)/rsync/search.h \
56 $(QPEDIR)/rsync/stream.h \ 56 $(OPIEDIR)/rsync/stream.h \
57 $(QPEDIR)/rsync/sumset.h \ 57 $(OPIEDIR)/rsync/sumset.h \
58 $(QPEDIR)/rsync/trace.h \ 58 $(OPIEDIR)/rsync/trace.h \
59 $(QPEDIR)/rsync/types.h \ 59 $(OPIEDIR)/rsync/types.h \
60 $(QPEDIR)/rsync/util.h \ 60 $(OPIEDIR)/rsync/util.h \
61 $(QPEDIR)/rsync/whole.h \ 61 $(OPIEDIR)/rsync/whole.h \
62 $(QPEDIR)/rsync/config_rsync.h \ 62 $(OPIEDIR)/rsync/config_rsync.h \
63 $(QPEDIR)/rsync/qrsync.h 63 $(OPIEDIR)/rsync/qrsync.h
64 SOURCES =background.cpp \ 64 SOURCES =background.cpp \
65 desktop.cpp \ 65 desktop.cpp \
66 info.cpp \ 66 info.cpp \
@@ -75,39 +75,39 @@ SOURCES = background.cpp \
75 shutdownimpl.cpp \ 75 shutdownimpl.cpp \
76 launcher.cpp \ 76 launcher.cpp \
77 launcherview.cpp \ 77 launcherview.cpp \
78 $(QPEDIR)/calibrate/calibrate.cpp \ 78 $(OPIEDIR)/calibrate/calibrate.cpp \
79 transferserver.cpp \ 79 transferserver.cpp \
80 packageslave.cpp \ 80 packageslave.cpp \
81 irserver.cpp \ 81 irserver.cpp \
82 qcopbridge.cpp \ 82 qcopbridge.cpp \
83 startmenu.cpp \ 83 startmenu.cpp \
84 main.cpp \ 84 main.cpp \
85 $(QPEDIR)/rsync/base64.c \ 85 $(OPIEDIR)/rsync/base64.c \
86 $(QPEDIR)/rsync/buf.c \ 86 $(OPIEDIR)/rsync/buf.c \
87 $(QPEDIR)/rsync/checksum.c \ 87 $(OPIEDIR)/rsync/checksum.c \
88 $(QPEDIR)/rsync/command.c \ 88 $(OPIEDIR)/rsync/command.c \
89 $(QPEDIR)/rsync/delta.c \ 89 $(OPIEDIR)/rsync/delta.c \
90 $(QPEDIR)/rsync/emit.c \ 90 $(OPIEDIR)/rsync/emit.c \
91 $(QPEDIR)/rsync/hex.c \ 91 $(OPIEDIR)/rsync/hex.c \
92 $(QPEDIR)/rsync/job.c \ 92 $(OPIEDIR)/rsync/job.c \
93 $(QPEDIR)/rsync/mdfour.c \ 93 $(OPIEDIR)/rsync/mdfour.c \
94 $(QPEDIR)/rsync/mksum.c \ 94 $(OPIEDIR)/rsync/mksum.c \
95 $(QPEDIR)/rsync/msg.c \ 95 $(OPIEDIR)/rsync/msg.c \
96 $(QPEDIR)/rsync/netint.c \ 96 $(OPIEDIR)/rsync/netint.c \
97 $(QPEDIR)/rsync/patch.c \ 97 $(OPIEDIR)/rsync/patch.c \
98 $(QPEDIR)/rsync/prototab.c \ 98 $(OPIEDIR)/rsync/prototab.c \
99 $(QPEDIR)/rsync/readsums.c \ 99 $(OPIEDIR)/rsync/readsums.c \
100 $(QPEDIR)/rsync/scoop.c \ 100 $(OPIEDIR)/rsync/scoop.c \
101 $(QPEDIR)/rsync/search.c \ 101 $(OPIEDIR)/rsync/search.c \
102 $(QPEDIR)/rsync/stats.c \ 102 $(OPIEDIR)/rsync/stats.c \
103 $(QPEDIR)/rsync/stream.c \ 103 $(OPIEDIR)/rsync/stream.c \
104 $(QPEDIR)/rsync/sumset.c \ 104 $(OPIEDIR)/rsync/sumset.c \
105 $(QPEDIR)/rsync/trace.c \ 105 $(OPIEDIR)/rsync/trace.c \
106 $(QPEDIR)/rsync/tube.c \ 106 $(OPIEDIR)/rsync/tube.c \
107 $(QPEDIR)/rsync/util.c \ 107 $(OPIEDIR)/rsync/util.c \
108 $(QPEDIR)/rsync/version.c \ 108 $(OPIEDIR)/rsync/version.c \
109 $(QPEDIR)/rsync/whole.c \ 109 $(OPIEDIR)/rsync/whole.c \
110 $(QPEDIR)/rsync/qrsync.cpp 110 $(OPIEDIR)/rsync/qrsync.cpp
111 OBJECTS =background.o \ 111 OBJECTS =background.o \
112 desktop.o \ 112 desktop.o \
113 info.o \ 113 info.o \
@@ -122,39 +122,39 @@ OBJECTS = background.o \
122 shutdownimpl.o \ 122 shutdownimpl.o \
123 launcher.o \ 123 launcher.o \
124 launcherview.o \ 124 launcherview.o \
125 $(QPEDIR)/calibrate/calibrate.o \ 125 $(OPIEDIR)/calibrate/calibrate.o \
126 transferserver.o \ 126 transferserver.o \
127 packageslave.o \ 127 packageslave.o \
128 irserver.o \ 128 irserver.o \
129 qcopbridge.o \ 129 qcopbridge.o \
130 startmenu.o \ 130 startmenu.o \
131 main.o \ 131 main.o \
132 $(QPEDIR)/rsync/base64.o \ 132 $(OPIEDIR)/rsync/base64.o \
133 $(QPEDIR)/rsync/buf.o \ 133 $(OPIEDIR)/rsync/buf.o \
134 $(QPEDIR)/rsync/checksum.o \ 134 $(OPIEDIR)/rsync/checksum.o \
135 $(QPEDIR)/rsync/command.o \ 135 $(OPIEDIR)/rsync/command.o \
136 $(QPEDIR)/rsync/delta.o \ 136 $(OPIEDIR)/rsync/delta.o \
137 $(QPEDIR)/rsync/emit.o \ 137 $(OPIEDIR)/rsync/emit.o \
138 $(QPEDIR)/rsync/hex.o \ 138 $(OPIEDIR)/rsync/hex.o \
139 $(QPEDIR)/rsync/job.o \ 139 $(OPIEDIR)/rsync/job.o \
140 $(QPEDIR)/rsync/mdfour.o \ 140 $(OPIEDIR)/rsync/mdfour.o \
141 $(QPEDIR)/rsync/mksum.o \ 141 $(OPIEDIR)/rsync/mksum.o \
142 $(QPEDIR)/rsync/msg.o \ 142 $(OPIEDIR)/rsync/msg.o \
143 $(QPEDIR)/rsync/netint.o \ 143 $(OPIEDIR)/rsync/netint.o \
144 $(QPEDIR)/rsync/patch.o \ 144 $(OPIEDIR)/rsync/patch.o \
145 $(QPEDIR)/rsync/prototab.o \ 145 $(OPIEDIR)/rsync/prototab.o \
146 $(QPEDIR)/rsync/readsums.o \ 146 $(OPIEDIR)/rsync/readsums.o \
147 $(QPEDIR)/rsync/scoop.o \ 147 $(OPIEDIR)/rsync/scoop.o \
148 $(QPEDIR)/rsync/search.o \ 148 $(OPIEDIR)/rsync/search.o \
149 $(QPEDIR)/rsync/stats.o \ 149 $(OPIEDIR)/rsync/stats.o \
150 $(QPEDIR)/rsync/stream.o \ 150 $(OPIEDIR)/rsync/stream.o \
151 $(QPEDIR)/rsync/sumset.o \ 151 $(OPIEDIR)/rsync/sumset.o \
152 $(QPEDIR)/rsync/trace.o \ 152 $(OPIEDIR)/rsync/trace.o \
153 $(QPEDIR)/rsync/tube.o \ 153 $(OPIEDIR)/rsync/tube.o \
154 $(QPEDIR)/rsync/util.o \ 154 $(OPIEDIR)/rsync/util.o \
155 $(QPEDIR)/rsync/version.o \ 155 $(OPIEDIR)/rsync/version.o \
156 $(QPEDIR)/rsync/whole.o \ 156 $(OPIEDIR)/rsync/whole.o \
157 $(QPEDIR)/rsync/qrsync.o \ 157 $(OPIEDIR)/rsync/qrsync.o \
158 shutdown.o \ 158 shutdown.o \
159 syncdialog.o 159 syncdialog.o
160INTERFACES = shutdown.ui \ 160INTERFACES = shutdown.ui \
@@ -272,34 +272,34 @@ background.o: background.cpp \
272 desktop.h \ 272 desktop.h \
273 shutdownimpl.h \ 273 shutdownimpl.h \
274 shutdown.h \ 274 shutdown.h \
275 $(QPEDIR)/include/qpe/qpeapplication.h \ 275 $(OPIEDIR)/include/qpe/qpeapplication.h \
276 $(QPEDIR)/include/qpe/resource.h 276 $(OPIEDIR)/include/qpe/resource.h
277 277
278desktop.o: desktop.cpp \ 278desktop.o: desktop.cpp \
279 desktop.h \ 279 desktop.h \
280 shutdownimpl.h \ 280 shutdownimpl.h \
281 shutdown.h \ 281 shutdown.h \
282 $(QPEDIR)/include/qpe/qpeapplication.h \ 282 $(OPIEDIR)/include/qpe/qpeapplication.h \
283 info.h \ 283 info.h \
284 background.h \ 284 background.h \
285 launcher.h \ 285 launcher.h \
286 launcherview.h \ 286 launcherview.h \
287 $(QPEDIR)/include/qpe/storage.h \ 287 $(OPIEDIR)/include/qpe/storage.h \
288 mrulist.h \ 288 mrulist.h \
289 $(QPEDIR)/include/qpe/applnk.h \ 289 $(OPIEDIR)/include/qpe/applnk.h \
290 qcopbridge.h \ 290 qcopbridge.h \
291 startmenu.h \ 291 startmenu.h \
292 taskbar.h \ 292 taskbar.h \
293 $(QPEDIR)/include/qpe/custom.h \ 293 $(OPIEDIR)/include/qpe/custom.h \
294 transferserver.h \ 294 transferserver.h \
295 irserver.h \ 295 irserver.h \
296 packageslave.h \ 296 packageslave.h \
297 $(QPEDIR)/include/qpe/mimetype.h \ 297 $(OPIEDIR)/include/qpe/mimetype.h \
298 $(QPEDIR)/include/qpe/password.h \ 298 $(OPIEDIR)/include/qpe/password.h \
299 $(QPEDIR)/include/qpe/config.h \ 299 $(OPIEDIR)/include/qpe/config.h \
300 $(QPEDIR)/include/qpe/power.h \ 300 $(OPIEDIR)/include/qpe/power.h \
301 $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ 301 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
302 $(QPEDIR)/include/qpe/global.h 302 $(OPIEDIR)/include/qpe/global.h
303 303
304info.o: info.cpp \ 304info.o: info.cpp \
305 info.h \ 305 info.h \
@@ -307,47 +307,49 @@ info.o: info.cpp \
307 desktop.h \ 307 desktop.h \
308 shutdownimpl.h \ 308 shutdownimpl.h \
309 shutdown.h \ 309 shutdown.h \
310 $(QPEDIR)/include/qpe/qpeapplication.h \ 310 $(OPIEDIR)/include/qpe/qpeapplication.h \
311 $(QPEDIR)/include/qpe/resource.h \ 311 $(OPIEDIR)/include/qpe/resource.h \
312 $(QPEDIR)/include/qpe/version.h 312 $(OPIEDIR)/include/qpe/version.h
313 313
314appicons.o: appicons.cpp \ 314appicons.o: appicons.cpp \
315 appicons.moc \ 315 appicons.moc \
316 appicons.h \ 316 appicons.h \
317 $(QPEDIR)/include/qpe/qcopenvelope_qws.h 317 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
318 318
319taskbar.o: taskbar.cpp \ 319taskbar.o: taskbar.cpp \
320 startmenu.h \ 320 startmenu.h \
321 inputmethods.h \ 321 inputmethods.h \
322 $(QPEDIR)/include/qpe/inputmethodinterface.h \ 322 $(OPIEDIR)/include/qpe/inputmethodinterface.h \
323 $(QPEDIR)/include/qpe/qcom.h \ 323 $(OPIEDIR)/include/qpe/qcom.h \
324 $(QPEDIR)/include/qpe/quuid.h \ 324 $(OPIEDIR)/include/qpe/quuid.h \
325 mrulist.h \ 325 mrulist.h \
326 $(QPEDIR)/include/qpe/applnk.h \ 326 $(OPIEDIR)/include/qpe/applnk.h \
327 systray.h \ 327 systray.h \
328 $(QPEDIR)/include/qpe/taskbarappletinterface.h \ 328 $(OPIEDIR)/include/qpe/taskbarappletinterface.h \
329 $(QPEDIR)/calibrate/calibrate.h \ 329 $(OPIEDIR)/calibrate/calibrate.h \
330 wait.h \ 330 wait.h \
331 $(QPEDIR)/include/qpe/resource.h \ 331 $(OPIEDIR)/include/qpe/resource.h \
332 appicons.h \ 332 appicons.h \
333 taskbar.h \ 333 taskbar.h \
334 $(QPEDIR)/include/qpe/custom.h \ 334 $(OPIEDIR)/include/qpe/custom.h \
335 desktop.h \ 335 desktop.h \
336 shutdownimpl.h \ 336 shutdownimpl.h \
337 shutdown.h \ 337 shutdown.h \
338 $(QPEDIR)/include/qpe/qpeapplication.h \ 338 $(OPIEDIR)/include/qpe/qpeapplication.h \
339 $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ 339 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
340 $(QPEDIR)/include/qpe/global.h \ 340 $(OPIEDIR)/include/qpe/global.h \
341 ../taskbar/apps.h \ 341 ../taskbar/apps.h \
342 ../addressbook/addressbook.h \ 342 ../addressbook/addressbook.h \
343 ../datebook/datebook.h \ 343 ../datebook/datebook.h \
344 $(QPEDIR)/include/qpe/datebookdb.h \ 344 $(OPIEDIR)/include/qpe/datebookdb.h \
345 $(QPEDIR)/include/qpe/event.h \ 345 $(OPIEDIR)/include/qpe/event.h \
346 $(QPEDIR)/include/qpe/palmtoprecord.h \ 346 $(OPIEDIR)/include/qpe/palmtoprecord.h \
347 $(OPIEDIR)/include/qpe/timeconversion.h \
348 $(OPIEDIR)/include/qpe/qpcglobal.h \
347 ../helpbrowser/helpbrowser.h \ 349 ../helpbrowser/helpbrowser.h \
348 ../minesweep/minesweep.h \ 350 ../minesweep/minesweep.h \
349 ../textedit/textedit.h \ 351 ../textedit/textedit.h \
350 $(QPEDIR)/include/qpe/filemanager.h \ 352 $(OPIEDIR)/include/qpe/filemanager.h \
351 ../todo/mainwindow.h \ 353 ../todo/mainwindow.h \
352 ../citytime/citytime.h \ 354 ../citytime/citytime.h \
353 ../clock/clock.h \ 355 ../clock/clock.h \
@@ -355,362 +357,370 @@ taskbar.o: taskbar.cpp \
355 ../sysinfo/sysinfo.h \ 357 ../sysinfo/sysinfo.h \
356 ../settings/appearance/settings.h \ 358 ../settings/appearance/settings.h \
357 ../settings/systemtime/settime.h \ 359 ../settings/systemtime/settime.h \
358 $(QPEDIR)/include/qpe/timestring.h \ 360 $(OPIEDIR)/include/qpe/timestring.h \
359 ../filebrowser/filebrowser.h \ 361 ../filebrowser/filebrowser.h \
360 ../solitaire/canvascardwindow.h \ 362 ../solitaire/canvascardwindow.h \
361 ../snake/interface.h \ 363 ../snake/interface.h \
362 ../parashoot/interface.h \ 364 ../parashoot/interface.h \
363 $(QPEDIR)/include/qpe/sound.h \ 365 $(OPIEDIR)/include/qpe/sound.h \
364 ../mpegplayer/mediaplayer.h \ 366 ../mpegplayer/mediaplayer.h \
365 $(QPEDIR)/include/qpe/qlibrary.h \ 367 $(OPIEDIR)/include/qpe/qlibrary.h \
366 ../embeddedkonsole/konsole.h \ 368 ../embeddedkonsole/konsole.h \
367 ../wordgame/wordgame.h \ 369 ../wordgame/wordgame.h \
368 $(QPEDIR)/include/qpe/qdawg.h 370 $(OPIEDIR)/include/qpe/qdawg.h
369 371
370sidething.o: sidething.cpp \ 372sidething.o: sidething.cpp \
371 sidething.h \ 373 sidething.h \
372 startmenu.h \ 374 startmenu.h \
373 $(QPEDIR)/include/qpe/resource.h 375 $(OPIEDIR)/include/qpe/resource.h
374 376
375mrulist.o: mrulist.cpp \ 377mrulist.o: mrulist.cpp \
376 mrulist.h \ 378 mrulist.h \
377 $(QPEDIR)/include/qpe/applnk.h \ 379 $(OPIEDIR)/include/qpe/applnk.h \
378 $(QPEDIR)/include/qpe/global.h \ 380 $(OPIEDIR)/include/qpe/global.h \
379 $(QPEDIR)/include/qpe/resource.h 381 $(OPIEDIR)/include/qpe/resource.h
380 382
381stabmon.o: stabmon.cpp \ 383stabmon.o: stabmon.cpp \
382 stabmon.h \ 384 stabmon.h \
383 $(QPEDIR)/include/qpe/qcopenvelope_qws.h 385 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
384 386
385inputmethods.o: inputmethods.cpp \ 387inputmethods.o: inputmethods.cpp \
386 inputmethods.h \ 388 inputmethods.h \
387 $(QPEDIR)/include/qpe/inputmethodinterface.h \ 389 $(OPIEDIR)/include/qpe/inputmethodinterface.h \
388 $(QPEDIR)/include/qpe/qcom.h \ 390 $(OPIEDIR)/include/qpe/qcom.h \
389 $(QPEDIR)/include/qpe/quuid.h \ 391 $(OPIEDIR)/include/qpe/quuid.h \
390 $(QPEDIR)/include/qpe/config.h \ 392 $(OPIEDIR)/include/qpe/config.h \
391 $(QPEDIR)/include/qpe/qpeapplication.h \ 393 $(OPIEDIR)/include/qpe/qpeapplication.h \
392 $(QPEDIR)/include/qpe/qlibrary.h 394 $(OPIEDIR)/include/qpe/qlibrary.h
393 395
394systray.o: systray.cpp \ 396systray.o: systray.cpp \
395 $(QPEDIR)/include/qpe/qpeapplication.h \ 397 $(OPIEDIR)/include/qpe/qpeapplication.h \
396 $(QPEDIR)/include/qpe/qlibrary.h \ 398 $(OPIEDIR)/include/qpe/qlibrary.h \
397 $(QPEDIR)/include/qpe/qcom.h \ 399 $(OPIEDIR)/include/qpe/qcom.h \
398 $(QPEDIR)/include/qpe/quuid.h \ 400 $(OPIEDIR)/include/qpe/quuid.h \
399 $(QPEDIR)/include/qpe/config.h \ 401 $(OPIEDIR)/include/qpe/config.h \
400 quicklauncher.h \ 402 quicklauncher.h \
401 systray.h \ 403 systray.h \
402 $(QPEDIR)/include/qpe/taskbarappletinterface.h 404 $(OPIEDIR)/include/qpe/taskbarappletinterface.h
403 405
404wait.o: wait.cpp \ 406wait.o: wait.cpp \
405 wait.h \ 407 wait.h \
406 $(QPEDIR)/include/qpe/resource.h 408 $(OPIEDIR)/include/qpe/resource.h
407 409
408shutdownimpl.o: shutdownimpl.cpp \ 410shutdownimpl.o: shutdownimpl.cpp \
409 shutdownimpl.h \ 411 shutdownimpl.h \
410 shutdown.h \ 412 shutdown.h \
411 $(QPEDIR)/include/qpe/global.h 413 $(OPIEDIR)/include/qpe/global.h
412 414
413launcher.o: launcher.cpp \ 415launcher.o: launcher.cpp \
414 $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ 416 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
415 $(QPEDIR)/include/qpe/resource.h \ 417 $(OPIEDIR)/include/qpe/resource.h \
416 $(QPEDIR)/include/qpe/applnk.h \ 418 $(OPIEDIR)/include/qpe/applnk.h \
417 $(QPEDIR)/include/qpe/config.h \ 419 $(OPIEDIR)/include/qpe/config.h \
418 $(QPEDIR)/include/qpe/global.h \ 420 $(OPIEDIR)/include/qpe/global.h \
419 $(QPEDIR)/include/qpe/qpeapplication.h \ 421 $(OPIEDIR)/include/qpe/qpeapplication.h \
420 $(QPEDIR)/include/qpe/mimetype.h \ 422 $(OPIEDIR)/include/qpe/mimetype.h \
421 $(QPEDIR)/include/qpe/storage.h \ 423 $(OPIEDIR)/include/qpe/storage.h \
424 $(OPIEDIR)/include/qpe/palmtoprecord.h \
422 launcherview.h \ 425 launcherview.h \
423 launcher.h \ 426 launcher.h \
424 $(QPEDIR)/include/qpe/lnkproperties.h \ 427 syncdialog.h \
428 desktop.h \
429 shutdownimpl.h \
430 shutdown.h \
431 $(OPIEDIR)/include/qpe/lnkproperties.h \
425 mrulist.h \ 432 mrulist.h \
426 $(QPEDIR)/rsync/qrsync.h 433 $(OPIEDIR)/rsync/qrsync.h
427 434
428launcherview.o: launcherview.cpp \ 435launcherview.o: launcherview.cpp \
429 launcherview.h \ 436 launcherview.h \
430 $(QPEDIR)/include/qpe/storage.h \ 437 $(OPIEDIR)/include/qpe/storage.h \
431 $(QPEDIR)/include/qpe/qpeapplication.h \ 438 $(OPIEDIR)/include/qpe/qpeapplication.h \
432 $(QPEDIR)/include/qpe/applnk.h \ 439 $(OPIEDIR)/include/qpe/applnk.h \
433 $(QPEDIR)/include/qpe/qpedebug.h \ 440 $(OPIEDIR)/include/qpe/qpedebug.h \
434 $(QPEDIR)/include/qpe/categories.h \ 441 $(OPIEDIR)/include/qpe/categories.h \
435 $(QPEDIR)/include/qpe/categoryselect.h \ 442 $(OPIEDIR)/include/qpe/categoryselect.h \
436 $(QPEDIR)/include/qpe/menubutton.h \ 443 $(OPIEDIR)/include/qpe/menubutton.h \
437 $(QPEDIR)/include/qpe/resource.h \ 444 $(OPIEDIR)/include/qpe/resource.h \
438 $(QPEDIR)/include/qpe/qpetoolbar.h 445 $(OPIEDIR)/include/qpe/qpetoolbar.h
439 446
440$(QPEDIR)/calibrate/calibrate.o: $(QPEDIR)/calibrate/calibrate.cpp \ 447$(OPIEDIR)/calibrate/calibrate.o: $(OPIEDIR)/calibrate/calibrate.cpp \
441 $(QPEDIR)/calibrate/calibrate.h \ 448 $(OPIEDIR)/calibrate/calibrate.h \
442 $(QPEDIR)/include/qpe/resource.h 449 $(OPIEDIR)/include/qpe/resource.h
443 450
444transferserver.o: transferserver.cpp \ 451transferserver.o: transferserver.cpp \
445 $(QPEDIR)/include/qpe/qprocess.h \ 452 $(OPIEDIR)/include/qpe/qprocess.h \
446 $(QPEDIR)/include/qpe/process.h \ 453 $(OPIEDIR)/include/qpe/process.h \
454 $(OPIEDIR)/include/qpe/config.h \
455 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
447 transferserver.h 456 transferserver.h
448 457
449packageslave.o: packageslave.cpp \ 458packageslave.o: packageslave.cpp \
450 packageslave.h \ 459 packageslave.h \
451 $(QPEDIR)/include/qpe/process.h \ 460 $(OPIEDIR)/include/qpe/process.h \
452 $(QPEDIR)/include/qpe/qcopenvelope_qws.h 461 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
453 462
454irserver.o: irserver.cpp \ 463irserver.o: irserver.cpp \
455 irserver.h \ 464 irserver.h \
456 $(QPEDIR)/include/qpe/qlibrary.h \ 465 $(OPIEDIR)/include/qpe/qlibrary.h \
457 $(QPEDIR)/include/qpe/qcom.h \ 466 $(OPIEDIR)/include/qpe/qcom.h \
458 $(QPEDIR)/include/qpe/quuid.h \ 467 $(OPIEDIR)/include/qpe/quuid.h \
459 $(QPEDIR)/include/qpe/qpeapplication.h \ 468 $(OPIEDIR)/include/qpe/qpeapplication.h \
460 obexinterface.h 469 obexinterface.h
461 470
462qcopbridge.o: qcopbridge.cpp \ 471qcopbridge.o: qcopbridge.cpp \
463 qcopbridge.h \ 472 qcopbridge.h \
464 $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ 473 transferserver.h \
465 $(QPEDIR)/include/qpe/qpeapplication.h 474 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
475 $(OPIEDIR)/include/qpe/qpeapplication.h
466 476
467startmenu.o: startmenu.cpp \ 477startmenu.o: startmenu.cpp \
468 startmenu.h \ 478 startmenu.h \
469 sidething.h \ 479 sidething.h \
470 mrulist.h \ 480 mrulist.h \
471 $(QPEDIR)/include/qpe/applnk.h \ 481 $(OPIEDIR)/include/qpe/applnk.h \
472 info.h \ 482 info.h \
473 background.h \ 483 background.h \
474 $(QPEDIR)/include/qpe/qpeapplication.h \ 484 $(OPIEDIR)/include/qpe/qpeapplication.h \
475 $(QPEDIR)/include/qpe/config.h \ 485 $(OPIEDIR)/include/qpe/config.h \
476 $(QPEDIR)/include/qpe/global.h \ 486 $(OPIEDIR)/include/qpe/global.h \
477 $(QPEDIR)/include/qpe/resource.h 487 $(OPIEDIR)/include/qpe/resource.h
478 488
479main.o: main.cpp \ 489main.o: main.cpp \
480 desktop.h \ 490 desktop.h \
481 shutdownimpl.h \ 491 shutdownimpl.h \
482 shutdown.h \ 492 shutdown.h \
483 $(QPEDIR)/include/qpe/qpeapplication.h \ 493 $(OPIEDIR)/include/qpe/qpeapplication.h \
484 taskbar.h \ 494 taskbar.h \
485 $(QPEDIR)/include/qpe/custom.h \ 495 $(OPIEDIR)/include/qpe/custom.h \
486 stabmon.h \ 496 stabmon.h \
487 $(QPEDIR)/include/qpe/network.h \ 497 $(OPIEDIR)/include/qpe/network.h \
488 $(QPEDIR)/include/qpe/config.h \ 498 $(OPIEDIR)/include/qpe/config.h \
489 $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ 499 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
490 $(QPEDIR)/include/qpe/alarmserver.h \ 500 $(OPIEDIR)/include/qpe/alarmserver.h \
491 ../calibrate/calibrate.h \ 501 ../calibrate/calibrate.h \
492 ../login/qdmdialogimpl.h \ 502 ../login/qdmdialogimpl.h \
493 $(QPEDIR)/include/qpe/global.h 503 $(OPIEDIR)/include/qpe/global.h
494 504
495$(QPEDIR)/rsync/base64.o: $(QPEDIR)/rsync/base64.c \ 505$(OPIEDIR)/rsync/base64.o: $(OPIEDIR)/rsync/base64.c \
496 $(QPEDIR)/rsync/config_rsync.h \ 506 $(OPIEDIR)/rsync/config_rsync.h \
497 $(QPEDIR)/rsync/config_linux.h \ 507 $(OPIEDIR)/rsync/config_linux.h \
498 $(QPEDIR)/rsync/rsync.h 508 $(OPIEDIR)/rsync/rsync.h
499 509
500$(QPEDIR)/rsync/buf.o: $(QPEDIR)/rsync/buf.c \ 510$(OPIEDIR)/rsync/buf.o: $(OPIEDIR)/rsync/buf.c \
501 $(QPEDIR)/rsync/config_rsync.h \ 511 $(OPIEDIR)/rsync/config_rsync.h \
502 $(QPEDIR)/rsync/config_linux.h \ 512 $(OPIEDIR)/rsync/config_linux.h \
503 $(QPEDIR)/rsync/rsync.h \ 513 $(OPIEDIR)/rsync/rsync.h \
504 $(QPEDIR)/rsync/trace.h \ 514 $(OPIEDIR)/rsync/trace.h \
505 $(QPEDIR)/rsync/buf.h \ 515 $(OPIEDIR)/rsync/buf.h \
506 $(QPEDIR)/rsync/util.h 516 $(OPIEDIR)/rsync/util.h
507 517
508$(QPEDIR)/rsync/checksum.o: $(QPEDIR)/rsync/checksum.c \ 518$(OPIEDIR)/rsync/checksum.o: $(OPIEDIR)/rsync/checksum.c \
509 $(QPEDIR)/rsync/config_rsync.h \ 519 $(OPIEDIR)/rsync/config_rsync.h \
510 $(QPEDIR)/rsync/config_linux.h \ 520 $(OPIEDIR)/rsync/config_linux.h \
511 $(QPEDIR)/rsync/rsync.h \ 521 $(OPIEDIR)/rsync/rsync.h \
512 $(QPEDIR)/rsync/checksum.h 522 $(OPIEDIR)/rsync/checksum.h
513 523
514$(QPEDIR)/rsync/command.o: $(QPEDIR)/rsync/command.c \ 524$(OPIEDIR)/rsync/command.o: $(OPIEDIR)/rsync/command.c \
515 $(QPEDIR)/rsync/config_rsync.h \ 525 $(OPIEDIR)/rsync/config_rsync.h \
516 $(QPEDIR)/rsync/config_linux.h \ 526 $(OPIEDIR)/rsync/config_linux.h \
517 $(QPEDIR)/rsync/rsync.h \ 527 $(OPIEDIR)/rsync/rsync.h \
518 $(QPEDIR)/rsync/command.h 528 $(OPIEDIR)/rsync/command.h
519 529
520$(QPEDIR)/rsync/delta.o: $(QPEDIR)/rsync/delta.c \ 530$(OPIEDIR)/rsync/delta.o: $(OPIEDIR)/rsync/delta.c \
521 $(QPEDIR)/rsync/config_rsync.h \ 531 $(OPIEDIR)/rsync/config_rsync.h \
522 $(QPEDIR)/rsync/config_linux.h \ 532 $(OPIEDIR)/rsync/config_linux.h \
523 $(QPEDIR)/rsync/rsync.h \ 533 $(OPIEDIR)/rsync/rsync.h \
524 $(QPEDIR)/rsync/emit.h \ 534 $(OPIEDIR)/rsync/emit.h \
525 $(QPEDIR)/rsync/stream.h \ 535 $(OPIEDIR)/rsync/stream.h \
526 $(QPEDIR)/rsync/util.h \ 536 $(OPIEDIR)/rsync/util.h \
527 $(QPEDIR)/rsync/sumset.h \ 537 $(OPIEDIR)/rsync/sumset.h \
528 $(QPEDIR)/rsync/job.h \ 538 $(OPIEDIR)/rsync/job.h \
529 $(QPEDIR)/rsync/trace.h \ 539 $(OPIEDIR)/rsync/trace.h \
530 $(QPEDIR)/rsync/checksum.h \ 540 $(OPIEDIR)/rsync/checksum.h \
531 $(QPEDIR)/rsync/search.h \ 541 $(OPIEDIR)/rsync/search.h \
532 $(QPEDIR)/rsync/types.h 542 $(OPIEDIR)/rsync/types.h
533 543
534$(QPEDIR)/rsync/emit.o: $(QPEDIR)/rsync/emit.c \ 544$(OPIEDIR)/rsync/emit.o: $(OPIEDIR)/rsync/emit.c \
535 $(QPEDIR)/rsync/config_rsync.h \ 545 $(OPIEDIR)/rsync/config_rsync.h \
536 $(QPEDIR)/rsync/config_linux.h \ 546 $(OPIEDIR)/rsync/config_linux.h \
537 $(QPEDIR)/rsync/rsync.h \ 547 $(OPIEDIR)/rsync/rsync.h \
538 $(QPEDIR)/rsync/command.h \ 548 $(OPIEDIR)/rsync/command.h \
539 $(QPEDIR)/rsync/protocol.h \ 549 $(OPIEDIR)/rsync/protocol.h \
540 $(QPEDIR)/rsync/trace.h \ 550 $(OPIEDIR)/rsync/trace.h \
541 $(QPEDIR)/rsync/emit.h \ 551 $(OPIEDIR)/rsync/emit.h \
542 $(QPEDIR)/rsync/prototab.h \ 552 $(OPIEDIR)/rsync/prototab.h \
543 $(QPEDIR)/rsync/netint.h \ 553 $(OPIEDIR)/rsync/netint.h \
544 $(QPEDIR)/rsync/sumset.h \ 554 $(OPIEDIR)/rsync/sumset.h \
545 $(QPEDIR)/rsync/job.h 555 $(OPIEDIR)/rsync/job.h
546 556
547$(QPEDIR)/rsync/hex.o: $(QPEDIR)/rsync/hex.c \ 557$(OPIEDIR)/rsync/hex.o: $(OPIEDIR)/rsync/hex.c \
548 $(QPEDIR)/rsync/config_rsync.h \ 558 $(OPIEDIR)/rsync/config_rsync.h \
549 $(QPEDIR)/rsync/config_linux.h \ 559 $(OPIEDIR)/rsync/config_linux.h \
550 $(QPEDIR)/rsync/rsync.h 560 $(OPIEDIR)/rsync/rsync.h
551 561
552$(QPEDIR)/rsync/job.o: $(QPEDIR)/rsync/job.c \ 562$(OPIEDIR)/rsync/job.o: $(OPIEDIR)/rsync/job.c \
553 $(QPEDIR)/rsync/config_rsync.h \ 563 $(OPIEDIR)/rsync/config_rsync.h \
554 $(QPEDIR)/rsync/config_linux.h \ 564 $(OPIEDIR)/rsync/config_linux.h \
555 $(QPEDIR)/rsync/rsync.h \ 565 $(OPIEDIR)/rsync/rsync.h \
556 $(QPEDIR)/rsync/stream.h \ 566 $(OPIEDIR)/rsync/stream.h \
557 $(QPEDIR)/rsync/util.h \ 567 $(OPIEDIR)/rsync/util.h \
558 $(QPEDIR)/rsync/sumset.h \ 568 $(OPIEDIR)/rsync/sumset.h \
559 $(QPEDIR)/rsync/job.h \ 569 $(OPIEDIR)/rsync/job.h \
560 $(QPEDIR)/rsync/trace.h 570 $(OPIEDIR)/rsync/trace.h
561 571
562$(QPEDIR)/rsync/mdfour.o: $(QPEDIR)/rsync/mdfour.c \ 572$(OPIEDIR)/rsync/mdfour.o: $(OPIEDIR)/rsync/mdfour.c \
563 $(QPEDIR)/rsync/config_rsync.h \ 573 $(OPIEDIR)/rsync/config_rsync.h \
564 $(QPEDIR)/rsync/config_linux.h \ 574 $(OPIEDIR)/rsync/config_linux.h \
565 $(QPEDIR)/rsync/rsync.h \ 575 $(OPIEDIR)/rsync/rsync.h \
566 $(QPEDIR)/rsync/trace.h \ 576 $(OPIEDIR)/rsync/trace.h \
567 $(QPEDIR)/rsync/types.h 577 $(OPIEDIR)/rsync/types.h
568 578
569$(QPEDIR)/rsync/mksum.o: $(QPEDIR)/rsync/mksum.c \ 579$(OPIEDIR)/rsync/mksum.o: $(OPIEDIR)/rsync/mksum.c \
570 $(QPEDIR)/rsync/config_rsync.h \ 580 $(OPIEDIR)/rsync/config_rsync.h \
571 $(QPEDIR)/rsync/config_linux.h \ 581 $(OPIEDIR)/rsync/config_linux.h \
572 $(QPEDIR)/rsync/rsync.h \ 582 $(OPIEDIR)/rsync/rsync.h \
573 $(QPEDIR)/rsync/stream.h \ 583 $(OPIEDIR)/rsync/stream.h \
574 $(QPEDIR)/rsync/util.h \ 584 $(OPIEDIR)/rsync/util.h \
575 $(QPEDIR)/rsync/sumset.h \ 585 $(OPIEDIR)/rsync/sumset.h \
576 $(QPEDIR)/rsync/job.h \ 586 $(OPIEDIR)/rsync/job.h \
577 $(QPEDIR)/rsync/protocol.h \ 587 $(OPIEDIR)/rsync/protocol.h \
578 $(QPEDIR)/rsync/netint.h \ 588 $(OPIEDIR)/rsync/netint.h \
579 $(QPEDIR)/rsync/trace.h \ 589 $(OPIEDIR)/rsync/trace.h \
580 $(QPEDIR)/rsync/checksum.h 590 $(OPIEDIR)/rsync/checksum.h
581 591
582$(QPEDIR)/rsync/msg.o: $(QPEDIR)/rsync/msg.c \ 592$(OPIEDIR)/rsync/msg.o: $(OPIEDIR)/rsync/msg.c \
583 $(QPEDIR)/rsync/config_rsync.h \ 593 $(OPIEDIR)/rsync/config_rsync.h \
584 $(QPEDIR)/rsync/config_linux.h \ 594 $(OPIEDIR)/rsync/config_linux.h \
585 $(QPEDIR)/rsync/rsync.h 595 $(OPIEDIR)/rsync/rsync.h
586 596
587$(QPEDIR)/rsync/netint.o: $(QPEDIR)/rsync/netint.c \ 597$(OPIEDIR)/rsync/netint.o: $(OPIEDIR)/rsync/netint.c \
588 $(QPEDIR)/rsync/config_rsync.h \ 598 $(OPIEDIR)/rsync/config_rsync.h \
589 $(QPEDIR)/rsync/config_linux.h \ 599 $(OPIEDIR)/rsync/config_linux.h \
590 $(QPEDIR)/rsync/rsync.h \ 600 $(OPIEDIR)/rsync/rsync.h \
591 $(QPEDIR)/rsync/job.h \ 601 $(OPIEDIR)/rsync/job.h \
592 $(QPEDIR)/rsync/netint.h \ 602 $(OPIEDIR)/rsync/netint.h \
593 $(QPEDIR)/rsync/trace.h \ 603 $(OPIEDIR)/rsync/trace.h \
594 $(QPEDIR)/rsync/stream.h 604 $(OPIEDIR)/rsync/stream.h
595 605
596$(QPEDIR)/rsync/patch.o: $(QPEDIR)/rsync/patch.c \ 606$(OPIEDIR)/rsync/patch.o: $(OPIEDIR)/rsync/patch.c \
597 $(QPEDIR)/rsync/config_rsync.h \ 607 $(OPIEDIR)/rsync/config_rsync.h \
598 $(QPEDIR)/rsync/config_linux.h \ 608 $(OPIEDIR)/rsync/config_linux.h \
599 $(QPEDIR)/rsync/rsync.h \ 609 $(OPIEDIR)/rsync/rsync.h \
600 $(QPEDIR)/rsync/util.h \ 610 $(OPIEDIR)/rsync/util.h \
601 $(QPEDIR)/rsync/trace.h \ 611 $(OPIEDIR)/rsync/trace.h \
602 $(QPEDIR)/rsync/protocol.h \ 612 $(OPIEDIR)/rsync/protocol.h \
603 $(QPEDIR)/rsync/netint.h \ 613 $(OPIEDIR)/rsync/netint.h \
604 $(QPEDIR)/rsync/command.h \ 614 $(OPIEDIR)/rsync/command.h \
605 $(QPEDIR)/rsync/sumset.h \ 615 $(OPIEDIR)/rsync/sumset.h \
606 $(QPEDIR)/rsync/prototab.h \ 616 $(OPIEDIR)/rsync/prototab.h \
607 $(QPEDIR)/rsync/stream.h \ 617 $(OPIEDIR)/rsync/stream.h \
608 $(QPEDIR)/rsync/job.h 618 $(OPIEDIR)/rsync/job.h
609 619
610$(QPEDIR)/rsync/prototab.o: $(QPEDIR)/rsync/prototab.c \ 620$(OPIEDIR)/rsync/prototab.o: $(OPIEDIR)/rsync/prototab.c \
611 $(QPEDIR)/rsync/config_rsync.h \ 621 $(OPIEDIR)/rsync/config_rsync.h \
612 $(QPEDIR)/rsync/config_linux.h \ 622 $(OPIEDIR)/rsync/config_linux.h \
613 $(QPEDIR)/rsync/rsync.h \ 623 $(OPIEDIR)/rsync/rsync.h \
614 $(QPEDIR)/rsync/protocol.h \ 624 $(OPIEDIR)/rsync/protocol.h \
615 $(QPEDIR)/rsync/command.h \ 625 $(OPIEDIR)/rsync/command.h \
616 $(QPEDIR)/rsync/prototab.h 626 $(OPIEDIR)/rsync/prototab.h
617 627
618$(QPEDIR)/rsync/readsums.o: $(QPEDIR)/rsync/readsums.c \ 628$(OPIEDIR)/rsync/readsums.o: $(OPIEDIR)/rsync/readsums.c \
619 $(QPEDIR)/rsync/config_rsync.h \ 629 $(OPIEDIR)/rsync/config_rsync.h \
620 $(QPEDIR)/rsync/config_linux.h \ 630 $(OPIEDIR)/rsync/config_linux.h \
621 $(QPEDIR)/rsync/rsync.h \ 631 $(OPIEDIR)/rsync/rsync.h \
622 $(QPEDIR)/rsync/sumset.h \ 632 $(OPIEDIR)/rsync/sumset.h \
623 $(QPEDIR)/rsync/job.h \ 633 $(OPIEDIR)/rsync/job.h \
624 $(QPEDIR)/rsync/trace.h \ 634 $(OPIEDIR)/rsync/trace.h \
625 $(QPEDIR)/rsync/netint.h \ 635 $(OPIEDIR)/rsync/netint.h \
626 $(QPEDIR)/rsync/protocol.h \ 636 $(OPIEDIR)/rsync/protocol.h \
627 $(QPEDIR)/rsync/util.h \ 637 $(OPIEDIR)/rsync/util.h \
628 $(QPEDIR)/rsync/stream.h 638 $(OPIEDIR)/rsync/stream.h
629 639
630$(QPEDIR)/rsync/scoop.o: $(QPEDIR)/rsync/scoop.c \ 640$(OPIEDIR)/rsync/scoop.o: $(OPIEDIR)/rsync/scoop.c \
631 $(QPEDIR)/rsync/config_rsync.h \ 641 $(OPIEDIR)/rsync/config_rsync.h \
632 $(QPEDIR)/rsync/config_linux.h \ 642 $(OPIEDIR)/rsync/config_linux.h \
633 $(QPEDIR)/rsync/rsync.h \ 643 $(OPIEDIR)/rsync/rsync.h \
634 $(QPEDIR)/rsync/job.h \ 644 $(OPIEDIR)/rsync/job.h \
635 $(QPEDIR)/rsync/stream.h \ 645 $(OPIEDIR)/rsync/stream.h \
636 $(QPEDIR)/rsync/trace.h \ 646 $(OPIEDIR)/rsync/trace.h \
637 $(QPEDIR)/rsync/util.h 647 $(OPIEDIR)/rsync/util.h
638 648
639$(QPEDIR)/rsync/search.o: $(QPEDIR)/rsync/search.c \ 649$(OPIEDIR)/rsync/search.o: $(OPIEDIR)/rsync/search.c \
640 $(QPEDIR)/rsync/config_rsync.h \ 650 $(OPIEDIR)/rsync/config_rsync.h \
641 $(QPEDIR)/rsync/config_linux.h \ 651 $(OPIEDIR)/rsync/config_linux.h \
642 $(QPEDIR)/rsync/rsync.h \ 652 $(OPIEDIR)/rsync/rsync.h \
643 $(QPEDIR)/rsync/trace.h \ 653 $(OPIEDIR)/rsync/trace.h \
644 $(QPEDIR)/rsync/util.h \ 654 $(OPIEDIR)/rsync/util.h \
645 $(QPEDIR)/rsync/sumset.h \ 655 $(OPIEDIR)/rsync/sumset.h \
646 $(QPEDIR)/rsync/search.h \ 656 $(OPIEDIR)/rsync/search.h \
647 $(QPEDIR)/rsync/checksum.h 657 $(OPIEDIR)/rsync/checksum.h
648 658
649$(QPEDIR)/rsync/stats.o: $(QPEDIR)/rsync/stats.c \ 659$(OPIEDIR)/rsync/stats.o: $(OPIEDIR)/rsync/stats.c \
650 $(QPEDIR)/rsync/config_rsync.h \ 660 $(OPIEDIR)/rsync/config_rsync.h \
651 $(QPEDIR)/rsync/config_linux.h \ 661 $(OPIEDIR)/rsync/config_linux.h \
652 $(QPEDIR)/rsync/rsync.h \ 662 $(OPIEDIR)/rsync/rsync.h \
653 $(QPEDIR)/rsync/trace.h 663 $(OPIEDIR)/rsync/trace.h
654 664
655$(QPEDIR)/rsync/stream.o: $(QPEDIR)/rsync/stream.c \ 665$(OPIEDIR)/rsync/stream.o: $(OPIEDIR)/rsync/stream.c \
656 $(QPEDIR)/rsync/config_rsync.h \ 666 $(OPIEDIR)/rsync/config_rsync.h \
657 $(QPEDIR)/rsync/config_linux.h \ 667 $(OPIEDIR)/rsync/config_linux.h \
658 $(QPEDIR)/rsync/rsync.h \ 668 $(OPIEDIR)/rsync/rsync.h \
659 $(QPEDIR)/rsync/stream.h \ 669 $(OPIEDIR)/rsync/stream.h \
660 $(QPEDIR)/rsync/util.h \ 670 $(OPIEDIR)/rsync/util.h \
661 $(QPEDIR)/rsync/trace.h 671 $(OPIEDIR)/rsync/trace.h
662 672
663$(QPEDIR)/rsync/sumset.o: $(QPEDIR)/rsync/sumset.c \ 673$(OPIEDIR)/rsync/sumset.o: $(OPIEDIR)/rsync/sumset.c \
664 $(QPEDIR)/rsync/config_rsync.h \ 674 $(OPIEDIR)/rsync/config_rsync.h \
665 $(QPEDIR)/rsync/config_linux.h \ 675 $(OPIEDIR)/rsync/config_linux.h \
666 $(QPEDIR)/rsync/rsync.h \ 676 $(OPIEDIR)/rsync/rsync.h \
667 $(QPEDIR)/rsync/sumset.h \ 677 $(OPIEDIR)/rsync/sumset.h \
668 $(QPEDIR)/rsync/util.h \ 678 $(OPIEDIR)/rsync/util.h \
669 $(QPEDIR)/rsync/trace.h 679 $(OPIEDIR)/rsync/trace.h
670 680
671$(QPEDIR)/rsync/trace.o: $(QPEDIR)/rsync/trace.c \ 681$(OPIEDIR)/rsync/trace.o: $(OPIEDIR)/rsync/trace.c \
672 $(QPEDIR)/rsync/config_rsync.h \ 682 $(OPIEDIR)/rsync/config_rsync.h \
673 $(QPEDIR)/rsync/config_linux.h \ 683 $(OPIEDIR)/rsync/config_linux.h \
674 $(QPEDIR)/rsync/rsync.h \ 684 $(OPIEDIR)/rsync/rsync.h \
675 $(QPEDIR)/rsync/util.h \ 685 $(OPIEDIR)/rsync/util.h \
676 $(QPEDIR)/rsync/trace.h 686 $(OPIEDIR)/rsync/trace.h
677 687
678$(QPEDIR)/rsync/tube.o: $(QPEDIR)/rsync/tube.c \ 688$(OPIEDIR)/rsync/tube.o: $(OPIEDIR)/rsync/tube.c \
679 $(QPEDIR)/rsync/config_rsync.h \ 689 $(OPIEDIR)/rsync/config_rsync.h \
680 $(QPEDIR)/rsync/config_linux.h \ 690 $(OPIEDIR)/rsync/config_linux.h \
681 $(QPEDIR)/rsync/rsync.h \ 691 $(OPIEDIR)/rsync/rsync.h \
682 $(QPEDIR)/rsync/trace.h \ 692 $(OPIEDIR)/rsync/trace.h \
683 $(QPEDIR)/rsync/util.h \ 693 $(OPIEDIR)/rsync/util.h \
684 $(QPEDIR)/rsync/job.h \ 694 $(OPIEDIR)/rsync/job.h \
685 $(QPEDIR)/rsync/stream.h 695 $(OPIEDIR)/rsync/stream.h
686 696
687$(QPEDIR)/rsync/util.o: $(QPEDIR)/rsync/util.c \ 697$(OPIEDIR)/rsync/util.o: $(OPIEDIR)/rsync/util.c \
688 $(QPEDIR)/rsync/config_rsync.h \ 698 $(OPIEDIR)/rsync/config_rsync.h \
689 $(QPEDIR)/rsync/config_linux.h \ 699 $(OPIEDIR)/rsync/config_linux.h \
690 $(QPEDIR)/rsync/util.h \ 700 $(OPIEDIR)/rsync/util.h \
691 $(QPEDIR)/rsync/rsync.h \ 701 $(OPIEDIR)/rsync/rsync.h \
692 $(QPEDIR)/rsync/trace.h 702 $(OPIEDIR)/rsync/trace.h
693 703
694$(QPEDIR)/rsync/version.o: $(QPEDIR)/rsync/version.c \ 704$(OPIEDIR)/rsync/version.o: $(OPIEDIR)/rsync/version.c \
695 $(QPEDIR)/rsync/config_rsync.h \ 705 $(OPIEDIR)/rsync/config_rsync.h \
696 $(QPEDIR)/rsync/config_linux.h \ 706 $(OPIEDIR)/rsync/config_linux.h \
697 $(QPEDIR)/rsync/rsync.h 707 $(OPIEDIR)/rsync/rsync.h
698 708
699$(QPEDIR)/rsync/whole.o: $(QPEDIR)/rsync/whole.c \ 709$(OPIEDIR)/rsync/whole.o: $(OPIEDIR)/rsync/whole.c \
700 $(QPEDIR)/rsync/config_rsync.h \ 710 $(OPIEDIR)/rsync/config_rsync.h \
701 $(QPEDIR)/rsync/config_linux.h \ 711 $(OPIEDIR)/rsync/config_linux.h \
702 $(QPEDIR)/rsync/rsync.h \ 712 $(OPIEDIR)/rsync/rsync.h \
703 $(QPEDIR)/rsync/trace.h \ 713 $(OPIEDIR)/rsync/trace.h \
704 $(QPEDIR)/rsync/fileutil.h \ 714 $(OPIEDIR)/rsync/fileutil.h \
705 $(QPEDIR)/rsync/sumset.h \ 715 $(OPIEDIR)/rsync/sumset.h \
706 $(QPEDIR)/rsync/job.h \ 716 $(OPIEDIR)/rsync/job.h \
707 $(QPEDIR)/rsync/buf.h \ 717 $(OPIEDIR)/rsync/buf.h \
708 $(QPEDIR)/rsync/whole.h \ 718 $(OPIEDIR)/rsync/whole.h \
709 $(QPEDIR)/rsync/util.h 719 $(OPIEDIR)/rsync/util.h
710 720
711$(QPEDIR)/rsync/qrsync.o: $(QPEDIR)/rsync/qrsync.cpp \ 721$(OPIEDIR)/rsync/qrsync.o: $(OPIEDIR)/rsync/qrsync.cpp \
712 $(QPEDIR)/rsync/qrsync.h \ 722 $(OPIEDIR)/rsync/qrsync.h \
713 $(QPEDIR)/rsync/rsync.h 723 $(OPIEDIR)/rsync/rsync.h
714 724
715shutdown.h: shutdown.ui 725shutdown.h: shutdown.ui
716 $(UIC) shutdown.ui -o $(INTERFACE_DECL_PATH)/shutdown.h 726 $(UIC) shutdown.ui -o $(INTERFACE_DECL_PATH)/shutdown.h
@@ -724,8 +734,7 @@ syncdialog.h: syncdialog.ui
724syncdialog.cpp: syncdialog.ui 734syncdialog.cpp: syncdialog.ui
725 $(UIC) syncdialog.ui -i syncdialog.h -o syncdialog.cpp 735 $(UIC) syncdialog.ui -i syncdialog.h -o syncdialog.cpp
726 736
727shutdown.o: shutdown.cpp \ 737shutdown.o: shutdown.cpp
728 shutdown.h
729 738
730syncdialog.o: syncdialog.cpp 739syncdialog.o: syncdialog.cpp
731 740
@@ -736,7 +745,7 @@ moc_desktop.o: moc_desktop.cpp \
736 desktop.h \ 745 desktop.h \
737 shutdownimpl.h \ 746 shutdownimpl.h \
738 shutdown.h \ 747 shutdown.h \
739 $(QPEDIR)/include/qpe/qpeapplication.h 748 $(OPIEDIR)/include/qpe/qpeapplication.h
740 749
741moc_info.o: moc_info.cpp \ 750moc_info.o: moc_info.cpp \
742 info.h \ 751 info.h \
@@ -747,7 +756,7 @@ moc_appicons.o: moc_appicons.cpp \
747 756
748moc_taskbar.o: moc_taskbar.cpp \ 757moc_taskbar.o: moc_taskbar.cpp \
749 taskbar.h \ 758 taskbar.h \
750 $(QPEDIR)/include/qpe/custom.h 759 $(OPIEDIR)/include/qpe/custom.h
751 760
752moc_sidething.o: moc_sidething.cpp \ 761moc_sidething.o: moc_sidething.cpp \
753 sidething.h \ 762 sidething.h \
@@ -755,15 +764,15 @@ moc_sidething.o: moc_sidething.cpp \
755 764
756moc_inputmethods.o: moc_inputmethods.cpp \ 765moc_inputmethods.o: moc_inputmethods.cpp \
757 inputmethods.h \ 766 inputmethods.h \
758 $(QPEDIR)/include/qpe/inputmethodinterface.h \ 767 $(OPIEDIR)/include/qpe/inputmethodinterface.h \
759 $(QPEDIR)/include/qpe/qcom.h \ 768 $(OPIEDIR)/include/qpe/qcom.h \
760 $(QPEDIR)/include/qpe/quuid.h 769 $(OPIEDIR)/include/qpe/quuid.h
761 770
762moc_systray.o: moc_systray.cpp \ 771moc_systray.o: moc_systray.cpp \
763 systray.h \ 772 systray.h \
764 $(QPEDIR)/include/qpe/taskbarappletinterface.h \ 773 $(OPIEDIR)/include/qpe/taskbarappletinterface.h \
765 $(QPEDIR)/include/qpe/qcom.h \ 774 $(OPIEDIR)/include/qpe/qcom.h \
766 $(QPEDIR)/include/qpe/quuid.h 775 $(OPIEDIR)/include/qpe/quuid.h
767 776
768moc_shutdownimpl.o: moc_shutdownimpl.cpp \ 777moc_shutdownimpl.o: moc_shutdownimpl.cpp \
769 shutdownimpl.h \ 778 shutdownimpl.h \
@@ -772,11 +781,11 @@ moc_shutdownimpl.o: moc_shutdownimpl.cpp \
772moc_launcher.o: moc_launcher.cpp \ 781moc_launcher.o: moc_launcher.cpp \
773 launcher.h \ 782 launcher.h \
774 launcherview.h \ 783 launcherview.h \
775 $(QPEDIR)/include/qpe/storage.h 784 $(OPIEDIR)/include/qpe/storage.h
776 785
777moc_launcherview.o: moc_launcherview.cpp \ 786moc_launcherview.o: moc_launcherview.cpp \
778 launcherview.h \ 787 launcherview.h \
779 $(QPEDIR)/include/qpe/storage.h 788 $(OPIEDIR)/include/qpe/storage.h
780 789
781../calibrate/moc_calibrate.o: ../calibrate/moc_calibrate.cpp \ 790../calibrate/moc_calibrate.o: ../calibrate/moc_calibrate.cpp \
782 ../calibrate/calibrate.h 791 ../calibrate/calibrate.h
@@ -799,7 +808,7 @@ moc_irserver.o: moc_irserver.cpp \
799moc_shutdown.o: appicons.moc \ 808moc_shutdown.o: appicons.moc \
800 appicons.cpp \ 809 appicons.cpp \
801 appicons.h \ 810 appicons.h \
802 $(QPEDIR)/include/qpe/qcopenvelope_qws.h 811 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
803 812
804moc_syncdialog.o: moc_shutdown.cpp \ 813moc_syncdialog.o: moc_shutdown.cpp \
805 shutdown.h 814 shutdown.h
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
@@ -2,7 +2,7 @@ TEMPLATE = app
2 2
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 4
5 DESTDIR = $(QPEDIR)/bin 5 DESTDIR = $(OPIEDIR)/bin
6 6
7 HEADERS = background.h \ 7 HEADERS = background.h \
8 desktop.h \ 8 desktop.h \
@@ -24,24 +24,24 @@ HEADERS = background.h \
24 qcopbridge.h \ 24 qcopbridge.h \
25 packageslave.h \ 25 packageslave.h \
26 irserver.h \ 26 irserver.h \
27 $(QPEDIR)/rsync/buf.h \ 27 $(OPIEDIR)/rsync/buf.h \
28 $(QPEDIR)/rsync/checksum.h \ 28 $(OPIEDIR)/rsync/checksum.h \
29 $(QPEDIR)/rsync/command.h \ 29 $(OPIEDIR)/rsync/command.h \
30 $(QPEDIR)/rsync/emit.h \ 30 $(OPIEDIR)/rsync/emit.h \
31 $(QPEDIR)/rsync/job.h \ 31 $(OPIEDIR)/rsync/job.h \
32 $(QPEDIR)/rsync/netint.h \ 32 $(OPIEDIR)/rsync/netint.h \
33 $(QPEDIR)/rsync/protocol.h \ 33 $(OPIEDIR)/rsync/protocol.h \
34 $(QPEDIR)/rsync/prototab.h \ 34 $(OPIEDIR)/rsync/prototab.h \
35 $(QPEDIR)/rsync/rsync.h \ 35 $(OPIEDIR)/rsync/rsync.h \
36 $(QPEDIR)/rsync/search.h \ 36 $(OPIEDIR)/rsync/search.h \
37 $(QPEDIR)/rsync/stream.h \ 37 $(OPIEDIR)/rsync/stream.h \
38 $(QPEDIR)/rsync/sumset.h \ 38 $(OPIEDIR)/rsync/sumset.h \
39 $(QPEDIR)/rsync/trace.h \ 39 $(OPIEDIR)/rsync/trace.h \
40 $(QPEDIR)/rsync/types.h \ 40 $(OPIEDIR)/rsync/types.h \
41 $(QPEDIR)/rsync/util.h \ 41 $(OPIEDIR)/rsync/util.h \
42 $(QPEDIR)/rsync/whole.h \ 42 $(OPIEDIR)/rsync/whole.h \
43 $(QPEDIR)/rsync/config_rsync.h \ 43 $(OPIEDIR)/rsync/config_rsync.h \
44 $(QPEDIR)/rsync/qrsync.h 44 $(OPIEDIR)/rsync/qrsync.h
45 # quicklauncher.h \ 45 # quicklauncher.h \
46 46
47 SOURCES = background.cpp \ 47 SOURCES = background.cpp \
@@ -58,50 +58,50 @@ SOURCES = background.cpp \
58 shutdownimpl.cpp \ 58 shutdownimpl.cpp \
59 launcher.cpp \ 59 launcher.cpp \
60 launcherview.cpp \ 60 launcherview.cpp \
61 $(QPEDIR)/calibrate/calibrate.cpp \ 61 $(OPIEDIR)/calibrate/calibrate.cpp \
62 transferserver.cpp \ 62 transferserver.cpp \
63 packageslave.cpp \ 63 packageslave.cpp \
64 irserver.cpp \ 64 irserver.cpp \
65 qcopbridge.cpp \ 65 qcopbridge.cpp \
66 startmenu.cpp \ 66 startmenu.cpp \
67 main.cpp \ 67 main.cpp \
68 $(QPEDIR)/rsync/base64.c \ 68 $(OPIEDIR)/rsync/base64.c \
69 $(QPEDIR)/rsync/buf.c \ 69 $(OPIEDIR)/rsync/buf.c \
70 $(QPEDIR)/rsync/checksum.c \ 70 $(OPIEDIR)/rsync/checksum.c \
71 $(QPEDIR)/rsync/command.c \ 71 $(OPIEDIR)/rsync/command.c \
72 $(QPEDIR)/rsync/delta.c \ 72 $(OPIEDIR)/rsync/delta.c \
73 $(QPEDIR)/rsync/emit.c \ 73 $(OPIEDIR)/rsync/emit.c \
74 $(QPEDIR)/rsync/hex.c \ 74 $(OPIEDIR)/rsync/hex.c \
75 $(QPEDIR)/rsync/job.c \ 75 $(OPIEDIR)/rsync/job.c \
76 $(QPEDIR)/rsync/mdfour.c \ 76 $(OPIEDIR)/rsync/mdfour.c \
77 $(QPEDIR)/rsync/mksum.c \ 77 $(OPIEDIR)/rsync/mksum.c \
78 $(QPEDIR)/rsync/msg.c \ 78 $(OPIEDIR)/rsync/msg.c \
79 $(QPEDIR)/rsync/netint.c \ 79 $(OPIEDIR)/rsync/netint.c \
80 $(QPEDIR)/rsync/patch.c \ 80 $(OPIEDIR)/rsync/patch.c \
81 $(QPEDIR)/rsync/prototab.c \ 81 $(OPIEDIR)/rsync/prototab.c \
82 $(QPEDIR)/rsync/readsums.c \ 82 $(OPIEDIR)/rsync/readsums.c \
83 $(QPEDIR)/rsync/scoop.c \ 83 $(OPIEDIR)/rsync/scoop.c \
84 $(QPEDIR)/rsync/search.c \ 84 $(OPIEDIR)/rsync/search.c \
85 $(QPEDIR)/rsync/stats.c \ 85 $(OPIEDIR)/rsync/stats.c \
86 $(QPEDIR)/rsync/stream.c \ 86 $(OPIEDIR)/rsync/stream.c \
87 $(QPEDIR)/rsync/sumset.c \ 87 $(OPIEDIR)/rsync/sumset.c \
88 $(QPEDIR)/rsync/trace.c \ 88 $(OPIEDIR)/rsync/trace.c \
89 $(QPEDIR)/rsync/tube.c \ 89 $(OPIEDIR)/rsync/tube.c \
90 $(QPEDIR)/rsync/util.c \ 90 $(OPIEDIR)/rsync/util.c \
91 $(QPEDIR)/rsync/version.c \ 91 $(OPIEDIR)/rsync/version.c \
92 $(QPEDIR)/rsync/whole.c \ 92 $(OPIEDIR)/rsync/whole.c \
93 $(QPEDIR)/rsync/qrsync.cpp 93 $(OPIEDIR)/rsync/qrsync.cpp
94 94
95 INTERFACES= shutdown.ui syncdialog.ui 95 INTERFACES= shutdown.ui syncdialog.ui
96 96
97INCLUDEPATH += $(QPEDIR)/include 97INCLUDEPATH += $(OPIEDIR)/include
98 DEPENDPATH+= $(QPEDIR)/include . 98 DEPENDPATH+= $(OPIEDIR)/include .
99 99
100INCLUDEPATH += $(QPEDIR)/calibrate 100INCLUDEPATH += $(OPIEDIR)/calibrate
101 DEPENDPATH+= $(QPEDIR)/calibrate 101 DEPENDPATH+= $(OPIEDIR)/calibrate
102 102
103INCLUDEPATH += $(QPEDIR)/rsync 103INCLUDEPATH += $(OPIEDIR)/rsync
104 DEPENDPATH+= $(QPEDIR)/rsync 104 DEPENDPATH+= $(OPIEDIR)/rsync
105 105
106 TARGET = qpe 106 TARGET = qpe
107 107
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
@@ -85,7 +85,7 @@ void initCassiopeia()
85 perror("Mounting - shm"); 85 perror("Mounting - shm");
86 } 86 }
87 setenv( "QTDIR", "/", 1 ); 87 setenv( "QTDIR", "/", 1 );
88 setenv( "QPEDIR", "/", 1 ); 88 setenv( "OPIEDIR", "/", 1 );
89 setenv( "HOME", "/home", 1 ); 89 setenv( "HOME", "/home", 1 );
90 mkdir( "/home/Documents", 0755 ); 90 mkdir( "/home/Documents", 0755 );
91 91
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
@@ -3,10 +3,10 @@
3####### Compiler, tools and options 3####### Compiler, tools and options
4 4
5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT) 5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DQCONFIG=\"qpe\" 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) -DQCONFIG=\"qpe\" 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe -lpthread $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe -lpthread $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -14,7 +14,7 @@ UIC = $(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
@@ -135,41 +135,41 @@ REQUIRES=
135####### Compile 135####### Compile
136 136
137main.o: main.cpp \ 137main.o: main.cpp \
138 $(QPEDIR)/include/qpe/qpeapplication.h \ 138 $(OPIEDIR)/include/qpe/qpeapplication.h \
139 mediaplayerstate.h \ 139 mediaplayerstate.h \
140 playlistwidget.h \ 140 playlistwidget.h \
141 $(QPEDIR)/include/qpe/applnk.h \ 141 $(OPIEDIR)/include/qpe/applnk.h \
142 audiowidget.h \ 142 audiowidget.h \
143 videowidget.h \ 143 videowidget.h \
144 loopcontrol.h \ 144 loopcontrol.h \
145 mediaplayer.h \ 145 mediaplayer.h \
146 $(QPEDIR)/include/qpe/qlibrary.h \ 146 $(OPIEDIR)/include/qpe/qlibrary.h \
147 $(QPEDIR)/include/qpe/qcom.h \ 147 $(OPIEDIR)/include/qpe/qcom.h \
148 $(QPEDIR)/include/qpe/quuid.h \ 148 $(OPIEDIR)/include/qpe/quuid.h \
149 mediaplayerplugininterface.h 149 mediaplayerplugininterface.h
150 150
151loopcontrol.o: loopcontrol.cpp \ 151loopcontrol.o: loopcontrol.cpp \
152 $(QPEDIR)/include/qpe/qpeapplication.h \ 152 $(OPIEDIR)/include/qpe/qpeapplication.h \
153 $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ 153 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
154 loopcontrol.h \ 154 loopcontrol.h \
155 videowidget.h \ 155 videowidget.h \
156 audiodevice.h \ 156 audiodevice.h \
157 mediaplayerplugininterface.h \ 157 mediaplayerplugininterface.h \
158 $(QPEDIR)/include/qpe/qcom.h \ 158 $(OPIEDIR)/include/qpe/qcom.h \
159 $(QPEDIR)/include/qpe/quuid.h \ 159 $(OPIEDIR)/include/qpe/quuid.h \
160 mediaplayerstate.h 160 mediaplayerstate.h
161 161
162playlistselection.o: playlistselection.cpp \ 162playlistselection.o: playlistselection.cpp \
163 $(QPEDIR)/include/qpe/applnk.h \ 163 $(OPIEDIR)/include/qpe/applnk.h \
164 $(QPEDIR)/include/qpe/resource.h \ 164 $(OPIEDIR)/include/qpe/resource.h \
165 playlistselection.h 165 playlistselection.h
166 166
167mediaplayerstate.o: mediaplayerstate.cpp \ 167mediaplayerstate.o: mediaplayerstate.cpp \
168 $(QPEDIR)/include/qpe/qpeapplication.h \ 168 $(OPIEDIR)/include/qpe/qpeapplication.h \
169 $(QPEDIR)/include/qpe/qlibrary.h \ 169 $(OPIEDIR)/include/qpe/qlibrary.h \
170 $(QPEDIR)/include/qpe/qcom.h \ 170 $(OPIEDIR)/include/qpe/qcom.h \
171 $(QPEDIR)/include/qpe/quuid.h \ 171 $(OPIEDIR)/include/qpe/quuid.h \
172 $(QPEDIR)/include/qpe/config.h \ 172 $(OPIEDIR)/include/qpe/config.h \
173 mediaplayerplugininterface.h \ 173 mediaplayerplugininterface.h \
174 mediaplayerstate.h \ 174 mediaplayerstate.h \
175 libmad/libmadpluginimpl.h \ 175 libmad/libmadpluginimpl.h \
@@ -177,58 +177,58 @@ mediaplayerstate.o: mediaplayerstate.cpp \
177 wavplugin/wavpluginimpl.h 177 wavplugin/wavpluginimpl.h
178 178
179videowidget.o: videowidget.cpp \ 179videowidget.o: videowidget.cpp \
180 $(QPEDIR)/include/qpe/resource.h \ 180 $(OPIEDIR)/include/qpe/resource.h \
181 videowidget.h \ 181 videowidget.h \
182 mediaplayerplugininterface.h \ 182 mediaplayerplugininterface.h \
183 $(QPEDIR)/include/qpe/qcom.h \ 183 $(OPIEDIR)/include/qpe/qcom.h \
184 $(QPEDIR)/include/qpe/quuid.h \ 184 $(OPIEDIR)/include/qpe/quuid.h \
185 mediaplayerstate.h 185 mediaplayerstate.h
186 186
187audiowidget.o: audiowidget.cpp \ 187audiowidget.o: audiowidget.cpp \
188 $(QPEDIR)/include/qpe/resource.h \ 188 $(OPIEDIR)/include/qpe/resource.h \
189 audiowidget.h \ 189 audiowidget.h \
190 mediaplayerstate.h 190 mediaplayerstate.h
191 191
192playlistwidget.o: playlistwidget.cpp \ 192playlistwidget.o: playlistwidget.cpp \
193 $(QPEDIR)/include/qpe/qpemenubar.h \ 193 $(OPIEDIR)/include/qpe/qpemenubar.h \
194 $(QPEDIR)/include/qpe/qpetoolbar.h \ 194 $(OPIEDIR)/include/qpe/qpetoolbar.h \
195 $(QPEDIR)/include/qpe/fileselector.h \ 195 $(OPIEDIR)/include/qpe/fileselector.h \
196 $(QPEDIR)/include/qpe/applnk.h \ 196 $(OPIEDIR)/include/qpe/applnk.h \
197 $(QPEDIR)/include/qpe/config.h \ 197 $(OPIEDIR)/include/qpe/config.h \
198 $(QPEDIR)/include/qpe/global.h \ 198 $(OPIEDIR)/include/qpe/global.h \
199 $(QPEDIR)/include/qpe/resource.h \ 199 $(OPIEDIR)/include/qpe/resource.h \
200 playlistselection.h \ 200 playlistselection.h \
201 playlistwidget.h \ 201 playlistwidget.h \
202 mediaplayerstate.h 202 mediaplayerstate.h
203 203
204mediaplayer.o: mediaplayer.cpp \ 204mediaplayer.o: mediaplayer.cpp \
205 $(QPEDIR)/include/qpe/qpeapplication.h \ 205 $(OPIEDIR)/include/qpe/qpeapplication.h \
206 $(QPEDIR)/include/qpe/qlibrary.h \ 206 $(OPIEDIR)/include/qpe/qlibrary.h \
207 $(QPEDIR)/include/qpe/qcom.h \ 207 $(OPIEDIR)/include/qpe/qcom.h \
208 $(QPEDIR)/include/qpe/quuid.h \ 208 $(OPIEDIR)/include/qpe/quuid.h \
209 $(QPEDIR)/include/qpe/resource.h \ 209 $(OPIEDIR)/include/qpe/resource.h \
210 $(QPEDIR)/include/qpe/config.h \ 210 $(OPIEDIR)/include/qpe/config.h \
211 mediaplayer.h \ 211 mediaplayer.h \
212 mediaplayerplugininterface.h \ 212 mediaplayerplugininterface.h \
213 playlistwidget.h \ 213 playlistwidget.h \
214 $(QPEDIR)/include/qpe/applnk.h \ 214 $(OPIEDIR)/include/qpe/applnk.h \
215 audiowidget.h \ 215 audiowidget.h \
216 loopcontrol.h \ 216 loopcontrol.h \
217 audiodevice.h \ 217 audiodevice.h \
218 mediaplayerstate.h 218 mediaplayerstate.h
219 219
220audiodevice.o: audiodevice.cpp \ 220audiodevice.o: audiodevice.cpp \
221 $(QPEDIR)/include/qpe/qpeapplication.h \ 221 $(OPIEDIR)/include/qpe/qpeapplication.h \
222 $(QPEDIR)/include/qpe/config.h \ 222 $(OPIEDIR)/include/qpe/config.h \
223 audiodevice.h \ 223 audiodevice.h \
224 $(QPEDIR)/include/qpe/qcopenvelope_qws.h 224 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
225 225
226moc_loopcontrol.o: moc_loopcontrol.cpp \ 226moc_loopcontrol.o: moc_loopcontrol.cpp \
227 loopcontrol.h 227 loopcontrol.h
228 228
229moc_playlistselection.o: moc_playlistselection.cpp \ 229moc_playlistselection.o: moc_playlistselection.cpp \
230 playlistselection.h \ 230 playlistselection.h \
231 $(QPEDIR)/include/qpe/applnk.h 231 $(OPIEDIR)/include/qpe/applnk.h
232 232
233moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \ 233moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \
234 mediaplayerstate.h 234 mediaplayerstate.h
@@ -241,13 +241,13 @@ moc_audiowidget.o: moc_audiowidget.cpp \
241 241
242moc_playlistwidget.o: moc_playlistwidget.cpp \ 242moc_playlistwidget.o: moc_playlistwidget.cpp \
243 playlistwidget.h \ 243 playlistwidget.h \
244 $(QPEDIR)/include/qpe/applnk.h 244 $(OPIEDIR)/include/qpe/applnk.h
245 245
246moc_mediaplayer.o: moc_mediaplayer.cpp \ 246moc_mediaplayer.o: moc_mediaplayer.cpp \
247 mediaplayer.h \ 247 mediaplayer.h \
248 $(QPEDIR)/include/qpe/qlibrary.h \ 248 $(OPIEDIR)/include/qpe/qlibrary.h \
249 $(QPEDIR)/include/qpe/qcom.h \ 249 $(OPIEDIR)/include/qpe/qcom.h \
250 $(QPEDIR)/include/qpe/quuid.h \ 250 $(OPIEDIR)/include/qpe/quuid.h \
251 mediaplayerplugininterface.h 251 mediaplayerplugininterface.h
252 252
253moc_audiodevice.o: moc_audiodevice.cpp \ 253moc_audiodevice.o: moc_audiodevice.cpp \
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
@@ -8,8 +8,8 @@ SOURCES = libflashplugin.cpp libflashpluginimpl.cpp \
8 program.cc sound.cc text.cc 8 program.cc sound.cc text.cc
9 TARGET = flashplugin 9 TARGET = flashplugin
10 DESTDIR = ../../plugins/codecs 10 DESTDIR = ../../plugins/codecs
11INCLUDEPATH += $(QPEDIR)/include .. 11INCLUDEPATH += $(OPIEDIR)/include ..
12DEPENDPATH += ../$(QPEDIR)/include .. 12DEPENDPATH += ../$(OPIEDIR)/include ..
13LIBS += -lqpe 13LIBS += -lqpe
14 VERSION = 1.0.0 14 VERSION = 1.0.0
15 15
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
@@ -3,10 +3,10 @@
3####### Compiler, tools and options 3####### Compiler, tools and options
4 4
5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT) 5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\" 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\" 8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9 INCPATH =-I$(QPEDIR)/include -I.. 9 INCPATH =-I$(OPIEDIR)/include -I..
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
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
@@ -6,7 +6,7 @@ SOURCES = version.c fixed.c bit.c timer.c stream.c frame.c synth.c dec
6 layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp 6 layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp
7 TARGET = madplugin 7 TARGET = madplugin
8 DESTDIR = ../../plugins/codecs 8 DESTDIR = ../../plugins/codecs
9INCLUDEPATH += $(QPEDIR)/include .. 9INCLUDEPATH += $(OPIEDIR)/include ..
10DEPENDPATH += ../$(QPEDIR)/include .. 10DEPENDPATH += ../$(OPIEDIR)/include ..
11LIBS += -lqpe -lm 11LIBS += -lqpe -lm
12 VERSION = 1.0.0 12 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
@@ -3,10 +3,10 @@
3####### Compiler, tools and options 3####### Compiler, tools and options
4 4
5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT) 5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\" 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\" 8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9 INCPATH =-I$(QPEDIR)/include -I.. 9 INCPATH =-I$(OPIEDIR)/include -I..
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe -lpthread -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe -lpthread -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
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
@@ -36,7 +36,7 @@ SOURCES = libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \
36 video/vlc.c 36 video/vlc.c
37 TARGET = mpeg3plugin 37 TARGET = mpeg3plugin
38 DESTDIR = ../../plugins/codecs 38 DESTDIR = ../../plugins/codecs
39INCLUDEPATH += $(QPEDIR)/include .. 39INCLUDEPATH += $(OPIEDIR)/include ..
40DEPENDPATH += ../$(QPEDIR)/include .. 40DEPENDPATH += ../$(OPIEDIR)/include ..
41LIBS += -lqpe -lpthread -lm 41LIBS += -lqpe -lpthread -lm
42 VERSION = 1.0.0 42 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,21 +1,21 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = loopcontrol.h mediaplayerplugininterface.h playlistselection.h mediaplayerstate.h \ 4 HEADERS = loopcontrol.h mediaplayerplugininterface.h playlistselection.h mediaplayerstate.h \
5 videowidget.h audiowidget.h playlistwidget.h mediaplayer.h audiodevice.h 5 videowidget.h audiowidget.h playlistwidget.h mediaplayer.h audiodevice.h
6 SOURCES = main.cpp \ 6 SOURCES = main.cpp \
7 loopcontrol.cpp playlistselection.cpp mediaplayerstate.cpp \ 7 loopcontrol.cpp playlistselection.cpp mediaplayerstate.cpp \
8 videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp audiodevice.cpp 8 videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp audiodevice.cpp
9 TARGET = mpegplayer 9 TARGET = mpegplayer
10 INCLUDEPATH+= $(QPEDIR)/include 10 INCLUDEPATH+= $(OPIEDIR)/include
11 DEPENDPATH+= $(QPEDIR)/include 11 DEPENDPATH+= $(OPIEDIR)/include
12LIBS += -lqpe -lpthread 12LIBS += -lqpe -lpthread
13 13
14 # INTERFACES= 14 # INTERFACES=
15# INCLUDEPATH += $(QPEDIR)/include 15# INCLUDEPATH += $(OPIEDIR)/include
16# CONFIG+=static 16# CONFIG+=static
17# TMAKE_CXXFLAGS += -DQPIM_STANDALONE 17# TMAKE_CXXFLAGS += -DQPIM_STANDALONE
18 # LIBS += libmpeg3/libmpeg3.a -lpthread 18 # LIBS += libmpeg3/libmpeg3.a -lpthread
19 # LIBS += $(QPEDIR)/plugins/codecs/liblibmadplugin.so 19 # LIBS += $(OPIEDIR)/plugins/codecs/liblibmadplugin.so
20 20
21TRANSLATIONS = ../i18n/de/mpegplayer.ts 21TRANSLATIONS = ../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
@@ -3,10 +3,10 @@
3####### Compiler, tools and options 3####### Compiler, tools and options
4 4
5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT) 5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\" 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\" 8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9 INCPATH =-I$(QPEDIR)/include -I.. 9 INCPATH =-I$(OPIEDIR)/include -I..
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
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
@@ -4,7 +4,7 @@ HEADERS = wavplugin.h wavpluginimpl.h
4 SOURCES = wavplugin.cpp wavpluginimpl.cpp 4 SOURCES = wavplugin.cpp wavpluginimpl.cpp
5 TARGET = wavplugin 5 TARGET = wavplugin
6 DESTDIR = ../../plugins/codecs 6 DESTDIR = ../../plugins/codecs
7INCLUDEPATH += $(QPEDIR)/include .. 7INCLUDEPATH += $(OPIEDIR)/include ..
8DEPENDPATH += ../$(QPEDIR)/include .. 8DEPENDPATH += ../$(OPIEDIR)/include ..
9LIBS += -lqpe 9LIBS += -lqpe
10 VERSION = 1.0.0 10 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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -14,7 +14,7 @@ UIC = $(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
@@ -88,7 +88,7 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
88moc: $(SRCMOC) 88moc: $(SRCMOC)
89 89
90tmake: 90tmake:
91 tmake p4addressbook.pro 91 tmake addressbook.pro
92 92
93clean: 93clean:
94 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 94 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
@@ -123,66 +123,66 @@ REQUIRES=
123 123
124main.o: main.cpp \ 124main.o: main.cpp \
125 addressbook.h \ 125 addressbook.h \
126 $(QPEDIR)/include/qpe/qpeapplication.h \ 126 $(OPIEDIR)/include/qpe/qpeapplication.h \
127 $(QPEDIR)/include/qpe/qcopenvelope_qws.h 127 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
128 128
129addressbook.o: addressbook.cpp \ 129addressbook.o: addressbook.cpp \
130 abeditor.h \ 130 abeditor.h \
131 $(QPEDIR)/include/qpe/contact.h \ 131 $(OPIEDIR)/include/qpe/contact.h \
132 $(QPEDIR)/include/qpe/palmtoprecord.h \ 132 $(OPIEDIR)/include/qpe/palmtoprecord.h \
133 $(QPEDIR)/include/qpe/recordfields.h \ 133 $(OPIEDIR)/include/qpe/recordfields.h \
134 ablabel.h \ 134 ablabel.h \
135 abtable.h \ 135 abtable.h \
136 $(QPEDIR)/include/qpe/categories.h \ 136 $(OPIEDIR)/include/qpe/categories.h \
137 addresssettings.h \ 137 addresssettings.h \
138 addresssettingsbase.h \ 138 addresssettingsbase.h \
139 addressbook.h \ 139 addressbook.h \
140 $(QPEDIR)/include/qpe/qpeapplication.h \ 140 $(OPIEDIR)/include/qpe/qpeapplication.h \
141 $(QPEDIR)/include/qpe/config.h \ 141 $(OPIEDIR)/include/qpe/config.h \
142 $(QPEDIR)/include/qpe/finddialog.h \ 142 $(OPIEDIR)/include/qpe/finddialog.h \
143 $(QPEDIR)/include/qpe/global.h \ 143 $(OPIEDIR)/include/qpe/global.h \
144 $(QPEDIR)/include/qpe/resource.h \ 144 $(OPIEDIR)/include/qpe/resource.h \
145 $(QPEDIR)/include/qpe/ir.h \ 145 $(OPIEDIR)/include/qpe/ir.h \
146 $(QPEDIR)/include/qpe/qpemessagebox.h \ 146 $(OPIEDIR)/include/qpe/qpemessagebox.h \
147 $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ 147 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
148 $(QPEDIR)/include/qpe/qpemenubar.h \ 148 $(OPIEDIR)/include/qpe/qpemenubar.h \
149 $(QPEDIR)/include/qpe/qpetoolbar.h 149 $(OPIEDIR)/include/qpe/qpetoolbar.h
150 150
151abeditor.o: abeditor.cpp \ 151abeditor.o: abeditor.cpp \
152 abeditor.h \ 152 abeditor.h \
153 $(QPEDIR)/include/qpe/contact.h \ 153 $(OPIEDIR)/include/qpe/contact.h \
154 $(QPEDIR)/include/qpe/palmtoprecord.h \ 154 $(OPIEDIR)/include/qpe/palmtoprecord.h \
155 $(QPEDIR)/include/qpe/recordfields.h \ 155 $(OPIEDIR)/include/qpe/recordfields.h \
156 addresspicker.h \ 156 addresspicker.h \
157 $(QPEDIR)/include/qpe/categoryselect.h \ 157 $(OPIEDIR)/include/qpe/categoryselect.h \
158 $(QPEDIR)/include/qpe/qpeapplication.h \ 158 $(OPIEDIR)/include/qpe/qpeapplication.h \
159 $(QPEDIR)/include/qpe/qpedialog.h 159 $(OPIEDIR)/include/qpe/qpedialog.h
160 160
161ablabel.o: ablabel.cpp \ 161ablabel.o: ablabel.cpp \
162 ablabel.h \ 162 ablabel.h \
163 $(QPEDIR)/include/qpe/contact.h \ 163 $(OPIEDIR)/include/qpe/contact.h \
164 $(QPEDIR)/include/qpe/palmtoprecord.h \ 164 $(OPIEDIR)/include/qpe/palmtoprecord.h \
165 $(QPEDIR)/include/qpe/recordfields.h \ 165 $(OPIEDIR)/include/qpe/recordfields.h \
166 $(QPEDIR)/include/qpe/stringutil.h 166 $(OPIEDIR)/include/qpe/stringutil.h
167 167
168abtable.o: abtable.cpp \ 168abtable.o: abtable.cpp \
169 $(QPEDIR)/include/qpe/categoryselect.h \ 169 $(OPIEDIR)/include/qpe/categoryselect.h \
170 $(QPEDIR)/include/qpe/config.h \ 170 $(OPIEDIR)/include/qpe/config.h \
171 $(QPEDIR)/include/qpe/stringutil.h \ 171 $(OPIEDIR)/include/qpe/stringutil.h \
172 $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ 172 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
173 abtable.h \ 173 abtable.h \
174 $(QPEDIR)/include/qpe/categories.h \ 174 $(OPIEDIR)/include/qpe/categories.h \
175 $(QPEDIR)/include/qpe/contact.h \ 175 $(OPIEDIR)/include/qpe/contact.h \
176 $(QPEDIR)/include/qpe/palmtoprecord.h \ 176 $(OPIEDIR)/include/qpe/palmtoprecord.h \
177 $(QPEDIR)/include/qpe/recordfields.h 177 $(OPIEDIR)/include/qpe/recordfields.h
178 178
179addresssettings.o: addresssettings.cpp \ 179addresssettings.o: addresssettings.cpp \
180 addresssettings.h \ 180 addresssettings.h \
181 addresssettingsbase.h \ 181 addresssettingsbase.h \
182 $(QPEDIR)/include/qpe/config.h \ 182 $(OPIEDIR)/include/qpe/config.h \
183 $(QPEDIR)/include/qpe/contact.h \ 183 $(OPIEDIR)/include/qpe/contact.h \
184 $(QPEDIR)/include/qpe/palmtoprecord.h \ 184 $(OPIEDIR)/include/qpe/palmtoprecord.h \
185 $(QPEDIR)/include/qpe/recordfields.h 185 $(OPIEDIR)/include/qpe/recordfields.h
186 186
187addresssettingsbase.h: addresssettingsbase.ui 187addresssettingsbase.h: addresssettingsbase.ui
188 $(UIC) addresssettingsbase.ui -o $(INTERFACE_DECL_PATH)/addresssettingsbase.h 188 $(UIC) addresssettingsbase.ui -o $(INTERFACE_DECL_PATH)/addresssettingsbase.h
@@ -199,22 +199,22 @@ moc_addressbook.o: moc_addressbook.cpp \
199 199
200moc_abeditor.o: moc_abeditor.cpp \ 200moc_abeditor.o: moc_abeditor.cpp \
201 abeditor.h \ 201 abeditor.h \
202 $(QPEDIR)/include/qpe/contact.h \ 202 $(OPIEDIR)/include/qpe/contact.h \
203 $(QPEDIR)/include/qpe/palmtoprecord.h \ 203 $(OPIEDIR)/include/qpe/palmtoprecord.h \
204 $(QPEDIR)/include/qpe/recordfields.h 204 $(OPIEDIR)/include/qpe/recordfields.h
205 205
206moc_ablabel.o: moc_ablabel.cpp \ 206moc_ablabel.o: moc_ablabel.cpp \
207 ablabel.h \ 207 ablabel.h \
208 $(QPEDIR)/include/qpe/contact.h \ 208 $(OPIEDIR)/include/qpe/contact.h \
209 $(QPEDIR)/include/qpe/palmtoprecord.h \ 209 $(OPIEDIR)/include/qpe/palmtoprecord.h \
210 $(QPEDIR)/include/qpe/recordfields.h 210 $(OPIEDIR)/include/qpe/recordfields.h
211 211
212moc_abtable.o: moc_abtable.cpp \ 212moc_abtable.o: moc_abtable.cpp \
213 abtable.h \ 213 abtable.h \
214 $(QPEDIR)/include/qpe/categories.h \ 214 $(OPIEDIR)/include/qpe/categories.h \
215 $(QPEDIR)/include/qpe/contact.h \ 215 $(OPIEDIR)/include/qpe/contact.h \
216 $(QPEDIR)/include/qpe/palmtoprecord.h \ 216 $(OPIEDIR)/include/qpe/palmtoprecord.h \
217 $(QPEDIR)/include/qpe/recordfields.h 217 $(OPIEDIR)/include/qpe/recordfields.h
218 218
219moc_addresssettings.o: moc_addresssettings.cpp \ 219moc_addresssettings.o: moc_addresssettings.cpp \
220 addresssettings.h \ 220 addresssettings.h \
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,6 +1,6 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS= addressbook.h \ 4 HEADERS= addressbook.h \
5 abeditor.h \ 5 abeditor.h \
6 ablabel.h \ 6 ablabel.h \
@@ -15,8 +15,8 @@ SOURCES = main.cpp \
15 INTERFACES= addresssettingsbase.ui 15 INTERFACES= addresssettingsbase.ui
16 16
17 TARGET = addressbook 17 TARGET = addressbook
18INCLUDEPATH += $(QPEDIR)/include 18INCLUDEPATH += $(OPIEDIR)/include
19 DEPENDPATH+= $(QPEDIR)/include 19 DEPENDPATH+= $(OPIEDIR)/include
20LIBS += -lqpe 20LIBS += -lqpe
21 21
22TRANSLATIONS = ../i18n/de/addressbook.ts 22TRANSLATIONS = ../i18n/de/addressbook.ts
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -14,7 +14,7 @@ UIC = $(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
@@ -160,87 +160,98 @@ REQUIRES=
160 160
161main.o: main.cpp \ 161main.o: main.cpp \
162 datebook.h \ 162 datebook.h \
163 $(QPEDIR)/include/qpe/datebookdb.h \ 163 $(OPIEDIR)/include/qpe/datebookdb.h \
164 $(QPEDIR)/include/qpe/event.h \ 164 $(OPIEDIR)/include/qpe/event.h \
165 $(QPEDIR)/include/qpe/palmtoprecord.h \ 165 $(OPIEDIR)/include/qpe/palmtoprecord.h \
166 $(QPEDIR)/include/qpe/qpeapplication.h 166 $(OPIEDIR)/include/qpe/timeconversion.h \
167 $(OPIEDIR)/include/qpe/qpcglobal.h \
168 $(OPIEDIR)/include/qpe/qpeapplication.h
167 169
168datebookday.o: datebookday.cpp \ 170datebookday.o: datebookday.cpp \
169 datebookday.h \ 171 datebookday.h \
170 $(QPEDIR)/include/qpe/event.h \ 172 $(OPIEDIR)/include/qpe/event.h \
171 $(QPEDIR)/include/qpe/palmtoprecord.h \ 173 $(OPIEDIR)/include/qpe/palmtoprecord.h \
174 $(OPIEDIR)/include/qpe/timeconversion.h \
175 $(OPIEDIR)/include/qpe/qpcglobal.h \
172 datebookdayheaderimpl.h \ 176 datebookdayheaderimpl.h \
173 datebookdayheader.h \ 177 datebookdayheader.h \
174 $(QPEDIR)/include/qpe/datebookdb.h \ 178 $(OPIEDIR)/include/qpe/datebookdb.h \
175 $(QPEDIR)/include/qpe/resource.h \ 179 $(OPIEDIR)/include/qpe/resource.h \
176 $(QPEDIR)/include/qpe/qpeapplication.h \ 180 $(OPIEDIR)/include/qpe/qpeapplication.h \
177 $(QPEDIR)/include/qpe/timestring.h \ 181 $(OPIEDIR)/include/qpe/timestring.h \
178 $(QPEDIR)/include/qpe/qpedebug.h 182 $(OPIEDIR)/include/qpe/qpedebug.h
179 183
180datebook.o: datebook.cpp \ 184datebook.o: datebook.cpp \
181 datebook.h \ 185 datebook.h \
182 $(QPEDIR)/include/qpe/datebookdb.h \ 186 $(OPIEDIR)/include/qpe/datebookdb.h \
183 $(QPEDIR)/include/qpe/event.h \ 187 $(OPIEDIR)/include/qpe/event.h \
184 $(QPEDIR)/include/qpe/palmtoprecord.h \ 188 $(OPIEDIR)/include/qpe/palmtoprecord.h \
189 $(OPIEDIR)/include/qpe/timeconversion.h \
190 $(OPIEDIR)/include/qpe/qpcglobal.h \
185 datebookday.h \ 191 datebookday.h \
186 datebooksettings.h \ 192 datebooksettings.h \
187 datebooksettingsbase.h \ 193 datebooksettingsbase.h \
188 datebookweek.h \ 194 datebookweek.h \
189 dateentryimpl.h \ 195 dateentryimpl.h \
190 dateentry.h \ 196 dateentry.h \
191 $(QPEDIR)/include/qpe/datebookmonth.h \ 197 $(OPIEDIR)/include/qpe/datebookmonth.h \
192 $(QPEDIR)/include/qpe/qpeapplication.h \ 198 $(OPIEDIR)/include/qpe/qpeapplication.h \
193 $(QPEDIR)/include/qpe/config.h \ 199 $(OPIEDIR)/include/qpe/config.h \
194 $(QPEDIR)/include/qpe/qpedebug.h \ 200 $(OPIEDIR)/include/qpe/qpedebug.h \
195 $(QPEDIR)/include/qpe/finddialog.h \ 201 $(OPIEDIR)/include/qpe/finddialog.h \
196 $(QPEDIR)/include/qpe/ir.h \ 202 $(OPIEDIR)/include/qpe/ir.h \
197 $(QPEDIR)/include/qpe/qpemenubar.h \ 203 $(OPIEDIR)/include/qpe/qpemenubar.h \
198 $(QPEDIR)/include/qpe/qpemessagebox.h \ 204 $(OPIEDIR)/include/qpe/qpemessagebox.h \
199 $(QPEDIR)/include/qpe/resource.h \ 205 $(OPIEDIR)/include/qpe/resource.h \
200 $(QPEDIR)/include/qpe/sound.h \ 206 $(OPIEDIR)/include/qpe/sound.h \
201 $(QPEDIR)/include/qpe/timestring.h \ 207 $(OPIEDIR)/include/qpe/timestring.h \
202 $(QPEDIR)/include/qpe/qpetoolbar.h \ 208 $(OPIEDIR)/include/qpe/qpetoolbar.h \
203 $(QPEDIR)/include/qpe/tzselect.h \ 209 $(OPIEDIR)/include/qpe/tzselect.h \
204 $(QPEDIR)/include/qpe/xmlreader.h 210 $(OPIEDIR)/include/qpe/xmlreader.h
205 211
206dateentryimpl.o: dateentryimpl.cpp \ 212dateentryimpl.o: dateentryimpl.cpp \
207 dateentryimpl.h \ 213 dateentryimpl.h \
208 dateentry.h \ 214 dateentry.h \
209 $(QPEDIR)/include/qpe/event.h \ 215 $(OPIEDIR)/include/qpe/event.h \
210 $(QPEDIR)/include/qpe/palmtoprecord.h \ 216 $(OPIEDIR)/include/qpe/palmtoprecord.h \
217 $(OPIEDIR)/include/qpe/timeconversion.h \
218 $(OPIEDIR)/include/qpe/qpcglobal.h \
211 repeatentry.h \ 219 repeatentry.h \
212 repeatentrybase.h \ 220 repeatentrybase.h \
213 $(QPEDIR)/include/qpe/qpeapplication.h \ 221 $(OPIEDIR)/include/qpe/qpeapplication.h \
214 $(QPEDIR)/include/qpe/categoryselect.h \ 222 $(OPIEDIR)/include/qpe/categoryselect.h \
215 $(QPEDIR)/include/qpe/datebookmonth.h \ 223 $(OPIEDIR)/include/qpe/datebookmonth.h \
216 $(QPEDIR)/include/qpe/global.h \ 224 $(OPIEDIR)/include/qpe/global.h \
217 $(QPEDIR)/include/qpe/timeconversion.h \ 225 $(OPIEDIR)/include/qpe/timestring.h \
218 $(QPEDIR)/include/qpe/timestring.h \ 226 $(OPIEDIR)/include/qpe/tzselect.h
219 $(QPEDIR)/include/qpe/tzselect.h
220 227
221datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \ 228datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \
222 datebookdayheaderimpl.h \ 229 datebookdayheaderimpl.h \
223 datebookdayheader.h \ 230 datebookdayheader.h \
224 $(QPEDIR)/include/qpe/datebookmonth.h \ 231 $(OPIEDIR)/include/qpe/datebookmonth.h \
225 $(QPEDIR)/include/qpe/event.h \ 232 $(OPIEDIR)/include/qpe/event.h \
226 $(QPEDIR)/include/qpe/palmtoprecord.h \ 233 $(OPIEDIR)/include/qpe/palmtoprecord.h \
227 $(QPEDIR)/include/qpe/timestring.h 234 $(OPIEDIR)/include/qpe/timeconversion.h \
235 $(OPIEDIR)/include/qpe/qpcglobal.h \
236 $(OPIEDIR)/include/qpe/timestring.h
228 237
229datebooksettings.o: datebooksettings.cpp \ 238datebooksettings.o: datebooksettings.cpp \
230 datebooksettings.h \ 239 datebooksettings.h \
231 datebooksettingsbase.h \ 240 datebooksettingsbase.h \
232 $(QPEDIR)/include/qpe/qpeapplication.h 241 $(OPIEDIR)/include/qpe/qpeapplication.h
233 242
234datebookweek.o: datebookweek.cpp \ 243datebookweek.o: datebookweek.cpp \
235 datebookweek.h \ 244 datebookweek.h \
236 $(QPEDIR)/include/qpe/event.h \ 245 $(OPIEDIR)/include/qpe/event.h \
237 $(QPEDIR)/include/qpe/palmtoprecord.h \ 246 $(OPIEDIR)/include/qpe/palmtoprecord.h \
247 $(OPIEDIR)/include/qpe/timeconversion.h \
248 $(OPIEDIR)/include/qpe/qpcglobal.h \
238 datebookweekheaderimpl.h \ 249 datebookweekheaderimpl.h \
239 datebookweekheader.h \ 250 datebookweekheader.h \
240 $(QPEDIR)/include/qpe/calendar.h \ 251 $(OPIEDIR)/include/qpe/calendar.h \
241 $(QPEDIR)/include/qpe/datebookdb.h \ 252 $(OPIEDIR)/include/qpe/datebookdb.h \
242 $(QPEDIR)/include/qpe/qpeapplication.h \ 253 $(OPIEDIR)/include/qpe/qpeapplication.h \
243 $(QPEDIR)/include/qpe/timestring.h 254 $(OPIEDIR)/include/qpe/timestring.h
244 255
245datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \ 256datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \
246 datebookweekheaderimpl.h \ 257 datebookweekheaderimpl.h \
@@ -249,11 +260,13 @@ datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \
249repeatentry.o: repeatentry.cpp \ 260repeatentry.o: repeatentry.cpp \
250 repeatentry.h \ 261 repeatentry.h \
251 repeatentrybase.h \ 262 repeatentrybase.h \
252 $(QPEDIR)/include/qpe/event.h \ 263 $(OPIEDIR)/include/qpe/event.h \
253 $(QPEDIR)/include/qpe/palmtoprecord.h \ 264 $(OPIEDIR)/include/qpe/palmtoprecord.h \
254 $(QPEDIR)/include/qpe/datebookmonth.h \ 265 $(OPIEDIR)/include/qpe/timeconversion.h \
255 $(QPEDIR)/include/qpe/qpeapplication.h \ 266 $(OPIEDIR)/include/qpe/qpcglobal.h \
256 $(QPEDIR)/include/qpe/timestring.h 267 $(OPIEDIR)/include/qpe/datebookmonth.h \
268 $(OPIEDIR)/include/qpe/qpeapplication.h \
269 $(OPIEDIR)/include/qpe/timestring.h
257 270
258dateentry.h: dateentry.ui 271dateentry.h: dateentry.ui
259 $(UIC) dateentry.ui -o $(INTERFACE_DECL_PATH)/dateentry.h 272 $(UIC) dateentry.ui -o $(INTERFACE_DECL_PATH)/dateentry.h
@@ -297,20 +310,26 @@ repeatentrybase.o: repeatentrybase.cpp
297 310
298moc_datebookday.o: moc_datebookday.cpp \ 311moc_datebookday.o: moc_datebookday.cpp \
299 datebookday.h \ 312 datebookday.h \
300 $(QPEDIR)/include/qpe/event.h \ 313 $(OPIEDIR)/include/qpe/event.h \
301 $(QPEDIR)/include/qpe/palmtoprecord.h 314 $(OPIEDIR)/include/qpe/palmtoprecord.h \
315 $(OPIEDIR)/include/qpe/timeconversion.h \
316 $(OPIEDIR)/include/qpe/qpcglobal.h
302 317
303moc_datebook.o: moc_datebook.cpp \ 318moc_datebook.o: moc_datebook.cpp \
304 datebook.h \ 319 datebook.h \
305 $(QPEDIR)/include/qpe/datebookdb.h \ 320 $(OPIEDIR)/include/qpe/datebookdb.h \
306 $(QPEDIR)/include/qpe/event.h \ 321 $(OPIEDIR)/include/qpe/event.h \
307 $(QPEDIR)/include/qpe/palmtoprecord.h 322 $(OPIEDIR)/include/qpe/palmtoprecord.h \
323 $(OPIEDIR)/include/qpe/timeconversion.h \
324 $(OPIEDIR)/include/qpe/qpcglobal.h
308 325
309moc_dateentryimpl.o: moc_dateentryimpl.cpp \ 326moc_dateentryimpl.o: moc_dateentryimpl.cpp \
310 dateentryimpl.h \ 327 dateentryimpl.h \
311 dateentry.h \ 328 dateentry.h \
312 $(QPEDIR)/include/qpe/event.h \ 329 $(OPIEDIR)/include/qpe/event.h \
313 $(QPEDIR)/include/qpe/palmtoprecord.h 330 $(OPIEDIR)/include/qpe/palmtoprecord.h \
331 $(OPIEDIR)/include/qpe/timeconversion.h \
332 $(OPIEDIR)/include/qpe/qpcglobal.h
314 333
315moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \ 334moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \
316 datebookdayheaderimpl.h \ 335 datebookdayheaderimpl.h \
@@ -318,8 +337,10 @@ moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \
318 337
319moc_datebookweek.o: moc_datebookweek.cpp \ 338moc_datebookweek.o: moc_datebookweek.cpp \
320 datebookweek.h \ 339 datebookweek.h \
321 $(QPEDIR)/include/qpe/event.h \ 340 $(OPIEDIR)/include/qpe/event.h \
322 $(QPEDIR)/include/qpe/palmtoprecord.h 341 $(OPIEDIR)/include/qpe/palmtoprecord.h \
342 $(OPIEDIR)/include/qpe/timeconversion.h \
343 $(OPIEDIR)/include/qpe/qpcglobal.h
323 344
324moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \ 345moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \
325 datebookweekheaderimpl.h \ 346 datebookweekheaderimpl.h \
@@ -328,8 +349,10 @@ moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \
328moc_repeatentry.o: moc_repeatentry.cpp \ 349moc_repeatentry.o: moc_repeatentry.cpp \
329 repeatentry.h \ 350 repeatentry.h \
330 repeatentrybase.h \ 351 repeatentrybase.h \
331 $(QPEDIR)/include/qpe/event.h \ 352 $(OPIEDIR)/include/qpe/event.h \
332 $(QPEDIR)/include/qpe/palmtoprecord.h 353 $(OPIEDIR)/include/qpe/palmtoprecord.h \
354 $(OPIEDIR)/include/qpe/timeconversion.h \
355 $(OPIEDIR)/include/qpe/qpcglobal.h
333 356
334moc_dateentry.o: moc_dateentry.cpp \ 357moc_dateentry.o: moc_dateentry.cpp \
335 dateentry.h 358 dateentry.h
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,6 +1,6 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 4
5 HEADERS= datebookday.h \ 5 HEADERS= datebookday.h \
6 datebook.h \ 6 datebook.h \
@@ -27,8 +27,8 @@ INTERFACES = dateentry.ui \
27 datebookweekheader.ui \ 27 datebookweekheader.ui \
28 repeatentrybase.ui 28 repeatentrybase.ui
29 29
30INCLUDEPATH += $(QPEDIR)/include 30INCLUDEPATH += $(OPIEDIR)/include
31 DEPENDPATH+= $(QPEDIR)/include 31 DEPENDPATH+= $(OPIEDIR)/include
32LIBS += -lqpe 32LIBS += -lqpe
33 33
34 TARGET = datebook 34 TARGET = datebook
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -14,7 +14,7 @@ UIC = $(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
@@ -113,48 +113,50 @@ REQUIRES=
113 113
114main.o: main.cpp \ 114main.o: main.cpp \
115 mainwindow.h \ 115 mainwindow.h \
116 $(QPEDIR)/include/qpe/qpeapplication.h 116 $(OPIEDIR)/include/qpe/qpeapplication.h
117 117
118mainwindow.o: mainwindow.cpp \ 118mainwindow.o: mainwindow.cpp \
119 mainwindow.h \ 119 mainwindow.h \
120 todoentryimpl.h \ 120 todoentryimpl.h \
121 todoentry.h \ 121 todoentry.h \
122 $(QPEDIR)/include/qpe/task.h \ 122 $(OPIEDIR)/include/qpe/task.h \
123 $(QPEDIR)/include/qpe/palmtoprecord.h \ 123 $(OPIEDIR)/include/qpe/palmtoprecord.h \
124 $(QPEDIR)/include/qpe/stringutil.h \ 124 $(OPIEDIR)/include/qpe/stringutil.h \
125 todotable.h \ 125 todotable.h \
126 $(QPEDIR)/include/qpe/categories.h \ 126 $(OPIEDIR)/include/qpe/categories.h \
127 $(QPEDIR)/include/qpe/qpeapplication.h \ 127 $(OPIEDIR)/include/qpe/qpeapplication.h \
128 $(QPEDIR)/include/qpe/config.h \ 128 $(OPIEDIR)/include/qpe/config.h \
129 $(QPEDIR)/include/qpe/finddialog.h \ 129 $(OPIEDIR)/include/qpe/finddialog.h \
130 $(QPEDIR)/include/qpe/global.h \ 130 $(OPIEDIR)/include/qpe/global.h \
131 $(QPEDIR)/include/qpe/ir.h \ 131 $(OPIEDIR)/include/qpe/ir.h \
132 $(QPEDIR)/include/qpe/qpemenubar.h \ 132 $(OPIEDIR)/include/qpe/qpemenubar.h \
133 $(QPEDIR)/include/qpe/qpemessagebox.h \ 133 $(OPIEDIR)/include/qpe/qpemessagebox.h \
134 $(QPEDIR)/include/qpe/resource.h \ 134 $(OPIEDIR)/include/qpe/resource.h \
135 $(QPEDIR)/include/qpe/qpetoolbar.h 135 $(OPIEDIR)/include/qpe/qpetoolbar.h
136 136
137todotable.o: todotable.cpp \ 137todotable.o: todotable.cpp \
138 todotable.h \ 138 todotable.h \
139 $(QPEDIR)/include/qpe/categories.h \ 139 $(OPIEDIR)/include/qpe/categories.h \
140 $(QPEDIR)/include/qpe/task.h \ 140 $(OPIEDIR)/include/qpe/stringutil.h \
141 $(QPEDIR)/include/qpe/palmtoprecord.h \ 141 $(OPIEDIR)/include/qpe/task.h \
142 $(QPEDIR)/include/qpe/stringutil.h \ 142 $(OPIEDIR)/include/qpe/palmtoprecord.h \
143 $(QPEDIR)/include/qpe/categoryselect.h \ 143 $(OPIEDIR)/include/qpe/categoryselect.h \
144 $(QPEDIR)/include/qpe/xmlreader.h 144 $(OPIEDIR)/include/qpe/xmlreader.h
145 145
146todoentryimpl.o: todoentryimpl.cpp \ 146todoentryimpl.o: todoentryimpl.cpp \
147 todoentryimpl.h \ 147 todoentryimpl.h \
148 todoentry.h \ 148 todoentry.h \
149 $(QPEDIR)/include/qpe/task.h \ 149 $(OPIEDIR)/include/qpe/task.h \
150 $(QPEDIR)/include/qpe/palmtoprecord.h \ 150 $(OPIEDIR)/include/qpe/palmtoprecord.h \
151 $(QPEDIR)/include/qpe/stringutil.h \ 151 $(OPIEDIR)/include/qpe/stringutil.h \
152 $(QPEDIR)/include/qpe/categoryselect.h \ 152 $(OPIEDIR)/include/qpe/categoryselect.h \
153 $(QPEDIR)/include/qpe/datebookmonth.h \ 153 $(OPIEDIR)/include/qpe/datebookmonth.h \
154 $(QPEDIR)/include/qpe/event.h \ 154 $(OPIEDIR)/include/qpe/event.h \
155 $(QPEDIR)/include/qpe/global.h \ 155 $(OPIEDIR)/include/qpe/timeconversion.h \
156 $(QPEDIR)/include/qpe/imageedit.h \ 156 $(OPIEDIR)/include/qpe/qpcglobal.h \
157 $(QPEDIR)/include/qpe/timestring.h 157 $(OPIEDIR)/include/qpe/global.h \
158 $(OPIEDIR)/include/qpe/imageedit.h \
159 $(OPIEDIR)/include/qpe/timestring.h
158 160
159todoentry.h: todoentry.ui 161todoentry.h: todoentry.ui
160 $(UIC) todoentry.ui -o $(INTERFACE_DECL_PATH)/todoentry.h 162 $(UIC) todoentry.ui -o $(INTERFACE_DECL_PATH)/todoentry.h
@@ -171,17 +173,17 @@ moc_mainwindow.o: moc_mainwindow.cpp \
171 173
172moc_todotable.o: moc_todotable.cpp \ 174moc_todotable.o: moc_todotable.cpp \
173 todotable.h \ 175 todotable.h \
174 $(QPEDIR)/include/qpe/categories.h \ 176 $(OPIEDIR)/include/qpe/categories.h \
175 $(QPEDIR)/include/qpe/task.h \ 177 $(OPIEDIR)/include/qpe/stringutil.h \
176 $(QPEDIR)/include/qpe/palmtoprecord.h \ 178 $(OPIEDIR)/include/qpe/task.h \
177 $(QPEDIR)/include/qpe/stringutil.h 179 $(OPIEDIR)/include/qpe/palmtoprecord.h
178 180
179moc_todoentryimpl.o: moc_todoentryimpl.cpp \ 181moc_todoentryimpl.o: moc_todoentryimpl.cpp \
180 todoentryimpl.h \ 182 todoentryimpl.h \
181 todoentry.h \ 183 todoentry.h \
182 $(QPEDIR)/include/qpe/task.h \ 184 $(OPIEDIR)/include/qpe/task.h \
183 $(QPEDIR)/include/qpe/palmtoprecord.h \ 185 $(OPIEDIR)/include/qpe/palmtoprecord.h \
184 $(QPEDIR)/include/qpe/stringutil.h 186 $(OPIEDIR)/include/qpe/stringutil.h
185 187
186moc_todoentry.o: moc_todoentry.cpp \ 188moc_todoentry.o: moc_todoentry.cpp \
187 todoentry.h 189 todoentry.h
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,6 +1,6 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS= mainwindow.h \ 4 HEADERS= mainwindow.h \
5 todotable.h \ 5 todotable.h \
6 todoentryimpl.h 6 todoentryimpl.h
@@ -12,8 +12,8 @@ SOURCES = main.cpp \
12 INTERFACES= todoentry.ui 12 INTERFACES= todoentry.ui
13 13
14 TARGET = todolist 14 TARGET = todolist
15INCLUDEPATH += $(QPEDIR)/include 15INCLUDEPATH += $(OPIEDIR)/include
16 DEPENDPATH+= $(QPEDIR)/include 16 DEPENDPATH+= $(OPIEDIR)/include
17LIBS += -lqpe 17LIBS += -lqpe
18 18
19TRANSLATIONS = ../i18n/de/todolist.ts 19TRANSLATIONS = ../i18n/de/todolist.ts
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -14,7 +14,7 @@ UIC = $(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
@@ -119,28 +119,28 @@ citytime.o: citytime.cpp \
119 stylusnormalizer.h \ 119 stylusnormalizer.h \
120 citytime.h \ 120 citytime.h \
121 citytimebase.h \ 121 citytimebase.h \
122 $(QPEDIR)/include/qpe/qpeapplication.h \ 122 $(OPIEDIR)/include/qpe/qpeapplication.h \
123 $(QPEDIR)/include/qpe/config.h \ 123 $(OPIEDIR)/include/qpe/config.h \
124 $(QPEDIR)/include/qpe/timestring.h \ 124 $(OPIEDIR)/include/qpe/timestring.h \
125 $(QPEDIR)/include/qpe/tzselect.h \ 125 $(OPIEDIR)/include/qpe/tzselect.h \
126 $(QPEDIR)/include/qpe/qcopenvelope_qws.h 126 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
127 127
128zonemap.o: zonemap.cpp \ 128zonemap.o: zonemap.cpp \
129 sun.h \ 129 sun.h \
130 zonemap.h \ 130 zonemap.h \
131 stylusnormalizer.h \ 131 stylusnormalizer.h \
132 $(QPEDIR)/include/qpe/resource.h \ 132 $(OPIEDIR)/include/qpe/resource.h \
133 $(QPEDIR)/include/qpe/timestring.h \ 133 $(OPIEDIR)/include/qpe/timestring.h \
134 $(QPEDIR)/include/qpe/qpeapplication.h 134 $(OPIEDIR)/include/qpe/qpeapplication.h
135 135
136main.o: main.cpp \ 136main.o: main.cpp \
137 citytime.h \ 137 citytime.h \
138 citytimebase.h \ 138 citytimebase.h \
139 $(QPEDIR)/include/qpe/qpeapplication.h 139 $(OPIEDIR)/include/qpe/qpeapplication.h
140 140
141sun.o: sun.c \ 141sun.o: sun.c \
142 sun.h \ 142 sun.h \
143 $(QPEDIR)/include/qpe/qmath.h 143 $(OPIEDIR)/include/qpe/qmath.h
144 144
145stylusnormalizer.o: stylusnormalizer.cpp \ 145stylusnormalizer.o: stylusnormalizer.cpp \
146 stylusnormalizer.h 146 stylusnormalizer.h
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
@@ -1,13 +1,13 @@
1# $Id$ 1# $Id$
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3TEMPLATE = app 3TEMPLATE = app
4DESTDIR = $(QPEDIR)/bin 4DESTDIR = $(OPIEDIR)/bin
5INTERFACES = citytimebase.ui 5INTERFACES = citytimebase.ui
6HEADERS = citytime.h zonemap.h sun.h stylusnormalizer.h 6HEADERS = citytime.h zonemap.h sun.h stylusnormalizer.h
7SOURCES = citytime.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp 7SOURCES = citytime.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp
8TARGET = citytime 8TARGET = citytime
9INCLUDEPATH += $(QPEDIR)/include 9INCLUDEPATH += $(OPIEDIR)/include
10DEPENDPATH += $(QPEDIR)/include 10DEPENDPATH += $(OPIEDIR)/include
11LIBS += -lqpe 11LIBS += -lqpe
12 12
13TRANSLATIONS = ../i18n/de/citytime.ts 13TRANSLATIONS = ../i18n/de/citytime.ts
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
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
@@ -4,8 +4,8 @@ DESTDIR = ../../bin
4 HEADERS = settings.h 4 HEADERS = settings.h
5 SOURCES = light.cpp main.cpp 5 SOURCES = light.cpp main.cpp
6 INTERFACES= lightsettingsbase.ui 6 INTERFACES= lightsettingsbase.ui
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= ../$(QPEDIR)/include 8 DEPENDPATH+= ../$(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 TARGET = light-and-power 10 TARGET = light-and-power
11 11
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
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
@@ -4,8 +4,8 @@ DESTDIR = ../../bin
4 HEADERS = security.h 4 HEADERS = security.h
5 SOURCES = security.cpp main.cpp 5 SOURCES = security.cpp main.cpp
6 INTERFACES= securitybase.ui 6 INTERFACES= securitybase.ui
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= ../$(QPEDIR)/include 8 DEPENDPATH+= ../$(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 TARGET = security 10 TARGET = security
11 11
diff --git a/docs/qcop.doc b/docs/qcop.doc
index 6fe4c71..e62f91d 100644
--- a/docs/qcop.doc
+++ b/docs/qcop.doc
@@ -167,7 +167,7 @@ Such messages in the base Qtopia applications are:
167 <li>showFile(QString <i>file</i>) 167 <li>showFile(QString <i>file</i>)
168 <br>Send this message to have the Help Browser show a file. 168 <br>Send this message to have the Help Browser show a file.
169 The <i>file</i> may be an absolute filename or relative 169 The <i>file</i> may be an absolute filename or relative
170 to the system HTML documentation directory ($QPEDIR/help/html). 170 to the system HTML documentation directory ($OPIEDIR/help/html).
171 </ul> 171 </ul>
172 <dt><b>QPE/Application/datebook</b> 172 <dt><b>QPE/Application/datebook</b>
173 <ul> 173 <ul>
diff --git a/docs/start.doc b/docs/start.doc
index 9745d9a..01b6ab1 100644
--- a/docs/start.doc
+++ b/docs/start.doc
@@ -58,7 +58,7 @@ To compile the example program for running on the Linux desktop:
58 58
59 <p> 59 <p>
60<pre> 60<pre>
61 export QPEDIR=/opt/Qtopia 61 export OPIEDIR=/opt/Qtopia
62 export QTDIR=/opt/Qtopia 62 export QTDIR=/opt/Qtopia
63 export PATH=$QTDIR/bin:$PATH 63 export PATH=$QTDIR/bin:$PATH
64 export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++ 64 export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++
@@ -69,7 +69,7 @@ To compile the example program for running on the Linux desktop:
69 69
70<pre> 70<pre>
71 cd somewhere 71 cd somewhere
72 cp -r $QPEDIR/example . 72 cp -r $OPIEDIR/example .
73 cd example 73 cd example
74</pre> 74</pre>
75 75
@@ -89,9 +89,9 @@ To compile the example program for running on the Linux desktop:
89 89
90<pre> 90<pre>
91 su # root privileges required to install 91 su # root privileges required to install
92 cp example.desktop $QPEDIR/apps/Applications 92 cp example.desktop $OPIEDIR/apps/Applications
93 cp Example.png $QPEDIR/pics 93 cp Example.png $OPIEDIR/pics
94 cp example $QPEDIR/bin 94 cp example $OPIEDIR/bin
95 exit # no need to be root anymore 95 exit # no need to be root anymore
96</pre> 96</pre>
97 97
@@ -135,7 +135,7 @@ on the desktop, the process is similar:
135 135
136 <p> 136 <p>
137<pre> 137<pre>
138 export QPEDIR=/opt/Qtopia/sharp 138 export OPIEDIR=/opt/Qtopia/sharp
139 export QTDIR=/opt/Qtopia/sharp 139 export QTDIR=/opt/Qtopia/sharp
140 export PATH=$QTDIR/bin:/usr/local/arm/bin:$PATH 140 export PATH=$QTDIR/bin:/usr/local/arm/bin:$PATH
141 export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++ 141 export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++
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
@@ -5,10 +5,10 @@ export LOGNAME=root
5export HOME=/$LOGNAME 5export HOME=/$LOGNAME
6export QWS_DISPLAY=Transformed:Rot270:0 6export QWS_DISPLAY=Transformed:Rot270:0
7export QTDIR=/usr 7export QTDIR=/usr
8export QPEDIR=/opt/QtPalmtop 8export OPIEDIR=/opt/QtPalmtop
9if [ ! -x $QPEDIR/bin/qpe ] ; then exit 0 ; fi 9if [ ! -x $OPIEDIR/bin/qpe ] ; then exit 0 ; fi
10 10
11$QPEDIR/bin/qpe-reorgfiles 11$OPIEDIR/bin/qpe-reorgfiles
12 12
13. /etc/profile 13. /etc/profile
14 14
@@ -25,7 +25,7 @@ case $1 in
25 25
26 rm -f /etc/rc2.d/S99x # Can't have both running! 26 rm -f /etc/rc2.d/S99x # Can't have both running!
27 27
28 $QPEDIR/bin/qpe 2>/dev/null >/dev/null & 28 $OPIEDIR/bin/qpe 2>/dev/null >/dev/null &
29 29
30 ;; 30 ;;
31'stop') 31'stop')
diff --git a/example/example.pro b/example/example.pro
index 2d89311..d150b1c 100644
--- a/example/example.pro
+++ b/example/example.pro
@@ -3,8 +3,8 @@ TEMPLATE = app
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 HEADERS = example.h 4 HEADERS = example.h
5 SOURCES = main.cpp example.cpp 5 SOURCES = main.cpp example.cpp
6 INCLUDEPATH+= $(QPEDIR)/include 6 INCLUDEPATH+= $(OPIEDIR)/include
7 DEPENDPATH+= $(QPEDIR)/include 7 DEPENDPATH+= $(OPIEDIR)/include
8LIBS += -lqpe 8LIBS += -lqpe
9 INTERFACES= examplebase.ui 9 INTERFACES= examplebase.ui
10 TARGET = example 10 TARGET = example
diff --git a/freetype/freetype.pro b/freetype/freetype.pro
index 841f6d4..f63a087 100644
--- a/freetype/freetype.pro
+++ b/freetype/freetype.pro
@@ -5,9 +5,9 @@ SOURCES = fontfactoryttf_qws.cpp freetypefactoryimpl.cpp
5 qt2:HEADERS+= qfontdata_p.h 5 qt2:HEADERS+= qfontdata_p.h
6 TARGET = freetypefactory 6 TARGET = freetypefactory
7 DESTDIR = ../plugins/fontfactories 7 DESTDIR = ../plugins/fontfactories
8INCLUDEPATH += $(QPEDIR)/include 8INCLUDEPATH += $(OPIEDIR)/include
9DEPENDPATH += $(QPEDIR)/include 9DEPENDPATH += $(OPIEDIR)/include
10#INCLUDEPATH += $(QPEDIR)/include 10#INCLUDEPATH += $(OPIEDIR)/include
11 #DEPENDPATH+= /usr/local/include/freetype2 11 #DEPENDPATH+= /usr/local/include/freetype2
12LIBS += -lqpe -lfreetype 12LIBS += -lqpe -lfreetype
13 VERSION = 1.0.0 13 VERSION = 1.0.0
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) 8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
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
@@ -25,8 +25,8 @@ SOURCES = qimpenchar.cpp \
25INTERFACES = qimpenprefbase.ui 25INTERFACES = qimpenprefbase.ui
26 TARGET = qhandwriting 26 TARGET = qhandwriting
27 DESTDIR = ../../plugins/inputmethods 27 DESTDIR = ../../plugins/inputmethods
28INCLUDEPATH += $(QPEDIR)/include 28INCLUDEPATH += $(OPIEDIR)/include
29DEPENDPATH += ../$(QPEDIR)/include ../../taskbar 29DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar
30LIBS += -lqpe 30LIBS += -lqpe
31 VERSION = 1.0.0 31 VERSION = 1.0.0
32 32
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) 8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
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
@@ -10,8 +10,8 @@ SOURCES = keyboard.cpp \
10 keyboardimpl.cpp 10 keyboardimpl.cpp
11 TARGET = qkeyboard 11 TARGET = qkeyboard
12 DESTDIR = ../../plugins/inputmethods 12 DESTDIR = ../../plugins/inputmethods
13INCLUDEPATH += $(QPEDIR)/include 13INCLUDEPATH += $(OPIEDIR)/include
14DEPENDPATH += ../$(QPEDIR)/include ../../taskbar 14DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar
15LIBS += -lqpe 15LIBS += -lqpe
16 VERSION = 1.0.0 16 VERSION = 1.0.0
17 17
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) 8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
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
@@ -4,8 +4,8 @@ HEADERS = pickboard.h pickboardcfg.h pickboardimpl.h pickboardpicks.h
4 SOURCES= pickboard.cpp pickboardcfg.cpp pickboardimpl.cpp pickboardpicks.cpp 4 SOURCES= pickboard.cpp pickboardcfg.cpp pickboardimpl.cpp pickboardpicks.cpp
5 TARGET = qpickboard 5 TARGET = qpickboard
6 DESTDIR = ../../plugins/inputmethods 6 DESTDIR = ../../plugins/inputmethods
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += ../$(QPEDIR)/include ../../taskbar 8DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar
9LIBS += -lqpe 9LIBS += -lqpe
10 VERSION = 1.0.0 10 VERSION = 1.0.0
11 11
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) 8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
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
@@ -4,8 +4,8 @@ HEADERS = unikeyboard.h unikeyboardimpl.h
4 SOURCES= unikeyboard.cpp unikeyboardimpl.cpp 4 SOURCES= unikeyboard.cpp unikeyboardimpl.cpp
5 TARGET = qunikeyboard 5 TARGET = qunikeyboard
6 DESTDIR = ../../plugins/inputmethods 6 DESTDIR = ../../plugins/inputmethods
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += ../$(QPEDIR)/include ../../taskbar 8DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar
9LIBS += -lqpe 9LIBS += -lqpe
10 VERSION = 1.0.0 10 VERSION = 1.0.0
11 11
diff --git a/library/Makefile.in b/library/Makefile.in
index c89390f..b74b818 100644
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) 8 CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
9 INCPATH =-I$(QPEDIR)/include -Ibackend 9 INCPATH =-I$(OPIEDIR)/include -Ibackend
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -ldl -lcrypt -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -ldl -lcrypt -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -457,7 +457,8 @@ qpeapplication.o: qpeapplication.cpp \
457 fontmanager.h \ 457 fontmanager.h \
458 power.h \ 458 power.h \
459 alarmserver.h \ 459 alarmserver.h \
460 applnk.h 460 applnk.h \
461 qpemenubar.h
461 462
462qpestyle.o: qpestyle.cpp \ 463qpestyle.o: qpestyle.cpp \
463 qpestyle.h \ 464 qpestyle.h \
@@ -533,7 +534,8 @@ fontdatabase.o: fontdatabase.cpp \
533 fontdatabase.h 534 fontdatabase.h
534 535
535power.o: power.cpp \ 536power.o: power.cpp \
536 power.h 537 power.h \
538 custom.h
537 539
538storage.o: storage.cpp 540storage.o: storage.cpp
539 541
@@ -610,7 +612,8 @@ ir.o: ir.cpp \
610 applnk.h 612 applnk.h
611 613
612backend/vcc_yacc.o: backend/vcc_yacc.cpp \ 614backend/vcc_yacc.o: backend/vcc_yacc.cpp \
613 backend/vobject_p.h 615 backend/vobject_p.h \
616 backend/qfiledirect_p.h
614 617
615backend/vobject.o: backend/vobject.cpp \ 618backend/vobject.o: backend/vobject.cpp \
616 backend/vobject_p.h \ 619 backend/vobject_p.h \
@@ -679,20 +682,15 @@ lnkpropertiesbase_p.h: lnkpropertiesbase_p.ui
679lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui 682lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui
680 $(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp 683 $(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp
681 684
682passwordbase_p.o: passwordbase_p.cpp \ 685passwordbase_p.o: passwordbase_p.cpp
683 passwordbase_p.h
684 686
685proxiesbase_p.o: proxiesbase_p.cpp \ 687proxiesbase_p.o: proxiesbase_p.cpp
686 proxiesbase_p.h
687 688
688categoryeditbase_p.o: categoryeditbase_p.cpp \ 689categoryeditbase_p.o: categoryeditbase_p.cpp
689 categoryeditbase_p.h
690 690
691findwidgetbase_p.o: findwidgetbase_p.cpp \ 691findwidgetbase_p.o: findwidgetbase_p.cpp
692 findwidgetbase_p.h
693 692
694lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp \ 693lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp
695 lnkpropertiesbase_p.h
696 694
697moc_menubutton.o: moc_menubutton.cpp \ 695moc_menubutton.o: moc_menubutton.cpp \
698 menubutton.h 696 menubutton.h
diff --git a/library/global.cpp b/library/global.cpp
index e1bbf3e..e5fc2b3 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -134,7 +134,7 @@ static QDict<QDawg> *named_dawg = 0;
134 134
135static QString qpeDir() 135static QString qpeDir()
136{ 136{
137 QString dir = getenv("QPEDIR"); 137 QString dir = getenv("OPIEDIR");
138 if ( dir.isEmpty() ) dir = ".."; 138 if ( dir.isEmpty() ) dir = "..";
139 return dir; 139 return dir;
140} 140}
diff --git a/library/library.pro b/library/library.pro
index 06dfc8f..058d216 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -119,14 +119,14 @@ qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h qprocess.h
119qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \ 119qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \
120 qprocess_unix.cpp 120 qprocess_unix.cpp
121 121
122INCLUDEPATH += $(QPEDIR)/include backend 122INCLUDEPATH += $(OPIEDIR)/include backend
123 LIBS += -ldl -lcrypt -lm 123 LIBS += -ldl -lcrypt -lm
124 124
125INTERFACES = passwordbase_p.ui proxiesbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui 125INTERFACES = passwordbase_p.ui proxiesbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
126 126
127 TARGET = qpe 127 TARGET = qpe
128 DESTDIR = $(QTDIR)/lib$(PROJMAK) 128 DESTDIR = $(QTDIR)/lib$(PROJMAK)
129# This is set by configure$(QPEDIR). 129# This is set by configure$(OPIEDIR).
130 VERSION = 1.5.0 130 VERSION = 1.5.0
131 131
132TRANSLATIONS = ../i18n/de/libqpe.ts 132TRANSLATIONS = ../i18n/de/libqpe.ts
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index f0a68cf..70ffec1 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -790,11 +790,11 @@ QPEApplication::~QPEApplication()
790} 790}
791 791
792/*! 792/*!
793 Returns <tt>$QPEDIR/</tt>. 793 Returns <tt>$OPIEDIR/</tt>.
794*/ 794*/
795QString QPEApplication::qpeDir() 795QString QPEApplication::qpeDir()
796{ 796{
797 const char *base = getenv( "QPEDIR" ); 797 const char *base = getenv( "OPIEDIR" );
798 if ( base ) 798 if ( base )
799 return QString( base ) + "/"; 799 return QString( base ) + "/";
800 800
diff --git a/mkipks b/mkipks
index 947b19e..45f2fb2 100755
--- a/mkipks
+++ b/mkipks
@@ -8,10 +8,10 @@ mkdir -p etc/rc2.d
8rm -f etc/rc2.d/S98qpe 8rm -f etc/rc2.d/S98qpe
9ln -s ../init.d/qpe etc/rc2.d/S98qpe 9ln -s ../init.d/qpe etc/rc2.d/S98qpe
10 10
11VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$QPEDIR/include/qpe/version.h) 11VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
12VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$QPEDIR/include/qpe/version.h) 12VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
13VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$QPEDIR/include/qpe/version.h) 13VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h)
14if grep -q 'QPE_VERSION .*snapshot' $QPEDIR/include/qpe/version.h 14if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h
15then 15then
16 VERSION_CVS="_$(date +%Y%m%d)" 16 VERSION_CVS="_$(date +%Y%m%d)"
17else 17else
@@ -47,9 +47,9 @@ do
47 DATADIR=$IMAGEDIR 47 DATADIR=$IMAGEDIR
48 mkdir -p $IMAGEDIR 48 mkdir -p $IMAGEDIR
49 ;; -rpm) 49 ;; -rpm)
50 if [ "$QPEDIR" != "/opt/Qtopia" ] 50 if [ "$OPIEDIR" != "/opt/Qtopia" ]
51 then 51 then
52 echo >&2 '$QPEDIR is not the standard /usr/Qtopia directory.' 52 echo >&2 '$OPIEDIR is not the standard /usr/Qtopia directory.'
53 sleep 1 53 sleep 1
54 #exit 1 54 #exit 1
55 fi 55 fi
@@ -70,11 +70,11 @@ done
70 70
71if [ -z "$FILES" ] 71if [ -z "$FILES" ]
72then 72then
73 FILES=`find $QPEDIR -name "*.control" -print` 73 FILES=`find $OPIEDIR -name "*.control" -print`
74fi 74fi
75 75
76RDIR=$PWD 76RDIR=$PWD
77cd $QPEDIR 77cd $OPIEDIR
78 78
79for i in $FILES 79for i in $FILES
80do 80do
@@ -140,7 +140,7 @@ do
140 then 140 then
141 case "$ff" in 141 case "$ff" in
142 /*) RPMFILES="$RPMFILES $ff" 142 /*) RPMFILES="$RPMFILES $ff"
143 ;; *) RPMFILES="$RPMFILES $QPEDIR/$ff" 143 ;; *) RPMFILES="$RPMFILES $OPIEDIR/$ff"
144 esac 144 esac
145 else 145 else
146 mkdir -p $D 146 mkdir -p $D
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
@@ -7,8 +7,8 @@ SOURCES = dicttool.cpp main.cpp
7 7
8 INTERFACES= dicttoolbase.ui 8 INTERFACES= dicttoolbase.ui
9 9
10INCLUDEPATH += $(QPEDIR)/include 10INCLUDEPATH += $(OPIEDIR)/include
11 DEPENDPATH+= $(QPEDIR)/include 11 DEPENDPATH+= $(OPIEDIR)/include
12LIBS += -lqpe 12LIBS += -lqpe
13 13
14 TARGET = dictionary 14 TARGET = dictionary
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
@@ -31,6 +31,6 @@ SOURCES = main.cpp \
31 db/common.cpp 31 db/common.cpp
32 INTERFACES= ui/tvkeyedit_gen.ui 32 INTERFACES= ui/tvkeyedit_gen.ui
33 TARGET = tableviewer 33 TARGET = tableviewer
34INCLUDEPATH += $(QPEDIR)/include 34INCLUDEPATH += $(OPIEDIR)/include
35DEPENDPATH += $(QPEDIR)/include 35DEPENDPATH += $(OPIEDIR)/include
36 LIBS += -lqpe 36 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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -165,7 +165,7 @@ krfbcanvas.o: krfbcanvas.cpp \
165 krfbcanvas.h \ 165 krfbcanvas.h \
166 krfboptions.h \ 166 krfboptions.h \
167 krfbbuffer.h \ 167 krfbbuffer.h \
168 $(QPEDIR)/include/qpe/config.h 168 $(OPIEDIR)/include/qpe/config.h
169 169
170krfbconnection.o: krfbconnection.cpp \ 170krfbconnection.o: krfbconnection.cpp \
171 krfbconnection.h \ 171 krfbconnection.h \
@@ -180,7 +180,7 @@ krfbdecoder.o: krfbdecoder.cpp \
180 krfbserverinfo.h \ 180 krfbserverinfo.h \
181 krfbdecoder.h \ 181 krfbdecoder.h \
182 krfbbuffer.h \ 182 krfbbuffer.h \
183 $(QPEDIR)/include/qpe/qpeapplication.h 183 $(OPIEDIR)/include/qpe/qpeapplication.h
184 184
185krfblogin.o: krfblogin.cpp \ 185krfblogin.o: krfblogin.cpp \
186 vncauth.h \ 186 vncauth.h \
@@ -188,15 +188,15 @@ krfblogin.o: krfblogin.cpp \
188 krfbconnection.h 188 krfbconnection.h
189 189
190krfboptions.o: krfboptions.cpp \ 190krfboptions.o: krfboptions.cpp \
191 $(QPEDIR)/include/qpe/config.h \ 191 $(OPIEDIR)/include/qpe/config.h \
192 $(QPEDIR)/include/qpe/qpeapplication.h \ 192 $(OPIEDIR)/include/qpe/qpeapplication.h \
193 krfboptions.h 193 krfboptions.h
194 194
195kvnc.o: kvnc.cpp \ 195kvnc.o: kvnc.cpp \
196 $(QPEDIR)/include/qpe/qpemenubar.h \ 196 $(OPIEDIR)/include/qpe/qpemenubar.h \
197 $(QPEDIR)/include/qpe/qpetoolbar.h \ 197 $(OPIEDIR)/include/qpe/qpetoolbar.h \
198 $(QPEDIR)/include/qpe/qpeapplication.h \ 198 $(OPIEDIR)/include/qpe/qpeapplication.h \
199 $(QPEDIR)/include/qpe/global.h \ 199 $(OPIEDIR)/include/qpe/global.h \
200 kvnc.h \ 200 kvnc.h \
201 krfbcanvas.h \ 201 krfbcanvas.h \
202 kvncoptionsdlg.h \ 202 kvncoptionsdlg.h \
@@ -215,7 +215,7 @@ kvncoptionsdlg.o: kvncoptionsdlg.cpp \
215 vncoptionsbase.h 215 vncoptionsbase.h
216 216
217main.o: main.cpp \ 217main.o: main.cpp \
218 $(QPEDIR)/include/qpe/qpeapplication.h \ 218 $(OPIEDIR)/include/qpe/qpeapplication.h \
219 kvnc.h 219 kvnc.h
220 220
221vncoptionsbase.h: vncoptionsbase.ui 221vncoptionsbase.h: vncoptionsbase.ui
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
@@ -32,7 +32,7 @@ SOURCES = d3des.c \
32 INTERFACES= vncoptionsbase.ui 32 INTERFACES= vncoptionsbase.ui
33TARGET = keypebble 33TARGET = keypebble
34 34
35INCLUDEPATH += $(QPEDIR)/include 35INCLUDEPATH += $(OPIEDIR)/include
36DEPENDPATH += $(QPEDIR)/include 36DEPENDPATH += $(OPIEDIR)/include
37LIBS += -lqpe 37LIBS += -lqpe
38 38
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
@@ -2,12 +2,12 @@ SOURCES += chess.cpp main.cpp
2 HEADERS+= chess.h 2 HEADERS+= chess.h
3DESTDIR = ../bin 3DESTDIR = ../bin
4TARGET = chess 4TARGET = chess
5 DEPENDPATH+= $(QPEDIR)/include 5 DEPENDPATH+= $(OPIEDIR)/include
6INTERFACES = mainwindow.ui 6INTERFACES = mainwindow.ui
7 IMAGES= images/new.png images/repeat.png images/txt.png images/back.png 7 IMAGES= images/new.png images/repeat.png images/txt.png images/back.png
8 TEMPLATE=app 8 TEMPLATE=app
9 CONFIG+= qt warn_on release 9 CONFIG+= qt warn_on release
10INCLUDEPATH += $(QPEDIR)/include 10INCLUDEPATH += $(OPIEDIR)/include
11 LIBS+= -lqpe 11 LIBS+= -lqpe
12 DBFILE= chess.db 12 DBFILE= chess.db
13 LANGUAGE= C++ 13 LANGUAGE= C++
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -100,14 +100,14 @@ REQUIRES=
100 100
101fifteen.o: fifteen.cpp \ 101fifteen.o: fifteen.cpp \
102 fifteen.h \ 102 fifteen.h \
103 $(QPEDIR)/include/qpe/resource.h \ 103 $(OPIEDIR)/include/qpe/resource.h \
104 $(QPEDIR)/include/qpe/config.h \ 104 $(OPIEDIR)/include/qpe/config.h \
105 $(QPEDIR)/include/qpe/qpetoolbar.h \ 105 $(OPIEDIR)/include/qpe/qpetoolbar.h \
106 $(QPEDIR)/include/qpe/qpemenubar.h 106 $(OPIEDIR)/include/qpe/qpemenubar.h
107 107
108main.o: main.cpp \ 108main.o: main.cpp \
109 fifteen.h \ 109 fifteen.h \
110 $(QPEDIR)/include/qpe/qpeapplication.h 110 $(OPIEDIR)/include/qpe/qpeapplication.h
111 111
112moc_fifteen.o: moc_fifteen.cpp \ 112moc_fifteen.o: moc_fifteen.cpp \
113 fifteen.h 113 fifteen.h
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
@@ -4,7 +4,7 @@ CONFIG = qt warn_on release
4 HEADERS = fifteen.h 4 HEADERS = fifteen.h
5 SOURCES = fifteen.cpp \ 5 SOURCES = fifteen.cpp \
6 main.cpp 6 main.cpp
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(QPEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 TARGET = fifteen 10 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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -134,17 +134,17 @@ gowidget.o: gowidget.cpp \
134 amigo.h \ 134 amigo.h \
135 go.h \ 135 go.h \
136 goplayutils.h \ 136 goplayutils.h \
137 $(QPEDIR)/include/qpe/config.h \ 137 $(OPIEDIR)/include/qpe/config.h \
138 $(QPEDIR)/include/qpe/resource.h \ 138 $(OPIEDIR)/include/qpe/resource.h \
139 $(QPEDIR)/include/qpe/qpetoolbar.h \ 139 $(OPIEDIR)/include/qpe/qpetoolbar.h \
140 $(QPEDIR)/include/qpe/qpemenubar.h 140 $(OPIEDIR)/include/qpe/qpemenubar.h
141 141
142main.o: main.cpp \ 142main.o: main.cpp \
143 gowidget.h \ 143 gowidget.h \
144 amigo.h \ 144 amigo.h \
145 go.h \ 145 go.h \
146 goplayutils.h \ 146 goplayutils.h \
147 $(QPEDIR)/include/qpe/qpeapplication.h 147 $(OPIEDIR)/include/qpe/qpeapplication.h
148 148
149moc_gowidget.o: moc_gowidget.cpp \ 149moc_gowidget.o: moc_gowidget.cpp \
150 gowidget.h \ 150 gowidget.h \
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
@@ -11,8 +11,8 @@ SOURCES = amigo.c \
11 killable.c \ 11 killable.c \
12 gowidget.cpp \ 12 gowidget.cpp \
13 main.cpp 13 main.cpp
14INCLUDEPATH += $(QPEDIR)/include 14INCLUDEPATH += $(OPIEDIR)/include
15 DEPENDPATH+= $(QPEDIR)/include 15 DEPENDPATH+= $(OPIEDIR)/include
16LIBS += -lqpe 16LIBS += -lqpe
17 TARGET = go 17 TARGET = go
18 18
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -14,7 +14,7 @@ UIC = $(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
@@ -100,13 +100,13 @@ REQUIRES=
100 100
101main.o: main.cpp \ 101main.o: main.cpp \
102 mindbreaker.h \ 102 mindbreaker.h \
103 $(QPEDIR)/include/qpe/qpeapplication.h 103 $(OPIEDIR)/include/qpe/qpeapplication.h
104 104
105mindbreaker.o: mindbreaker.cpp \ 105mindbreaker.o: mindbreaker.cpp \
106 mindbreaker.h \ 106 mindbreaker.h \
107 $(QPEDIR)/include/qpe/resource.h \ 107 $(OPIEDIR)/include/qpe/resource.h \
108 $(QPEDIR)/include/qpe/config.h \ 108 $(OPIEDIR)/include/qpe/config.h \
109 $(QPEDIR)/include/qpe/qpetoolbar.h 109 $(OPIEDIR)/include/qpe/qpetoolbar.h
110 110
111moc_mindbreaker.o: moc_mindbreaker.cpp \ 111moc_mindbreaker.o: moc_mindbreaker.cpp \
112 mindbreaker.h 112 mindbreaker.h
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,12 +1,12 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3DESTDIR = $(QPEDIR)/bin 3DESTDIR = $(OPIEDIR)/bin
4 HEADERS = mindbreaker.h 4 HEADERS = mindbreaker.h
5 SOURCES = main.cpp \ 5 SOURCES = main.cpp \
6 mindbreaker.cpp 6 mindbreaker.cpp
7TARGET = mindbreaker 7TARGET = mindbreaker
8INCLUDEPATH += $(QPEDIR)/include 8INCLUDEPATH += $(OPIEDIR)/include
9DEPENDPATH += $(QPEDIR)/include 9DEPENDPATH += $(OPIEDIR)/include
10LIBS += -lqpe 10LIBS += -lqpe
11 11
12TRANSLATIONS = ../i18n/de/mindbreaker.ts 12TRANSLATIONS = ../i18n/de/mindbreaker.ts
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -14,7 +14,7 @@ UIC = $(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
@@ -105,19 +105,19 @@ REQUIRES=
105 105
106main.o: main.cpp \ 106main.o: main.cpp \
107 minesweep.h \ 107 minesweep.h \
108 $(QPEDIR)/include/qpe/qpeapplication.h 108 $(OPIEDIR)/include/qpe/qpeapplication.h
109 109
110minefield.o: minefield.cpp \ 110minefield.o: minefield.cpp \
111 minefield.h \ 111 minefield.h \
112 $(QPEDIR)/include/qpe/config.h 112 $(OPIEDIR)/include/qpe/config.h
113 113
114minesweep.o: minesweep.cpp \ 114minesweep.o: minesweep.cpp \
115 minesweep.h \ 115 minesweep.h \
116 minefield.h \ 116 minefield.h \
117 $(QPEDIR)/include/qpe/resource.h \ 117 $(OPIEDIR)/include/qpe/resource.h \
118 $(QPEDIR)/include/qpe/config.h \ 118 $(OPIEDIR)/include/qpe/config.h \
119 $(QPEDIR)/include/qpe/qpetoolbar.h \ 119 $(OPIEDIR)/include/qpe/qpetoolbar.h \
120 $(QPEDIR)/include/qpe/qpemenubar.h 120 $(OPIEDIR)/include/qpe/qpemenubar.h
121 121
122moc_minefield.o: moc_minefield.cpp \ 122moc_minefield.o: moc_minefield.cpp \
123 minefield.h 123 minefield.h
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,13 +1,13 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = minefield.h \ 4 HEADERS = minefield.h \
5 minesweep.h 5 minesweep.h
6 SOURCES = main.cpp \ 6 SOURCES = main.cpp \
7 minefield.cpp \ 7 minefield.cpp \
8 minesweep.cpp 8 minesweep.cpp
9INCLUDEPATH += $(QPEDIR)/include 9INCLUDEPATH += $(OPIEDIR)/include
10 DEPENDPATH+= $(QPEDIR)/include 10 DEPENDPATH+= $(OPIEDIR)/include
11LIBS += -lqpe 11LIBS += -lqpe
12 INTERFACES= 12 INTERFACES=
13 13
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -14,7 +14,7 @@ UIC = $(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
@@ -121,75 +121,75 @@ main.o: main.cpp \
121 interface.h \ 121 interface.h \
122 cannon.h \ 122 cannon.h \
123 bullet.h \ 123 bullet.h \
124 $(QPEDIR)/include/qpe/sound.h \ 124 $(OPIEDIR)/include/qpe/sound.h \
125 base.h \ 125 base.h \
126 helicopter.h \ 126 helicopter.h \
127 $(QPEDIR)/include/qpe/qpeapplication.h 127 $(OPIEDIR)/include/qpe/qpeapplication.h
128 128
129interface.o: interface.cpp \ 129interface.o: interface.cpp \
130 interface.h \ 130 interface.h \
131 cannon.h \ 131 cannon.h \
132 bullet.h \ 132 bullet.h \
133 $(QPEDIR)/include/qpe/sound.h \ 133 $(OPIEDIR)/include/qpe/sound.h \
134 base.h \ 134 base.h \
135 helicopter.h \ 135 helicopter.h \
136 man.h \ 136 man.h \
137 $(QPEDIR)/include/qpe/resource.h \ 137 $(OPIEDIR)/include/qpe/resource.h \
138 $(QPEDIR)/include/qpe/qpetoolbar.h 138 $(OPIEDIR)/include/qpe/qpetoolbar.h
139 139
140man.o: man.cpp \ 140man.o: man.cpp \
141 codes.h \ 141 codes.h \
142 man.h \ 142 man.h \
143 $(QPEDIR)/include/qpe/sound.h \ 143 $(OPIEDIR)/include/qpe/sound.h \
144 base.h \ 144 base.h \
145 $(QPEDIR)/include/qpe/resource.h 145 $(OPIEDIR)/include/qpe/resource.h
146 146
147cannon.o: cannon.cpp \ 147cannon.o: cannon.cpp \
148 $(QPEDIR)/include/qpe/resource.h \ 148 $(OPIEDIR)/include/qpe/resource.h \
149 codes.h \ 149 codes.h \
150 cannon.h \ 150 cannon.h \
151 bullet.h \ 151 bullet.h \
152 $(QPEDIR)/include/qpe/sound.h 152 $(OPIEDIR)/include/qpe/sound.h
153 153
154base.o: base.cpp \ 154base.o: base.cpp \
155 codes.h \ 155 codes.h \
156 base.h \ 156 base.h \
157 $(QPEDIR)/include/qpe/sound.h \ 157 $(OPIEDIR)/include/qpe/sound.h \
158 man.h \ 158 man.h \
159 $(QPEDIR)/include/qpe/resource.h 159 $(OPIEDIR)/include/qpe/resource.h
160 160
161bullet.o: bullet.cpp \ 161bullet.o: bullet.cpp \
162 codes.h \ 162 codes.h \
163 bullet.h \ 163 bullet.h \
164 $(QPEDIR)/include/qpe/sound.h \ 164 $(OPIEDIR)/include/qpe/sound.h \
165 man.h \ 165 man.h \
166 helicopter.h \ 166 helicopter.h \
167 $(QPEDIR)/include/qpe/resource.h \ 167 $(OPIEDIR)/include/qpe/resource.h \
168 $(QPEDIR)/include/qpe/qmath.h 168 $(OPIEDIR)/include/qpe/qmath.h
169 169
170helicopter.o: helicopter.cpp \ 170helicopter.o: helicopter.cpp \
171 helicopter.h \ 171 helicopter.h \
172 $(QPEDIR)/include/qpe/sound.h \ 172 $(OPIEDIR)/include/qpe/sound.h \
173 man.h \ 173 man.h \
174 codes.h \ 174 codes.h \
175 $(QPEDIR)/include/qpe/resource.h 175 $(OPIEDIR)/include/qpe/resource.h
176 176
177moc_interface.o: moc_interface.cpp \ 177moc_interface.o: moc_interface.cpp \
178 interface.h \ 178 interface.h \
179 cannon.h \ 179 cannon.h \
180 bullet.h \ 180 bullet.h \
181 $(QPEDIR)/include/qpe/sound.h \ 181 $(OPIEDIR)/include/qpe/sound.h \
182 base.h \ 182 base.h \
183 helicopter.h 183 helicopter.h
184 184
185moc_cannon.o: moc_cannon.cpp \ 185moc_cannon.o: moc_cannon.cpp \
186 cannon.h \ 186 cannon.h \
187 bullet.h \ 187 bullet.h \
188 $(QPEDIR)/include/qpe/sound.h 188 $(OPIEDIR)/include/qpe/sound.h
189 189
190moc_bullet.o: moc_bullet.cpp \ 190moc_bullet.o: moc_bullet.cpp \
191 bullet.h \ 191 bullet.h \
192 $(QPEDIR)/include/qpe/sound.h 192 $(OPIEDIR)/include/qpe/sound.h
193 193
194moc_interface.cpp: interface.h 194moc_interface.cpp: interface.h
195 $(MOC) interface.h -o moc_interface.cpp 195 $(MOC) interface.h -o moc_interface.cpp
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,11 +1,11 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = interface.h man.h cannon.h base.h bullet.h helicopter.h 4 HEADERS = interface.h man.h cannon.h base.h bullet.h helicopter.h
5 SOURCES = main.cpp interface.cpp man.cpp cannon.cpp base.cpp bullet.cpp helicopter.cpp 5 SOURCES = main.cpp interface.cpp man.cpp cannon.cpp base.cpp bullet.cpp helicopter.cpp
6 TARGET = parashoot 6 TARGET = parashoot
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(QPEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 10
11TRANSLATIONS = ../i18n/de/parashoot.ts 11TRANSLATIONS = ../i18n/de/parashoot.ts
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -14,7 +14,7 @@ UIC = $(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
@@ -117,19 +117,19 @@ toplevel.o: toplevel.cpp \
117 view.h \ 117 view.h \
118 sprites.h \ 118 sprites.h \
119 ledmeter.h \ 119 ledmeter.h \
120 $(QPEDIR)/include/qpe/qpeapplication.h \ 120 $(OPIEDIR)/include/qpe/qpeapplication.h \
121 $(QPEDIR)/include/qpe/resource.h 121 $(OPIEDIR)/include/qpe/resource.h
122 122
123view.o: view.cpp \ 123view.o: view.cpp \
124 view.h \ 124 view.h \
125 sprites.h \ 125 sprites.h \
126 $(QPEDIR)/include/qpe/resource.h 126 $(OPIEDIR)/include/qpe/resource.h
127 127
128main.o: main.cpp \ 128main.o: main.cpp \
129 toplevel.h \ 129 toplevel.h \
130 view.h \ 130 view.h \
131 sprites.h \ 131 sprites.h \
132 $(QPEDIR)/include/qpe/qpeapplication.h 132 $(OPIEDIR)/include/qpe/qpeapplication.h
133 133
134moc_ledmeter.o: moc_ledmeter.cpp \ 134moc_ledmeter.o: moc_ledmeter.cpp \
135 ledmeter.h 135 ledmeter.h
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,11 +1,11 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = ledmeter.h sprites.h toplevel.h view.h 4 HEADERS = ledmeter.h sprites.h toplevel.h view.h
5 SOURCES = ledmeter.cpp toplevel.cpp view.cpp main.cpp 5 SOURCES = ledmeter.cpp toplevel.cpp view.cpp main.cpp
6 TARGET = qasteroids 6 TARGET = qasteroids
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(QPEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 10
11TRANSLATIONS = ../i18n/de/qasteroids.ts 11TRANSLATIONS = ../i18n/de/qasteroids.ts
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -14,7 +14,7 @@ UIC = $(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
@@ -114,32 +114,32 @@ snake.o: snake.cpp \
114 snake.h \ 114 snake.h \
115 target.h \ 115 target.h \
116 codes.h \ 116 codes.h \
117 $(QPEDIR)/include/qpe/resource.h 117 $(OPIEDIR)/include/qpe/resource.h
118 118
119target.o: target.cpp \ 119target.o: target.cpp \
120 target.h \ 120 target.h \
121 codes.h \ 121 codes.h \
122 $(QPEDIR)/include/qpe/resource.h 122 $(OPIEDIR)/include/qpe/resource.h
123 123
124obstacle.o: obstacle.cpp \ 124obstacle.o: obstacle.cpp \
125 obstacle.h \ 125 obstacle.h \
126 codes.h \ 126 codes.h \
127 $(QPEDIR)/include/qpe/resource.h 127 $(OPIEDIR)/include/qpe/resource.h
128 128
129interface.o: interface.cpp \ 129interface.o: interface.cpp \
130 interface.h \ 130 interface.h \
131 snake.h \ 131 snake.h \
132 target.h \ 132 target.h \
133 obstacle.h \ 133 obstacle.h \
134 $(QPEDIR)/include/qpe/resource.h \ 134 $(OPIEDIR)/include/qpe/resource.h \
135 $(QPEDIR)/include/qpe/qpetoolbar.h 135 $(OPIEDIR)/include/qpe/qpetoolbar.h
136 136
137main.o: main.cpp \ 137main.o: main.cpp \
138 interface.h \ 138 interface.h \
139 snake.h \ 139 snake.h \
140 target.h \ 140 target.h \
141 obstacle.h \ 141 obstacle.h \
142 $(QPEDIR)/include/qpe/qpeapplication.h 142 $(OPIEDIR)/include/qpe/qpeapplication.h
143 143
144moc_snake.o: moc_snake.cpp \ 144moc_snake.o: moc_snake.cpp \
145 snake.h 145 snake.h
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,11 +1,11 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = snake.h target.h obstacle.h interface.h codes.h 4 HEADERS = snake.h target.h obstacle.h interface.h codes.h
5 SOURCES = snake.cpp target.cpp obstacle.cpp interface.cpp main.cpp 5 SOURCES = snake.cpp target.cpp obstacle.cpp interface.cpp main.cpp
6 TARGET = snake 6 TARGET = snake
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(QPEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 10
11TRANSLATIONS = ../i18n/de/snake.ts 11TRANSLATIONS = ../i18n/de/snake.ts
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -14,7 +14,7 @@ UIC = $(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
@@ -135,7 +135,7 @@ canvascard.o: canvascard.cpp \
135 carddeck.h \ 135 carddeck.h \
136 cardgamelayout.h \ 136 cardgamelayout.h \
137 canvascard.h \ 137 canvascard.h \
138 $(QPEDIR)/include/qpe/resource.h 138 $(OPIEDIR)/include/qpe/resource.h
139 139
140canvasshapes.o: canvasshapes.cpp \ 140canvasshapes.o: canvasshapes.cpp \
141 canvasshapes.h 141 canvasshapes.h
@@ -154,11 +154,11 @@ cardgamelayout.o: cardgamelayout.cpp \
154cardpile.o: cardpile.cpp \ 154cardpile.o: cardpile.cpp \
155 cardpile.h \ 155 cardpile.h \
156 card.h \ 156 card.h \
157 $(QPEDIR)/include/qpe/config.h 157 $(OPIEDIR)/include/qpe/config.h
158 158
159card.o: card.cpp \ 159card.o: card.cpp \
160 card.h \ 160 card.h \
161 $(QPEDIR)/include/qpe/config.h 161 $(OPIEDIR)/include/qpe/config.h
162 162
163carddeck.o: carddeck.cpp \ 163carddeck.o: carddeck.cpp \
164 card.h \ 164 card.h \
@@ -173,9 +173,9 @@ canvascardgame.o: canvascardgame.cpp \
173 canvasshapes.h \ 173 canvasshapes.h \
174 canvascard.h \ 174 canvascard.h \
175 canvascardgame.h \ 175 canvascardgame.h \
176 $(QPEDIR)/include/qpe/resource.h \ 176 $(OPIEDIR)/include/qpe/resource.h \
177 $(QPEDIR)/include/qpe/config.h \ 177 $(OPIEDIR)/include/qpe/config.h \
178 $(QPEDIR)/include/qpe/qpemenubar.h 178 $(OPIEDIR)/include/qpe/qpemenubar.h
179 179
180freecellcardgame.o: freecellcardgame.cpp \ 180freecellcardgame.o: freecellcardgame.cpp \
181 freecellcardgame.h \ 181 freecellcardgame.h \
@@ -188,9 +188,9 @@ freecellcardgame.o: freecellcardgame.cpp \
188 cardgamelayout.h \ 188 cardgamelayout.h \
189 canvasshapes.h \ 189 canvasshapes.h \
190 canvascard.h \ 190 canvascard.h \
191 $(QPEDIR)/include/qpe/resource.h \ 191 $(OPIEDIR)/include/qpe/resource.h \
192 $(QPEDIR)/include/qpe/config.h \ 192 $(OPIEDIR)/include/qpe/config.h \
193 $(QPEDIR)/include/qpe/qpemenubar.h 193 $(OPIEDIR)/include/qpe/qpemenubar.h
194 194
195patiencecardgame.o: patiencecardgame.cpp \ 195patiencecardgame.o: patiencecardgame.cpp \
196 patiencecardgame.h \ 196 patiencecardgame.h \
@@ -202,9 +202,9 @@ patiencecardgame.o: patiencecardgame.cpp \
202 cardgamelayout.h \ 202 cardgamelayout.h \
203 canvasshapes.h \ 203 canvasshapes.h \
204 canvascard.h \ 204 canvascard.h \
205 $(QPEDIR)/include/qpe/resource.h \ 205 $(OPIEDIR)/include/qpe/resource.h \
206 $(QPEDIR)/include/qpe/config.h \ 206 $(OPIEDIR)/include/qpe/config.h \
207 $(QPEDIR)/include/qpe/qpemenubar.h 207 $(OPIEDIR)/include/qpe/qpemenubar.h
208 208
209canvascardwindow.o: canvascardwindow.cpp \ 209canvascardwindow.o: canvascardwindow.cpp \
210 canvascardwindow.h \ 210 canvascardwindow.h \
@@ -217,14 +217,14 @@ canvascardwindow.o: canvascardwindow.cpp \
217 cardgamelayout.h \ 217 cardgamelayout.h \
218 canvasshapes.h \ 218 canvasshapes.h \
219 canvascard.h \ 219 canvascard.h \
220 $(QPEDIR)/include/qpe/resource.h \ 220 $(OPIEDIR)/include/qpe/resource.h \
221 $(QPEDIR)/include/qpe/config.h \ 221 $(OPIEDIR)/include/qpe/config.h \
222 $(QPEDIR)/include/qpe/qpemenubar.h \ 222 $(OPIEDIR)/include/qpe/qpemenubar.h \
223 freecellcardgame.h 223 freecellcardgame.h
224 224
225main.o: main.cpp \ 225main.o: main.cpp \
226 canvascardwindow.h \ 226 canvascardwindow.h \
227 $(QPEDIR)/include/qpe/qpeapplication.h 227 $(OPIEDIR)/include/qpe/qpeapplication.h
228 228
229moc_canvascardwindow.o: moc_canvascardwindow.cpp \ 229moc_canvascardwindow.o: moc_canvascardwindow.cpp \
230 canvascardwindow.h 230 canvascardwindow.h
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
@@ -1,7 +1,7 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 2
3 CONFIG += qt warn_on release 3 CONFIG += qt warn_on release
4 DESTDIR = $(QPEDIR)/bin 4 DESTDIR = $(OPIEDIR)/bin
5 5
6 HEADERS = canvascard.h canvasshapes.h cardgame.h cardgamelayout.h cardpile.h card.h carddeck.h canvascardgame.h freecellcardgame.h patiencecardgame.h canvascardwindow.h 6 HEADERS = canvascard.h canvasshapes.h cardgame.h cardgamelayout.h cardpile.h card.h carddeck.h canvascardgame.h freecellcardgame.h patiencecardgame.h canvascardwindow.h
7 7
@@ -9,8 +9,8 @@ SOURCES = canvascard.cpp canvasshapes.cpp cardgame.cpp cardgamelayout.cpp cardp
9 9
10 TARGET = patience 10 TARGET = patience
11 11
12INCLUDEPATH += $(QPEDIR)/include 12INCLUDEPATH += $(OPIEDIR)/include
13 DEPENDPATH+= $(QPEDIR)/include 13 DEPENDPATH+= $(OPIEDIR)/include
14LIBS += -lqpe 14LIBS += -lqpe
15 15
16 REQUIRES= patience 16 REQUIRES= patience
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -115,7 +115,7 @@ main.o: main.cpp \
115 qtetrixb.h \ 115 qtetrixb.h \
116 gtetrix.h \ 116 gtetrix.h \
117 tpiece.h \ 117 tpiece.h \
118 $(QPEDIR)/include/qpe/qpeapplication.h 118 $(OPIEDIR)/include/qpe/qpeapplication.h
119 119
120gtetrix.o: gtetrix.cpp \ 120gtetrix.o: gtetrix.cpp \
121 gtetrix.h \ 121 gtetrix.h \
@@ -126,7 +126,7 @@ qtetrix.o: qtetrix.cpp \
126 qtetrixb.h \ 126 qtetrixb.h \
127 gtetrix.h \ 127 gtetrix.h \
128 tpiece.h \ 128 tpiece.h \
129 $(QPEDIR)/include/qpe/resource.h 129 $(OPIEDIR)/include/qpe/resource.h
130 130
131qtetrixb.o: qtetrixb.cpp \ 131qtetrixb.o: qtetrixb.cpp \
132 qtetrixb.h \ 132 qtetrixb.h \
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
@@ -11,7 +11,7 @@ SOURCES = main.cpp \
11 qtetrix.cpp \ 11 qtetrix.cpp \
12 qtetrixb.cpp \ 12 qtetrixb.cpp \
13 tpiece.cpp 13 tpiece.cpp
14INCLUDEPATH += $(QPEDIR)/include 14INCLUDEPATH += $(OPIEDIR)/include
15 DEPENDPATH+= $(QPEDIR)/include 15 DEPENDPATH+= $(OPIEDIR)/include
16LIBS += -lqpe 16LIBS += -lqpe
17 INTERFACES= 17 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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -14,7 +14,7 @@ UIC = $(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
@@ -111,21 +111,21 @@ main.o: main.cpp \
111 wordgame.h \ 111 wordgame.h \
112 newgamebase.h \ 112 newgamebase.h \
113 rulesbase.h \ 113 rulesbase.h \
114 $(QPEDIR)/include/qpe/qdawg.h \ 114 $(OPIEDIR)/include/qpe/qdawg.h \
115 $(QPEDIR)/include/qpe/applnk.h \ 115 $(OPIEDIR)/include/qpe/applnk.h \
116 $(QPEDIR)/include/qpe/qpeapplication.h 116 $(OPIEDIR)/include/qpe/qpeapplication.h
117 117
118wordgame.o: wordgame.cpp \ 118wordgame.o: wordgame.cpp \
119 wordgame.h \ 119 wordgame.h \
120 newgamebase.h \ 120 newgamebase.h \
121 rulesbase.h \ 121 rulesbase.h \
122 $(QPEDIR)/include/qpe/qdawg.h \ 122 $(OPIEDIR)/include/qpe/qdawg.h \
123 $(QPEDIR)/include/qpe/applnk.h \ 123 $(OPIEDIR)/include/qpe/applnk.h \
124 $(QPEDIR)/include/qpe/global.h \ 124 $(OPIEDIR)/include/qpe/global.h \
125 $(QPEDIR)/include/qpe/filemanager.h \ 125 $(OPIEDIR)/include/qpe/filemanager.h \
126 $(QPEDIR)/include/qpe/resource.h \ 126 $(OPIEDIR)/include/qpe/resource.h \
127 $(QPEDIR)/include/qpe/config.h \ 127 $(OPIEDIR)/include/qpe/config.h \
128 $(QPEDIR)/include/qpe/qpetoolbar.h 128 $(OPIEDIR)/include/qpe/qpetoolbar.h
129 129
130newgamebase.h: newgamebase.ui 130newgamebase.h: newgamebase.ui
131 $(UIC) newgamebase.ui -o $(INTERFACE_DECL_PATH)/newgamebase.h 131 $(UIC) newgamebase.ui -o $(INTERFACE_DECL_PATH)/newgamebase.h
@@ -147,8 +147,8 @@ moc_wordgame.o: moc_wordgame.cpp \
147 wordgame.h \ 147 wordgame.h \
148 newgamebase.h \ 148 newgamebase.h \
149 rulesbase.h \ 149 rulesbase.h \
150 $(QPEDIR)/include/qpe/qdawg.h \ 150 $(OPIEDIR)/include/qpe/qdawg.h \
151 $(QPEDIR)/include/qpe/applnk.h 151 $(OPIEDIR)/include/qpe/applnk.h
152 152
153moc_newgamebase.o: moc_newgamebase.cpp \ 153moc_newgamebase.o: moc_newgamebase.cpp \
154 newgamebase.h 154 newgamebase.h
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,13 +1,13 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = wordgame.h 4 HEADERS = wordgame.h
5 SOURCES = main.cpp \ 5 SOURCES = main.cpp \
6 wordgame.cpp 6 wordgame.cpp
7 INTERFACES= newgamebase.ui rulesbase.ui 7 INTERFACES= newgamebase.ui rulesbase.ui
8 TARGET = wordgame 8 TARGET = wordgame
9INCLUDEPATH += $(QPEDIR)/include 9INCLUDEPATH += $(OPIEDIR)/include
10 DEPENDPATH+= $(QPEDIR)/include 10 DEPENDPATH+= $(OPIEDIR)/include
11LIBS += -lqpe 11LIBS += -lqpe
12 12
13TRANSLATIONS = ../i18n/de/wordgame.ts 13TRANSLATIONS = ../i18n/de/wordgame.ts
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -14,7 +14,7 @@ UIC = $(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
@@ -100,15 +100,15 @@ REQUIRES=showimg
100 100
101main.o: main.cpp \ 101main.o: main.cpp \
102 showimg.h \ 102 showimg.h \
103 $(QPEDIR)/include/qpe/qpeapplication.h 103 $(OPIEDIR)/include/qpe/qpeapplication.h
104 104
105showimg.o: showimg.cpp \ 105showimg.o: showimg.cpp \
106 showimg.h \ 106 showimg.h \
107 $(QPEDIR)/include/qpe/resource.h \ 107 $(OPIEDIR)/include/qpe/resource.h \
108 $(QPEDIR)/include/qpe/fileselector.h \ 108 $(OPIEDIR)/include/qpe/fileselector.h \
109 $(QPEDIR)/include/qpe/applnk.h \ 109 $(OPIEDIR)/include/qpe/applnk.h \
110 $(QPEDIR)/include/qpe/qpemenubar.h \ 110 $(OPIEDIR)/include/qpe/qpemenubar.h \
111 $(QPEDIR)/include/qpe/qpetoolbar.h 111 $(OPIEDIR)/include/qpe/qpetoolbar.h
112 112
113moc_showimg.o: moc_showimg.cpp \ 113moc_showimg.o: moc_showimg.cpp \
114 showimg.h 114 showimg.h
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
@@ -1,7 +1,7 @@
1TEMPLATE = app 1TEMPLATE = app
2 2
3CONFIG += qt warn_on release 3CONFIG += qt warn_on release
4DESTDIR = $(QPEDIR)/bin 4DESTDIR = $(OPIEDIR)/bin
5 5
6 HEADERS = showimg.h 6 HEADERS = showimg.h
7 7
@@ -10,8 +10,8 @@ SOURCES = main.cpp \
10 10
11TARGET = showimg 11TARGET = showimg
12 12
13INCLUDEPATH += $(QPEDIR)/include 13INCLUDEPATH += $(OPIEDIR)/include
14DEPENDPATH += $(QPEDIR)/include 14DEPENDPATH += $(OPIEDIR)/include
15LIBS += -lqpe 15LIBS += -lqpe
16 16
17REQUIRES = showimg 17REQUIRES = showimg
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
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
@@ -4,8 +4,8 @@ DESTDIR = ../../bin
4 HEADERS = settings.h 4 HEADERS = settings.h
5 SOURCES = language.cpp main.cpp 5 SOURCES = language.cpp main.cpp
6 INTERFACES= languagesettingsbase.ui 6 INTERFACES= languagesettingsbase.ui
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= ../$(QPEDIR)/include 8 DEPENDPATH+= ../$(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 TARGET = language 10 TARGET = language
11 11
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
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
@@ -4,7 +4,7 @@ DESTDIR = ../../bin
4 HEADERS = soundsettings.h 4 HEADERS = soundsettings.h
5 SOURCES = soundsettings.cpp main.cpp 5 SOURCES = soundsettings.cpp main.cpp
6 INTERFACES= soundsettingsbase.ui 6 INTERFACES= soundsettingsbase.ui
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= ../$(QPEDIR)/include 8 DEPENDPATH+= ../$(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 TARGET = sound 10 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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -14,7 +14,7 @@ UIC = $(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
@@ -125,7 +125,7 @@ REQUIRES=
125 125
126main.o: main.cpp \ 126main.o: main.cpp \
127 sysinfo.h \ 127 sysinfo.h \
128 $(QPEDIR)/include/qpe/qpeapplication.h 128 $(OPIEDIR)/include/qpe/qpeapplication.h
129 129
130memory.o: memory.cpp \ 130memory.o: memory.cpp \
131 graph.h \ 131 graph.h \
@@ -142,8 +142,8 @@ storage.o: storage.cpp \
142 storage.h 142 storage.h
143 143
144versioninfo.o: versioninfo.cpp \ 144versioninfo.o: versioninfo.cpp \
145 $(QPEDIR)/include/qpe/resource.h \ 145 $(OPIEDIR)/include/qpe/resource.h \
146 $(QPEDIR)/include/qpe/version.h \ 146 $(OPIEDIR)/include/qpe/version.h \
147 versioninfo.h 147 versioninfo.h
148 148
149sysinfo.o: sysinfo.cpp \ 149sysinfo.o: sysinfo.cpp \
@@ -152,7 +152,7 @@ sysinfo.o: sysinfo.cpp \
152 storage.h \ 152 storage.h \
153 versioninfo.h \ 153 versioninfo.h \
154 sysinfo.h \ 154 sysinfo.h \
155 $(QPEDIR)/include/qpe/resource.h 155 $(OPIEDIR)/include/qpe/resource.h
156 156
157moc_memory.o: moc_memory.cpp \ 157moc_memory.o: moc_memory.cpp \
158 memory.h 158 memory.h
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,6 +1,6 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = memory.h \ 4 HEADERS = memory.h \
5 graph.h \ 5 graph.h \
6 load.h \ 6 load.h \
@@ -16,8 +16,8 @@ SOURCES = main.cpp \
16 sysinfo.cpp 16 sysinfo.cpp
17 INTERFACES= 17 INTERFACES=
18 18
19INCLUDEPATH += $(QPEDIR)/include 19INCLUDEPATH += $(OPIEDIR)/include
20 DEPENDPATH+= $(QPEDIR)/include 20 DEPENDPATH+= $(OPIEDIR)/include
21LIBS += -lqpe 21LIBS += -lqpe
22 22
23 TARGET = sysinfo 23 TARGET = sysinfo
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
@@ -9,8 +9,8 @@ HEADERS = binaryimpl.h \
9SOURCES = binaryimpl.cpp \ 9SOURCES = binaryimpl.cpp \
10 binaryfactory.cpp 10 binaryfactory.cpp
11 11
12INCLUDEPATH += $(QPEDIR)/include \ 12INCLUDEPATH += $(OPIEDIR)/include \
13 $(QPEDIR)/calc2 13 $(OPIEDIR)/calc2
14DEPENDPATH += $(QPEDIR)/include 14DEPENDPATH += $(OPIEDIR)/include
15 15
16DESTDIR = $(QPEDIR)/plugins/calculator 16DESTDIR = $(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
@@ -5,7 +5,7 @@ CONFIG += qt release
5HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h 5HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h
6SOURCES += calc.cpp main.cpp engine.cpp 6SOURCES += calc.cpp main.cpp engine.cpp
7 7
8INCLUDEPATH += $(QPEDIR)/include 8INCLUDEPATH += $(OPIEDIR)/include
9DEPENDPATH += $(QPEDIR)/include 9DEPENDPATH += $(OPIEDIR)/include
10LIBS += -lqpe -Wl,-export-dynamic 10LIBS += -lqpe -Wl,-export-dynamic
11 11
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
@@ -7,8 +7,8 @@ INTERFACES += simple.ui
7HEADERS = simpleimpl.h simplefactory.h stdinstructions.h 7HEADERS = simpleimpl.h simplefactory.h stdinstructions.h
8SOURCES = simpleimpl.cpp simplefactory.cpp 8SOURCES = simpleimpl.cpp simplefactory.cpp
9 9
10INCLUDEPATH += $(QPEDIR)/include \ 10INCLUDEPATH += $(OPIEDIR)/include \
11 $(QPEDIR)/calc2 11 $(OPIEDIR)/calc2
12DEPENDPATH += $(QPEDIR)/include 12DEPENDPATH += $(OPIEDIR)/include
13 13
14DESTDIR = $(QPEDIR)/plugins/calculator 14DESTDIR = $(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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -14,7 +14,7 @@ UIC = $(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
@@ -104,17 +104,17 @@ REQUIRES=
104calculatorimpl.o: calculatorimpl.cpp \ 104calculatorimpl.o: calculatorimpl.cpp \
105 calculatorimpl.h \ 105 calculatorimpl.h \
106 calculator.h \ 106 calculator.h \
107 $(QPEDIR)/include/qpe/resource.h \ 107 $(OPIEDIR)/include/qpe/resource.h \
108 $(QPEDIR)/include/qpe/qmath.h \ 108 $(OPIEDIR)/include/qpe/qmath.h \
109 $(QPEDIR)/include/qpe/qpeapplication.h 109 $(OPIEDIR)/include/qpe/qpeapplication.h
110 110
111main.o: main.cpp \ 111main.o: main.cpp \
112 calculatorimpl.h \ 112 calculatorimpl.h \
113 calculator.h \ 113 calculator.h \
114 $(QPEDIR)/include/qpe/qpeapplication.h 114 $(OPIEDIR)/include/qpe/qpeapplication.h
115 115
116calculator.h: calculator.ui 116calculator.h: calculator.ui
117 $(UIC) calculator.ui -o calculator.h 117 $(UIC) calculator.ui -o $(INTERFACE_DECL_PATH)/calculator.h
118 118
119calculator.cpp: calculator.ui 119calculator.cpp: calculator.ui
120 $(UIC) calculator.ui -i calculator.h -o calculator.cpp 120 $(UIC) calculator.ui -i calculator.h -o calculator.cpp
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,11 +1,11 @@
1 DESTDIR = $(QPEDIR)/bin 1 DESTDIR = $(OPIEDIR)/bin
2 TEMPLATE= app 2 TEMPLATE= app
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 HEADERS = calculatorimpl.h 4 HEADERS = calculatorimpl.h
5 SOURCES = calculatorimpl.cpp \ 5 SOURCES = calculatorimpl.cpp \
6 main.cpp 6 main.cpp
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(QPEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 INTERFACES= calculator.ui 10 INTERFACES= calculator.ui
11 TARGET = calculator 11 TARGET = calculator
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -14,7 +14,7 @@ UIC = $(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
@@ -100,14 +100,14 @@ REQUIRES=
100 100
101clock.o: clock.cpp \ 101clock.o: clock.cpp \
102 clock.h \ 102 clock.h \
103 $(QPEDIR)/include/qpe/qpeapplication.h \ 103 $(OPIEDIR)/include/qpe/qpeapplication.h \
104 $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ 104 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
105 $(QPEDIR)/include/qpe/config.h \ 105 $(OPIEDIR)/include/qpe/config.h \
106 $(QPEDIR)/include/qpe/timestring.h 106 $(OPIEDIR)/include/qpe/timestring.h
107 107
108main.o: main.cpp \ 108main.o: main.cpp \
109 clock.h \ 109 clock.h \
110 $(QPEDIR)/include/qpe/qpeapplication.h 110 $(OPIEDIR)/include/qpe/qpeapplication.h
111 111
112moc_clock.o: moc_clock.cpp \ 112moc_clock.o: moc_clock.cpp \
113 clock.h 113 clock.h
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,11 +1,11 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = clock.h 4 HEADERS = clock.h
5 SOURCES = clock.cpp \ 5 SOURCES = clock.cpp \
6 main.cpp 6 main.cpp
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(QPEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 INTERFACES= 10 INTERFACES=
11 TARGET = clock 11 TARGET = clock
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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -14,7 +14,7 @@ UIC = $(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
@@ -106,20 +106,20 @@ REQUIRES=
106filebrowser.o: filebrowser.cpp \ 106filebrowser.o: filebrowser.cpp \
107 inlineedit.h \ 107 inlineedit.h \
108 filebrowser.h \ 108 filebrowser.h \
109 $(QPEDIR)/include/qpe/resource.h \ 109 $(OPIEDIR)/include/qpe/resource.h \
110 $(QPEDIR)/include/qpe/global.h \ 110 $(OPIEDIR)/include/qpe/global.h \
111 $(QPEDIR)/include/qpe/mimetype.h \ 111 $(OPIEDIR)/include/qpe/mimetype.h \
112 $(QPEDIR)/include/qpe/applnk.h \ 112 $(OPIEDIR)/include/qpe/applnk.h \
113 $(QPEDIR)/include/qpe/qpetoolbar.h \ 113 $(OPIEDIR)/include/qpe/qpetoolbar.h \
114 $(QPEDIR)/include/qpe/qpemenubar.h 114 $(OPIEDIR)/include/qpe/qpemenubar.h
115 115
116inlineedit.o: inlineedit.cpp \ 116inlineedit.o: inlineedit.cpp \
117 inlineedit.h 117 inlineedit.h
118 118
119main.o: main.cpp \ 119main.o: main.cpp \
120 filebrowser.h \ 120 filebrowser.h \
121 $(QPEDIR)/include/qpe/qpeapplication.h \ 121 $(OPIEDIR)/include/qpe/qpeapplication.h \
122 $(QPEDIR)/include/qpe/mimetype.h 122 $(OPIEDIR)/include/qpe/mimetype.h
123 123
124moc_inlineedit.o: moc_inlineedit.cpp \ 124moc_inlineedit.o: moc_inlineedit.cpp \
125 inlineedit.h 125 inlineedit.h
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,12 +1,12 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = inlineedit.h \ 4 HEADERS = inlineedit.h \
5 filebrowser.h 5 filebrowser.h
6 SOURCES = filebrowser.cpp \ 6 SOURCES = filebrowser.cpp \
7 inlineedit.cpp \ 7 inlineedit.cpp \
8 main.cpp 8 main.cpp
9INCLUDEPATH += $(QPEDIR)/include 9INCLUDEPATH += $(OPIEDIR)/include
10 DEPENDPATH+= $(QPEDIR)/include 10 DEPENDPATH+= $(OPIEDIR)/include
11LIBS += -lqpe 11LIBS += -lqpe
12 INTERFACES= 12 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
@@ -6,7 +6,7 @@ CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(QPEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
@@ -14,7 +14,7 @@ UIC = $(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(QPEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
@@ -125,17 +125,17 @@ packagemanager.o: packagemanager.cpp \
125 pkdesc.h \ 125 pkdesc.h \
126 pkfind.h \ 126 pkfind.h \
127 pksettings.h \ 127 pksettings.h \
128 $(QPEDIR)/include/qpe/process.h \ 128 $(OPIEDIR)/include/qpe/process.h \
129 $(QPEDIR)/include/qpe/resource.h \ 129 $(OPIEDIR)/include/qpe/resource.h \
130 $(QPEDIR)/include/qpe/stringutil.h \ 130 $(OPIEDIR)/include/qpe/stringutil.h \
131 $(QPEDIR)/include/qpe/qpeapplication.h \ 131 $(OPIEDIR)/include/qpe/qpeapplication.h \
132 $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ 132 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
133 $(QPEDIR)/include/qpe/applnk.h 133 $(OPIEDIR)/include/qpe/applnk.h
134 134
135main.o: main.cpp \ 135main.o: main.cpp \
136 packagemanager.h \ 136 packagemanager.h \
137 packagemanagerbase.h \ 137 packagemanagerbase.h \
138 $(QPEDIR)/include/qpe/qpeapplication.h 138 $(OPIEDIR)/include/qpe/qpeapplication.h
139 139
140packagemanagerbase.h: packagemanagerbase.ui 140packagemanagerbase.h: packagemanagerbase.ui
141 $(UIC) packagemanagerbase.ui -o $(INTERFACE_DECL_PATH)/packagemanagerbase.h 141 $(UIC) packagemanagerbase.ui -o $(INTERFACE_DECL_PATH)/packagemanagerbase.h
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,11 +1,11 @@
1 DESTDIR = $(QPEDIR)/bin 1 DESTDIR = $(OPIEDIR)/bin
2 TEMPLATE= app 2 TEMPLATE= app
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 HEADERS = packagemanager.h 4 HEADERS = packagemanager.h
5 SOURCES = packagemanager.cpp \ 5 SOURCES = packagemanager.cpp \
6 main.cpp 6 main.cpp
7INCLUDEPATH += $(QPEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(QPEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 INTERFACES= packagemanagerbase.ui pkdesc.ui pkfind.ui pksettings.ui 10 INTERFACES= packagemanagerbase.ui pkdesc.ui pkfind.ui pksettings.ui
11 TARGET = qipkg 11 TARGET = qipkg
diff --git a/scripts/q_functions b/scripts/q_functions
index cf2c2e1..0705cc2 100755
--- a/scripts/q_functions
+++ b/scripts/q_functions
@@ -139,16 +139,16 @@ function print_install_file
139{ 139{
140cat << END 140cat << END
141#!/bin/sh 141#!/bin/sh
142if [ a\$QPEDIR = a ] 142if [ a\$OPIEDIR = a ]
143then 143then
144echo QPEDIR must be set 144echo OPIEDIR must be set
145exit 145exit
146fi 146fi
147[ -f \$QPEDIR/pics/$NEW_APP_ICON_FILE ] || cp $NEW_APP_ICON_FILE \$QPEDIR/pics/ 147[ -f \$OPIEDIR/pics/$NEW_APP_ICON_FILE ] || cp $NEW_APP_ICON_FILE \$OPIEDIR/pics/
148[ -f \$QPEDIR/apps/$NEW_APP_DESKTOP_FILE ] || cp $NEW_APP_DESKTOP_FILE \$QPEDIR/apps/ 148[ -f \$OPIEDIR/apps/$NEW_APP_DESKTOP_FILE ] || cp $NEW_APP_DESKTOP_FILE \$OPIEDIR/apps/
149mv \$QPEDIR/Makefile \$QPEDIR/Makefile.orig 149mv \$OPIEDIR/Makefile \$OPIEDIR/Makefile.orig
150sed "s/APPS=/&$NEW_APP_NAME \\\\\\\\ \\\\ 150sed "s/APPS=/&$NEW_APP_NAME \\\\\\\\ \\\\
151 /" \$QPEDIR/Makefile.orig >> \$QPEDIR/Makefile 151 /" \$OPIEDIR/Makefile.orig >> \$OPIEDIR/Makefile
152echo You may wish to move the desktop file in to 152echo You may wish to move the desktop file in to
153echo an appropriate subdirectory of the menus. 153echo an appropriate subdirectory of the menus.
154END 154END