summaryrefslogtreecommitdiff
path: root/inputmethods/keyboard
authorsimon <simon>2002-11-24 10:36:54 (UTC)
committer simon <simon>2002-11-24 10:36:54 (UTC)
commit9387bc3f63b1e48c559d0758c50d9af857e7feeb (patch) (side-by-side diff)
tree13318ea1c82fcdb54790af111537ca00708746f3 /inputmethods/keyboard
parent83a6751b29b0a7e77d09477880cdc16e14dfe0a1 (diff)
downloadopie-9387bc3f63b1e48c559d0758c50d9af857e7feeb.zip
opie-9387bc3f63b1e48c559d0758c50d9af857e7feeb.tar.gz
opie-9387bc3f63b1e48c559d0758c50d9af857e7feeb.tar.bz2
- link multikey, dvorak and keyboard input method against pickboard
(and updated ipkg dependencies accordingly) , to avoid duplicated symbols at run-time (patch posted on opie list a couple of days ago)
Diffstat (limited to 'inputmethods/keyboard') (more/less context) (show whitespace changes)
-rw-r--r--inputmethods/keyboard/keyboard.pro6
-rw-r--r--inputmethods/keyboard/opie-keyboard.control2
2 files changed, 2 insertions, 6 deletions
diff --git a/inputmethods/keyboard/keyboard.pro b/inputmethods/keyboard/keyboard.pro
index 105316f..540d177 100644
--- a/inputmethods/keyboard/keyboard.pro
+++ b/inputmethods/keyboard/keyboard.pro
@@ -1,19 +1,15 @@
TEMPLATE = lib
CONFIG += qt warn_on release
HEADERS = keyboard.h \
- ../pickboard/pickboardcfg.h \
- ../pickboard/pickboardpicks.h \
keyboardimpl.h
SOURCES = keyboard.cpp \
- ../pickboard/pickboardcfg.cpp \
- ../pickboard/pickboardpicks.cpp \
keyboardimpl.cpp
TARGET = qkeyboard
DESTDIR = ../../plugins/inputmethods
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += ../$(OPIEDIR)/include ../../launcher
-LIBS += -lqpe
+LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard
VERSION = 1.0.0
TRANSLATIONS = ../../i18n/de/libqkeyboard.ts \
../../i18n/en/libqkeyboard.ts \
diff --git a/inputmethods/keyboard/opie-keyboard.control b/inputmethods/keyboard/opie-keyboard.control
index cd60148..2a6b7a5 100644
--- a/inputmethods/keyboard/opie-keyboard.control
+++ b/inputmethods/keyboard/opie-keyboard.control
@@ -3,7 +3,7 @@ Priority: optional
Section: opie/inputmethods
Maintainer: Martin Jones <mjones@trolltech.com>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION)
+Depends: opie-base ($QPE_VERSION) opie-pickboard
Description: Keyboard input method
Keyboard input method for the Opie environment.