summaryrefslogtreecommitdiff
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
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 (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/dvorak/dvorak.pro6
-rw-r--r--inputmethods/dvorak/opie-dvorak.control2
-rw-r--r--inputmethods/keyboard/keyboard.pro6
-rw-r--r--inputmethods/keyboard/opie-keyboard.control2
-rw-r--r--inputmethods/multikey/multikey.pro6
-rw-r--r--inputmethods/multikey/opie-multikey.control2
6 files changed, 6 insertions, 18 deletions
diff --git a/inputmethods/dvorak/dvorak.pro b/inputmethods/dvorak/dvorak.pro
index 5c14761..3236749 100644
--- a/inputmethods/dvorak/dvorak.pro
+++ b/inputmethods/dvorak/dvorak.pro
@@ -2,10 +2,6 @@ TEMPLATE = lib
CONFIG += qt warn_on release
HEADERS = dvorak.h \
- ../pickboard/pickboardcfg.h \
- ../pickboard/pickboardpicks.h \
dvorakimpl.h
SOURCES = dvorak.cpp \
- ../pickboard/pickboardcfg.cpp \
- ../pickboard/pickboardpicks.cpp \
dvorakimpl.cpp
TARGET = qdvorak
@@ -13,5 +9,5 @@ DESTDIR = ../../plugins/inputmethods
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += ../$(OPIEDIR)/include ../../launcher
-LIBS += -lqpe
+LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard
VERSION = 1.0.0
diff --git a/inputmethods/dvorak/opie-dvorak.control b/inputmethods/dvorak/opie-dvorak.control
index 11a33b9..fcc9138 100644
--- a/inputmethods/dvorak/opie-dvorak.control
+++ b/inputmethods/dvorak/opie-dvorak.control
@@ -5,5 +5,5 @@ Maintainer: Jeremy Cowgar <jc@cowgar.com>
Architecture: arm
Version: $QPE_VERSION-4
-Depends: opie-base ($QPE_VERSION)
+Depends: opie-base ($QPE_VERSION) opie-pickboard
Description: Dvorak keyboard input method
Dvorak keyboard input method for the Opie environment. This is
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
@@ -2,10 +2,6 @@ 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
@@ -13,5 +9,5 @@ DESTDIR = ../../plugins/inputmethods
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += ../$(OPIEDIR)/include ../../launcher
-LIBS += -lqpe
+LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard
VERSION = 1.0.0
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
@@ -5,5 +5,5 @@ 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.
diff --git a/inputmethods/multikey/multikey.pro b/inputmethods/multikey/multikey.pro
index 1171602..268640e 100644
--- a/inputmethods/multikey/multikey.pro
+++ b/inputmethods/multikey/multikey.pro
@@ -3,11 +3,7 @@ CONFIG += qt warn_on release
HEADERS = keyboard.h \
configdlg.h \
- ../pickboard/pickboardcfg.h \
- ../pickboard/pickboardpicks.h \
keyboardimpl.h
SOURCES = keyboard.cpp \
configdlg.cpp \
- ../pickboard/pickboardcfg.cpp \
- ../pickboard/pickboardpicks.cpp \
keyboardimpl.cpp
TARGET = qmultikey
@@ -15,5 +11,5 @@ DESTDIR = $(OPIEDIR)/plugins/inputmethods
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += ../$(OPIEDIR)/include ../../launcher
-LIBS += -lqpe
+LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard
VERSION = 1.0.0
diff --git a/inputmethods/multikey/opie-multikey.control b/inputmethods/multikey/opie-multikey.control
index ce39f36..3de8b02 100644
--- a/inputmethods/multikey/opie-multikey.control
+++ b/inputmethods/multikey/opie-multikey.control
@@ -5,5 +5,5 @@ Maintainer: Jake Richardson (jake@asdfnews.org)
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION)
+Depends: opie-base ($QPE_VERSION) opie-pickboard
Description: Multiple language keyboard
Keyboard for inputing multiple languages in the OPIE environment.