103 files changed, 1088 insertions, 1055 deletions
@@ -8,23 +8,23 @@ PLATFORM=linux-generic-g++ SHARING=shared DEBUG= QCONFIGARG= touch .test.qpe. -if [ '!' -f ${QPEDIR}/.test.qpe. ]; +if [ '!' -f ${OPIEDIR}/.test.qpe. ]; then rm .test.qpe. echo echo - echo ' The environment variable $QPEDIR is not set correctly. It is currently' - echo ' set to "'$QPEDIR'", but it should be set to this directory,' + echo ' The environment variable $OPIEDIR is not set correctly. It is currently' + echo ' set to "'$OPIEDIR'", but it should be set to this directory,' echo ' which is "'`pwd`'".' echo - echo ' Please read the INSTALL file for instructions on how to set $QPEDIR' - echo ' correctly. If you have set $QPEDIR in your .profile or .login, you ' + echo ' Please read the INSTALL file for instructions on how to set $OPIEDIR' + echo ' correctly. If you have set $OPIEDIR in your .profile or .login, you ' echo ' will need to log out and log in again to make the setting effective.' echo echo exit 1 fi rm .test.qpe. @@ -151,13 +151,13 @@ for a in $TOMAKE ; do if [ -f $TMAKEPATH/tmake.conf -a -f $a/$f.pro ] then ( cd $a; TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \ tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \ -t $H/qt/tmake/propagate.t $f.pro | - sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$QPEDIR|\$(QPEDIR)|g" >Makefile.in; + sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in; ) echo -n "." appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'` translation=`grep '^TRANSLATION' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' ` if [ -n "$translation" -a -n "$appname" ] then 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 @@ -3,13 +3,13 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target 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 @@ -1,12 +1,12 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = battery.h batterystatus.h batteryappletimpl.h SOURCES = battery.cpp batterystatus.cpp batteryappletimpl.cpp TARGET = batteryapplet DESTDIR = ../../plugins/applets -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include .. +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libbatteryapplet.ts 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 @@ -1,10 +1,10 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = clipboard.h clipboardappletimpl.h SOURCES = clipboard.cpp clipboardappletimpl.cpp TARGET = clipboardapplet DESTDIR = ../../plugins/applets -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe VERSION = 1.0.0 diff --git a/core/applets/clockapplet/Makefile.in b/core/applets/clockapplet/Makefile.in index fcf737e..742f25f 100644 --- a/core/applets/clockapplet/Makefile.in +++ b/core/applets/clockapplet/Makefile.in @@ -3,13 +3,13 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target 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 @@ -1,12 +1,12 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = clock.h clockappletimpl.h SOURCES = clock.cpp clockappletimpl.cpp TARGET = clockapplet DESTDIR = ../../plugins/applets -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include .. +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libclockapplet.ts 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 @@ -3,13 +3,13 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target 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 @@ -1,12 +1,12 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = volume.h volumeappletimpl.h SOURCES = volume.cpp volumeappletimpl.cpp TARGET = volumeapplet DESTDIR = ../../plugins/applets -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libvolumeapplet.ts 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 @@ -3,21 +3,21 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = embeddedkonsole TARGET1 = lib$(TARGET).so.$(VER_MAJ) @@ -180,19 +180,20 @@ session.o: session.cpp \ TEHistory.h \ TEmulation.h \ keytrans.h keytrans.o: keytrans.cpp \ keytrans.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ default.keytab.h konsole.o: konsole.cpp \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h \ - $(QPEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/config.h \ konsole.h \ MyPty.h \ TEWidget.h \ TECommon.h \ TEmuVt102.h \ TEScreen.h \ @@ -209,13 +210,13 @@ main.o: main.cpp \ TEmuVt102.h \ TEScreen.h \ TEHistory.h \ TEmulation.h \ keytrans.h \ session.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h MyPty.o: MyPty.cpp \ MyPty.h moc_TEWidget.o: moc_TEWidget.cpp \ TEWidget.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 @@ -1,11 +1,11 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = TEWidget.h \ TEScreen.h \ TECommon.h \ TEHistory.h \ TEmulation.h \ @@ -25,14 +25,14 @@ SOURCES = TEScreen.cpp \ konsole.cpp \ main.cpp \ MyPty.cpp TARGET = embeddedkonsole -INCLUDEPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += $(QPEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe REQUIRES = embeddedkonsole 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 @@ -3,21 +3,21 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = helpbrowser TARGET1 = lib$(TARGET).so.$(VER_MAJ) @@ -97,21 +97,21 @@ REQUIRES= ####### Compile helpbrowser.o: helpbrowser.cpp \ helpbrowser.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/global.h \ - $(QPEDIR)/include/qpe/qpemenubar.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h main.o: main.cpp \ helpbrowser.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h moc_helpbrowser.o: moc_helpbrowser.cpp \ helpbrowser.h moc_helpbrowser.cpp: helpbrowser.h $(MOC) helpbrowser.h -o moc_helpbrowser.cpp diff --git a/core/apps/helpbrowser/helpbrowser.pro b/core/apps/helpbrowser/helpbrowser.pro index 43230f1..f6ede8b 100644 --- a/core/apps/helpbrowser/helpbrowser.pro +++ b/core/apps/helpbrowser/helpbrowser.pro @@ -1,12 +1,12 @@ TEMPLATE = app CONFIG = qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = helpbrowser.h SOURCES = helpbrowser.cpp \ main.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = TRANSLATIONS = ../i18n/de/helpbrowser.ts 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 @@ -3,13 +3,13 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target @@ -94,9 +94,9 @@ REQUIRES= ####### Compile main.o: main.cpp \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h diff --git a/core/apps/qcop/qcop.pro b/core/apps/qcop/qcop.pro index b52bfd8..3ffe796 100644 --- a/core/apps/qcop/qcop.pro +++ b/core/apps/qcop/qcop.pro @@ -1,10 +1,10 @@ TEMPLATE = app CONFIG = qt warn_on release DESTDIR = ../bin HEADERS = SOURCES = main.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = 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 @@ -3,21 +3,21 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = textedit TARGET1 = lib$(TARGET).so.$(VER_MAJ) @@ -97,29 +97,29 @@ REQUIRES= ####### Compile main.o: main.cpp \ textedit.h \ - $(QPEDIR)/include/qpe/filemanager.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/filemanager.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h textedit.o: textedit.cpp \ textedit.h \ - $(QPEDIR)/include/qpe/filemanager.h \ - $(QPEDIR)/include/qpe/global.h \ - $(QPEDIR)/include/qpe/fileselector.h \ - $(QPEDIR)/include/qpe/applnk.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/qpemenubar.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h + $(OPIEDIR)/include/qpe/filemanager.h \ + $(OPIEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/fileselector.h \ + $(OPIEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h moc_textedit.o: moc_textedit.cpp \ textedit.h \ - $(QPEDIR)/include/qpe/filemanager.h + $(OPIEDIR)/include/qpe/filemanager.h moc_textedit.cpp: textedit.h $(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,16 +1,16 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = textedit.h SOURCES = main.cpp textedit.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TARGET = textedit TRANSLATIONS = ../i18n/de/textedit.ts 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 @@ -3,21 +3,21 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include -I$(QPEDIR)/calibrate -I$(QPEDIR)/rsync +INCPATH = -I$(OPIEDIR)/include -I$(OPIEDIR)/calibrate -I$(OPIEDIR)/rsync LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe -lcrypt $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = qpe TARGET1 = lib$(TARGET).so.$(VER_MAJ) @@ -40,30 +40,30 @@ HEADERS = background.h \ ../calibrate/calibrate.h \ startmenu.h \ transferserver.h \ qcopbridge.h \ packageslave.h \ irserver.h \ - $(QPEDIR)/rsync/buf.h \ - $(QPEDIR)/rsync/checksum.h \ - $(QPEDIR)/rsync/command.h \ - $(QPEDIR)/rsync/emit.h \ - $(QPEDIR)/rsync/job.h \ - $(QPEDIR)/rsync/netint.h \ - $(QPEDIR)/rsync/protocol.h \ - $(QPEDIR)/rsync/prototab.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/search.h \ - $(QPEDIR)/rsync/stream.h \ - $(QPEDIR)/rsync/sumset.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/types.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/whole.h \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/qrsync.h + $(OPIEDIR)/rsync/buf.h \ + $(OPIEDIR)/rsync/checksum.h \ + $(OPIEDIR)/rsync/command.h \ + $(OPIEDIR)/rsync/emit.h \ + $(OPIEDIR)/rsync/job.h \ + $(OPIEDIR)/rsync/netint.h \ + $(OPIEDIR)/rsync/protocol.h \ + $(OPIEDIR)/rsync/prototab.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/search.h \ + $(OPIEDIR)/rsync/stream.h \ + $(OPIEDIR)/rsync/sumset.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/types.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/whole.h \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/qrsync.h SOURCES = background.cpp \ desktop.cpp \ info.cpp \ appicons.cpp \ taskbar.cpp \ sidething.cpp \ @@ -72,45 +72,45 @@ SOURCES = background.cpp \ inputmethods.cpp \ systray.cpp \ wait.cpp \ shutdownimpl.cpp \ launcher.cpp \ launcherview.cpp \ - $(QPEDIR)/calibrate/calibrate.cpp \ + $(OPIEDIR)/calibrate/calibrate.cpp \ transferserver.cpp \ packageslave.cpp \ irserver.cpp \ qcopbridge.cpp \ startmenu.cpp \ main.cpp \ - $(QPEDIR)/rsync/base64.c \ - $(QPEDIR)/rsync/buf.c \ - $(QPEDIR)/rsync/checksum.c \ - $(QPEDIR)/rsync/command.c \ - $(QPEDIR)/rsync/delta.c \ - $(QPEDIR)/rsync/emit.c \ - $(QPEDIR)/rsync/hex.c \ - $(QPEDIR)/rsync/job.c \ - $(QPEDIR)/rsync/mdfour.c \ - $(QPEDIR)/rsync/mksum.c \ - $(QPEDIR)/rsync/msg.c \ - $(QPEDIR)/rsync/netint.c \ - $(QPEDIR)/rsync/patch.c \ - $(QPEDIR)/rsync/prototab.c \ - $(QPEDIR)/rsync/readsums.c \ - $(QPEDIR)/rsync/scoop.c \ - $(QPEDIR)/rsync/search.c \ - $(QPEDIR)/rsync/stats.c \ - $(QPEDIR)/rsync/stream.c \ - $(QPEDIR)/rsync/sumset.c \ - $(QPEDIR)/rsync/trace.c \ - $(QPEDIR)/rsync/tube.c \ - $(QPEDIR)/rsync/util.c \ - $(QPEDIR)/rsync/version.c \ - $(QPEDIR)/rsync/whole.c \ - $(QPEDIR)/rsync/qrsync.cpp + $(OPIEDIR)/rsync/base64.c \ + $(OPIEDIR)/rsync/buf.c \ + $(OPIEDIR)/rsync/checksum.c \ + $(OPIEDIR)/rsync/command.c \ + $(OPIEDIR)/rsync/delta.c \ + $(OPIEDIR)/rsync/emit.c \ + $(OPIEDIR)/rsync/hex.c \ + $(OPIEDIR)/rsync/job.c \ + $(OPIEDIR)/rsync/mdfour.c \ + $(OPIEDIR)/rsync/mksum.c \ + $(OPIEDIR)/rsync/msg.c \ + $(OPIEDIR)/rsync/netint.c \ + $(OPIEDIR)/rsync/patch.c \ + $(OPIEDIR)/rsync/prototab.c \ + $(OPIEDIR)/rsync/readsums.c \ + $(OPIEDIR)/rsync/scoop.c \ + $(OPIEDIR)/rsync/search.c \ + $(OPIEDIR)/rsync/stats.c \ + $(OPIEDIR)/rsync/stream.c \ + $(OPIEDIR)/rsync/sumset.c \ + $(OPIEDIR)/rsync/trace.c \ + $(OPIEDIR)/rsync/tube.c \ + $(OPIEDIR)/rsync/util.c \ + $(OPIEDIR)/rsync/version.c \ + $(OPIEDIR)/rsync/whole.c \ + $(OPIEDIR)/rsync/qrsync.cpp OBJECTS = background.o \ desktop.o \ info.o \ appicons.o \ taskbar.o \ sidething.o \ @@ -119,45 +119,45 @@ OBJECTS = background.o \ inputmethods.o \ systray.o \ wait.o \ shutdownimpl.o \ launcher.o \ launcherview.o \ - $(QPEDIR)/calibrate/calibrate.o \ + $(OPIEDIR)/calibrate/calibrate.o \ transferserver.o \ packageslave.o \ irserver.o \ qcopbridge.o \ startmenu.o \ main.o \ - $(QPEDIR)/rsync/base64.o \ - $(QPEDIR)/rsync/buf.o \ - $(QPEDIR)/rsync/checksum.o \ - $(QPEDIR)/rsync/command.o \ - $(QPEDIR)/rsync/delta.o \ - $(QPEDIR)/rsync/emit.o \ - $(QPEDIR)/rsync/hex.o \ - $(QPEDIR)/rsync/job.o \ - $(QPEDIR)/rsync/mdfour.o \ - $(QPEDIR)/rsync/mksum.o \ - $(QPEDIR)/rsync/msg.o \ - $(QPEDIR)/rsync/netint.o \ - $(QPEDIR)/rsync/patch.o \ - $(QPEDIR)/rsync/prototab.o \ - $(QPEDIR)/rsync/readsums.o \ - $(QPEDIR)/rsync/scoop.o \ - $(QPEDIR)/rsync/search.o \ - $(QPEDIR)/rsync/stats.o \ - $(QPEDIR)/rsync/stream.o \ - $(QPEDIR)/rsync/sumset.o \ - $(QPEDIR)/rsync/trace.o \ - $(QPEDIR)/rsync/tube.o \ - $(QPEDIR)/rsync/util.o \ - $(QPEDIR)/rsync/version.o \ - $(QPEDIR)/rsync/whole.o \ - $(QPEDIR)/rsync/qrsync.o \ + $(OPIEDIR)/rsync/base64.o \ + $(OPIEDIR)/rsync/buf.o \ + $(OPIEDIR)/rsync/checksum.o \ + $(OPIEDIR)/rsync/command.o \ + $(OPIEDIR)/rsync/delta.o \ + $(OPIEDIR)/rsync/emit.o \ + $(OPIEDIR)/rsync/hex.o \ + $(OPIEDIR)/rsync/job.o \ + $(OPIEDIR)/rsync/mdfour.o \ + $(OPIEDIR)/rsync/mksum.o \ + $(OPIEDIR)/rsync/msg.o \ + $(OPIEDIR)/rsync/netint.o \ + $(OPIEDIR)/rsync/patch.o \ + $(OPIEDIR)/rsync/prototab.o \ + $(OPIEDIR)/rsync/readsums.o \ + $(OPIEDIR)/rsync/scoop.o \ + $(OPIEDIR)/rsync/search.o \ + $(OPIEDIR)/rsync/stats.o \ + $(OPIEDIR)/rsync/stream.o \ + $(OPIEDIR)/rsync/sumset.o \ + $(OPIEDIR)/rsync/trace.o \ + $(OPIEDIR)/rsync/tube.o \ + $(OPIEDIR)/rsync/util.o \ + $(OPIEDIR)/rsync/version.o \ + $(OPIEDIR)/rsync/whole.o \ + $(OPIEDIR)/rsync/qrsync.o \ shutdown.o \ syncdialog.o INTERFACES = shutdown.ui \ syncdialog.ui UICDECLS = shutdown.h \ syncdialog.h @@ -269,451 +269,461 @@ REQUIRES= background.o: background.cpp \ background.h \ desktop.h \ shutdownimpl.h \ shutdown.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/resource.h desktop.o: desktop.cpp \ desktop.h \ shutdownimpl.h \ shutdown.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ info.h \ background.h \ launcher.h \ launcherview.h \ - $(QPEDIR)/include/qpe/storage.h \ + $(OPIEDIR)/include/qpe/storage.h \ mrulist.h \ - $(QPEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/applnk.h \ qcopbridge.h \ startmenu.h \ taskbar.h \ - $(QPEDIR)/include/qpe/custom.h \ + $(OPIEDIR)/include/qpe/custom.h \ transferserver.h \ irserver.h \ packageslave.h \ - $(QPEDIR)/include/qpe/mimetype.h \ - $(QPEDIR)/include/qpe/password.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/power.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ - $(QPEDIR)/include/qpe/global.h + $(OPIEDIR)/include/qpe/mimetype.h \ + $(OPIEDIR)/include/qpe/password.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/power.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ + $(OPIEDIR)/include/qpe/global.h info.o: info.cpp \ info.h \ background.h \ desktop.h \ shutdownimpl.h \ shutdown.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/version.h + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/version.h appicons.o: appicons.cpp \ appicons.moc \ appicons.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h taskbar.o: taskbar.cpp \ startmenu.h \ inputmethods.h \ - $(QPEDIR)/include/qpe/inputmethodinterface.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/inputmethodinterface.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ mrulist.h \ - $(QPEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/applnk.h \ systray.h \ - $(QPEDIR)/include/qpe/taskbarappletinterface.h \ - $(QPEDIR)/calibrate/calibrate.h \ + $(OPIEDIR)/include/qpe/taskbarappletinterface.h \ + $(OPIEDIR)/calibrate/calibrate.h \ wait.h \ - $(QPEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/resource.h \ appicons.h \ taskbar.h \ - $(QPEDIR)/include/qpe/custom.h \ + $(OPIEDIR)/include/qpe/custom.h \ desktop.h \ shutdownimpl.h \ shutdown.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ - $(QPEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ + $(OPIEDIR)/include/qpe/global.h \ ../taskbar/apps.h \ ../addressbook/addressbook.h \ ../datebook/datebook.h \ - $(QPEDIR)/include/qpe/datebookdb.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/datebookdb.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h \ ../helpbrowser/helpbrowser.h \ ../minesweep/minesweep.h \ ../textedit/textedit.h \ - $(QPEDIR)/include/qpe/filemanager.h \ + $(OPIEDIR)/include/qpe/filemanager.h \ ../todo/mainwindow.h \ ../citytime/citytime.h \ ../clock/clock.h \ ../calculator/calculatorimpl.h \ ../sysinfo/sysinfo.h \ ../settings/appearance/settings.h \ ../settings/systemtime/settime.h \ - $(QPEDIR)/include/qpe/timestring.h \ + $(OPIEDIR)/include/qpe/timestring.h \ ../filebrowser/filebrowser.h \ ../solitaire/canvascardwindow.h \ ../snake/interface.h \ ../parashoot/interface.h \ - $(QPEDIR)/include/qpe/sound.h \ + $(OPIEDIR)/include/qpe/sound.h \ ../mpegplayer/mediaplayer.h \ - $(QPEDIR)/include/qpe/qlibrary.h \ + $(OPIEDIR)/include/qpe/qlibrary.h \ ../embeddedkonsole/konsole.h \ ../wordgame/wordgame.h \ - $(QPEDIR)/include/qpe/qdawg.h + $(OPIEDIR)/include/qpe/qdawg.h sidething.o: sidething.cpp \ sidething.h \ startmenu.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h mrulist.o: mrulist.cpp \ mrulist.h \ - $(QPEDIR)/include/qpe/applnk.h \ - $(QPEDIR)/include/qpe/global.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/resource.h stabmon.o: stabmon.cpp \ stabmon.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h inputmethods.o: inputmethods.cpp \ inputmethods.h \ - $(QPEDIR)/include/qpe/inputmethodinterface.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/qlibrary.h + $(OPIEDIR)/include/qpe/inputmethodinterface.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qlibrary.h systray.o: systray.cpp \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/qlibrary.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h \ - $(QPEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qlibrary.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/config.h \ quicklauncher.h \ systray.h \ - $(QPEDIR)/include/qpe/taskbarappletinterface.h + $(OPIEDIR)/include/qpe/taskbarappletinterface.h wait.o: wait.cpp \ wait.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h shutdownimpl.o: shutdownimpl.cpp \ shutdownimpl.h \ shutdown.h \ - $(QPEDIR)/include/qpe/global.h + $(OPIEDIR)/include/qpe/global.h launcher.o: launcher.cpp \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/applnk.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/global.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/mimetype.h \ - $(QPEDIR)/include/qpe/storage.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/mimetype.h \ + $(OPIEDIR)/include/qpe/storage.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ launcherview.h \ launcher.h \ - $(QPEDIR)/include/qpe/lnkproperties.h \ + syncdialog.h \ + desktop.h \ + shutdownimpl.h \ + shutdown.h \ + $(OPIEDIR)/include/qpe/lnkproperties.h \ mrulist.h \ - $(QPEDIR)/rsync/qrsync.h + $(OPIEDIR)/rsync/qrsync.h launcherview.o: launcherview.cpp \ launcherview.h \ - $(QPEDIR)/include/qpe/storage.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/applnk.h \ - $(QPEDIR)/include/qpe/qpedebug.h \ - $(QPEDIR)/include/qpe/categories.h \ - $(QPEDIR)/include/qpe/categoryselect.h \ - $(QPEDIR)/include/qpe/menubutton.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h - -$(QPEDIR)/calibrate/calibrate.o: $(QPEDIR)/calibrate/calibrate.cpp \ - $(QPEDIR)/calibrate/calibrate.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/storage.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/qpedebug.h \ + $(OPIEDIR)/include/qpe/categories.h \ + $(OPIEDIR)/include/qpe/categoryselect.h \ + $(OPIEDIR)/include/qpe/menubutton.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h + +$(OPIEDIR)/calibrate/calibrate.o: $(OPIEDIR)/calibrate/calibrate.cpp \ + $(OPIEDIR)/calibrate/calibrate.h \ + $(OPIEDIR)/include/qpe/resource.h transferserver.o: transferserver.cpp \ - $(QPEDIR)/include/qpe/qprocess.h \ - $(QPEDIR)/include/qpe/process.h \ + $(OPIEDIR)/include/qpe/qprocess.h \ + $(OPIEDIR)/include/qpe/process.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ transferserver.h packageslave.o: packageslave.cpp \ packageslave.h \ - $(QPEDIR)/include/qpe/process.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h + $(OPIEDIR)/include/qpe/process.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h irserver.o: irserver.cpp \ irserver.h \ - $(QPEDIR)/include/qpe/qlibrary.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qlibrary.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ obexinterface.h qcopbridge.o: qcopbridge.cpp \ qcopbridge.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + transferserver.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h startmenu.o: startmenu.cpp \ startmenu.h \ sidething.h \ mrulist.h \ - $(QPEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/applnk.h \ info.h \ background.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/global.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/resource.h main.o: main.cpp \ desktop.h \ shutdownimpl.h \ shutdown.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ taskbar.h \ - $(QPEDIR)/include/qpe/custom.h \ + $(OPIEDIR)/include/qpe/custom.h \ stabmon.h \ - $(QPEDIR)/include/qpe/network.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ - $(QPEDIR)/include/qpe/alarmserver.h \ + $(OPIEDIR)/include/qpe/network.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ + $(OPIEDIR)/include/qpe/alarmserver.h \ ../calibrate/calibrate.h \ ../login/qdmdialogimpl.h \ - $(QPEDIR)/include/qpe/global.h - -$(QPEDIR)/rsync/base64.o: $(QPEDIR)/rsync/base64.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h - -$(QPEDIR)/rsync/buf.o: $(QPEDIR)/rsync/buf.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/buf.h \ - $(QPEDIR)/rsync/util.h - -$(QPEDIR)/rsync/checksum.o: $(QPEDIR)/rsync/checksum.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/checksum.h - -$(QPEDIR)/rsync/command.o: $(QPEDIR)/rsync/command.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/command.h - -$(QPEDIR)/rsync/delta.o: $(QPEDIR)/rsync/delta.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/emit.h \ - $(QPEDIR)/rsync/stream.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/sumset.h \ - $(QPEDIR)/rsync/job.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/checksum.h \ - $(QPEDIR)/rsync/search.h \ - $(QPEDIR)/rsync/types.h - -$(QPEDIR)/rsync/emit.o: $(QPEDIR)/rsync/emit.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/command.h \ - $(QPEDIR)/rsync/protocol.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/emit.h \ - $(QPEDIR)/rsync/prototab.h \ - $(QPEDIR)/rsync/netint.h \ - $(QPEDIR)/rsync/sumset.h \ - $(QPEDIR)/rsync/job.h - -$(QPEDIR)/rsync/hex.o: $(QPEDIR)/rsync/hex.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h - -$(QPEDIR)/rsync/job.o: $(QPEDIR)/rsync/job.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/stream.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/sumset.h \ - $(QPEDIR)/rsync/job.h \ - $(QPEDIR)/rsync/trace.h - -$(QPEDIR)/rsync/mdfour.o: $(QPEDIR)/rsync/mdfour.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/types.h - -$(QPEDIR)/rsync/mksum.o: $(QPEDIR)/rsync/mksum.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/stream.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/sumset.h \ - $(QPEDIR)/rsync/job.h \ - $(QPEDIR)/rsync/protocol.h \ - $(QPEDIR)/rsync/netint.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/checksum.h - -$(QPEDIR)/rsync/msg.o: $(QPEDIR)/rsync/msg.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h - -$(QPEDIR)/rsync/netint.o: $(QPEDIR)/rsync/netint.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/job.h \ - $(QPEDIR)/rsync/netint.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/stream.h - -$(QPEDIR)/rsync/patch.o: $(QPEDIR)/rsync/patch.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/protocol.h \ - $(QPEDIR)/rsync/netint.h \ - $(QPEDIR)/rsync/command.h \ - $(QPEDIR)/rsync/sumset.h \ - $(QPEDIR)/rsync/prototab.h \ - $(QPEDIR)/rsync/stream.h \ - $(QPEDIR)/rsync/job.h - -$(QPEDIR)/rsync/prototab.o: $(QPEDIR)/rsync/prototab.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/protocol.h \ - $(QPEDIR)/rsync/command.h \ - $(QPEDIR)/rsync/prototab.h - -$(QPEDIR)/rsync/readsums.o: $(QPEDIR)/rsync/readsums.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/sumset.h \ - $(QPEDIR)/rsync/job.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/netint.h \ - $(QPEDIR)/rsync/protocol.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/stream.h - -$(QPEDIR)/rsync/scoop.o: $(QPEDIR)/rsync/scoop.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/job.h \ - $(QPEDIR)/rsync/stream.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/util.h - -$(QPEDIR)/rsync/search.o: $(QPEDIR)/rsync/search.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/sumset.h \ - $(QPEDIR)/rsync/search.h \ - $(QPEDIR)/rsync/checksum.h - -$(QPEDIR)/rsync/stats.o: $(QPEDIR)/rsync/stats.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/trace.h - -$(QPEDIR)/rsync/stream.o: $(QPEDIR)/rsync/stream.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/stream.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/trace.h - -$(QPEDIR)/rsync/sumset.o: $(QPEDIR)/rsync/sumset.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/sumset.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/trace.h - -$(QPEDIR)/rsync/trace.o: $(QPEDIR)/rsync/trace.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/trace.h - -$(QPEDIR)/rsync/tube.o: $(QPEDIR)/rsync/tube.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/job.h \ - $(QPEDIR)/rsync/stream.h - -$(QPEDIR)/rsync/util.o: $(QPEDIR)/rsync/util.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/trace.h - -$(QPEDIR)/rsync/version.o: $(QPEDIR)/rsync/version.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h - -$(QPEDIR)/rsync/whole.o: $(QPEDIR)/rsync/whole.c \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/config_linux.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/fileutil.h \ - $(QPEDIR)/rsync/sumset.h \ - $(QPEDIR)/rsync/job.h \ - $(QPEDIR)/rsync/buf.h \ - $(QPEDIR)/rsync/whole.h \ - $(QPEDIR)/rsync/util.h - -$(QPEDIR)/rsync/qrsync.o: $(QPEDIR)/rsync/qrsync.cpp \ - $(QPEDIR)/rsync/qrsync.h \ - $(QPEDIR)/rsync/rsync.h + $(OPIEDIR)/include/qpe/global.h + +$(OPIEDIR)/rsync/base64.o: $(OPIEDIR)/rsync/base64.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h + +$(OPIEDIR)/rsync/buf.o: $(OPIEDIR)/rsync/buf.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/buf.h \ + $(OPIEDIR)/rsync/util.h + +$(OPIEDIR)/rsync/checksum.o: $(OPIEDIR)/rsync/checksum.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/checksum.h + +$(OPIEDIR)/rsync/command.o: $(OPIEDIR)/rsync/command.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/command.h + +$(OPIEDIR)/rsync/delta.o: $(OPIEDIR)/rsync/delta.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/emit.h \ + $(OPIEDIR)/rsync/stream.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/sumset.h \ + $(OPIEDIR)/rsync/job.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/checksum.h \ + $(OPIEDIR)/rsync/search.h \ + $(OPIEDIR)/rsync/types.h + +$(OPIEDIR)/rsync/emit.o: $(OPIEDIR)/rsync/emit.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/command.h \ + $(OPIEDIR)/rsync/protocol.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/emit.h \ + $(OPIEDIR)/rsync/prototab.h \ + $(OPIEDIR)/rsync/netint.h \ + $(OPIEDIR)/rsync/sumset.h \ + $(OPIEDIR)/rsync/job.h + +$(OPIEDIR)/rsync/hex.o: $(OPIEDIR)/rsync/hex.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h + +$(OPIEDIR)/rsync/job.o: $(OPIEDIR)/rsync/job.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/stream.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/sumset.h \ + $(OPIEDIR)/rsync/job.h \ + $(OPIEDIR)/rsync/trace.h + +$(OPIEDIR)/rsync/mdfour.o: $(OPIEDIR)/rsync/mdfour.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/types.h + +$(OPIEDIR)/rsync/mksum.o: $(OPIEDIR)/rsync/mksum.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/stream.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/sumset.h \ + $(OPIEDIR)/rsync/job.h \ + $(OPIEDIR)/rsync/protocol.h \ + $(OPIEDIR)/rsync/netint.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/checksum.h + +$(OPIEDIR)/rsync/msg.o: $(OPIEDIR)/rsync/msg.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h + +$(OPIEDIR)/rsync/netint.o: $(OPIEDIR)/rsync/netint.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/job.h \ + $(OPIEDIR)/rsync/netint.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/stream.h + +$(OPIEDIR)/rsync/patch.o: $(OPIEDIR)/rsync/patch.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/protocol.h \ + $(OPIEDIR)/rsync/netint.h \ + $(OPIEDIR)/rsync/command.h \ + $(OPIEDIR)/rsync/sumset.h \ + $(OPIEDIR)/rsync/prototab.h \ + $(OPIEDIR)/rsync/stream.h \ + $(OPIEDIR)/rsync/job.h + +$(OPIEDIR)/rsync/prototab.o: $(OPIEDIR)/rsync/prototab.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/protocol.h \ + $(OPIEDIR)/rsync/command.h \ + $(OPIEDIR)/rsync/prototab.h + +$(OPIEDIR)/rsync/readsums.o: $(OPIEDIR)/rsync/readsums.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/sumset.h \ + $(OPIEDIR)/rsync/job.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/netint.h \ + $(OPIEDIR)/rsync/protocol.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/stream.h + +$(OPIEDIR)/rsync/scoop.o: $(OPIEDIR)/rsync/scoop.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/job.h \ + $(OPIEDIR)/rsync/stream.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/util.h + +$(OPIEDIR)/rsync/search.o: $(OPIEDIR)/rsync/search.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/sumset.h \ + $(OPIEDIR)/rsync/search.h \ + $(OPIEDIR)/rsync/checksum.h + +$(OPIEDIR)/rsync/stats.o: $(OPIEDIR)/rsync/stats.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/trace.h + +$(OPIEDIR)/rsync/stream.o: $(OPIEDIR)/rsync/stream.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/stream.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/trace.h + +$(OPIEDIR)/rsync/sumset.o: $(OPIEDIR)/rsync/sumset.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/sumset.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/trace.h + +$(OPIEDIR)/rsync/trace.o: $(OPIEDIR)/rsync/trace.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/trace.h + +$(OPIEDIR)/rsync/tube.o: $(OPIEDIR)/rsync/tube.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/job.h \ + $(OPIEDIR)/rsync/stream.h + +$(OPIEDIR)/rsync/util.o: $(OPIEDIR)/rsync/util.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/trace.h + +$(OPIEDIR)/rsync/version.o: $(OPIEDIR)/rsync/version.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h + +$(OPIEDIR)/rsync/whole.o: $(OPIEDIR)/rsync/whole.c \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/config_linux.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/fileutil.h \ + $(OPIEDIR)/rsync/sumset.h \ + $(OPIEDIR)/rsync/job.h \ + $(OPIEDIR)/rsync/buf.h \ + $(OPIEDIR)/rsync/whole.h \ + $(OPIEDIR)/rsync/util.h + +$(OPIEDIR)/rsync/qrsync.o: $(OPIEDIR)/rsync/qrsync.cpp \ + $(OPIEDIR)/rsync/qrsync.h \ + $(OPIEDIR)/rsync/rsync.h shutdown.h: shutdown.ui $(UIC) shutdown.ui -o $(INTERFACE_DECL_PATH)/shutdown.h shutdown.cpp: shutdown.ui $(UIC) shutdown.ui -i shutdown.h -o shutdown.cpp @@ -721,65 +731,64 @@ shutdown.cpp: shutdown.ui syncdialog.h: syncdialog.ui $(UIC) syncdialog.ui -o $(INTERFACE_DECL_PATH)/syncdialog.h syncdialog.cpp: syncdialog.ui $(UIC) syncdialog.ui -i syncdialog.h -o syncdialog.cpp -shutdown.o: shutdown.cpp \ - shutdown.h +shutdown.o: shutdown.cpp syncdialog.o: syncdialog.cpp moc_background.o: moc_background.cpp \ background.h moc_desktop.o: moc_desktop.cpp \ desktop.h \ shutdownimpl.h \ shutdown.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h moc_info.o: moc_info.cpp \ info.h \ background.h moc_appicons.o: moc_appicons.cpp \ appicons.h moc_taskbar.o: moc_taskbar.cpp \ taskbar.h \ - $(QPEDIR)/include/qpe/custom.h + $(OPIEDIR)/include/qpe/custom.h moc_sidething.o: moc_sidething.cpp \ sidething.h \ startmenu.h moc_inputmethods.o: moc_inputmethods.cpp \ inputmethods.h \ - $(QPEDIR)/include/qpe/inputmethodinterface.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h + $(OPIEDIR)/include/qpe/inputmethodinterface.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h moc_systray.o: moc_systray.cpp \ systray.h \ - $(QPEDIR)/include/qpe/taskbarappletinterface.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h + $(OPIEDIR)/include/qpe/taskbarappletinterface.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h moc_shutdownimpl.o: moc_shutdownimpl.cpp \ shutdownimpl.h \ shutdown.h moc_launcher.o: moc_launcher.cpp \ launcher.h \ launcherview.h \ - $(QPEDIR)/include/qpe/storage.h + $(OPIEDIR)/include/qpe/storage.h moc_launcherview.o: moc_launcherview.cpp \ launcherview.h \ - $(QPEDIR)/include/qpe/storage.h + $(OPIEDIR)/include/qpe/storage.h ../calibrate/moc_calibrate.o: ../calibrate/moc_calibrate.cpp \ ../calibrate/calibrate.h moc_startmenu.o: moc_startmenu.cpp \ startmenu.h @@ -796,13 +805,13 @@ moc_packageslave.o: moc_packageslave.cpp \ moc_irserver.o: moc_irserver.cpp \ irserver.h moc_shutdown.o: appicons.moc \ appicons.cpp \ appicons.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h moc_syncdialog.o: moc_shutdown.cpp \ shutdown.h moc_background.cpp: background.h $(MOC) background.h -o moc_background.cpp diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro index 7d7c9ac..0078faf 100644 --- a/core/launcher/launcher.pro +++ b/core/launcher/launcher.pro @@ -1,11 +1,11 @@ TEMPLATE = app CONFIG = qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = background.h \ desktop.h \ info.h \ appicons.h \ taskbar.h \ @@ -21,30 +21,30 @@ HEADERS = background.h \ ../calibrate/calibrate.h \ startmenu.h \ transferserver.h \ qcopbridge.h \ packageslave.h \ irserver.h \ - $(QPEDIR)/rsync/buf.h \ - $(QPEDIR)/rsync/checksum.h \ - $(QPEDIR)/rsync/command.h \ - $(QPEDIR)/rsync/emit.h \ - $(QPEDIR)/rsync/job.h \ - $(QPEDIR)/rsync/netint.h \ - $(QPEDIR)/rsync/protocol.h \ - $(QPEDIR)/rsync/prototab.h \ - $(QPEDIR)/rsync/rsync.h \ - $(QPEDIR)/rsync/search.h \ - $(QPEDIR)/rsync/stream.h \ - $(QPEDIR)/rsync/sumset.h \ - $(QPEDIR)/rsync/trace.h \ - $(QPEDIR)/rsync/types.h \ - $(QPEDIR)/rsync/util.h \ - $(QPEDIR)/rsync/whole.h \ - $(QPEDIR)/rsync/config_rsync.h \ - $(QPEDIR)/rsync/qrsync.h + $(OPIEDIR)/rsync/buf.h \ + $(OPIEDIR)/rsync/checksum.h \ + $(OPIEDIR)/rsync/command.h \ + $(OPIEDIR)/rsync/emit.h \ + $(OPIEDIR)/rsync/job.h \ + $(OPIEDIR)/rsync/netint.h \ + $(OPIEDIR)/rsync/protocol.h \ + $(OPIEDIR)/rsync/prototab.h \ + $(OPIEDIR)/rsync/rsync.h \ + $(OPIEDIR)/rsync/search.h \ + $(OPIEDIR)/rsync/stream.h \ + $(OPIEDIR)/rsync/sumset.h \ + $(OPIEDIR)/rsync/trace.h \ + $(OPIEDIR)/rsync/types.h \ + $(OPIEDIR)/rsync/util.h \ + $(OPIEDIR)/rsync/whole.h \ + $(OPIEDIR)/rsync/config_rsync.h \ + $(OPIEDIR)/rsync/qrsync.h # quicklauncher.h \ SOURCES = background.cpp \ desktop.cpp \ info.cpp \ appicons.cpp \ @@ -55,56 +55,56 @@ SOURCES = background.cpp \ inputmethods.cpp \ systray.cpp \ wait.cpp \ shutdownimpl.cpp \ launcher.cpp \ launcherview.cpp \ - $(QPEDIR)/calibrate/calibrate.cpp \ + $(OPIEDIR)/calibrate/calibrate.cpp \ transferserver.cpp \ packageslave.cpp \ irserver.cpp \ qcopbridge.cpp \ startmenu.cpp \ main.cpp \ - $(QPEDIR)/rsync/base64.c \ - $(QPEDIR)/rsync/buf.c \ - $(QPEDIR)/rsync/checksum.c \ - $(QPEDIR)/rsync/command.c \ - $(QPEDIR)/rsync/delta.c \ - $(QPEDIR)/rsync/emit.c \ - $(QPEDIR)/rsync/hex.c \ - $(QPEDIR)/rsync/job.c \ - $(QPEDIR)/rsync/mdfour.c \ - $(QPEDIR)/rsync/mksum.c \ - $(QPEDIR)/rsync/msg.c \ - $(QPEDIR)/rsync/netint.c \ - $(QPEDIR)/rsync/patch.c \ - $(QPEDIR)/rsync/prototab.c \ - $(QPEDIR)/rsync/readsums.c \ - $(QPEDIR)/rsync/scoop.c \ - $(QPEDIR)/rsync/search.c \ - $(QPEDIR)/rsync/stats.c \ - $(QPEDIR)/rsync/stream.c \ - $(QPEDIR)/rsync/sumset.c \ - $(QPEDIR)/rsync/trace.c \ - $(QPEDIR)/rsync/tube.c \ - $(QPEDIR)/rsync/util.c \ - $(QPEDIR)/rsync/version.c \ - $(QPEDIR)/rsync/whole.c \ - $(QPEDIR)/rsync/qrsync.cpp + $(OPIEDIR)/rsync/base64.c \ + $(OPIEDIR)/rsync/buf.c \ + $(OPIEDIR)/rsync/checksum.c \ + $(OPIEDIR)/rsync/command.c \ + $(OPIEDIR)/rsync/delta.c \ + $(OPIEDIR)/rsync/emit.c \ + $(OPIEDIR)/rsync/hex.c \ + $(OPIEDIR)/rsync/job.c \ + $(OPIEDIR)/rsync/mdfour.c \ + $(OPIEDIR)/rsync/mksum.c \ + $(OPIEDIR)/rsync/msg.c \ + $(OPIEDIR)/rsync/netint.c \ + $(OPIEDIR)/rsync/patch.c \ + $(OPIEDIR)/rsync/prototab.c \ + $(OPIEDIR)/rsync/readsums.c \ + $(OPIEDIR)/rsync/scoop.c \ + $(OPIEDIR)/rsync/search.c \ + $(OPIEDIR)/rsync/stats.c \ + $(OPIEDIR)/rsync/stream.c \ + $(OPIEDIR)/rsync/sumset.c \ + $(OPIEDIR)/rsync/trace.c \ + $(OPIEDIR)/rsync/tube.c \ + $(OPIEDIR)/rsync/util.c \ + $(OPIEDIR)/rsync/version.c \ + $(OPIEDIR)/rsync/whole.c \ + $(OPIEDIR)/rsync/qrsync.cpp INTERFACES = shutdown.ui syncdialog.ui -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include . +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include . -INCLUDEPATH += $(QPEDIR)/calibrate -DEPENDPATH += $(QPEDIR)/calibrate +INCLUDEPATH += $(OPIEDIR)/calibrate +DEPENDPATH += $(OPIEDIR)/calibrate -INCLUDEPATH += $(QPEDIR)/rsync -DEPENDPATH += $(QPEDIR)/rsync +INCLUDEPATH += $(OPIEDIR)/rsync +DEPENDPATH += $(OPIEDIR)/rsync TARGET = qpe LIBS += -lqpe -lcrypt TRANSLATIONS = ../i18n/de/qpe.ts 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 @@ -82,13 +82,13 @@ void initCassiopeia() fprintf( stderr, "mounted /proc\n" ); } if ( mount("none","/mnt","shm",0,0) ) { perror("Mounting - shm"); } setenv( "QTDIR", "/", 1 ); - setenv( "QPEDIR", "/", 1 ); + setenv( "OPIEDIR", "/", 1 ); setenv( "HOME", "/home", 1 ); mkdir( "/home/Documents", 0755 ); // set a reasonable starting date QDateTime dt( QDate( 2001, 3, 15 ) ); QDateTime now = QDateTime::currentDateTime(); 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 @@ -1,23 +1,23 @@ ############################################################################# ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) -CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DQCONFIG=\"qpe\" +CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) -CFLAGS = $(SYSCONF_CFLAGS) -DQCONFIG=\"qpe\" -INCPATH = -I$(QPEDIR)/include +CFLAGS = $(SYSCONF_CFLAGS) +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe -lpthread $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = mpegplayer TARGET1 = lib$(TARGET).so.$(VER_MAJ) @@ -132,125 +132,125 @@ REQUIRES= ####### Compile main.o: main.cpp \ - $(QPEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ mediaplayerstate.h \ playlistwidget.h \ - $(QPEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/applnk.h \ audiowidget.h \ videowidget.h \ loopcontrol.h \ mediaplayer.h \ - $(QPEDIR)/include/qpe/qlibrary.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/qlibrary.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ mediaplayerplugininterface.h loopcontrol.o: loopcontrol.cpp \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ loopcontrol.h \ videowidget.h \ audiodevice.h \ mediaplayerplugininterface.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ mediaplayerstate.h playlistselection.o: playlistselection.cpp \ - $(QPEDIR)/include/qpe/applnk.h \ - $(QPEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/resource.h \ playlistselection.h mediaplayerstate.o: mediaplayerstate.cpp \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/qlibrary.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h \ - $(QPEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qlibrary.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/config.h \ mediaplayerplugininterface.h \ mediaplayerstate.h \ libmad/libmadpluginimpl.h \ libmpeg3/libmpeg3pluginimpl.h \ wavplugin/wavpluginimpl.h videowidget.o: videowidget.cpp \ - $(QPEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/resource.h \ videowidget.h \ mediaplayerplugininterface.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ mediaplayerstate.h audiowidget.o: audiowidget.cpp \ - $(QPEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/resource.h \ audiowidget.h \ mediaplayerstate.h playlistwidget.o: playlistwidget.cpp \ - $(QPEDIR)/include/qpe/qpemenubar.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h \ - $(QPEDIR)/include/qpe/fileselector.h \ - $(QPEDIR)/include/qpe/applnk.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/global.h \ - $(QPEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h \ + $(OPIEDIR)/include/qpe/fileselector.h \ + $(OPIEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/resource.h \ playlistselection.h \ playlistwidget.h \ mediaplayerstate.h mediaplayer.o: mediaplayer.cpp \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/qlibrary.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qlibrary.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/config.h \ mediaplayer.h \ mediaplayerplugininterface.h \ playlistwidget.h \ - $(QPEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/applnk.h \ audiowidget.h \ loopcontrol.h \ audiodevice.h \ mediaplayerstate.h audiodevice.o: audiodevice.cpp \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/config.h \ audiodevice.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h moc_loopcontrol.o: moc_loopcontrol.cpp \ loopcontrol.h moc_playlistselection.o: moc_playlistselection.cpp \ playlistselection.h \ - $(QPEDIR)/include/qpe/applnk.h + $(OPIEDIR)/include/qpe/applnk.h moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \ mediaplayerstate.h moc_videowidget.o: moc_videowidget.cpp \ videowidget.h moc_audiowidget.o: moc_audiowidget.cpp \ audiowidget.h moc_playlistwidget.o: moc_playlistwidget.cpp \ playlistwidget.h \ - $(QPEDIR)/include/qpe/applnk.h + $(OPIEDIR)/include/qpe/applnk.h moc_mediaplayer.o: moc_mediaplayer.cpp \ mediaplayer.h \ - $(QPEDIR)/include/qpe/qlibrary.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/qlibrary.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ mediaplayerplugininterface.h moc_audiodevice.o: moc_audiodevice.cpp \ audiodevice.h moc_loopcontrol.cpp: loopcontrol.h diff --git a/core/multimedia/opieplayer/libflash/libflash.pro b/core/multimedia/opieplayer/libflash/libflash.pro index d144f0b..bf97fbf 100644 --- a/core/multimedia/opieplayer/libflash/libflash.pro +++ b/core/multimedia/opieplayer/libflash/libflash.pro @@ -5,11 +5,11 @@ SOURCES = libflashplugin.cpp libflashpluginimpl.cpp \ adpcm.cc character.cc flash.cc graphic16.cc matrix.cc script.cc \ sprite.cc bitmap.cc cxform.cc font.cc graphic24.cc movie.cc \ shape.cc sqrt.cc button.cc displaylist.cc graphic.cc graphic32.cc \ program.cc sound.cc text.cc TARGET = flashplugin DESTDIR = ../../plugins/codecs -INCLUDEPATH += $(QPEDIR)/include .. -DEPENDPATH += ../$(QPEDIR)/include .. +INCLUDEPATH += $(OPIEDIR)/include .. +DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe VERSION = 1.0.0 diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in index 9e17769..19ded26 100644 --- a/core/multimedia/opieplayer/libmad/Makefile.in +++ b/core/multimedia/opieplayer/libmad/Makefile.in @@ -1,15 +1,15 @@ ############################################################################# ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) -CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\" +CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) CC = $(SYSCONF_CC) $(QT_C_MT) -CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\" -INCPATH = -I$(QPEDIR)/include -I.. +CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) +INCPATH = -I$(OPIEDIR)/include -I.. LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target 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 @@ -3,10 +3,10 @@ CONFIG += qt warn_on release HEADERS = libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \ layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h SOURCES = version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \ layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp TARGET = madplugin DESTDIR = ../../plugins/codecs -INCLUDEPATH += $(QPEDIR)/include .. -DEPENDPATH += ../$(QPEDIR)/include .. +INCLUDEPATH += $(OPIEDIR)/include .. +DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe -lm VERSION = 1.0.0 diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in index 1817902..9881815 100644 --- a/core/multimedia/opieplayer/libmpeg3/Makefile.in +++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in @@ -1,15 +1,15 @@ ############################################################################# ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) -CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\" +CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) CC = $(SYSCONF_CC) $(QT_C_MT) -CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\" -INCPATH = -I$(QPEDIR)/include -I.. +CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) +INCPATH = -I$(OPIEDIR)/include -I.. LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe -lpthread -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target 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 @@ -33,10 +33,10 @@ SOURCES = libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \ video/reconstruct.c \ video/seek.c \ video/slice.c \ video/vlc.c TARGET = mpeg3plugin DESTDIR = ../../plugins/codecs -INCLUDEPATH += $(QPEDIR)/include .. -DEPENDPATH += ../$(QPEDIR)/include .. +INCLUDEPATH += $(OPIEDIR)/include .. +DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe -lpthread -lm VERSION = 1.0.0 diff --git a/core/multimedia/opieplayer/mpegplayer.pro b/core/multimedia/opieplayer/mpegplayer.pro index d6952f8..3b8d4b0 100644 --- a/core/multimedia/opieplayer/mpegplayer.pro +++ b/core/multimedia/opieplayer/mpegplayer.pro @@ -1,21 +1,21 @@ TEMPLATE = app CONFIG = qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = loopcontrol.h mediaplayerplugininterface.h playlistselection.h mediaplayerstate.h \ videowidget.h audiowidget.h playlistwidget.h mediaplayer.h audiodevice.h SOURCES = main.cpp \ loopcontrol.cpp playlistselection.cpp mediaplayerstate.cpp \ videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp audiodevice.cpp TARGET = mpegplayer -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -lpthread # INTERFACES = -# INCLUDEPATH += $(QPEDIR)/include +# INCLUDEPATH += $(OPIEDIR)/include # CONFIG+=static # TMAKE_CXXFLAGS += -DQPIM_STANDALONE # LIBS += libmpeg3/libmpeg3.a -lpthread -# LIBS += $(QPEDIR)/plugins/codecs/liblibmadplugin.so +# LIBS += $(OPIEDIR)/plugins/codecs/liblibmadplugin.so TRANSLATIONS = ../i18n/de/mpegplayer.ts diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in index c9203f8..e9fec6c 100644 --- a/core/multimedia/opieplayer/wavplugin/Makefile.in +++ b/core/multimedia/opieplayer/wavplugin/Makefile.in @@ -1,15 +1,15 @@ ############################################################################# ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) -CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\" +CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) CC = $(SYSCONF_CC) $(QT_C_MT) -CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\" -INCPATH = -I$(QPEDIR)/include -I.. +CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) +INCPATH = -I$(OPIEDIR)/include -I.. LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target 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 @@ -1,10 +1,10 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = wavplugin.h wavpluginimpl.h SOURCES = wavplugin.cpp wavpluginimpl.cpp TARGET = wavplugin DESTDIR = ../../plugins/codecs -INCLUDEPATH += $(QPEDIR)/include .. -DEPENDPATH += ../$(QPEDIR)/include .. +INCLUDEPATH += $(OPIEDIR)/include .. +DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe VERSION = 1.0.0 diff --git a/core/pim/addressbook/Makefile.in b/core/pim/addressbook/Makefile.in index 93c73c3..c46d0e5 100644 --- a/core/pim/addressbook/Makefile.in +++ b/core/pim/addressbook/Makefile.in @@ -3,21 +3,21 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = addressbook TARGET1 = lib$(TARGET).so.$(VER_MAJ) @@ -85,13 +85,13 @@ all: $(DESTDIR)$(TARGET) $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) moc: $(SRCMOC) tmake: - tmake p4addressbook.pro + tmake addressbook.pro clean: -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) -rm -f *~ core -rm -f allmoc.cpp @@ -120,72 +120,72 @@ REQUIRES= ####### Compile main.o: main.cpp \ addressbook.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h addressbook.o: addressbook.cpp \ abeditor.h \ - $(QPEDIR)/include/qpe/contact.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ - $(QPEDIR)/include/qpe/recordfields.h \ + $(OPIEDIR)/include/qpe/contact.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/recordfields.h \ ablabel.h \ abtable.h \ - $(QPEDIR)/include/qpe/categories.h \ + $(OPIEDIR)/include/qpe/categories.h \ addresssettings.h \ addresssettingsbase.h \ addressbook.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/finddialog.h \ - $(QPEDIR)/include/qpe/global.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/ir.h \ - $(QPEDIR)/include/qpe/qpemessagebox.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ - $(QPEDIR)/include/qpe/qpemenubar.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/finddialog.h \ + $(OPIEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/ir.h \ + $(OPIEDIR)/include/qpe/qpemessagebox.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h abeditor.o: abeditor.cpp \ abeditor.h \ - $(QPEDIR)/include/qpe/contact.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ - $(QPEDIR)/include/qpe/recordfields.h \ + $(OPIEDIR)/include/qpe/contact.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/recordfields.h \ addresspicker.h \ - $(QPEDIR)/include/qpe/categoryselect.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/qpedialog.h + $(OPIEDIR)/include/qpe/categoryselect.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qpedialog.h ablabel.o: ablabel.cpp \ ablabel.h \ - $(QPEDIR)/include/qpe/contact.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ - $(QPEDIR)/include/qpe/recordfields.h \ - $(QPEDIR)/include/qpe/stringutil.h + $(OPIEDIR)/include/qpe/contact.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/recordfields.h \ + $(OPIEDIR)/include/qpe/stringutil.h abtable.o: abtable.cpp \ - $(QPEDIR)/include/qpe/categoryselect.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/stringutil.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ + $(OPIEDIR)/include/qpe/categoryselect.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/stringutil.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ abtable.h \ - $(QPEDIR)/include/qpe/categories.h \ - $(QPEDIR)/include/qpe/contact.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ - $(QPEDIR)/include/qpe/recordfields.h + $(OPIEDIR)/include/qpe/categories.h \ + $(OPIEDIR)/include/qpe/contact.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/recordfields.h addresssettings.o: addresssettings.cpp \ addresssettings.h \ addresssettingsbase.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/contact.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ - $(QPEDIR)/include/qpe/recordfields.h + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/contact.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/recordfields.h addresssettingsbase.h: addresssettingsbase.ui $(UIC) addresssettingsbase.ui -o $(INTERFACE_DECL_PATH)/addresssettingsbase.h addresssettingsbase.cpp: addresssettingsbase.ui $(UIC) addresssettingsbase.ui -i addresssettingsbase.h -o addresssettingsbase.cpp @@ -196,28 +196,28 @@ addresssettingsbase.o: addresssettingsbase.cpp \ moc_addressbook.o: moc_addressbook.cpp \ addressbook.h moc_abeditor.o: moc_abeditor.cpp \ abeditor.h \ - $(QPEDIR)/include/qpe/contact.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ - $(QPEDIR)/include/qpe/recordfields.h + $(OPIEDIR)/include/qpe/contact.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/recordfields.h moc_ablabel.o: moc_ablabel.cpp \ ablabel.h \ - $(QPEDIR)/include/qpe/contact.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ - $(QPEDIR)/include/qpe/recordfields.h + $(OPIEDIR)/include/qpe/contact.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/recordfields.h moc_abtable.o: moc_abtable.cpp \ abtable.h \ - $(QPEDIR)/include/qpe/categories.h \ - $(QPEDIR)/include/qpe/contact.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ - $(QPEDIR)/include/qpe/recordfields.h + $(OPIEDIR)/include/qpe/categories.h \ + $(OPIEDIR)/include/qpe/contact.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/recordfields.h moc_addresssettings.o: moc_addresssettings.cpp \ addresssettings.h \ addresssettingsbase.h moc_addresssettingsbase.o: moc_addresssettingsbase.cpp \ diff --git a/core/pim/addressbook/addressbook.pro b/core/pim/addressbook/addressbook.pro index 8d3401d..32e21a2 100644 --- a/core/pim/addressbook/addressbook.pro +++ b/core/pim/addressbook/addressbook.pro @@ -1,9 +1,9 @@ TEMPLATE = app CONFIG = qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = addressbook.h \ abeditor.h \ ablabel.h \ abtable.h \ addresssettings.h SOURCES = main.cpp \ @@ -12,11 +12,11 @@ SOURCES = main.cpp \ ablabel.cpp \ abtable.cpp \ addresssettings.cpp INTERFACES = addresssettingsbase.ui TARGET = addressbook -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TRANSLATIONS = ../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 @@ -3,21 +3,21 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = datebook TARGET1 = lib$(TARGET).so.$(VER_MAJ) @@ -157,106 +157,119 @@ REQUIRES= ####### Compile main.o: main.cpp \ datebook.h \ - $(QPEDIR)/include/qpe/datebookdb.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/datebookdb.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h datebookday.o: datebookday.cpp \ datebookday.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h \ datebookdayheaderimpl.h \ datebookdayheader.h \ - $(QPEDIR)/include/qpe/datebookdb.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/timestring.h \ - $(QPEDIR)/include/qpe/qpedebug.h + $(OPIEDIR)/include/qpe/datebookdb.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/timestring.h \ + $(OPIEDIR)/include/qpe/qpedebug.h datebook.o: datebook.cpp \ datebook.h \ - $(QPEDIR)/include/qpe/datebookdb.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/datebookdb.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h \ datebookday.h \ datebooksettings.h \ datebooksettingsbase.h \ datebookweek.h \ dateentryimpl.h \ dateentry.h \ - $(QPEDIR)/include/qpe/datebookmonth.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpedebug.h \ - $(QPEDIR)/include/qpe/finddialog.h \ - $(QPEDIR)/include/qpe/ir.h \ - $(QPEDIR)/include/qpe/qpemenubar.h \ - $(QPEDIR)/include/qpe/qpemessagebox.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/sound.h \ - $(QPEDIR)/include/qpe/timestring.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h \ - $(QPEDIR)/include/qpe/tzselect.h \ - $(QPEDIR)/include/qpe/xmlreader.h + $(OPIEDIR)/include/qpe/datebookmonth.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpedebug.h \ + $(OPIEDIR)/include/qpe/finddialog.h \ + $(OPIEDIR)/include/qpe/ir.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/qpemessagebox.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/sound.h \ + $(OPIEDIR)/include/qpe/timestring.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h \ + $(OPIEDIR)/include/qpe/tzselect.h \ + $(OPIEDIR)/include/qpe/xmlreader.h dateentryimpl.o: dateentryimpl.cpp \ dateentryimpl.h \ dateentry.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h \ repeatentry.h \ repeatentrybase.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/categoryselect.h \ - $(QPEDIR)/include/qpe/datebookmonth.h \ - $(QPEDIR)/include/qpe/global.h \ - $(QPEDIR)/include/qpe/timeconversion.h \ - $(QPEDIR)/include/qpe/timestring.h \ - $(QPEDIR)/include/qpe/tzselect.h + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/categoryselect.h \ + $(OPIEDIR)/include/qpe/datebookmonth.h \ + $(OPIEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/timestring.h \ + $(OPIEDIR)/include/qpe/tzselect.h datebookdayheaderimpl.o: datebookdayheaderimpl.cpp \ datebookdayheaderimpl.h \ datebookdayheader.h \ - $(QPEDIR)/include/qpe/datebookmonth.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ - $(QPEDIR)/include/qpe/timestring.h + $(OPIEDIR)/include/qpe/datebookmonth.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h \ + $(OPIEDIR)/include/qpe/timestring.h datebooksettings.o: datebooksettings.cpp \ datebooksettings.h \ datebooksettingsbase.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h datebookweek.o: datebookweek.cpp \ datebookweek.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h \ datebookweekheaderimpl.h \ datebookweekheader.h \ - $(QPEDIR)/include/qpe/calendar.h \ - $(QPEDIR)/include/qpe/datebookdb.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/timestring.h + $(OPIEDIR)/include/qpe/calendar.h \ + $(OPIEDIR)/include/qpe/datebookdb.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/timestring.h datebookweekheaderimpl.o: datebookweekheaderimpl.cpp \ datebookweekheaderimpl.h \ datebookweekheader.h repeatentry.o: repeatentry.cpp \ repeatentry.h \ repeatentrybase.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ - $(QPEDIR)/include/qpe/datebookmonth.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/timestring.h + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h \ + $(OPIEDIR)/include/qpe/datebookmonth.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/timestring.h dateentry.h: dateentry.ui $(UIC) dateentry.ui -o $(INTERFACE_DECL_PATH)/dateentry.h dateentry.cpp: dateentry.ui $(UIC) dateentry.ui -i dateentry.h -o dateentry.cpp @@ -294,45 +307,55 @@ datebooksettingsbase.o: datebooksettingsbase.cpp datebookweekheader.o: datebookweekheader.cpp repeatentrybase.o: repeatentrybase.cpp moc_datebookday.o: moc_datebookday.cpp \ datebookday.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h moc_datebook.o: moc_datebook.cpp \ datebook.h \ - $(QPEDIR)/include/qpe/datebookdb.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h + $(OPIEDIR)/include/qpe/datebookdb.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h moc_dateentryimpl.o: moc_dateentryimpl.cpp \ dateentryimpl.h \ dateentry.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h moc_datebookdayheaderimpl.o: moc_datebookdayheaderimpl.cpp \ datebookdayheaderimpl.h \ datebookdayheader.h moc_datebookweek.o: moc_datebookweek.cpp \ datebookweek.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h moc_datebookweekheaderimpl.o: moc_datebookweekheaderimpl.cpp \ datebookweekheaderimpl.h \ datebookweekheader.h moc_repeatentry.o: moc_repeatentry.cpp \ repeatentry.h \ repeatentrybase.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h moc_dateentry.o: moc_dateentry.cpp \ dateentry.h moc_datebookdayheader.o: moc_datebookdayheader.cpp \ datebookdayheader.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,9 +1,9 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = datebookday.h \ datebook.h \ dateentryimpl.h \ datebookdayheaderimpl.h \ datebooksettings.h \ @@ -24,13 +24,13 @@ SOURCES = main.cpp \ INTERFACES = dateentry.ui \ datebookdayheader.ui \ datebooksettingsbase.ui \ datebookweekheader.ui \ repeatentrybase.ui -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TARGET = datebook TRANSLATIONS = ../i18n/de/datebook.ts 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 @@ -3,21 +3,21 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = todolist TARGET1 = lib$(TARGET).so.$(VER_MAJ) @@ -110,54 +110,56 @@ REQUIRES= ####### Compile main.o: main.cpp \ mainwindow.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h mainwindow.o: mainwindow.cpp \ mainwindow.h \ todoentryimpl.h \ todoentry.h \ - $(QPEDIR)/include/qpe/task.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ - $(QPEDIR)/include/qpe/stringutil.h \ + $(OPIEDIR)/include/qpe/task.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/stringutil.h \ todotable.h \ - $(QPEDIR)/include/qpe/categories.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/finddialog.h \ - $(QPEDIR)/include/qpe/global.h \ - $(QPEDIR)/include/qpe/ir.h \ - $(QPEDIR)/include/qpe/qpemenubar.h \ - $(QPEDIR)/include/qpe/qpemessagebox.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h + $(OPIEDIR)/include/qpe/categories.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/finddialog.h \ + $(OPIEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/ir.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/qpemessagebox.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h todotable.o: todotable.cpp \ todotable.h \ - $(QPEDIR)/include/qpe/categories.h \ - $(QPEDIR)/include/qpe/task.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ - $(QPEDIR)/include/qpe/stringutil.h \ - $(QPEDIR)/include/qpe/categoryselect.h \ - $(QPEDIR)/include/qpe/xmlreader.h + $(OPIEDIR)/include/qpe/categories.h \ + $(OPIEDIR)/include/qpe/stringutil.h \ + $(OPIEDIR)/include/qpe/task.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/categoryselect.h \ + $(OPIEDIR)/include/qpe/xmlreader.h todoentryimpl.o: todoentryimpl.cpp \ todoentryimpl.h \ todoentry.h \ - $(QPEDIR)/include/qpe/task.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ - $(QPEDIR)/include/qpe/stringutil.h \ - $(QPEDIR)/include/qpe/categoryselect.h \ - $(QPEDIR)/include/qpe/datebookmonth.h \ - $(QPEDIR)/include/qpe/event.h \ - $(QPEDIR)/include/qpe/global.h \ - $(QPEDIR)/include/qpe/imageedit.h \ - $(QPEDIR)/include/qpe/timestring.h + $(OPIEDIR)/include/qpe/task.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/stringutil.h \ + $(OPIEDIR)/include/qpe/categoryselect.h \ + $(OPIEDIR)/include/qpe/datebookmonth.h \ + $(OPIEDIR)/include/qpe/event.h \ + $(OPIEDIR)/include/qpe/timeconversion.h \ + $(OPIEDIR)/include/qpe/qpcglobal.h \ + $(OPIEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/imageedit.h \ + $(OPIEDIR)/include/qpe/timestring.h todoentry.h: todoentry.ui $(UIC) todoentry.ui -o $(INTERFACE_DECL_PATH)/todoentry.h todoentry.cpp: todoentry.ui $(UIC) todoentry.ui -i todoentry.h -o todoentry.cpp @@ -168,23 +170,23 @@ todoentry.o: todoentry.cpp \ moc_mainwindow.o: moc_mainwindow.cpp \ mainwindow.h moc_todotable.o: moc_todotable.cpp \ todotable.h \ - $(QPEDIR)/include/qpe/categories.h \ - $(QPEDIR)/include/qpe/task.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ - $(QPEDIR)/include/qpe/stringutil.h + $(OPIEDIR)/include/qpe/categories.h \ + $(OPIEDIR)/include/qpe/stringutil.h \ + $(OPIEDIR)/include/qpe/task.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h moc_todoentryimpl.o: moc_todoentryimpl.cpp \ todoentryimpl.h \ todoentry.h \ - $(QPEDIR)/include/qpe/task.h \ - $(QPEDIR)/include/qpe/palmtoprecord.h \ - $(QPEDIR)/include/qpe/stringutil.h + $(OPIEDIR)/include/qpe/task.h \ + $(OPIEDIR)/include/qpe/palmtoprecord.h \ + $(OPIEDIR)/include/qpe/stringutil.h moc_todoentry.o: moc_todoentry.cpp \ todoentry.h moc_mainwindow.cpp: mainwindow.h $(MOC) mainwindow.h -o moc_mainwindow.cpp diff --git a/core/pim/todo/todo.pro b/core/pim/todo/todo.pro index e28ea1c..5eb02a2 100644 --- a/core/pim/todo/todo.pro +++ b/core/pim/todo/todo.pro @@ -1,19 +1,19 @@ TEMPLATE = app CONFIG = qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = mainwindow.h \ todotable.h \ todoentryimpl.h SOURCES = main.cpp \ mainwindow.cpp \ todotable.cpp \ todoentryimpl.cpp INTERFACES = todoentry.ui TARGET = todolist -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TRANSLATIONS = ../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 @@ -3,21 +3,21 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = citytime TARGET1 = lib$(TARGET).so.$(VER_MAJ) @@ -116,34 +116,34 @@ REQUIRES= citytime.o: citytime.cpp \ zonemap.h \ stylusnormalizer.h \ citytime.h \ citytimebase.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/timestring.h \ - $(QPEDIR)/include/qpe/tzselect.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/timestring.h \ + $(OPIEDIR)/include/qpe/tzselect.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h zonemap.o: zonemap.cpp \ sun.h \ zonemap.h \ stylusnormalizer.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/timestring.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/timestring.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h main.o: main.cpp \ citytime.h \ citytimebase.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h sun.o: sun.c \ sun.h \ - $(QPEDIR)/include/qpe/qmath.h + $(OPIEDIR)/include/qpe/qmath.h stylusnormalizer.o: stylusnormalizer.cpp \ stylusnormalizer.h citytimebase.h: citytimebase.ui $(UIC) citytimebase.ui -o $(INTERFACE_DECL_PATH)/citytimebase.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 @@ # $Id$ CONFIG += qt warn_on release TEMPLATE = app -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin INTERFACES = citytimebase.ui HEADERS = citytime.h zonemap.h sun.h stylusnormalizer.h SOURCES = citytime.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp TARGET = citytime -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TRANSLATIONS = ../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 @@ -3,13 +3,13 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target 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 @@ -1,12 +1,12 @@ TEMPLATE = app CONFIG += qt warn_on release DESTDIR = ../../bin HEADERS = settings.h SOURCES = light.cpp main.cpp INTERFACES = lightsettingsbase.ui -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe TARGET = light-and-power TRANSLATIONS = ../../i18n/de/light-and-power.ts 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 @@ -3,13 +3,13 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target 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 @@ -1,12 +1,12 @@ TEMPLATE = app CONFIG += qt warn_on release DESTDIR = ../../bin HEADERS = security.h SOURCES = security.cpp main.cpp INTERFACES = securitybase.ui -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe TARGET = security TRANSLATIONS = ../../i18n/de/security.ts diff --git a/docs/qcop.doc b/docs/qcop.doc index 6fe4c71..e62f91d 100644 --- a/docs/qcop.doc +++ b/docs/qcop.doc @@ -164,13 +164,13 @@ Such messages in the base Qtopia applications are: <dl> <dt><b>QPE/Application/helpbrowser</b> <ul> <li>showFile(QString <i>file</i>) <br>Send this message to have the Help Browser show a file. The <i>file</i> may be an absolute filename or relative - to the system HTML documentation directory ($QPEDIR/help/html). + to the system HTML documentation directory ($OPIEDIR/help/html). </ul> <dt><b>QPE/Application/datebook</b> <ul> <li>alarm(QDateTime,int) <br>Internal. Causes the Calendar application to sound alarms. </ul> diff --git a/docs/start.doc b/docs/start.doc index 9745d9a..01b6ab1 100644 --- a/docs/start.doc +++ b/docs/start.doc @@ -55,24 +55,24 @@ To compile the example program for running on the Linux desktop: <li> <p> Check the environment is correct: <p> <pre> - export QPEDIR=/opt/Qtopia + export OPIEDIR=/opt/Qtopia export QTDIR=/opt/Qtopia export PATH=$QTDIR/bin:$PATH export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++ export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH </pre> <li> Take a copy of the example: <pre> cd somewhere - cp -r $QPEDIR/example . + cp -r $OPIEDIR/example . cd example </pre> <li> Generate a Makefile: <pre> @@ -86,15 +86,15 @@ To compile the example program for running on the Linux desktop: </pre> <li> Install it: <pre> su # root privileges required to install - cp example.desktop $QPEDIR/apps/Applications - cp Example.png $QPEDIR/pics - cp example $QPEDIR/bin + cp example.desktop $OPIEDIR/apps/Applications + cp Example.png $OPIEDIR/pics + cp example $OPIEDIR/bin exit # no need to be root anymore </pre> <li> To run it, first run the Qt Virtual Framebuffer: <pre> @@ -132,13 +132,13 @@ on the desktop, the process is similar: <li> <p> Check the environment is correctly set for the SHARP SL5000: <p> <pre> - export QPEDIR=/opt/Qtopia/sharp + export OPIEDIR=/opt/Qtopia/sharp export QTDIR=/opt/Qtopia/sharp export PATH=$QTDIR/bin:/usr/local/arm/bin:$PATH export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++ </pre> <li> Build and install exactly the same as you did for the desktop 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 @@ -2,16 +2,16 @@ # export LOGNAME=root export HOME=/$LOGNAME export QWS_DISPLAY=Transformed:Rot270:0 export QTDIR=/usr -export QPEDIR=/opt/QtPalmtop -if [ ! -x $QPEDIR/bin/qpe ] ; then exit 0 ; fi +export OPIEDIR=/opt/QtPalmtop +if [ ! -x $OPIEDIR/bin/qpe ] ; then exit 0 ; fi -$QPEDIR/bin/qpe-reorgfiles +$OPIEDIR/bin/qpe-reorgfiles . /etc/profile killproc() { pid=`/bin/ps -e | /bin/sed -n -e '/\<'$1'\>/ s/^ *\([0-9][0-9]*\).*/\1/p'` [ "$pid" != "" ] && kill $pid @@ -22,13 +22,13 @@ case $1 in echo "Starting QPE..." cd $HOME rm -f /etc/rc2.d/S99x # Can't have both running! - $QPEDIR/bin/qpe 2>/dev/null >/dev/null & + $OPIEDIR/bin/qpe 2>/dev/null >/dev/null & ;; 'stop') echo "Killing QPE..." killproc qpe ;; diff --git a/example/example.pro b/example/example.pro index 2d89311..d150b1c 100644 --- a/example/example.pro +++ b/example/example.pro @@ -1,10 +1,10 @@ TEMPLATE = app #CONFIG = qt warn_on debug CONFIG = qt warn_on release HEADERS = example.h SOURCES = main.cpp example.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = examplebase.ui TARGET = example diff --git a/freetype/freetype.pro b/freetype/freetype.pro index 841f6d4..f63a087 100644 --- a/freetype/freetype.pro +++ b/freetype/freetype.pro @@ -2,12 +2,12 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = fontfactoryttf_qws.h freetypefactoryimpl.h SOURCES = fontfactoryttf_qws.cpp freetypefactoryimpl.cpp qt2:HEADERS += qfontdata_p.h TARGET = freetypefactory DESTDIR = ../plugins/fontfactories -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include -#INCLUDEPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include +#INCLUDEPATH += $(OPIEDIR)/include #DEPENDPATH += /usr/local/include/freetype2 LIBS += -lqpe -lfreetype 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 @@ -3,13 +3,13 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target 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 @@ -22,12 +22,12 @@ SOURCES = qimpenchar.cpp \ qimpenwidget.cpp \ qimpenwordpick.cpp \ handwritingimpl.cpp INTERFACES = qimpenprefbase.ui TARGET = qhandwriting DESTDIR = ../../plugins/inputmethods -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include ../../taskbar +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libqhandwriting.ts 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 @@ -3,13 +3,13 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target 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 @@ -7,12 +7,12 @@ HEADERS = keyboard.h \ SOURCES = keyboard.cpp \ ../pickboard/pickboardcfg.cpp \ ../pickboard/pickboardpicks.cpp \ keyboardimpl.cpp TARGET = qkeyboard DESTDIR = ../../plugins/inputmethods -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include ../../taskbar +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libqkeyboard.ts 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 @@ -3,13 +3,13 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target 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 @@ -1,12 +1,12 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = pickboard.h pickboardcfg.h pickboardimpl.h pickboardpicks.h SOURCES = pickboard.cpp pickboardcfg.cpp pickboardimpl.cpp pickboardpicks.cpp TARGET = qpickboard DESTDIR = ../../plugins/inputmethods -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include ../../taskbar +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libqpickboard.ts 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 @@ -3,13 +3,13 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target 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 @@ -1,12 +1,12 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = unikeyboard.h unikeyboardimpl.h SOURCES = unikeyboard.cpp unikeyboardimpl.cpp TARGET = qunikeyboard DESTDIR = ../../plugins/inputmethods -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include ../../taskbar +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libqunikeyboard.ts diff --git a/library/Makefile.in b/library/Makefile.in index c89390f..b74b818 100644 --- a/library/Makefile.in +++ b/library/Makefile.in @@ -3,13 +3,13 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -INCPATH = -I$(QPEDIR)/include -Ibackend +INCPATH = -I$(OPIEDIR)/include -Ibackend LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -ldl -lcrypt -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target @@ -454,13 +454,14 @@ qpeapplication.o: qpeapplication.cpp \ resource.h \ config.h \ network.h \ fontmanager.h \ power.h \ alarmserver.h \ - applnk.h + applnk.h \ + qpemenubar.h qpestyle.o: qpestyle.cpp \ qpestyle.h \ qpeapplication.h \ qpedecoration_qws.h \ timestring.h @@ -530,13 +531,14 @@ fontdatabase.o: fontdatabase.cpp \ qpedecoration_qws.h \ timestring.h \ fontfactoryinterface.h \ fontdatabase.h power.o: power.cpp \ - power.h + power.h \ + custom.h storage.o: storage.cpp qpemessagebox.o: qpemessagebox.cpp \ qpemessagebox.h @@ -607,13 +609,14 @@ categorywidget.o: categorywidget.cpp \ ir.o: ir.cpp \ ir.h \ qcopenvelope_qws.h \ applnk.h backend/vcc_yacc.o: backend/vcc_yacc.cpp \ - backend/vobject_p.h + backend/vobject_p.h \ + backend/qfiledirect_p.h backend/vobject.o: backend/vobject.cpp \ backend/vobject_p.h \ backend/qfiledirect_p.h findwidget_p.o: findwidget_p.cpp \ @@ -676,26 +679,21 @@ findwidgetbase_p.cpp: findwidgetbase_p.ui lnkpropertiesbase_p.h: lnkpropertiesbase_p.ui $(UIC) lnkpropertiesbase_p.ui -o $(INTERFACE_DECL_PATH)/lnkpropertiesbase_p.h lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui $(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp -passwordbase_p.o: passwordbase_p.cpp \ - passwordbase_p.h +passwordbase_p.o: passwordbase_p.cpp -proxiesbase_p.o: proxiesbase_p.cpp \ - proxiesbase_p.h +proxiesbase_p.o: proxiesbase_p.cpp -categoryeditbase_p.o: categoryeditbase_p.cpp \ - categoryeditbase_p.h +categoryeditbase_p.o: categoryeditbase_p.cpp -findwidgetbase_p.o: findwidgetbase_p.cpp \ - findwidgetbase_p.h +findwidgetbase_p.o: findwidgetbase_p.cpp -lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp \ - lnkpropertiesbase_p.h +lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp moc_menubutton.o: moc_menubutton.cpp \ menubutton.h moc_proxies.o: moc_proxies.cpp \ proxies.h \ diff --git a/library/global.cpp b/library/global.cpp index e1bbf3e..e5fc2b3 100644 --- a/library/global.cpp +++ b/library/global.cpp @@ -131,13 +131,13 @@ void StartingAppList::handleNewChannel( const QString & name ) static bool docDirCreated = FALSE; static QDawg* fixed_dawg = 0; static QDict<QDawg> *named_dawg = 0; static QString qpeDir() { - QString dir = getenv("QPEDIR"); + QString dir = getenv("OPIEDIR"); if ( dir.isEmpty() ) dir = ".."; return dir; } static QString dictDir() { diff --git a/library/library.pro b/library/library.pro index 06dfc8f..058d216 100644 --- a/library/library.pro +++ b/library/library.pro @@ -116,17 +116,17 @@ SOURCES = calendar.cpp \ # Qt 3 compatibility qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h qprocess.h qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \ qprocess_unix.cpp -INCLUDEPATH += $(QPEDIR)/include backend +INCLUDEPATH += $(OPIEDIR)/include backend LIBS += -ldl -lcrypt -lm INTERFACES = passwordbase_p.ui proxiesbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui TARGET = qpe DESTDIR = $(QTDIR)/lib$(PROJMAK) -# This is set by configure$(QPEDIR). +# This is set by configure$(OPIEDIR). VERSION = 1.5.0 TRANSLATIONS = ../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 @@ -787,17 +787,17 @@ QPEApplication::~QPEApplication() delete pidChannel; #endif delete d; } /*! - Returns <tt>$QPEDIR/</tt>. + Returns <tt>$OPIEDIR/</tt>. */ QString QPEApplication::qpeDir() { - const char *base = getenv( "QPEDIR" ); + const char *base = getenv( "OPIEDIR" ); if ( base ) return QString( base ) + "/"; return QString( "../" ); } @@ -5,16 +5,16 @@ DEB_VERSION=2.0 # Have to do this here, since CVS can't store symlinks mkdir -p etc/rc2.d rm -f etc/rc2.d/S98qpe ln -s ../init.d/qpe etc/rc2.d/S98qpe -VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$QPEDIR/include/qpe/version.h) -VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$QPEDIR/include/qpe/version.h) -VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$QPEDIR/include/qpe/version.h) -if grep -q 'QPE_VERSION .*snapshot' $QPEDIR/include/qpe/version.h +VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) +VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) +VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h) +if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h then VERSION_CVS="_$(date +%Y%m%d)" else VERSION_CVS="" fi @@ -44,15 +44,15 @@ do ;; -i) shift IMAGEDIR=$1 DATADIR=$IMAGEDIR mkdir -p $IMAGEDIR ;; -rpm) - if [ "$QPEDIR" != "/opt/Qtopia" ] + if [ "$OPIEDIR" != "/opt/Qtopia" ] then - echo >&2 '$QPEDIR is not the standard /usr/Qtopia directory.' + echo >&2 '$OPIEDIR is not the standard /usr/Qtopia directory.' sleep 1 #exit 1 fi RPM=1 ;; -arch) shift @@ -67,17 +67,17 @@ do shift done if [ -z "$FILES" ] then - FILES=`find $QPEDIR -name "*.control" -print` + FILES=`find $OPIEDIR -name "*.control" -print` fi RDIR=$PWD -cd $QPEDIR +cd $OPIEDIR for i in $FILES do rm -rf $TDIR mkdir -p $DATADIR @@ -137,13 +137,13 @@ do esac fi if [ -n "$RPM" ] then case "$ff" in /*) RPMFILES="$RPMFILES $ff" - ;; *) RPMFILES="$RPMFILES $QPEDIR/$ff" + ;; *) RPMFILES="$RPMFILES $OPIEDIR/$ff" esac else mkdir -p $D if cp -a $ff $D then true 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 @@ -4,11 +4,11 @@ DESTDIR = ../bin HEADERS = dicttool.h SOURCES = dicttool.cpp main.cpp INTERFACES = dicttoolbase.ui -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe 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 @@ -28,9 +28,9 @@ SOURCES = main.cpp \ db/datacache.cpp \ db/xmlsource.cpp \ db/csvsource.cpp \ db/common.cpp INTERFACES = ui/tvkeyedit_gen.ui TARGET = tableviewer -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe diff --git a/noncore/comm/keypebble/Makefile.in b/noncore/comm/keypebble/Makefile.in index 1dbd5d2..18c43e8 100644 --- a/noncore/comm/keypebble/Makefile.in +++ b/noncore/comm/keypebble/Makefile.in @@ -3,13 +3,13 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target @@ -162,13 +162,13 @@ krfbbuffer.o: krfbbuffer.cpp \ krfbcanvas.o: krfbcanvas.cpp \ kvncconnectdlg.h \ krfbconnection.h \ krfbcanvas.h \ krfboptions.h \ krfbbuffer.h \ - $(QPEDIR)/include/qpe/config.h + $(OPIEDIR)/include/qpe/config.h krfbconnection.o: krfbconnection.cpp \ krfbconnection.h \ krfblogin.h \ krfboptions.h \ krfbdecoder.h \ @@ -177,29 +177,29 @@ krfbconnection.o: krfbconnection.cpp \ krfbdecoder.o: krfbdecoder.cpp \ krfbconnection.h \ krfboptions.h \ krfbserverinfo.h \ krfbdecoder.h \ krfbbuffer.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h krfblogin.o: krfblogin.cpp \ vncauth.h \ krfblogin.h \ krfbconnection.h krfboptions.o: krfboptions.cpp \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ krfboptions.h kvnc.o: kvnc.cpp \ - $(QPEDIR)/include/qpe/qpemenubar.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/global.h \ kvnc.h \ krfbcanvas.h \ kvncoptionsdlg.h \ vncoptionsbase.h \ krfbconnection.h @@ -212,13 +212,13 @@ kvncconnectdlg.o: kvncconnectdlg.cpp \ kvncoptionsdlg.o: kvncoptionsdlg.cpp \ krfboptions.h \ kvncoptionsdlg.h \ vncoptionsbase.h main.o: main.cpp \ - $(QPEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ kvnc.h vncoptionsbase.h: vncoptionsbase.ui $(UIC) vncoptionsbase.ui -o $(INTERFACE_DECL_PATH)/vncoptionsbase.h vncoptionsbase.cpp: 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 @@ -29,10 +29,10 @@ SOURCES = d3des.c \ kvncconnectdlg.cpp \ kvncoptionsdlg.cpp \ main.cpp INTERFACES = vncoptionsbase.ui TARGET = keypebble -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe diff --git a/noncore/games/chess/chess.pro b/noncore/games/chess/chess.pro index f6650a0..9053809 100644 --- a/noncore/games/chess/chess.pro +++ b/noncore/games/chess/chess.pro @@ -1,14 +1,14 @@ SOURCES += chess.cpp main.cpp HEADERS += chess.h DESTDIR = ../bin TARGET = chess -DEPENDPATH += $(QPEDIR)/include +DEPENDPATH += $(OPIEDIR)/include INTERFACES = mainwindow.ui IMAGES = images/new.png images/repeat.png images/txt.png images/back.png TEMPLATE =app CONFIG += qt warn_on release -INCLUDEPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include LIBS += -lqpe DBFILE = chess.db LANGUAGE = C++ CPP_ALWAYS_CREATE_SOURCE = TRUE 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 @@ -3,13 +3,13 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target @@ -97,20 +97,20 @@ REQUIRES= ####### Compile fifteen.o: fifteen.cpp \ fifteen.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h \ - $(QPEDIR)/include/qpe/qpemenubar.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h main.o: main.cpp \ fifteen.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h moc_fifteen.o: moc_fifteen.cpp \ fifteen.h moc_fifteen.cpp: fifteen.h $(MOC) fifteen.h -o moc_fifteen.cpp diff --git a/noncore/games/fifteen/fifteen.pro b/noncore/games/fifteen/fifteen.pro index 167f4f8..92072ab 100644 --- a/noncore/games/fifteen/fifteen.pro +++ b/noncore/games/fifteen/fifteen.pro @@ -1,10 +1,10 @@ DESTDIR = ../bin TEMPLATE = app CONFIG = qt warn_on release HEADERS = fifteen.h SOURCES = fifteen.cpp \ main.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TARGET = fifteen diff --git a/noncore/games/go/Makefile.in b/noncore/games/go/Makefile.in index 27304f1..985eff0 100644 --- a/noncore/games/go/Makefile.in +++ b/noncore/games/go/Makefile.in @@ -3,13 +3,13 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target @@ -131,23 +131,23 @@ killable.o: killable.c \ gowidget.o: gowidget.cpp \ gowidget.h \ amigo.h \ go.h \ goplayutils.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h \ - $(QPEDIR)/include/qpe/qpemenubar.h + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h main.o: main.cpp \ gowidget.h \ amigo.h \ go.h \ goplayutils.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h moc_gowidget.o: moc_gowidget.cpp \ gowidget.h \ amigo.h \ go.h \ goplayutils.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 @@ -8,12 +8,12 @@ HEADERS = amigo.h \ SOURCES = amigo.c \ goplayer.c \ goplayutils.c \ killable.c \ gowidget.cpp \ main.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TARGET = go TRANSLATIONS = ../i18n/de/go.ts
\ No newline at end of file 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 @@ -3,21 +3,21 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = mindbreaker TARGET1 = lib$(TARGET).so.$(VER_MAJ) @@ -97,19 +97,19 @@ REQUIRES= ####### Compile main.o: main.cpp \ mindbreaker.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h mindbreaker.o: mindbreaker.cpp \ mindbreaker.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h moc_mindbreaker.o: moc_mindbreaker.cpp \ mindbreaker.h moc_mindbreaker.cpp: mindbreaker.h $(MOC) mindbreaker.h -o moc_mindbreaker.cpp diff --git a/noncore/games/mindbreaker/mindbreaker.pro b/noncore/games/mindbreaker/mindbreaker.pro index 12944d1..fa7dc0c 100644 --- a/noncore/games/mindbreaker/mindbreaker.pro +++ b/noncore/games/mindbreaker/mindbreaker.pro @@ -1,12 +1,12 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = mindbreaker.h SOURCES = main.cpp \ mindbreaker.cpp TARGET = mindbreaker -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TRANSLATIONS = ../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 @@ -3,21 +3,21 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = minesweep TARGET1 = lib$(TARGET).so.$(VER_MAJ) @@ -102,25 +102,25 @@ REQUIRES= ####### Compile main.o: main.cpp \ minesweep.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h minefield.o: minefield.cpp \ minefield.h \ - $(QPEDIR)/include/qpe/config.h + $(OPIEDIR)/include/qpe/config.h minesweep.o: minesweep.cpp \ minesweep.h \ minefield.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h \ - $(QPEDIR)/include/qpe/qpemenubar.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h moc_minefield.o: moc_minefield.cpp \ minefield.h moc_minesweep.o: moc_minesweep.cpp \ minesweep.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,14 +1,14 @@ TEMPLATE = app CONFIG = qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = minefield.h \ minesweep.h SOURCES = main.cpp \ minefield.cpp \ minesweep.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = TRANSLATIONS = ../i18n/de/minesweep.ts 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 @@ -3,21 +3,21 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = parashoot TARGET1 = lib$(TARGET).so.$(VER_MAJ) @@ -118,81 +118,81 @@ REQUIRES= ####### Compile main.o: main.cpp \ interface.h \ cannon.h \ bullet.h \ - $(QPEDIR)/include/qpe/sound.h \ + $(OPIEDIR)/include/qpe/sound.h \ base.h \ helicopter.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h interface.o: interface.cpp \ interface.h \ cannon.h \ bullet.h \ - $(QPEDIR)/include/qpe/sound.h \ + $(OPIEDIR)/include/qpe/sound.h \ base.h \ helicopter.h \ man.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h man.o: man.cpp \ codes.h \ man.h \ - $(QPEDIR)/include/qpe/sound.h \ + $(OPIEDIR)/include/qpe/sound.h \ base.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h cannon.o: cannon.cpp \ - $(QPEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/resource.h \ codes.h \ cannon.h \ bullet.h \ - $(QPEDIR)/include/qpe/sound.h + $(OPIEDIR)/include/qpe/sound.h base.o: base.cpp \ codes.h \ base.h \ - $(QPEDIR)/include/qpe/sound.h \ + $(OPIEDIR)/include/qpe/sound.h \ man.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h bullet.o: bullet.cpp \ codes.h \ bullet.h \ - $(QPEDIR)/include/qpe/sound.h \ + $(OPIEDIR)/include/qpe/sound.h \ man.h \ helicopter.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/qmath.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/qmath.h helicopter.o: helicopter.cpp \ helicopter.h \ - $(QPEDIR)/include/qpe/sound.h \ + $(OPIEDIR)/include/qpe/sound.h \ man.h \ codes.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h moc_interface.o: moc_interface.cpp \ interface.h \ cannon.h \ bullet.h \ - $(QPEDIR)/include/qpe/sound.h \ + $(OPIEDIR)/include/qpe/sound.h \ base.h \ helicopter.h moc_cannon.o: moc_cannon.cpp \ cannon.h \ bullet.h \ - $(QPEDIR)/include/qpe/sound.h + $(OPIEDIR)/include/qpe/sound.h moc_bullet.o: moc_bullet.cpp \ bullet.h \ - $(QPEDIR)/include/qpe/sound.h + $(OPIEDIR)/include/qpe/sound.h moc_interface.cpp: interface.h $(MOC) interface.h -o moc_interface.cpp moc_cannon.cpp: cannon.h $(MOC) cannon.h -o moc_cannon.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 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = interface.h man.h cannon.h base.h bullet.h helicopter.h SOURCES = main.cpp interface.cpp man.cpp cannon.cpp base.cpp bullet.cpp helicopter.cpp TARGET = parashoot -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TRANSLATIONS = ../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 @@ -3,21 +3,21 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = qasteroids TARGET1 = lib$(TARGET).so.$(VER_MAJ) @@ -114,25 +114,25 @@ ledmeter.o: ledmeter.cpp \ toplevel.o: toplevel.cpp \ toplevel.h \ view.h \ sprites.h \ ledmeter.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/resource.h view.o: view.cpp \ view.h \ sprites.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h main.o: main.cpp \ toplevel.h \ view.h \ sprites.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h moc_ledmeter.o: moc_ledmeter.cpp \ ledmeter.h moc_toplevel.o: moc_toplevel.cpp \ toplevel.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 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = ledmeter.h sprites.h toplevel.h view.h SOURCES = ledmeter.cpp toplevel.cpp view.cpp main.cpp TARGET = qasteroids -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TRANSLATIONS = ../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 @@ -3,21 +3,21 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = snake TARGET1 = lib$(TARGET).so.$(VER_MAJ) @@ -111,38 +111,38 @@ REQUIRES= ####### Compile snake.o: snake.cpp \ snake.h \ target.h \ codes.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h target.o: target.cpp \ target.h \ codes.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h obstacle.o: obstacle.cpp \ obstacle.h \ codes.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h interface.o: interface.cpp \ interface.h \ snake.h \ target.h \ obstacle.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h main.o: main.cpp \ interface.h \ snake.h \ target.h \ obstacle.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h moc_snake.o: moc_snake.cpp \ snake.h moc_interface.o: moc_interface.cpp \ interface.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 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = snake.h target.h obstacle.h interface.h codes.h SOURCES = snake.cpp target.cpp obstacle.cpp interface.cpp main.cpp TARGET = snake -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TRANSLATIONS = ../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 @@ -3,21 +3,21 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = patience TARGET1 = lib$(TARGET).so.$(VER_MAJ) @@ -132,13 +132,13 @@ canvascard.o: canvascard.cpp \ cardgame.h \ card.h \ cardpile.h \ carddeck.h \ cardgamelayout.h \ canvascard.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h canvasshapes.o: canvasshapes.cpp \ canvasshapes.h cardgame.o: cardgame.cpp \ cardgame.h \ @@ -151,17 +151,17 @@ cardgamelayout.o: cardgamelayout.cpp \ cardgamelayout.h \ cardpile.h cardpile.o: cardpile.cpp \ cardpile.h \ card.h \ - $(QPEDIR)/include/qpe/config.h + $(OPIEDIR)/include/qpe/config.h card.o: card.cpp \ card.h \ - $(QPEDIR)/include/qpe/config.h + $(OPIEDIR)/include/qpe/config.h carddeck.o: carddeck.cpp \ card.h \ carddeck.h canvascardgame.o: canvascardgame.cpp \ @@ -170,64 +170,64 @@ canvascardgame.o: canvascardgame.cpp \ cardpile.h \ carddeck.h \ cardgamelayout.h \ canvasshapes.h \ canvascard.h \ canvascardgame.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpemenubar.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h freecellcardgame.o: freecellcardgame.cpp \ freecellcardgame.h \ patiencecardgame.h \ canvascardgame.h \ cardgame.h \ card.h \ cardpile.h \ carddeck.h \ cardgamelayout.h \ canvasshapes.h \ canvascard.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpemenubar.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h patiencecardgame.o: patiencecardgame.cpp \ patiencecardgame.h \ canvascardgame.h \ cardgame.h \ card.h \ cardpile.h \ carddeck.h \ cardgamelayout.h \ canvasshapes.h \ canvascard.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpemenubar.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h canvascardwindow.o: canvascardwindow.cpp \ canvascardwindow.h \ patiencecardgame.h \ canvascardgame.h \ cardgame.h \ card.h \ cardpile.h \ carddeck.h \ cardgamelayout.h \ canvasshapes.h \ canvascard.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h \ freecellcardgame.h main.o: main.cpp \ canvascardwindow.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h moc_canvascardwindow.o: moc_canvascardwindow.cpp \ canvascardwindow.h moc_canvascardwindow.cpp: canvascardwindow.h $(MOC) canvascardwindow.h -o moc_canvascardwindow.cpp diff --git a/noncore/games/solitaire/solitaire.pro b/noncore/games/solitaire/solitaire.pro index 8617cab..1c90c94 100755 --- a/noncore/games/solitaire/solitaire.pro +++ b/noncore/games/solitaire/solitaire.pro @@ -1,18 +1,18 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = canvascard.h canvasshapes.h cardgame.h cardgamelayout.h cardpile.h card.h carddeck.h canvascardgame.h freecellcardgame.h patiencecardgame.h canvascardwindow.h SOURCES = canvascard.cpp canvasshapes.cpp cardgame.cpp cardgamelayout.cpp cardpile.cpp card.cpp carddeck.cpp canvascardgame.cpp freecellcardgame.cpp patiencecardgame.cpp canvascardwindow.cpp main.cpp TARGET = patience -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe REQUIRES = patience TRANSLATIONS = ../i18n/de/patience.ts 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 @@ -3,13 +3,13 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target @@ -112,24 +112,24 @@ REQUIRES= main.o: main.cpp \ qtetrix.h \ qtetrixb.h \ gtetrix.h \ tpiece.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h gtetrix.o: gtetrix.cpp \ gtetrix.h \ tpiece.h qtetrix.o: qtetrix.cpp \ qtetrix.h \ qtetrixb.h \ gtetrix.h \ tpiece.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h qtetrixb.o: qtetrixb.cpp \ qtetrixb.h \ gtetrix.h \ tpiece.h \ qtetrix.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 @@ -8,10 +8,10 @@ HEADERS = minefield.h \ tpiece.h SOURCES = main.cpp \ gtetrix.cpp \ qtetrix.cpp \ qtetrixb.cpp \ tpiece.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = diff --git a/noncore/games/wordgame/Makefile.in b/noncore/games/wordgame/Makefile.in index 5627414..2e0a47c 100644 --- a/noncore/games/wordgame/Makefile.in +++ b/noncore/games/wordgame/Makefile.in @@ -3,21 +3,21 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = wordgame TARGET1 = lib$(TARGET).so.$(VER_MAJ) @@ -108,27 +108,27 @@ REQUIRES= ####### Compile main.o: main.cpp \ wordgame.h \ newgamebase.h \ rulesbase.h \ - $(QPEDIR)/include/qpe/qdawg.h \ - $(QPEDIR)/include/qpe/applnk.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qdawg.h \ + $(OPIEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h wordgame.o: wordgame.cpp \ wordgame.h \ newgamebase.h \ rulesbase.h \ - $(QPEDIR)/include/qpe/qdawg.h \ - $(QPEDIR)/include/qpe/applnk.h \ - $(QPEDIR)/include/qpe/global.h \ - $(QPEDIR)/include/qpe/filemanager.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h + $(OPIEDIR)/include/qpe/qdawg.h \ + $(OPIEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/filemanager.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h newgamebase.h: newgamebase.ui $(UIC) newgamebase.ui -o $(INTERFACE_DECL_PATH)/newgamebase.h newgamebase.cpp: newgamebase.ui $(UIC) newgamebase.ui -i newgamebase.h -o newgamebase.cpp @@ -144,14 +144,14 @@ newgamebase.o: newgamebase.cpp rulesbase.o: rulesbase.cpp moc_wordgame.o: moc_wordgame.cpp \ wordgame.h \ newgamebase.h \ rulesbase.h \ - $(QPEDIR)/include/qpe/qdawg.h \ - $(QPEDIR)/include/qpe/applnk.h + $(OPIEDIR)/include/qpe/qdawg.h \ + $(OPIEDIR)/include/qpe/applnk.h moc_newgamebase.o: moc_newgamebase.cpp \ newgamebase.h moc_rulesbase.o: moc_rulesbase.cpp \ rulesbase.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 @@ TEMPLATE = app CONFIG = qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = wordgame.h SOURCES = main.cpp \ wordgame.cpp INTERFACES = newgamebase.ui rulesbase.ui TARGET = wordgame -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TRANSLATIONS = ../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 @@ -3,21 +3,21 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = showimg TARGET1 = lib$(TARGET).so.$(VER_MAJ) @@ -97,21 +97,21 @@ REQUIRES=showimg ####### Compile main.o: main.cpp \ showimg.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h showimg.o: showimg.cpp \ showimg.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/fileselector.h \ - $(QPEDIR)/include/qpe/applnk.h \ - $(QPEDIR)/include/qpe/qpemenubar.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/fileselector.h \ + $(OPIEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h moc_showimg.o: moc_showimg.cpp \ showimg.h moc_showimg.cpp: showimg.h $(MOC) showimg.h -o moc_showimg.cpp diff --git a/noncore/multimedia/showimg/showimg.pro b/noncore/multimedia/showimg/showimg.pro index a372f62..29da458 100644 --- a/noncore/multimedia/showimg/showimg.pro +++ b/noncore/multimedia/showimg/showimg.pro @@ -1,19 +1,19 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = showimg.h SOURCES = main.cpp \ showimg.cpp TARGET = showimg -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe REQUIRES = showimg TRANSLATIONS = ../i18n/de/showimg.ts 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 @@ -3,13 +3,13 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target 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 @@ -1,12 +1,12 @@ TEMPLATE = app CONFIG += qt warn_on release DESTDIR = ../../bin HEADERS = settings.h SOURCES = language.cpp main.cpp INTERFACES = languagesettingsbase.ui -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe TARGET = language TRANSLATIONS = ../../i18n/de/language.ts 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 @@ -3,13 +3,13 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target 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 @@ -1,10 +1,10 @@ TEMPLATE = app CONFIG += qt warn_on release DESTDIR = ../../bin HEADERS = soundsettings.h SOURCES = soundsettings.cpp main.cpp INTERFACES = soundsettingsbase.ui -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe TARGET = sound diff --git a/noncore/settings/sysinfo/Makefile.in b/noncore/settings/sysinfo/Makefile.in index 1149304..fb9d15e 100644 --- a/noncore/settings/sysinfo/Makefile.in +++ b/noncore/settings/sysinfo/Makefile.in @@ -3,21 +3,21 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = sysinfo TARGET1 = lib$(TARGET).so.$(VER_MAJ) @@ -122,13 +122,13 @@ REQUIRES= ####### Compile main.o: main.cpp \ sysinfo.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h memory.o: memory.cpp \ graph.h \ memory.h graph.o: graph.cpp \ @@ -139,23 +139,23 @@ load.o: load.cpp \ storage.o: storage.cpp \ graph.h \ storage.h versioninfo.o: versioninfo.cpp \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/version.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/version.h \ versioninfo.h sysinfo.o: sysinfo.cpp \ memory.h \ load.h \ storage.h \ versioninfo.h \ sysinfo.h \ - $(QPEDIR)/include/qpe/resource.h + $(OPIEDIR)/include/qpe/resource.h moc_memory.o: moc_memory.cpp \ memory.h moc_graph.o: moc_graph.cpp \ graph.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,9 +1,9 @@ TEMPLATE = app CONFIG = qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = memory.h \ graph.h \ load.h \ storage.h \ versioninfo.h \ sysinfo.h @@ -13,13 +13,13 @@ SOURCES = main.cpp \ load.cpp \ storage.cpp \ versioninfo.cpp \ sysinfo.cpp INTERFACES = -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TARGET = sysinfo TRANSLATIONS = ../i18n/de/sysinfo.ts 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 @@ -6,11 +6,11 @@ CONFIG += qt release INTERFACES += binary.ui HEADERS = binaryimpl.h \ binaryfactory.h SOURCES = binaryimpl.cpp \ binaryfactory.cpp -INCLUDEPATH += $(QPEDIR)/include \ - $(QPEDIR)/calc2 -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include \ + $(OPIEDIR)/calc2 +DEPENDPATH += $(OPIEDIR)/include -DESTDIR = $(QPEDIR)/plugins/calculator +DESTDIR = $(OPIEDIR)/plugins/calculator diff --git a/noncore/tools/calc2/calc.pro b/noncore/tools/calc2/calc.pro index c10232a..00e13b7 100644 --- a/noncore/tools/calc2/calc.pro +++ b/noncore/tools/calc2/calc.pro @@ -2,10 +2,10 @@ TEMPLATE = app CONFIG += qt release # Input HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h SOURCES += calc.cpp main.cpp engine.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -Wl,-export-dynamic diff --git a/noncore/tools/calc2/simple/simple.pro b/noncore/tools/calc2/simple/simple.pro index 92378a6..9e5d4e0 100644 --- a/noncore/tools/calc2/simple/simple.pro +++ b/noncore/tools/calc2/simple/simple.pro @@ -4,11 +4,11 @@ CONFIG += qt release # Input INTERFACES += simple.ui HEADERS = simpleimpl.h simplefactory.h stdinstructions.h SOURCES = simpleimpl.cpp simplefactory.cpp -INCLUDEPATH += $(QPEDIR)/include \ - $(QPEDIR)/calc2 -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include \ + $(OPIEDIR)/calc2 +DEPENDPATH += $(OPIEDIR)/include -DESTDIR = $(QPEDIR)/plugins/calculator +DESTDIR = $(OPIEDIR)/plugins/calculator diff --git a/noncore/tools/calculator/Makefile.in b/noncore/tools/calculator/Makefile.in index d62b046..ba78df5 100644 --- a/noncore/tools/calculator/Makefile.in +++ b/noncore/tools/calculator/Makefile.in @@ -3,21 +3,21 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = calculator TARGET1 = lib$(TARGET).so.$(VER_MAJ) @@ -101,23 +101,23 @@ REQUIRES= ####### Compile calculatorimpl.o: calculatorimpl.cpp \ calculatorimpl.h \ calculator.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/qmath.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/qmath.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h main.o: main.cpp \ calculatorimpl.h \ calculator.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h calculator.h: calculator.ui - $(UIC) calculator.ui -o calculator.h + $(UIC) calculator.ui -o $(INTERFACE_DECL_PATH)/calculator.h calculator.cpp: calculator.ui $(UIC) calculator.ui -i calculator.h -o calculator.cpp calculator.o: calculator.cpp \ calculator.h \ 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,13 +1,13 @@ -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin TEMPLATE = app CONFIG = qt warn_on release HEADERS = calculatorimpl.h SOURCES = calculatorimpl.cpp \ main.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = calculator.ui TARGET = calculator TRANSLATIONS = ../i18n/de/calculator.ts 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 @@ -3,21 +3,21 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = clock TARGET1 = lib$(TARGET).so.$(VER_MAJ) @@ -97,20 +97,20 @@ REQUIRES= ####### Compile clock.o: clock.cpp \ clock.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ - $(QPEDIR)/include/qpe/config.h \ - $(QPEDIR)/include/qpe/timestring.h + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ + $(OPIEDIR)/include/qpe/config.h \ + $(OPIEDIR)/include/qpe/timestring.h main.o: main.cpp \ clock.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h moc_clock.o: moc_clock.cpp \ clock.h moc_clock.cpp: clock.h $(MOC) clock.h -o moc_clock.cpp diff --git a/noncore/tools/clock/clock.pro b/noncore/tools/clock/clock.pro index 97f4d2c..ec27adc 100644 --- a/noncore/tools/clock/clock.pro +++ b/noncore/tools/clock/clock.pro @@ -1,13 +1,13 @@ TEMPLATE = app CONFIG = qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = clock.h SOURCES = clock.cpp \ main.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = TARGET = clock TRANSLATIONS = ../i18n/de/clock.ts 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 @@ -3,21 +3,21 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = filebrowser TARGET1 = lib$(TARGET).so.$(VER_MAJ) @@ -103,26 +103,26 @@ REQUIRES= ####### Compile filebrowser.o: filebrowser.cpp \ inlineedit.h \ filebrowser.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/global.h \ - $(QPEDIR)/include/qpe/mimetype.h \ - $(QPEDIR)/include/qpe/applnk.h \ - $(QPEDIR)/include/qpe/qpetoolbar.h \ - $(QPEDIR)/include/qpe/qpemenubar.h + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/global.h \ + $(OPIEDIR)/include/qpe/mimetype.h \ + $(OPIEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/qpetoolbar.h \ + $(OPIEDIR)/include/qpe/qpemenubar.h inlineedit.o: inlineedit.cpp \ inlineedit.h main.o: main.cpp \ filebrowser.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/mimetype.h + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/mimetype.h moc_inlineedit.o: moc_inlineedit.cpp \ inlineedit.h moc_filebrowser.o: moc_filebrowser.cpp \ filebrowser.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 @@ TEMPLATE = app CONFIG = qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = inlineedit.h \ filebrowser.h SOURCES = filebrowser.cpp \ inlineedit.cpp \ main.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = diff --git a/noncore/unsupported/oipkg/Makefile.in b/noncore/unsupported/oipkg/Makefile.in index 8dd7edb..a7e22ef 100644 --- a/noncore/unsupported/oipkg/Makefile.in +++ b/noncore/unsupported/oipkg/Makefile.in @@ -3,21 +3,21 @@ ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = qipkg TARGET1 = lib$(TARGET).so.$(VER_MAJ) @@ -122,23 +122,23 @@ REQUIRES= packagemanager.o: packagemanager.cpp \ packagemanager.h \ packagemanagerbase.h \ pkdesc.h \ pkfind.h \ pksettings.h \ - $(QPEDIR)/include/qpe/process.h \ - $(QPEDIR)/include/qpe/resource.h \ - $(QPEDIR)/include/qpe/stringutil.h \ - $(QPEDIR)/include/qpe/qpeapplication.h \ - $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ - $(QPEDIR)/include/qpe/applnk.h + $(OPIEDIR)/include/qpe/process.h \ + $(OPIEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/stringutil.h \ + $(OPIEDIR)/include/qpe/qpeapplication.h \ + $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ + $(OPIEDIR)/include/qpe/applnk.h main.o: main.cpp \ packagemanager.h \ packagemanagerbase.h \ - $(QPEDIR)/include/qpe/qpeapplication.h + $(OPIEDIR)/include/qpe/qpeapplication.h packagemanagerbase.h: packagemanagerbase.ui $(UIC) packagemanagerbase.ui -o $(INTERFACE_DECL_PATH)/packagemanagerbase.h packagemanagerbase.cpp: packagemanagerbase.ui $(UIC) packagemanagerbase.ui -i packagemanagerbase.h -o packagemanagerbase.cpp 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,13 +1,13 @@ -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin TEMPLATE = app CONFIG = qt warn_on release HEADERS = packagemanager.h SOURCES = packagemanager.cpp \ main.cpp -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = packagemanagerbase.ui pkdesc.ui pkfind.ui pksettings.ui TARGET = qipkg TRANSLATIONS = ../i18n/de/qipkg.ts diff --git a/scripts/q_functions b/scripts/q_functions index cf2c2e1..0705cc2 100755 --- a/scripts/q_functions +++ b/scripts/q_functions @@ -136,22 +136,22 @@ END function print_install_file { cat << END #!/bin/sh -if [ a\$QPEDIR = a ] +if [ a\$OPIEDIR = a ] then -echo QPEDIR must be set +echo OPIEDIR must be set exit fi -[ -f \$QPEDIR/pics/$NEW_APP_ICON_FILE ] || cp $NEW_APP_ICON_FILE \$QPEDIR/pics/ -[ -f \$QPEDIR/apps/$NEW_APP_DESKTOP_FILE ] || cp $NEW_APP_DESKTOP_FILE \$QPEDIR/apps/ -mv \$QPEDIR/Makefile \$QPEDIR/Makefile.orig +[ -f \$OPIEDIR/pics/$NEW_APP_ICON_FILE ] || cp $NEW_APP_ICON_FILE \$OPIEDIR/pics/ +[ -f \$OPIEDIR/apps/$NEW_APP_DESKTOP_FILE ] || cp $NEW_APP_DESKTOP_FILE \$OPIEDIR/apps/ +mv \$OPIEDIR/Makefile \$OPIEDIR/Makefile.orig sed "s/APPS=/&$NEW_APP_NAME \\\\\\\\ \\\\ - /" \$QPEDIR/Makefile.orig >> \$QPEDIR/Makefile + /" \$OPIEDIR/Makefile.orig >> \$OPIEDIR/Makefile echo You may wish to move the desktop file in to echo an appropriate subdirectory of the menus. END } |