| -rw-r--r-- | Makefile | 124 | ||||
| -rw-r--r-- | core/applets/batteryapplet/batteryapplet.pro | 2 | ||||
| -rw-r--r-- | core/applets/clipboardapplet/clipboardapplet.pro | 2 | ||||
| -rw-r--r-- | core/applets/clockapplet/clockapplet.pro | 2 | ||||
| -rw-r--r-- | core/applets/irdaapplet/irdaapplet.pro | 2 | ||||
| -rw-r--r-- | core/applets/obex/obex.pro | 4 | ||||
| -rw-r--r-- | core/applets/obex/obeximpl.h | 2 | ||||
| -rw-r--r-- | core/applets/screenshotapplet/screenshotapplet.pro | 2 | ||||
| -rw-r--r-- | core/applets/vmemo/vmemo.pro | 2 | ||||
| -rw-r--r-- | core/applets/volumeapplet/volumeapplet.pro | 2 | ||||
| -rw-r--r-- | core/launcher/launcher.pro | 8 | ||||
| -rw-r--r-- | core/settings/light-and-power/light-and-power.pro | 2 | ||||
| -rw-r--r-- | core/settings/security/security.pro | 2 | ||||
| -rw-r--r-- | noncore/settings/language/language.pro | 2 | ||||
| -rw-r--r-- | noncore/settings/mediummount/mediummount.pro | 2 | ||||
| -rw-r--r-- | noncore/settings/sound/sound.pro | 2 |
16 files changed, 91 insertions, 71 deletions
@@ -1,71 +1,91 @@ indefault: dynamic all: default docs LIBS=library libopie -COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \ - inputmethods/pickboard \ - inputmethods/handwriting \ - inputmethods/unikeyboard \ - inputmethods/jumpx \ - inputmethods/kjumpx \ - inputmethods/dvorak \ - core/applets/batteryapplet \ - core/applets/batteryapplet-ipaq \ - core/applets/irdaapplet \ - core/applets/volumeapplet \ - core/applets/clockapplet \ - core/applets/netmonapplet \ - core/applets/screenshotapplet \ - core/applets/clipboardapplet \ - core/applets/cardmon \ - core/applets/obex \ - core/applets/vmemo \ - noncore/net/netsetup/dialup \ - noncore/net/netsetup/lan \ - core/multimedia/opieplayer/libmpeg3 \ + +INPUTCOMPONENTS= inputmethods/keyboard inputmethods/pickboard \ + inputmethods/handwriting inputmethods/unikeyboard \ + inputmethods/jumpx inputmethods/kjumpx \ + inputmethods/dvorak + +APPLETS= core/applets/batteryapplet core/applets/batteryapplet-ipaq \ + core/applets/irdaapplet core/applets/volumeapplet \ + core/applets/clockapplet core/applets/netmonapplet \ + core/applets/screenshotapplet core/applets/clipboardapplet \ + core/applets/cardmon core/applets/obex \ + core/applets/vmemo noncore/net/netsetup/dialup \ + noncore/net/netsetup/lan + +MAIL= noncore/mail/libmail noncore/mail/bend + +PLAYER = core/multimedia/opieplayer/libmpeg3 \ core/multimedia/opieplayer/libmad \ - core/multimedia/opieplayer/wavplugin \ - noncore/mail/libmail \ - noncore/mail/bend \ - -APPS=$(LOCALAPPS) core/pim/addressbook noncore/tools/calculator \ - noncore/tools/clock core/pim/datebook core/apps/filebrowser \ - core/apps/helpbrowser noncore/games/minesweep \ - core/multimedia/opieplayer core/settings/light-and-power \ - noncore/settings/language \ - noncore/settings/rotation \ - noncore/settings/appearance \ - core/settings/security \ - noncore/settings/sound \ - core/settings/systemtime \ - noncore/settings/mediummount \ - noncore/settings/tabmanager \ - noncore/games/solitaire noncore/apps/spreadsheet \ - noncore/games/tetrix core/apps/textedit \ - core/pim/todo noncore/games/wordgame core/apps/embeddedkonsole \ - core/launcher core/apps/sysinfo \ - noncore/games/parashoot noncore/games/snake core/settings/citytime \ - noncore/multimedia/showimg noncore/net/netsetup core/settings/wlansetup \ - noncore/apps/tableviewer core/apps/oipkg noncore/games/mindbreaker \ - noncore/games/go noncore/games/qasteroids core/apps/qcop \ - noncore/games/fifteen noncore/comm/keypebble \ - core/pim/today noncore/games/tictac noncore/net/opieftp \ - noncore/graphics/drawpad noncore/games/kcheckers noncore/settings/appskey \ - noncore/graphics/qpdf noncore/games/kpacman noncore/apps/advancedfm \ - noncore/games/kbill noncore/tools/remote \ - noncore/tools/opie-sh \ - noncore/mail + core/multimedia/opieplayer/wavplugin + +COMPONENTS=$(LOCALCOMPONENTS) $(INPUTCOMPONENTS) $(APPLETS) $(MAIL) $(PLAYER) + + +PIMAPPS = core/pim/addressbook core/pim/datebook \ + core/pim/today core/pim/todo + +COREAPPS = core/apps/filebrowser core/apps/helpbrowser \ + core/apps/textedit core/apps/embeddedkonsole \ + core/launcher core/apps/sysinfo \ + core/apps/oipkg core/apps/qcop + +COREMULTIMEDIA = core/multimedia/opieplayer + +CORESETTINGS = core/settings/light-and-power core/settings/security \ + core/settings/systemtime core/settings/citytime \ + core/settings/wlansetup + +NONCORESETTINGS =noncore/settings/language noncore/settings/rotation \ + noncore/settings/appearance noncore/settings/sound \ + noncore/settings/mediummount \ + noncore/settings/tabmanager noncore/settings/appskey + +NONCORETOOLS = noncore/tools/calculator noncore/tools/clock \ + noncore/tools/remote noncore/tools/opie-sh + +GAMES = noncore/games/minesweep noncore/games/solitaire \ + noncore/games/tetrix noncore/games/wordgame \ + noncore/games/parashoot noncore/games/snake \ + noncore/games/mindbreaker \ + noncore/games/go noncore/games/qasteroids \ + noncore/games/fifteen noncore/games/tictac \ + noncore/games/kcheckers noncore/games/kpacman \ + noncore/games/kbill + +NONAPPS = noncore/apps/spreadsheet noncore/apps/tableviewer \ + noncore/apps/advancedfm + +NONNET = noncore/net/netsetup noncore/net/opieftp \ + noncore/mail + +NONMULT = noncore/multimedia/showimg noncore/graphics/drawpad \ + noncore/graphics/qpdf + + +NONCOMM = noncore/comm/keypebble + +APPS=$(LOCALAPPS) $(PIMAPPS) $(COREAPPS) \ + $(COREMULTIMEDIA) $(CORESETTINGS) \ + $(NONCORESETTINGS) $(NONCORETOOLS) \ + $(NOAPPS) $(NONNET) $(NONMULT) \ + $(NONCOMM) $(GAMES) + + NONTMAKEAPPS := ipaq/opiealarm noncore/nethack DOCS = docs/src/opie-policy single: mpegplayer/libmpeg3 dynamic: $(APPS) $(NONTMAKEAPPS) docs: $(DOCS) $(COMPONENTS): $(LIBS) diff --git a/core/applets/batteryapplet/batteryapplet.pro b/core/applets/batteryapplet/batteryapplet.pro index 9cf7556..b854b89 100644 --- a/core/applets/batteryapplet/batteryapplet.pro +++ b/core/applets/batteryapplet/batteryapplet.pro @@ -1,18 +1,18 @@ 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 +DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS = ../../i18n/de/libbatteryapplet.ts TRANSLATIONS += ../../i18n/es/libbatteryapplet.ts TRANSLATIONS += ../../i18n/pt/libbatteryapplet.ts TRANSLATIONS += ../../i18n/pt_BR/libbatteryapplet.ts TRANSLATIONS += ../../i18n/en/libbatteryapplet.ts TRANSLATIONS += ../../i18n/hu/libbatteryapplet.ts TRANSLATIONS += ../../i18n/ja/libbatteryapplet.ts diff --git a/core/applets/clipboardapplet/clipboardapplet.pro b/core/applets/clipboardapplet/clipboardapplet.pro index 71e2bbe..36fbc49 100644 --- a/core/applets/clipboardapplet/clipboardapplet.pro +++ b/core/applets/clipboardapplet/clipboardapplet.pro @@ -1,14 +1,14 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = clipboard.h clipboardappletimpl.h SOURCES = clipboard.cpp clipboardappletimpl.cpp TARGET = clipboardapplet -DESTDIR = ../../plugins/applets +DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS = ../../i18n/pt_BR/libclipboardapplet.ts TRANSLATIONS += ../../i18n/es/libclipboardapplet.ts TRANSLATIONS += ../../i18n/pt/libclipboardapplet.ts diff --git a/core/applets/clockapplet/clockapplet.pro b/core/applets/clockapplet/clockapplet.pro index 85e3316..2dc1784 100644 --- a/core/applets/clockapplet/clockapplet.pro +++ b/core/applets/clockapplet/clockapplet.pro @@ -1,15 +1,15 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = clock.h clockappletimpl.h SOURCES = clock.cpp clockappletimpl.cpp TARGET = clockapplet -DESTDIR = ../../plugins/applets +DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS = ../../i18n/de/libclockapplet.ts TRANSLATIONS += ../../i18n/es/libclockapplet.ts TRANSLATIONS += ../../i18n/pt/libclockapplet.ts TRANSLATIONS += ../../i18n/pt_BR/libclockapplet.ts diff --git a/core/applets/irdaapplet/irdaapplet.pro b/core/applets/irdaapplet/irdaapplet.pro index bfcfc3f..035b0c1 100644 --- a/core/applets/irdaapplet/irdaapplet.pro +++ b/core/applets/irdaapplet/irdaapplet.pro @@ -1,18 +1,18 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = irda.h irdaappletimpl.h SOURCES = irda.cpp irdaappletimpl.cpp TARGET = irdaapplet -DESTDIR = ../../plugins/applets +DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS = ../../i18n/de/libirdaapplet.ts TRANSLATIONS += ../../i18n/en/libirdaapplet.ts TRANSLATIONS += ../../i18n/es/libirdaapplet.ts TRANSLATIONS += ../../i18n/fr/libirdaapplet.ts TRANSLATIONS += ../../i18n/hu/libirdaapplet.ts TRANSLATIONS += ../../i18n/ja/libirdaapplet.ts TRANSLATIONS += ../../i18n/ko/libirdaapplet.ts diff --git a/core/applets/obex/obex.pro b/core/applets/obex/obex.pro index 6915737..a8c2340 100644 --- a/core/applets/obex/obex.pro +++ b/core/applets/obex/obex.pro @@ -1,12 +1,12 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = obex.h obeximpl.h SOURCES = obex.cc obeximpl.cc TARGET = opieobex -DESTDIR = ../../plugins/obex -INCLUDEPATH += $(OPIEDIR)/include +DESTDIR = $(OPIEDIR)/plugins/obex +INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher DEPENDPATH += ../$(OPIEDIR)/include INTERFACES = obexinc.ui obexdlg.ui LIBS += -lqpe -lopie VERSION = 0.0.1 diff --git a/core/applets/obex/obeximpl.h b/core/applets/obex/obeximpl.h index 8d10cf1..78d5b25 100644 --- a/core/applets/obex/obeximpl.h +++ b/core/applets/obex/obeximpl.h @@ -1,18 +1,18 @@ #ifndef OpieObexImpl_H #define OpieObexImpl_H #include <qobject.h> -#include "../obexinterface.h" +#include <obexinterface.h> #include "obexdlg.h" #include "obexinc.h" #include <qpe/qcopenvelope_qws.h> namespace OpieObex { class Obex; class ObexImpl : public QObject, public ObexInterface { Q_OBJECT public: ObexImpl(); virtual ~ObexImpl(); QRESULT queryInterface( const QUuid&, QUnknownInterface** ); diff --git a/core/applets/screenshotapplet/screenshotapplet.pro b/core/applets/screenshotapplet/screenshotapplet.pro index e3c5440..6b97a2d 100644 --- a/core/applets/screenshotapplet/screenshotapplet.pro +++ b/core/applets/screenshotapplet/screenshotapplet.pro @@ -1,18 +1,18 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = screenshot.h screenshotappletimpl.h SOURCES = screenshot.cpp screenshotappletimpl.cpp TARGET = screenshotapplet -DESTDIR = ../../plugins/applets +DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe VERSION = 1.0.0 MOC_DIR=opieobj OBJECTS_DIR=opieobj TRANSLATIONS = ../../i18n/pt_BR/libscreenshotapplet.ts TRANSLATIONS += ../../i18n/pt/libscreenshotapplet.ts TRANSLATIONS += ../../i18n/de/libscreenshotapplet.ts TRANSLATIONS += ../../i18n/en/libscreenshotapplet.ts TRANSLATIONS += ../../i18n/es/libscreenshotapplet.ts diff --git a/core/applets/vmemo/vmemo.pro b/core/applets/vmemo/vmemo.pro index f7cc439..298d989 100644 --- a/core/applets/vmemo/vmemo.pro +++ b/core/applets/vmemo/vmemo.pro @@ -1,14 +1,14 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = vmemo.h vmemoimpl.h SOURCES = vmemo.cpp vmemoimpl.cpp TARGET = vmemoapplet -DESTDIR = ../../plugins/applets +DESTDIR =$(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS = ../../i18n/pt_BR/libvmemoapplet.ts TRANSLATIONS += ../../i18n/es/libvmemoapplet.ts TRANSLATIONS += ../../i18n/pt/libvmemoapplet.ts diff --git a/core/applets/volumeapplet/volumeapplet.pro b/core/applets/volumeapplet/volumeapplet.pro index 54404bf..f89eea2 100644 --- a/core/applets/volumeapplet/volumeapplet.pro +++ b/core/applets/volumeapplet/volumeapplet.pro @@ -1,15 +1,15 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = volume.h volumeappletimpl.h SOURCES = volume.cpp volumeappletimpl.cpp TARGET = volumeapplet -DESTDIR = ../../plugins/applets +DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS = ../../i18n/de/libvolumeapplet.ts TRANSLATIONS += ../../i18n/es/libvolumeapplet.ts TRANSLATIONS += ../../i18n/pt/libvolumeapplet.ts TRANSLATIONS += ../../i18n/pt_BR/libvolumeapplet.ts diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro index b8e9236..182cd1f 100644 --- a/core/launcher/launcher.pro +++ b/core/launcher/launcher.pro @@ -11,25 +11,25 @@ HEADERS = background.h \ info.h \ appicons.h \ taskbar.h \ sidething.h \ mrulist.h \ stabmon.h \ inputmethods.h \ systray.h \ wait.h \ shutdownimpl.h \ launcher.h \ launcherview.h \ - ../calibrate/calibrate.h \ + $(OPIEDIR)/core/apps/calibrate/calibrate.h \ startmenu.h \ transferserver.h \ qcopbridge.h \ packageslave.h \ irserver.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 \ @@ -53,25 +53,25 @@ SOURCES = background.cpp \ info.cpp \ appicons.cpp \ taskbar.cpp \ sidething.cpp \ mrulist.cpp \ stabmon.cpp \ inputmethods.cpp \ systray.cpp \ wait.cpp \ shutdownimpl.cpp \ launcher.cpp \ launcherview.cpp \ - $(OPIEDIR)/calibrate/calibrate.cpp \ + $(OPIEDIR)/core/apps/calibrate/calibrate.cpp \ transferserver.cpp \ packageslave.cpp \ irserver.cpp \ qcopbridge.cpp \ startmenu.cpp \ main.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 \ @@ -92,26 +92,26 @@ SOURCES = background.cpp \ $(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 += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include . -INCLUDEPATH += $(OPIEDIR)/calibrate -DEPENDPATH += $(OPIEDIR)/calibrate +INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate +DEPENDPATH += $(OPIEDIR)/core/apps/calibrate INCLUDEPATH += $(OPIEDIR)/rsync DEPENDPATH += $(OPIEDIR)/rsync TARGET = qpe LIBS += -lqpe -lcrypt -lopie TRANSLATIONS = ../i18n/de/qpe.ts TRANSLATIONS += ../i18n/es/qpe.ts TRANSLATIONS += ../i18n/pt/qpe.ts TRANSLATIONS += ../i18n/pt_BR/qpe.ts diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro index 7e2afed..eb4a0db 100644 --- a/core/settings/light-and-power/light-and-power.pro +++ b/core/settings/light-and-power/light-and-power.pro @@ -1,15 +1,15 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = ../../bin +DESTDIR = $(OPIEDIR)/bin HEADERS = settings.h SOURCES = light.cpp main.cpp INTERFACES = lightsettingsbase.ui INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe TARGET = light-and-power TRANSLATIONS = ../../i18n/de/light-and-power.ts TRANSLATIONS += ../../i18n/es/light-and-power.ts TRANSLATIONS += ../../i18n/pt/light-and-power.ts TRANSLATIONS += ../../i18n/pt_BR/light-and-power.ts diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro index 1e815ac..6b28485 100644 --- a/core/settings/security/security.pro +++ b/core/settings/security/security.pro @@ -1,15 +1,15 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = ../../bin +DESTDIR = $(OPIEDIR)/bin HEADERS = security.h SOURCES = security.cpp main.cpp INTERFACES = securitybase.ui INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe TARGET = security TRANSLATIONS = ../../i18n/pt_BR/security.ts TRANSLATIONS += ../../i18n/es/security.ts TRANSLATIONS += ../../i18n/pt/security.ts TRANSLATIONS += ../../i18n/de/security.ts diff --git a/noncore/settings/language/language.pro b/noncore/settings/language/language.pro index 16888bb..f3a76d4 100644 --- a/noncore/settings/language/language.pro +++ b/noncore/settings/language/language.pro @@ -1,15 +1,15 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = ../../bin +DESTDIR = $(OPIEDIR)/bin HEADERS = settings.h SOURCES = language.cpp main.cpp INTERFACES = languagesettingsbase.ui INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe TARGET = language TRANSLATIONS = ../../i18n/pt_BR/language.ts TRANSLATIONS += ../../i18n/es/language.ts TRANSLATIONS += ../../i18n/pt/language.ts TRANSLATIONS += ../../i18n/de/language.ts diff --git a/noncore/settings/mediummount/mediummount.pro b/noncore/settings/mediummount/mediummount.pro index 0ed5744..d6983ec 100644 --- a/noncore/settings/mediummount/mediummount.pro +++ b/noncore/settings/mediummount/mediummount.pro @@ -1,10 +1,10 @@ TEMPLATE = app -DESTDIR = ../../bin/ +DESTDIR = $(OPIEDIR)/bin/ #CONFIG = qt warn_on debug CONFIG = qt warn_on release HEADERS = mediumwidget.h mediumglobal.h mainwindow.h SOURCES = main.cpp mediumwidget.cc mediumglobal.cc mainwindow.cc INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TARGET = mediummount
\ No newline at end of file diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro index ff5cd09..28c8b0d 100644 --- a/noncore/settings/sound/sound.pro +++ b/noncore/settings/sound/sound.pro @@ -1,15 +1,15 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = ../../bin +DESTDIR = $(OPIEDIR)/bin HEADERS = soundsettings.h soundsettingsbase.h SOURCES = soundsettings.cpp soundsettingsbase.cpp main.cpp #INTERFACES = soundsettingsbase.ui INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe TARGET = sound TRANSLATIONS = ../../i18n/pt_BR/sound.ts TRANSLATIONS += ../../i18n/es/sound.ts TRANSLATIONS += ../../i18n/pt/sound.ts TRANSLATIONS += ../../i18n/de/sound.ts |